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

fix bugs

Browse Source
This commit is contained in:
Ilya Grigorev
2024-11-02 21:31:42 +05:00
parent 3472cda172
commit 8566bc1e3b
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main.py
+12 -7
View File
@@ -157,6 +157,10 @@ def interior_point(
eps: np.float64 = 1e-6, # Solution accuracy eps: np.float64 = 1e-6, # Solution accuracy
alpha: np.float64 = 0.5, # Step coefficient alpha: np.float64 = 0.5, # Step coefficient
maximizing: bool = True) -> Result: # Flag for maximization or minimization maximizing: bool = True) -> Result: # Flag for maximization or minimization
# number of non-slack variables
k = C.shape[0]
# Check if the method is applicable: the initial point must satisfy the constraints # Check if the method is applicable: the initial point must satisfy the constraints
if (not np.all(np.dot(A, x_0) <= b) or np.any(x_0 <= 0)): if (not np.all(np.dot(A, x_0) <= b) or np.any(x_0 <= 0)):
return Result(State.INAPPLICABLE, maximize=maximizing) return Result(State.INAPPLICABLE, maximize=maximizing)
@@ -201,6 +205,7 @@ def interior_point(
# Check the stopping criterion based on accuracy # Check the stopping criterion based on accuracy
if np.linalg.norm(x_new - x) <= eps: if np.linalg.norm(x_new - x) <= eps:
result = np.dot(C, x) if (maximizing) else -np.dot(C, x) result = np.dot(C, x) if (maximizing) else -np.dot(C, x)
x = x[:k]
return Result( return Result(
State.SOLVED, objective_function_value=np.round(result, 3), solution=np.round(x, 3), maximize=maximizing State.SOLVED, objective_function_value=np.round(result, 3), solution=np.round(x, 3), maximize=maximizing
) )
@@ -324,7 +329,7 @@ def TEST_MINIMIZE_CASE_A09():
x_0 = np.array([1, 1, 1]) x_0 = np.array([1, 1, 1])
eps = 1e-4 eps = 1e-4
alpha = 0.9 alpha = 0.9
maximize = True maximize = False
print_initial_inputs(C, A, b, x_0, eps, alpha, maximize) print_initial_inputs(C, A, b, x_0, eps, alpha, maximize)
result = interior_point(C, A, b, x_0, eps, alpha, maximize) result = interior_point(C, A, b, x_0, eps, alpha, maximize)
@@ -559,11 +564,11 @@ simplex_unsolvable_case_decVar_str = ("----------------------------SIMPLEX_TEST_
tests = [ tests = [
[TEST_CASE_GENERAL_A05(), TEST_CASE_GENERAL_A09(), simplex_general_case_decVar_str], [TEST_CASE_GENERAL_A05, TEST_CASE_GENERAL_A09, simplex_general_case_decVar_str],
[TEST_MINIMIZE_CASE_A05(), TEST_MINIMIZE_CASE_A09(), simplex_minimize_case_decVar_str], [TEST_MINIMIZE_CASE_A05, TEST_MINIMIZE_CASE_A09, simplex_minimize_case_decVar_str],
[TEST_WITH_SLACK_CASE_A05(), TEST_WITH_SLACK_CASE_A09(), simplex_slack_case_decVar_str], [TEST_WITH_SLACK_CASE_A05, TEST_WITH_SLACK_CASE_A09, simplex_slack_case_decVar_str],
[TEST_UNBOUNDED_CASE_A05(), TEST_UNBOUNDED_CASE_A09(), simplex_unbounded_case_decVar_str], [TEST_UNBOUNDED_CASE_A05, TEST_UNBOUNDED_CASE_A09, simplex_unbounded_case_decVar_str],
[TEST_UNSOLVABLE_CASE_A05(), TEST_UNSOLVABLE_CASE_A09(), simplex_unsolvable_case_decVar_str] [TEST_UNSOLVABLE_CASE_A05, TEST_UNSOLVABLE_CASE_A09, simplex_unsolvable_case_decVar_str]
] ]
tests_passed = 0 tests_passed = 0
for test in tests: for test in tests:
@@ -571,7 +576,7 @@ for test in tests:
if (test_variant_i == 2): if (test_variant_i == 2):
print(test[2]) print(test[2])
else: else:
tests_passed += test[test_variant_i] tests_passed += test[test_variant_i]()
print("----------------------------RESULTS----------------------------") print("----------------------------RESULTS----------------------------")