From 5e5b07ec7e94b18690bb8fa15a876e7ff400f397 Mon Sep 17 00:00:00 2001 From: ROM-ZAH <76934427+ROM-ZAH@users.noreply.github.com> Date: Tue, 7 Jun 2022 11:18:58 +0300 Subject: [PATCH 1/5] Delete oo.py --- oo.py | 27 --------------------------- 1 file changed, 27 deletions(-) delete mode 100644 oo.py diff --git a/oo.py b/oo.py deleted file mode 100644 index d63a632..0000000 --- a/oo.py +++ /dev/null @@ -1,27 +0,0 @@ -a = input() -k = 0 -s = a.split(";") -for i in range(len(s)): - if s[i].isdigit(): - if int(s[i]) % 2 == 0: - if k == 0: - print(f'{s[i]}', end="") - k = 1 - else: - print(f',{s[i]}', end="") -for i in range(len(s)): - if s[i].isdigit(): - if int(s[i]) % 3 == 0: - if k == 0: - print(f'{s[i]}', end="") - k = 15 - else: - print(f',{s[i]}', end="") -for i in range(len(s)): - if not s[i].isdigit(): - if len(s[i]) > 4: - if k == 0: - print(f'{s[i]}', end="") - k = 1 - else: - print(f',{s[i]}', end="") From 6c2f173e1e3bfadcb7f44081a9456c6769a7bfbd Mon Sep 17 00:00:00 2001 From: ROM-ZAH <76934427+ROM-ZAH@users.noreply.github.com> Date: Tue, 7 Jun 2022 11:20:27 +0300 Subject: [PATCH 2/5] Add files via upload --- Dz2.py | 131 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 131 insertions(+) create mode 100644 Dz2.py diff --git a/Dz2.py b/Dz2.py new file mode 100644 index 0000000..07cedc6 --- /dev/null +++ b/Dz2.py @@ -0,0 +1,131 @@ +import random +import csv +import math +import matplotlib.pyplot as plt + +def gen_str31(): + X = [] + Y = [] + + file = open("Alg_str31_1.csv", "w+") + file.write("vu,x,y\n") + + r_min = 10 + r_max = 20 + R_min = 80 + R_max = 120 + r_pu = 50 + R_pu = 100 + + X.append(0) + Y.append(0) + + #Размещение взвода управления огнем + X.append(0) + Y.append(0) + file.write("FIREU," + str(X[1]) + "," + str(Y[1]) + "\n") + X.append(X[1] + random.uniform(r_min, r_max)) + Y.append(Y[1] + random.uniform(r_min, r_max)) + file.write("FIREU," + str(X[2]) + "," + str(Y[2]) + "\n") + X.append(X[1] + random.uniform(r_min / 6, r_max / 6)) + Y.append(Y[1] + random.uniform(r_min, r_max)) + file.write("FIREU," + str(X[3]) + "," + str(Y[3]) + "\n") + X.append(X[1] - random.uniform(r_min, r_max)) + Y.append(Y[1] + random.uniform(r_min, r_max)) + file.write("FIREU," + str(X[4]) + "," + str(Y[4]) + "\n") + + #Размещение огневых секций + X.append(X[1] + math.sqrt(2) * random.uniform(R_min, R_max)) + Y.append(Y[1] - math.sqrt(2) * random.uniform(R_min, R_max)) + file.write("FIRES," + str(X[5]) + "," + str(Y[5]) + "\n") + X.append(X[5] + math.sqrt(2) * random.uniform(r_pu, R_pu)) + Y.append(Y[5] + math.sqrt(2) * random.uniform(r_pu, R_pu)) + file.write("FIRES," + str(X[6]) + "," + str(Y[6]) + "\n") + X.append(X[6] + math.sqrt(2) * random.uniform(R_min, R_max)) + Y.append(Y[6] + math.sqrt(2) * random.uniform(R_min, R_max)) + file.write("FIRES," + str(X[7]) + "," + str(Y[7]) + "\n") + X.append(X[7] + math.sqrt(2) * random.uniform(r_pu, R_pu)) + Y.append(Y[7] + math.sqrt(2) * random.uniform(r_pu, R_pu)) + file.write("FIRES," + str(X[8]) + "," + str(Y[8]) + "\n") + X.append(X[8] + random.uniform(r_min, r_max)) + Y.append(Y[8] + math.sqrt(2) * random.uniform(R_min, R_max)) + file.write("FIRES," + str(X[9]) + "," + str(Y[9]) + "\n") + X.append(X[9] - math.sqrt(2) * random.uniform(r_pu, R_pu)) + Y.append(Y[9] + math.sqrt(2) * random.uniform(r_pu, R_pu)) + file.write("FIRES," + str(X[10]) + "," + str(Y[10]) + "\n") + X.append(X[10] - math.sqrt(2) * random.uniform(R_min, R_max)) + Y.append(Y[10] + math.sqrt(2) * random.uniform(R_min, R_max)) + file.write("FIRES," + str(X[11]) + "," + str(Y[11]) + "\n") + X.append(X[11] - math.sqrt(2) * random.uniform(r_pu, R_pu)) + Y.append(Y[11] + math.sqrt(2) * random.uniform(r_pu, R_pu)) + file.write("FIRES," + str(X[12]) + "," + str(Y[12]) + "\n") + + #Размещение взвода обслуживания + X.append(X[1] + random.uniform(r_min, r_max)) + Y.append(Y[1] - random.uniform(R_min, R_max)) + file.write("vzvodOBSL," + str(X[13]) + "," + str(Y[13]) + "\n") + X.append(X[13] - random.uniform(r_min, r_max)) + Y.append(Y[13] + random.uniform(r_min, r_max)) + file.write("vzvodOBSL," + str(X[14]) + "," + str(Y[14]) + "\n") + X.append(X[14] - random.uniform(r_min, r_max)) + Y.append(Y[14] + random.uniform(r_min, r_max)) + file.write("vzvodOBSL," + str(X[15]) + "," + str(Y[15]) + "\n") + X.append(X[15] + random.uniform(r_min, r_max)) + Y.append(Y[15] + random.uniform(r_min, r_max)) + file.write("vzvodOBSL," + str(X[16]) + "," + str(Y[16]) + "\n") + X.append(X[16] - random.uniform(r_min, r_max)) + Y.append(Y[16] + random.uniform(r_min, r_max)) + file.write("vzvodOBSL," + str(X[17]) + "," + str(Y[17]) + "\n") + X.append(X[13] - random.uniform(r_min, r_max)) + Y.append(Y[13] + random.uniform(r_min, r_max)) + file.write("vzvodOBSL," + str(X[18]) + "," + str(Y[18]) + "\n") + X.append(X[18] - random.uniform(r_min, r_max)) + Y.append(Y[18] + random.uniform(r_min, r_max)) + file.write("vzvodOBSL," + str(X[19]) + "," + str(Y[19]) + "\n") + + +def draw_gen_str31(): + x1 = [] + y1 = [] + + x2 = [] + y2 = [] + + x3 = [] + y3 = [] + + with open('Alg_str31_1.csv') as f: + reader = csv.DictReader(f) + for row in reader: + if row['vu'] == 'FIREU': + x1.append(float(row['x'])) + y1.append(float(row['y'])) + elif row['vu'] == 'FIRES': + x2.append(float(row['x'])) + y2.append(float(row['y'])) + elif row['vu'] == 'vzvodOBSL': + x3.append(float(row['x'])) + y3.append(float(row['y'])) + fig, ax = plt.subplots() + + ax.scatter(x1, y1, label='FIREU') + ax.scatter(x2, y2, label='FIRES') + ax.scatter(x3, y3, label='vzvodOBSL') + x = [] + y = [] + num = 25 + for i in range(-num,num): + y.append(i*i) + x.append(i) + + + ax.plot(x, y, label='cos(x)') + ax.set_title('Гармонические функции') + ax.set_xlabel('x') # Add an x-label to the axes. + ax.set_ylabel('y') + ax.legend() + + ax.legend() + +gen_str31() +draw_gen_str31() \ No newline at end of file From 828aaf59d0283a44d3dbdcb2bf2efa93ace84da2 Mon Sep 17 00:00:00 2001 From: ROM-ZAH <76934427+ROM-ZAH@users.noreply.github.com> Date: Tue, 7 Jun 2022 14:27:15 +0300 Subject: [PATCH 3/5] Update Dz2.py +plt.show() --- Dz2.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Dz2.py b/Dz2.py index 07cedc6..46734d9 100644 --- a/Dz2.py +++ b/Dz2.py @@ -125,7 +125,8 @@ def draw_gen_str31(): ax.set_ylabel('y') ax.legend() - ax.legend() + ax.legend() + plt.show() gen_str31() -draw_gen_str31() \ No newline at end of file +draw_gen_str31() From ce89c2ea097d3eabe891993e1b68ebc3719292c8 Mon Sep 17 00:00:00 2001 From: ROM-ZAH <76934427+ROM-ZAH@users.noreply.github.com> Date: Wed, 8 Jun 2022 10:41:24 +0300 Subject: [PATCH 4/5] Delete Dz2.py --- Dz2.py | 132 --------------------------------------------------------- 1 file changed, 132 deletions(-) delete mode 100644 Dz2.py diff --git a/Dz2.py b/Dz2.py deleted file mode 100644 index 46734d9..0000000 --- a/Dz2.py +++ /dev/null @@ -1,132 +0,0 @@ -import random -import csv -import math -import matplotlib.pyplot as plt - -def gen_str31(): - X = [] - Y = [] - - file = open("Alg_str31_1.csv", "w+") - file.write("vu,x,y\n") - - r_min = 10 - r_max = 20 - R_min = 80 - R_max = 120 - r_pu = 50 - R_pu = 100 - - X.append(0) - Y.append(0) - - #Размещение взвода управления огнем - X.append(0) - Y.append(0) - file.write("FIREU," + str(X[1]) + "," + str(Y[1]) + "\n") - X.append(X[1] + random.uniform(r_min, r_max)) - Y.append(Y[1] + random.uniform(r_min, r_max)) - file.write("FIREU," + str(X[2]) + "," + str(Y[2]) + "\n") - X.append(X[1] + random.uniform(r_min / 6, r_max / 6)) - Y.append(Y[1] + random.uniform(r_min, r_max)) - file.write("FIREU," + str(X[3]) + "," + str(Y[3]) + "\n") - X.append(X[1] - random.uniform(r_min, r_max)) - Y.append(Y[1] + random.uniform(r_min, r_max)) - file.write("FIREU," + str(X[4]) + "," + str(Y[4]) + "\n") - - #Размещение огневых секций - X.append(X[1] + math.sqrt(2) * random.uniform(R_min, R_max)) - Y.append(Y[1] - math.sqrt(2) * random.uniform(R_min, R_max)) - file.write("FIRES," + str(X[5]) + "," + str(Y[5]) + "\n") - X.append(X[5] + math.sqrt(2) * random.uniform(r_pu, R_pu)) - Y.append(Y[5] + math.sqrt(2) * random.uniform(r_pu, R_pu)) - file.write("FIRES," + str(X[6]) + "," + str(Y[6]) + "\n") - X.append(X[6] + math.sqrt(2) * random.uniform(R_min, R_max)) - Y.append(Y[6] + math.sqrt(2) * random.uniform(R_min, R_max)) - file.write("FIRES," + str(X[7]) + "," + str(Y[7]) + "\n") - X.append(X[7] + math.sqrt(2) * random.uniform(r_pu, R_pu)) - Y.append(Y[7] + math.sqrt(2) * random.uniform(r_pu, R_pu)) - file.write("FIRES," + str(X[8]) + "," + str(Y[8]) + "\n") - X.append(X[8] + random.uniform(r_min, r_max)) - Y.append(Y[8] + math.sqrt(2) * random.uniform(R_min, R_max)) - file.write("FIRES," + str(X[9]) + "," + str(Y[9]) + "\n") - X.append(X[9] - math.sqrt(2) * random.uniform(r_pu, R_pu)) - Y.append(Y[9] + math.sqrt(2) * random.uniform(r_pu, R_pu)) - file.write("FIRES," + str(X[10]) + "," + str(Y[10]) + "\n") - X.append(X[10] - math.sqrt(2) * random.uniform(R_min, R_max)) - Y.append(Y[10] + math.sqrt(2) * random.uniform(R_min, R_max)) - file.write("FIRES," + str(X[11]) + "," + str(Y[11]) + "\n") - X.append(X[11] - math.sqrt(2) * random.uniform(r_pu, R_pu)) - Y.append(Y[11] + math.sqrt(2) * random.uniform(r_pu, R_pu)) - file.write("FIRES," + str(X[12]) + "," + str(Y[12]) + "\n") - - #Размещение взвода обслуживания - X.append(X[1] + random.uniform(r_min, r_max)) - Y.append(Y[1] - random.uniform(R_min, R_max)) - file.write("vzvodOBSL," + str(X[13]) + "," + str(Y[13]) + "\n") - X.append(X[13] - random.uniform(r_min, r_max)) - Y.append(Y[13] + random.uniform(r_min, r_max)) - file.write("vzvodOBSL," + str(X[14]) + "," + str(Y[14]) + "\n") - X.append(X[14] - random.uniform(r_min, r_max)) - Y.append(Y[14] + random.uniform(r_min, r_max)) - file.write("vzvodOBSL," + str(X[15]) + "," + str(Y[15]) + "\n") - X.append(X[15] + random.uniform(r_min, r_max)) - Y.append(Y[15] + random.uniform(r_min, r_max)) - file.write("vzvodOBSL," + str(X[16]) + "," + str(Y[16]) + "\n") - X.append(X[16] - random.uniform(r_min, r_max)) - Y.append(Y[16] + random.uniform(r_min, r_max)) - file.write("vzvodOBSL," + str(X[17]) + "," + str(Y[17]) + "\n") - X.append(X[13] - random.uniform(r_min, r_max)) - Y.append(Y[13] + random.uniform(r_min, r_max)) - file.write("vzvodOBSL," + str(X[18]) + "," + str(Y[18]) + "\n") - X.append(X[18] - random.uniform(r_min, r_max)) - Y.append(Y[18] + random.uniform(r_min, r_max)) - file.write("vzvodOBSL," + str(X[19]) + "," + str(Y[19]) + "\n") - - -def draw_gen_str31(): - x1 = [] - y1 = [] - - x2 = [] - y2 = [] - - x3 = [] - y3 = [] - - with open('Alg_str31_1.csv') as f: - reader = csv.DictReader(f) - for row in reader: - if row['vu'] == 'FIREU': - x1.append(float(row['x'])) - y1.append(float(row['y'])) - elif row['vu'] == 'FIRES': - x2.append(float(row['x'])) - y2.append(float(row['y'])) - elif row['vu'] == 'vzvodOBSL': - x3.append(float(row['x'])) - y3.append(float(row['y'])) - fig, ax = plt.subplots() - - ax.scatter(x1, y1, label='FIREU') - ax.scatter(x2, y2, label='FIRES') - ax.scatter(x3, y3, label='vzvodOBSL') - x = [] - y = [] - num = 25 - for i in range(-num,num): - y.append(i*i) - x.append(i) - - - ax.plot(x, y, label='cos(x)') - ax.set_title('Гармонические функции') - ax.set_xlabel('x') # Add an x-label to the axes. - ax.set_ylabel('y') - ax.legend() - - ax.legend() - plt.show() - -gen_str31() -draw_gen_str31() From f9c4769a338fa84185a6069852c1068797682101 Mon Sep 17 00:00:00 2001 From: ROM-ZAH <76934427+ROM-ZAH@users.noreply.github.com> Date: Wed, 8 Jun 2022 10:41:33 +0300 Subject: [PATCH 5/5] Add files via upload --- Dz2.py | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 Dz2.py diff --git a/Dz2.py b/Dz2.py new file mode 100644 index 0000000..8af839f --- /dev/null +++ b/Dz2.py @@ -0,0 +1,34 @@ +import csv +import matplotlib.pyplot as plt + +x1 = [] +y1 = [] + +x2 = [] +y2 = [] + +with open('dz2.csv') as f: + reader = csv.DictReader(f) + for row in reader: + if row['Period'] == '2010' and row['Sex'] == 'Male': + x1.append(int(row['Age'])) + y1.append(int(row['Count'])) + + num = 25 + for i in range(-num,num): + y2.append(i*i) + x2.append(i) + +fig = plt.figure(figsize=(10, 10)) +ax = plt.subplot(2, 1, 1) +ax.plot(x2, y2, label='X * X') +ax.set_title('Гармонические функции') +ax.set_xlabel('x') # Add an x-label to the axes. +ax.set_ylabel('y') +ax1 = plt.subplot(2, 1, 2) +ax1.plot(x1, y1, label='deth') +ax1.set_title('Количество смертей в 2010 по годам(мужчины)') +ax1.set_xlabel('Age') # Add an x-label to the axes. +ax1.set_ylabel('Count') +ax1.legend() +plt.show() \ No newline at end of file