diff --git a/TaskA00/run b/TaskA00/run index 808bd59..3e8e3f3 100644 --- a/TaskA00/run +++ b/TaskA00/run @@ -3,7 +3,7 @@ import sys import re def is_number(test): - pattern = re.compile(r'^\-?[1-9]*[05]$') + pattern = re.compile(r'^\-?(([1-9][0-9]*[05])|(0))$') result = re.match(pattern, test) if result: diff --git a/TaskA40/run b/TaskA40/run index 6ba685c..b668a06 100644 --- a/TaskA40/run +++ b/TaskA40/run @@ -3,7 +3,7 @@ import sys import re def is_number(test): - pattern = re.compile(r'^(1 roczek)|([2-4] (lata|latka))|([5-9]|(1[0-9])|20|21 lat)|(([2-9][2-4]) lata)|(([2-9](156789)|10[0-9]|110) lat)$') + pattern = re.compile(r'^((1 roczek)|([2-4] (lata|latka))|(([5-9]|(1[0-9])|20|21) lat)|((([2-9][2-4])|10[2-4]) lata)|(([2-9](156789)|10[0-1]|10[5-9]|110) lat))$') result = re.match(pattern, test) if result: diff --git a/TaskA45/run b/TaskA45/run index 4c127da..aefc922 100644 --- a/TaskA45/run +++ b/TaskA45/run @@ -3,11 +3,12 @@ import sys import re def is_number(test): - pattern = re.compile(r'^([A-Za-ĆŁŚŹŻ]\w*[^a]|Kosma|Jarema) [A-Za-ĆŁŚŹŻ]\w*$') + pattern = re.compile(r'^([A-ZĆŁŚŹŻ]\w*[^a]|Kosma|Jarema) [A-ZĆŁŚŹŻ]\w*$') result = re.match(pattern, test) if result: test = test.split(' ') + test[1] = test[1].replace('\n','') if(len(test[0])<2 or len(test[1])<2): return "" else: diff --git a/lista_zadań.txt b/lista_zadań.txt index dad8dd4..cf1d1d3 100644 --- a/lista_zadań.txt +++ b/lista_zadań.txt @@ -1 +1,2 @@ -2: A00 A13 A42 A45 \ No newline at end of file +2: A00 A13 A42 A45 +2: A00 A13 A40 A45 \ No newline at end of file diff --git a/shortcut.bat b/shortcut.bat new file mode 100644 index 0000000..dadf5ca --- /dev/null +++ b/shortcut.bat @@ -0,0 +1,3 @@ +git add TaskA%1/run +git commit -m 'hm' +git push origin master \ No newline at end of file