diff --git a/TaskF04/run.py b/TaskF04/run.py index 0158bba..8766b89 100644 --- a/TaskF04/run.py +++ b/TaskF04/run.py @@ -1,29 +1,38 @@ import re import sys -def analyze_line(line): - lowercase_count = len(re.findall(r'\b[a-ząćęłńóśźż]\w*\b', line)) - uppercase_count = len(re.findall(r'\b[A-ZĄĆĘŁŃÓŚŹŻ]\w*\b', line)) - - result_line = f"{lowercase_count} {uppercase_count}\n" - return result_line - +def replace_second_number(line): + pattern = re.compile(r'(\D*\d+\D*).*?(\d+)(.*)') + group1, group2, group3 = '', '', '' + matches = pattern.search(line) + if matches: + group1 = matches.group(1) + group2 = matches.group(2) + group3 = matches.group(3) + print('group1:', group1) + print('group2:', group2) + print('group3:', group3) + if group2 != '': + modified_line = group1 + group3 + return modified_line + else: + return line def write_answer(row, ouput_file): with open(ouput_file, "a", encoding="utf-8") as file: - file.write(row) + file.write(row+'\n') def main_function(input_file, output_file): with open(output_file, "w", encoding="utf-8") as output_file1: with open(input_file, "r", encoding="utf-8") as file: for row in file: - write_answer(analyze_line(row), output_file) + write_answer(replace_second_number(row), output_file) -output_file ='simple.out' -input_file = 'simple.in' -# input_file = sys.argv[1] -# output_file = sys.argv[2] +# output_file ='simple.out' +# input_file = 'simple.in' +input_file = sys.argv[1] +output_file = sys.argv[2] main_function(input_file, output_file) diff --git a/TaskF04/simple.in b/TaskF04/simple.in index 5d7461c..ed5ad39 100644 --- a/TaskF04/simple.in +++ b/TaskF04/simple.in @@ -1,3 +1,3 @@ Mam 2 jabłka i 35 banananów. Mam 2 jabłka i 35 banananów oraz 20 gruszek. -Widziałem 2 bociany. +Widziałem 2 bociany. \ No newline at end of file diff --git a/TaskF04/simple.out b/TaskF04/simple.out new file mode 100644 index 0000000..d42a47f --- /dev/null +++ b/TaskF04/simple.out @@ -0,0 +1,3 @@ +Mam 2 jabłka i banananów. +Mam 22 jabłka i banananów oraz 20 gruszek. +Widziałem 2 bociany.