From 54b3809fbba3e2accf4931530d781484a6837d81 Mon Sep 17 00:00:00 2001 From: DragIvBor Date: Sat, 19 Nov 2022 10:16:49 +0300 Subject: [PATCH 1/8] add lab_2.py --- python/src/lab_2.py | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 python/src/lab_2.py diff --git a/python/src/lab_2.py b/python/src/lab_2.py new file mode 100644 index 0000000..24e46f7 --- /dev/null +++ b/python/src/lab_2.py @@ -0,0 +1,25 @@ +import math +a=1.35 +b=0.98 +x=1.14 +print('Задание А:') +# Задание А + + +def y(x): + y = (((a * x + b) ** (1 / 3)) / (((math.log(x, math.e))) ** 2)) + return y + + +if __name__ == '__main__': + while x < 4.24: + print(y(x)) + x +=0.62 + + # Задание B + print('Задание B:') + xlist = [0.35,1.28,3.51,5.21,4.16] + xlen = len(xlist) + for i in range(0, xlen): + x = xlist[i] + print(y(x)) From 834aff2bf7280cb8f024487368228c3d17928324 Mon Sep 17 00:00:00 2001 From: DragIvBor Date: Sat, 19 Nov 2022 10:31:39 +0300 Subject: [PATCH 2/8] Fixed linter error --- python/src/lab_2.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/python/src/lab_2.py b/python/src/lab_2.py index 24e46f7..468db07 100644 --- a/python/src/lab_2.py +++ b/python/src/lab_2.py @@ -1,24 +1,24 @@ import math -a=1.35 -b=0.98 -x=1.14 +a = 1.35 +b = 0.98 +x = 1.14 print('Задание А:') # Задание А def y(x): - y = (((a * x + b) ** (1 / 3)) / (((math.log(x, math.e))) ** 2)) + y = (((a * x + b) ** (1 / 3)) / ((math.log(x, math.e)) ** 2)) return y if __name__ == '__main__': while x < 4.24: print(y(x)) - x +=0.62 + x += 0.62 # Задание B print('Задание B:') - xlist = [0.35,1.28,3.51,5.21,4.16] + xlist = [0.35, 1.28, 3.51, 5.21, 4.16] xlen = len(xlist) for i in range(0, xlen): x = xlist[i] From 6f7965cd197de7af0646f0fdb866715f6ddfa627 Mon Sep 17 00:00:00 2001 From: DragIvBor Date: Sat, 3 Dec 2022 10:48:51 +0300 Subject: [PATCH 3/8] solving three problems --- python/src/matrica_min.py | 9 +++++++++ python/src/pol'ski'.py | 12 ++++++++++++ python/src/spisok.py | 15 +++++++++++++++ 3 files changed, 36 insertions(+) create mode 100644 python/src/matrica_min.py create mode 100644 python/src/pol'ski'.py create mode 100644 python/src/spisok.py diff --git a/python/src/matrica_min.py b/python/src/matrica_min.py new file mode 100644 index 0000000..647f523 --- /dev/null +++ b/python/src/matrica_min.py @@ -0,0 +1,9 @@ +# https://www.codewars.com/kata/5d5ee4c35162d9001af7d699 +def sum_of_minimums(numbers): + result = 0 + for i in numbers: + result += min(i) + return result + + +print(sum_of_minimums([[1, 2, 3, 4, 5], [5, 6, 7, 8, 9], [20, 21, 34, 56, 100]])) diff --git a/python/src/pol'ski'.py b/python/src/pol'ski'.py new file mode 100644 index 0000000..af0a967 --- /dev/null +++ b/python/src/pol'ski'.py @@ -0,0 +1,12 @@ +# https://www.codewars.com/kata/57ab2d6072292dbf7c000039 +x = 'Jędrzej Błądziński' +x = x.replace('ą', 'a') +x = x.replace('ć', 'c') +x = x.replace('ę', 'e') +x = x.replace('ł', 'l') +x = x.replace('ń', 'n') +x = x.replace('ó', 'o') +x = x.replace('ś', 's') +x = x.replace('ź', 'z') + +print(x) diff --git a/python/src/spisok.py b/python/src/spisok.py new file mode 100644 index 0000000..59e279f --- /dev/null +++ b/python/src/spisok.py @@ -0,0 +1,15 @@ +# https://www.codewars.com/kata/59a9919107157a45220000e1 + +list = [] + + +def find_all(list, x): + l = len(list) + result = [] + for i in range(0, l): + if x == list[i]: + result.append(i) + return result + + +print(find_all([6, 9, 3, 4, 3, 82, 11], 3)) From 67113696b30641cf6a2eafeb16f3f36b816f07a6 Mon Sep 17 00:00:00 2001 From: DragIvBor Date: Sat, 3 Dec 2022 10:59:36 +0300 Subject: [PATCH 4/8] solving three problems --- python/src/matrica_min.py | 1 + python/src/pol'ski'.py | 1 + python/src/spisok.py | 1 + 3 files changed, 3 insertions(+) diff --git a/python/src/matrica_min.py b/python/src/matrica_min.py index 647f523..4bf40f5 100644 --- a/python/src/matrica_min.py +++ b/python/src/matrica_min.py @@ -7,3 +7,4 @@ def sum_of_minimums(numbers): print(sum_of_minimums([[1, 2, 3, 4, 5], [5, 6, 7, 8, 9], [20, 21, 34, 56, 100]])) + diff --git a/python/src/pol'ski'.py b/python/src/pol'ski'.py index af0a967..322afe2 100644 --- a/python/src/pol'ski'.py +++ b/python/src/pol'ski'.py @@ -10,3 +10,4 @@ x = x.replace('ź', 'z') print(x) + diff --git a/python/src/spisok.py b/python/src/spisok.py index 59e279f..1a0269e 100644 --- a/python/src/spisok.py +++ b/python/src/spisok.py @@ -13,3 +13,4 @@ def find_all(list, x): print(find_all([6, 9, 3, 4, 3, 82, 11], 3)) + From 3c4b5a4267d6c93e10e4cb5094fd4f0754bbec67 Mon Sep 17 00:00:00 2001 From: DragIvBor Date: Sat, 10 Dec 2022 13:37:41 +0300 Subject: [PATCH 5/8] add solving three --- python/src/matrica_min.py | 1 - python/src/pol'ski'.py | 24 ++++++++++++++---------- python/src/spisok.py | 7 ++----- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/python/src/matrica_min.py b/python/src/matrica_min.py index 4bf40f5..647f523 100644 --- a/python/src/matrica_min.py +++ b/python/src/matrica_min.py @@ -7,4 +7,3 @@ def sum_of_minimums(numbers): print(sum_of_minimums([[1, 2, 3, 4, 5], [5, 6, 7, 8, 9], [20, 21, 34, 56, 100]])) - diff --git a/python/src/pol'ski'.py b/python/src/pol'ski'.py index 322afe2..f6b23a9 100644 --- a/python/src/pol'ski'.py +++ b/python/src/pol'ski'.py @@ -1,13 +1,17 @@ # https://www.codewars.com/kata/57ab2d6072292dbf7c000039 -x = 'Jędrzej Błądziński' -x = x.replace('ą', 'a') -x = x.replace('ć', 'c') -x = x.replace('ę', 'e') -x = x.replace('ł', 'l') -x = x.replace('ń', 'n') -x = x.replace('ó', 'o') -x = x.replace('ś', 's') -x = x.replace('ź', 'z') +abs = {"ą": "a", + "ć": "c", + "ę": "e", + "ł": "l", + "ń": "n", + "ó": "o", + "ś": "s", + "ź": "z", + "ż": "z"} -print(x) +word = "Jędrzej Błądziński" + +for i in abs.keys(): + word = word.replace(i, abs[i]) +print(word) diff --git a/python/src/spisok.py b/python/src/spisok.py index 1a0269e..f05d7d6 100644 --- a/python/src/spisok.py +++ b/python/src/spisok.py @@ -1,16 +1,13 @@ # https://www.codewars.com/kata/59a9919107157a45220000e1 - -list = [] +# list = [] def find_all(list, x): - l = len(list) result = [] - for i in range(0, l): + for i in range(0, len(list)): if x == list[i]: result.append(i) return result print(find_all([6, 9, 3, 4, 3, 82, 11], 3)) - From bf308b1c7b812cf973cb2f6ef95051c2240f1c14 Mon Sep 17 00:00:00 2001 From: DragIvBor Date: Sat, 10 Dec 2022 14:21:59 +0300 Subject: [PATCH 6/8] update lab_2.py --- python/src/lab_2.py | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/python/src/lab_2.py b/python/src/lab_2.py index 468db07..d76522c 100644 --- a/python/src/lab_2.py +++ b/python/src/lab_2.py @@ -1,25 +1,33 @@ import math -a = 1.35 -b = 0.98 + x = 1.14 print('Задание А:') -# Задание А -def y(x): +# Задание А + +def A(x, a=1.35, b=0.98): y = (((a * x + b) ** (1 / 3)) / ((math.log(x, math.e)) ** 2)) return y if __name__ == '__main__': while x < 4.24: - print(y(x)) + print(A(x)) x += 0.62 - # Задание B - print('Задание B:') - xlist = [0.35, 1.28, 3.51, 5.21, 4.16] - xlen = len(xlist) - for i in range(0, xlen): - x = xlist[i] - print(y(x)) + +# Задание B + + +def B(x): + y = (((1.35 * x + 0.98) ** (1 / 3)) / ((math.log(x, math.e)) ** 2)) + return y + + +print('Задание B:') +xlist = [0.35, 1.28, 3.51, 5.21, 4.16] +xlen = len(xlist) +for i in range(0, xlen): + x = xlist[i] + print(B(x)) From a9beb5fe46364029b8cb7231184316f420793473 Mon Sep 17 00:00:00 2001 From: DragIvBor Date: Sat, 10 Dec 2022 14:23:56 +0300 Subject: [PATCH 7/8] update lab_2.py --- python/src/lab_2.py | 1 + 1 file changed, 1 insertion(+) diff --git a/python/src/lab_2.py b/python/src/lab_2.py index d76522c..8fdd96b 100644 --- a/python/src/lab_2.py +++ b/python/src/lab_2.py @@ -31,3 +31,4 @@ def B(x): for i in range(0, xlen): x = xlist[i] print(B(x)) + From 6cc4b86b2ba1341d6733bcd3d42bef0deab4e4ef Mon Sep 17 00:00:00 2001 From: DragIvBor <115340250+DragIvBor@users.noreply.github.com> Date: Wed, 14 Dec 2022 10:50:45 +0300 Subject: [PATCH 8/8] Delete lab_2.py --- python/src/lab_2.py | 34 ---------------------------------- 1 file changed, 34 deletions(-) delete mode 100644 python/src/lab_2.py diff --git a/python/src/lab_2.py b/python/src/lab_2.py deleted file mode 100644 index 8fdd96b..0000000 --- a/python/src/lab_2.py +++ /dev/null @@ -1,34 +0,0 @@ -import math - -x = 1.14 -print('Задание А:') - - -# Задание А - -def A(x, a=1.35, b=0.98): - y = (((a * x + b) ** (1 / 3)) / ((math.log(x, math.e)) ** 2)) - return y - - -if __name__ == '__main__': - while x < 4.24: - print(A(x)) - x += 0.62 - - -# Задание B - - -def B(x): - y = (((1.35 * x + 0.98) ** (1 / 3)) / ((math.log(x, math.e)) ** 2)) - return y - - -print('Задание B:') -xlist = [0.35, 1.28, 3.51, 5.21, 4.16] -xlen = len(xlist) -for i in range(0, xlen): - x = xlist[i] - print(B(x)) -