From 8a698c716bbb4286aeeff002490d2a4b4f3e5ac6 Mon Sep 17 00:00:00 2001 From: emil Date: Sat, 9 Nov 2024 21:26:21 +0300 Subject: [PATCH 1/2] 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) From ca8b4ac07ec99858fd0784dface3119ea70d970b Mon Sep 17 00:00:00 2001 From: emil Date: Sat, 9 Nov 2024 21:36:34 +0300 Subject: [PATCH 2/2] fixed Vogel? --- main.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/main.py b/main.py index c0db515..12a9cea 100644 --- a/main.py +++ b/main.py @@ -201,7 +201,7 @@ def Vogel( print(f"x:{x_ter} y:{y_ter}") add_to_solutions(terminal_selected_value, x_ter, y_ter) - if i >= len(S): + elif i >= len(S): terminal_selected_value = D[i] print(f"terminal_selected_valueS2: {terminal_selected_value}") @@ -248,7 +248,7 @@ def Vogel( else: return Result(State.UNAPPLICABLE)''' -Vogel(S,C,D) +#Vogel(S,C,D) def Russell( @@ -443,12 +443,11 @@ def TEST_CASE_2(): return solve(S, C, D, NWExpected, VogelExpected, RussellExpected) -'''if __name__ == "__main__": - tests = [TEST_CASE_1] +if __name__ == "__main__": + tests = [TEST_CASE_1, TEST_CASE_2] tests_passed = 0 for test in tests: tests_passed += test() print("----------------------RESULTS----------------------") print(f"Total number of tests: {len(tests)}") print(f"Total number of passed tests: {tests_passed}") -''' \ No newline at end of file