Skip to content

Commit 22c9fe5

Browse files
Rename var isNotOutGraphic to isNotOutBounds for solution conflicts
1 parent dcc2092 commit 22c9fe5

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

Lab2/frontshow/calc_algorithm/aritificialImmuneSystemShow.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ def call_AIimmuneSystem(arr_textField) -> None:
1616
max_x = float(arr_textField[1].get())
1717
min_y = float(arr_textField[2].get())
1818
max_y = float(arr_textField[3].get())
19-
isNotOutGraphic = False
19+
isNotOutBounds = False
2020
if (type(gv.START) == dict):
21-
isNotOutGraphic = isNotOutGraphicDict(gv.START, gv.END, min_x, max_x, min_y, max_y)
21+
isNotOutBounds = isNotOutGraphicDict(gv.START, gv.END, min_x, max_x, min_y, max_y)
2222
else:
23-
isNotOutGraphic = isNotOutGraphic(gv.START, gv.END, min_x, max_x, min_y, max_y)
23+
isNotOutBounds = isNotOutGraphic(gv.START, gv.END, min_x, max_x, min_y, max_y)
2424

25-
if isNotOutGraphic:
25+
if isNotOutBounds:
2626
sizePopulize = int(arr_textField[4].get())
2727
countGenerations = int(arr_textField[5].get())
2828
best_point, points = algorithm_artificial_immune_system(min_x, max_x, min_y, max_y, sizePopulize, gv.current_function, countGenerations)

Lab2/frontshow/calc_algorithm/bacterialShow.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ def call_Bacterial(arr_textField) -> None:
1515
max_x = float(arr_textField[1].get())
1616
min_y = float(arr_textField[2].get())
1717
max_y = float(arr_textField[3].get())
18-
isNotOutGraphic = False
18+
isNotOutBounds = False
1919
if(type(gv.START) == dict):
20-
isNotOutGraphic = isNotOutGraphicDict(gv.START,gv.END,min_x, max_x, min_y, max_y)
20+
isNotOutBounds = isNotOutGraphicDict(gv.START,gv.END,min_x, max_x, min_y, max_y)
2121
else:
22-
isNotOutGraphic = isNotOutGraphic(gv.START, gv.END, min_x, max_x, min_y, max_y)
23-
if isNotOutGraphic:
22+
isNotOutBounds = isNotOutGraphic(gv.START, gv.END, min_x, max_x, min_y, max_y)
23+
if isNotOutBounds:
2424
count_bacterials = int(arr_textField[4].get())
2525
time = int(arr_textField[5].get())
2626
points,bestPoint = algorithm_is_bacterial(min_x, max_x, min_y, max_y, count_bacterials, gv.current_function, time,gv.STEP)

Lab2/frontshow/calc_algorithm/beesShow.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ def call_Bees(arr_textField) -> None:
1717
min_y = float(arr_textField[2].get())
1818
max_y = float(arr_textField[3].get())
1919

20-
isNotOutGraphic = False
20+
isNotOutBounds = False
2121
if (type(gv.START) == dict):
22-
isNotOutGraphic = isNotOutGraphicDict(gv.START, gv.END, min_x, max_x, min_y, max_y)
22+
isNotOutBounds = isNotOutGraphicDict(gv.START, gv.END, min_x, max_x, min_y, max_y)
2323
else:
24-
isNotOutGraphic = isNotOutGraphic(gv.START, gv.END, min_x, max_x, min_y, max_y)
24+
isNotOutBounds = isNotOutGraphic(gv.START, gv.END, min_x, max_x, min_y, max_y)
2525

26-
if isNotOutGraphic:
26+
if isNotOutBounds:
2727
numBees = int(arr_textField[4].get())
2828
time = int(arr_textField[5].get())
2929
rezusl, points = algorithm_of_bees(min_x, max_x, min_y, max_y, numBees, gv.current_function, time)

0 commit comments

Comments
 (0)