From c11228831bf73a3f61b7ddc5ecdf68985447f337 Mon Sep 17 00:00:00 2001 From: Lyagin Dmitry Date: Fri, 9 Jun 2023 21:38:53 +0300 Subject: [PATCH 01/10] =?UTF-8?q?=D0=94=D0=97=205.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Practice/Lyagin/dim_5.1.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 Practice/Lyagin/dim_5.1.py diff --git a/Practice/Lyagin/dim_5.1.py b/Practice/Lyagin/dim_5.1.py new file mode 100644 index 0000000..be4fa35 --- /dev/null +++ b/Practice/Lyagin/dim_5.1.py @@ -0,0 +1,12 @@ +arr = [0,3,-8,2,3,7] + + +def min_el(arr): + ind = 0 + for i in range(1,len(arr)): + if arr[i] < arr[ind]: + ind = i + arr[0], arr[ind] = arr[ind], arr[0] +print(arr) +min_el(arr) +print(arr) From 01e5353e103b2b12a4ca8f3c64489891243be857 Mon Sep 17 00:00:00 2001 From: Lyagin Dmitry Date: Sat, 10 Jun 2023 21:29:38 +0300 Subject: [PATCH 02/10] =?UTF-8?q?=D0=94=D0=97=205.1=20Edit1=20+=205.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Practice/Lyagin/dim_5.1.py | 20 +++++++++++--------- Practice/Lyagin/dim_5.2.py | 9 +++++++++ 2 files changed, 20 insertions(+), 9 deletions(-) create mode 100644 Practice/Lyagin/dim_5.2.py diff --git a/Practice/Lyagin/dim_5.1.py b/Practice/Lyagin/dim_5.1.py index be4fa35..c0d64c1 100644 --- a/Practice/Lyagin/dim_5.1.py +++ b/Practice/Lyagin/dim_5.1.py @@ -1,12 +1,14 @@ -arr = [0,3,-8,2,3,7] - def min_el(arr): - ind = 0 - for i in range(1,len(arr)): - if arr[i] < arr[ind]: - ind = i - arr[0], arr[ind] = arr[ind], arr[0] -print(arr) -min_el(arr) + for i in range(len(arr)): + for k in range(i): + if arr[k] > arr[i]: + arr[k],arr[i] = arr[i],arr[k] + return(arr) + + + + +arr = [0, 3, -8, 2, 3, 7] print(arr) +print(min_el(arr)) diff --git a/Practice/Lyagin/dim_5.2.py b/Practice/Lyagin/dim_5.2.py new file mode 100644 index 0000000..09613c0 --- /dev/null +++ b/Practice/Lyagin/dim_5.2.py @@ -0,0 +1,9 @@ +def povtor(lst): + for i in range(len(lst)): + for k in range(i): + if lst[i] == lst[k]: + return (lst[i]) + + +lst = [2, 3, 4, 5, 3, 2] +print(povtor(lst)) From 5a1e9f8278af5057c4c6956aa0f6ddbad49ce8c9 Mon Sep 17 00:00:00 2001 From: Lyagin Dmitry Date: Sun, 11 Jun 2023 16:00:13 +0300 Subject: [PATCH 03/10] =?UTF-8?q?=D0=94=D0=97=205.1=20Edit2=20+=205.2=20Ed?= =?UTF-8?q?it1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Practice/Lyagin/dim_5.1.py | 53 +++++++++++++++++++++++++++++++------- Practice/Lyagin/dim_5.2.py | 2 +- 2 files changed, 45 insertions(+), 10 deletions(-) diff --git a/Practice/Lyagin/dim_5.1.py b/Practice/Lyagin/dim_5.1.py index c0d64c1..cc8eaae 100644 --- a/Practice/Lyagin/dim_5.1.py +++ b/Practice/Lyagin/dim_5.1.py @@ -1,14 +1,49 @@ -def min_el(arr): - for i in range(len(arr)): - for k in range(i): - if arr[k] > arr[i]: - arr[k],arr[i] = arr[i],arr[k] - return(arr) +# def min_el(arr): +# for i in range(len(arr)): +# for k in range(i): +# if arr[k] > arr[i]: +# arr[k],arr[i] = arr[i],arr[k] +# return arr + + +arr = [0, 3, 24, 2, 3, 7] +# print(arr) +# print(min_el(arr)) +j = 0 +for i in range(len(arr)): + if arr[i] <= arr[j]: + arr[i],arr[j] = arr[j],arr[i] + print(arr[i]) + print(arr) +j += 1 +for i in range(j,len(arr)): + if arr[i] <= arr[j]: + arr[i],arr[j] = arr[j],arr[i] + print(arr[i]) + print(arr) + +j += 1 +for i in range(j,len(arr)): + if arr[i] <= arr[j]: + arr[i],arr[j] = arr[j],arr[i] + print(arr[i]) + print(arr) + +j += 1 +for i in range(j,len(arr)): + if arr[i] <= arr[j]: + arr[i],arr[j] = arr[j],arr[i] + print(arr[i]) + print(arr) + +j += 1 +for i in range(j,len(arr)): + if arr[i] <= arr[j]: + arr[i],arr[j] = arr[j],arr[i] + print(arr[i]) + print(arr) -arr = [0, 3, -8, 2, 3, 7] -print(arr) -print(min_el(arr)) diff --git a/Practice/Lyagin/dim_5.2.py b/Practice/Lyagin/dim_5.2.py index 09613c0..ef1e43f 100644 --- a/Practice/Lyagin/dim_5.2.py +++ b/Practice/Lyagin/dim_5.2.py @@ -2,7 +2,7 @@ def povtor(lst): for i in range(len(lst)): for k in range(i): if lst[i] == lst[k]: - return (lst[i]) + return lst[i] lst = [2, 3, 4, 5, 3, 2] From 6e4b9a8573e9264d442fba05a64e99e997a921e7 Mon Sep 17 00:00:00 2001 From: Lyagin Dmitry Date: Thu, 15 Jun 2023 08:30:09 +0300 Subject: [PATCH 04/10] =?UTF-8?q?=D0=94=D0=97=206.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Practice/Lyagin/dim_6.1.py | 44 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 Practice/Lyagin/dim_6.1.py diff --git a/Practice/Lyagin/dim_6.1.py b/Practice/Lyagin/dim_6.1.py new file mode 100644 index 0000000..abff367 --- /dev/null +++ b/Practice/Lyagin/dim_6.1.py @@ -0,0 +1,44 @@ + +class tanks: + country = "" + name = "" + hp = 0 # Прочность + dmg = 0 # Урон + + def __init__(self, country_, name_): + self.country = country_ + self.name = name_ + + + def add_hp(self, increase): + self.hp += increase + + + def add_dmg(self, incr): + self.dmg += incr + + def in_game(self): + print(f"In Game {self.name} from {self.country}") + + + +t1 = tanks("rus", "T-90M «Прорыв»") +t1.add_hp(90) +t1.add_dmg(30) + +t2 = tanks("ger","Leopard" ) +t2.add_hp(60) +t2.add_dmg(20) + +t3 = tanks("usa","M1 Abrams" ) +t3.add_hp(50) +t3.add_dmg(10) + +t1.in_game() +print(f"{t1.hp = },{t1.dmg = }") +print("**********************") +t2.in_game() +print(f"{t2.hp = },{t2.dmg = }") +print("**********************") +t3.in_game() +print(f"{t3.hp = },{t3.dmg = }") From e273ef837c68bdc0f738090d63490a78a0e01f0c Mon Sep 17 00:00:00 2001 From: Lyagin Dmitry Date: Thu, 15 Jun 2023 11:14:00 +0300 Subject: [PATCH 05/10] =?UTF-8?q?=D0=94=D0=97=206.1=20Edit1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Practice/Lyagin/dim_6.1.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/Practice/Lyagin/dim_6.1.py b/Practice/Lyagin/dim_6.1.py index abff367..4f073ac 100644 --- a/Practice/Lyagin/dim_6.1.py +++ b/Practice/Lyagin/dim_6.1.py @@ -1,5 +1,5 @@ -class tanks: +class Tanks: country = "" name = "" hp = 0 # Прочность @@ -9,11 +9,9 @@ def __init__(self, country_, name_): self.country = country_ self.name = name_ - def add_hp(self, increase): self.hp += increase - def add_dmg(self, incr): self.dmg += incr @@ -21,16 +19,15 @@ def in_game(self): print(f"In Game {self.name} from {self.country}") - -t1 = tanks("rus", "T-90M «Прорыв»") +t1 = Tanks("rus", "T-90M «Прорыв»") t1.add_hp(90) t1.add_dmg(30) -t2 = tanks("ger","Leopard" ) +t2 = Tanks("ger","Leopard" ) t2.add_hp(60) t2.add_dmg(20) -t3 = tanks("usa","M1 Abrams" ) +t3 = Tanks("usa","M1 Abrams" ) t3.add_hp(50) t3.add_dmg(10) From b60f045b7ebc34c73677cc4a9facf8badaea4df6 Mon Sep 17 00:00:00 2001 From: Lyagin Dmitry Date: Mon, 19 Jun 2023 11:35:39 +0300 Subject: [PATCH 06/10] =?UTF-8?q?=D0=94=D0=97=205.1=20Edit3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Practice/Lyagin/dim_5.1.py | 48 +++++++++++--------------------------- 1 file changed, 14 insertions(+), 34 deletions(-) diff --git a/Practice/Lyagin/dim_5.1.py b/Practice/Lyagin/dim_5.1.py index cc8eaae..992c3a9 100644 --- a/Practice/Lyagin/dim_5.1.py +++ b/Practice/Lyagin/dim_5.1.py @@ -7,43 +7,23 @@ # return arr -arr = [0, 3, 24, 2, 3, 7] + # print(arr) # print(min_el(arr)) -j = 0 -for i in range(len(arr)): - if arr[i] <= arr[j]: - arr[i],arr[j] = arr[j],arr[i] - print(arr[i]) - print(arr) -j += 1 -for i in range(j,len(arr)): - if arr[i] <= arr[j]: - arr[i],arr[j] = arr[j],arr[i] - print(arr[i]) - print(arr) - -j += 1 -for i in range(j,len(arr)): - if arr[i] <= arr[j]: - arr[i],arr[j] = arr[j],arr[i] - print(arr[i]) - print(arr) - -j += 1 -for i in range(j,len(arr)): - if arr[i] <= arr[j]: - arr[i],arr[j] = arr[j],arr[i] - print(arr[i]) - print(arr) - -j += 1 -for i in range(j,len(arr)): - if arr[i] <= arr[j]: - arr[i],arr[j] = arr[j],arr[i] - print(arr[i]) - print(arr) +arr = [0, 3, 24, 2, 3, 7] + +i = 0 +while i < len(arr)-1: + m = i + j = i + 1 + while j < len(arr): + if arr[j] < arr[m]: + m = j + j = j+1 + arr[i], arr[m] = arr[m], arr[i] + i += 1 + print(arr) From 35c86726f438998490ff63acc935aeb334601d41 Mon Sep 17 00:00:00 2001 From: Lyagin Dmitry Date: Thu, 22 Jun 2023 08:19:36 +0300 Subject: [PATCH 07/10] =?UTF-8?q?=D0=94=D0=97=205.1=20Edit4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Practice/Lyagin/dim_5.1.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Practice/Lyagin/dim_5.1.py b/Practice/Lyagin/dim_5.1.py index 992c3a9..b288675 100644 --- a/Practice/Lyagin/dim_5.1.py +++ b/Practice/Lyagin/dim_5.1.py @@ -23,7 +23,8 @@ if arr[j] < arr[m]: m = j j = j+1 - arr[i], arr[m] = arr[m], arr[i] + if m != i: + arr[i], arr[m] = arr[m], arr[i] i += 1 print(arr) From 75e60af9b235ef7fb795df7878b14b3e84a61b91 Mon Sep 17 00:00:00 2001 From: Lyagin Dmitry Date: Thu, 22 Jun 2023 08:21:09 +0300 Subject: [PATCH 08/10] =?UTF-8?q?=D0=94=D0=97=205.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Practice/Lyagin/dim_5.3.py | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 Practice/Lyagin/dim_5.3.py diff --git a/Practice/Lyagin/dim_5.3.py b/Practice/Lyagin/dim_5.3.py new file mode 100644 index 0000000..0d9e5dd --- /dev/null +++ b/Practice/Lyagin/dim_5.3.py @@ -0,0 +1,11 @@ + +d = {"Зимой" : "Щи", "летом" : "каша", "одним" : "пища", "цветом" : "наша"} +str = "Зимой и летом одним цветом" + +print(f"Было: ", str) + +for k,v in d.items(): + str = str.replace(k,v) + print((k,v)) + +print(f"Стало: ", str) From f5776a737eb816e2a504556ac774cb303738095d Mon Sep 17 00:00:00 2001 From: Lyagin Dmitry Date: Thu, 22 Jun 2023 09:56:20 +0300 Subject: [PATCH 09/10] =?UTF-8?q?=D0=94=D0=97=205.3=20Edit1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Practice/Lyagin/dim_5.3.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Practice/Lyagin/dim_5.3.py b/Practice/Lyagin/dim_5.3.py index 0d9e5dd..54c80b2 100644 --- a/Practice/Lyagin/dim_5.3.py +++ b/Practice/Lyagin/dim_5.3.py @@ -1,11 +1,11 @@ d = {"Зимой" : "Щи", "летом" : "каша", "одним" : "пища", "цветом" : "наша"} -str = "Зимой и летом одним цветом" +st_r = "Зимой и летом одним цветом" -print(f"Было: ", str) +print(f"Было: ", st_r) for k,v in d.items(): - str = str.replace(k,v) - print((k,v)) + st_r = st_r.replace(k,v) + print(k,v) -print(f"Стало: ", str) +print(f"Стало: ", st_r) From 3be7ad2ae222fcaa7e5c7e9e281dc3ca6733ee77 Mon Sep 17 00:00:00 2001 From: Lyagin Dmitry Date: Thu, 22 Jun 2023 09:58:03 +0300 Subject: [PATCH 10/10] =?UTF-8?q?=D0=94=D0=97=206.1=20Edit1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Practice/Lyagin/dim_6.1.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/Practice/Lyagin/dim_6.1.py b/Practice/Lyagin/dim_6.1.py index 4f073ac..208ddb1 100644 --- a/Practice/Lyagin/dim_6.1.py +++ b/Practice/Lyagin/dim_6.1.py @@ -31,11 +31,12 @@ def in_game(self): t3.add_hp(50) t3.add_dmg(10) -t1.in_game() -print(f"{t1.hp = },{t1.dmg = }") -print("**********************") -t2.in_game() -print(f"{t2.hp = },{t2.dmg = }") -print("**********************") -t3.in_game() -print(f"{t3.hp = },{t3.dmg = }") +for i in [t1,t2,t3]: + i.in_game() + print(f"{i.hp = },{i.dmg = }") + print("**********************") +# t2.in_game() +# print(f"{t2.hp = },{t2.dmg = }") +# print("**********************") +# t3.in_game() +# print(f"{t3.hp = },{t3.dmg = }")