Emil_Shanaty/Transportation_Problem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix merge conflict

Browse Source
This commit is contained in:
Ilya Grigorev
2024-11-09 20:28:35 +03:00
parent 81a2ec372b
commit d774775cb2
2 changed files with 32 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main.py
+8 -7
View File
@@ -86,8 +86,8 @@ def Vogel(
solution_matrix[y][x] = val solution_matrix[y][x] = val
C_numerated = np.zeros((C_init_height, C_init_length), dtype=np.int64) C_numerated = np.zeros((C_init_height, C_init_length), dtype=np.int64)
C_numerated = np.insert(C_numerated, 0, [str(i+1) for i in range( C_init_length)], axis=0) C_numerated = np.insert(C_numerated, 0, [i+1 for i in range( C_init_length)], axis=0)
C_numerated = np.insert(C_numerated, 0, [str(i) for i in range( C_init_height+1)], axis=1) C_numerated = np.insert(C_numerated, 0, [i for i in range( C_init_height+1)], axis=1)
@@ -131,8 +131,8 @@ def Vogel(
target_number = min(target_array) target_number = min(target_array)
x = np.where(target_array == target_number)[0][0] x = np.where(target_array == target_number)[0][0]
x_num = C_numerated[0][x+1] x_num = C_numerated[y+1][0]
y_num = C_numerated[y+1][0] y_num = C_numerated[0][x+1]
if (D[x] >= S[y]): if (D[x] >= S[y]):
@@ -160,9 +160,10 @@ def Vogel(
target_array = C.T[np.where(ColD == maxD)[0]][0] target_array = C.T[np.where(ColD == maxD)[0]][0]
target_number = min(target_array) target_number = min(target_array)
y = np.where(target_array == target_number)[0][0] y = np.where(target_array == target_number)[0][0]
print(ColD[x], target_array[y])
x_num = C_numerated[0][x+1] x_num = C_numerated[y+1][0]
y_num = C_numerated[y+1][0] y_num = C_numerated[0][x+1]
if (D[x] >= S[y]): if (D[x] >= S[y]):
row_index_to_eleminate = y row_index_to_eleminate = y
@@ -285,7 +286,7 @@ def print_problem_statement(
if len(str(matrix[y][x])) == 1: if len(str(matrix[y][x])) == 1:
row += " " row += " "
if (y == len(matrix)-1): if (y == len(matrix)-1):
table += f"\n{"_ " * ((len(matrix[0])-1) * 2)}" table += "\n" + "_ " * ((len(matrix[0])-1) * 2)
table += f"\n{row}" table += f"\n{row}"
print(table) print(table)
print(print_problem_statement(S,C,D)) print(print_problem_statement(S,C,D))
test.py
+24
View File
@@ -0,0 +1,24 @@
from main import Vogel
import numpy as np
C = np.array([
[7, 8, 1, 2],
[4, 5, 9, 8],
[9, 2, 3, 6],
], dtype=np.int64)
S = np.array([
160, 140, 170
], dtype=np.int64)
D = np.array([
120, 50, 190, 110
], dtype=np.int64)
VogelExpected = np.array([
[0, 0, 50, 110],
[120, 20, 0, 0],
[0, 30, 140, 0],
], dtype=np.int64)
print(Vogel(S, C, D).solution)