From 8a698c716bbb4286aeeff002490d2a4b4f3e5ac6 Mon Sep 17 00:00:00 2001 From: emil Date: Sat, 9 Nov 2024 21:26:21 +0300 Subject: [PATCH] fixed (I hope) Vogel --- main.py | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/main.py b/main.py index 7bf8469..c0db515 100644 --- a/main.py +++ b/main.py @@ -188,6 +188,46 @@ def Vogel( print(C_numerated) print(selected_value) + print(f"D: {D}") + print(f"S: {S}") + print(solution_matrix) + for i in range(max(len(D),len(S))): + + if i >= len(D): + terminal_selected_value = S[i] + print(f"terminal_selected_valueD2: {terminal_selected_value}") + x_ter = 0 + y_ter = C_numerated[i][0]+1 + print(f"x:{x_ter} y:{y_ter}") + add_to_solutions(terminal_selected_value, x_ter, y_ter) + + if i >= len(S): + + terminal_selected_value = D[i] + print(f"terminal_selected_valueS2: {terminal_selected_value}") + x_ter = 1 + y_ter = C_numerated[0][i]+1 + print(f"x:{x_ter} y:{y_ter}") + add_to_solutions(terminal_selected_value, x_ter, y_ter) + else: + if D[i] <= S[i]: + + terminal_selected_value = D[i] + print(f"terminal_selected_valueD: {terminal_selected_value}") + x_ter = 0 + y_ter = C_numerated[0][i-1]-1 + print(f"x:{x_ter} y:{y_ter}") + add_to_solutions(terminal_selected_value, x_ter, y_ter) + else: + terminal_selected_value = S[i] + print(f"terminal_selected_valueS: {terminal_selected_value}") + x_ter = C_numerated[i-1][0]-1 + y_ter = 0 + print(f"x:{x_ter} y:{y_ter}") + add_to_solutions(terminal_selected_value, x_ter, y_ter) + print(solution_matrix) + + print(solution_matrix)