fixed small issues

Author: Arthod

__pycache__/linear_programming.cpython-39.pyc

@@ -227,7 +227,7 @@ def solve(self, method=SOLVER_SIMPLEX):
             x_sol = simplex(lp_slacked.A, lp_slacked.b, lp_slacked.c, lp_slacked.vars_slack_amount)
 
             # Cut slack variables
-            x_sol = x_sol[:lp_slacked.vars_slack_amount]
+            x_sol = x_sol[:lp_slacked.c.size - lp_slacked.vars_slack_amount]
             print(x_sol)
 
             return x_sol

linear_programming.py

@@ -15,13 +15,11 @@
 def simplex(A: np.array, b: np.array, c: np.array, slacks_amt: int) -> np.array:
     # https://sdu.itslearning.com/ContentArea/ContentArea.aspx?LocationID=17727&LocationType=1&ElementID=589350
     #x_current = basic_feasible_solution(A, b, c)
-    N = [i for i in range(c.size - slacks_amt)]   # Not In basis
-    B = [i for i in range(slacks_amt, c.size)]    # In basis
-
-    print(A, b, c)
-    print(N, B)
+    #N = [i for i in range(c.size - slacks_amt)]   # Not In basis
+    B = [i + (c.size - slacks_amt) for i in range(slacks_amt)]    # In basis
 
     while True:
+        tableau(A, b, c)
         ## Choosing a pivot
         # Pick a non-negative column    TODO
         positives = np.where(c > 0)
@@ -53,8 +51,8 @@ def simplex(A: np.array, b: np.array, c: np.array, slacks_amt: int) -> np.array:
         # Remove yy_old from basis and add yy to basis
         B.remove(yy_old)
         B.append(yy)
-        N.append(yy_old)
-        N.remove(yy)
+        #N.append(yy_old)
+        #N.remove(yy)
 
         ## Pivot: A[xx, yy] - Peform row operations
         # Set yy row with in column xx to 1
@@ -120,6 +118,9 @@ def is_feasible(A: np.array, x: np.array, b: np.array, tol=10e-5) -> bool:
     return all(np.isclose(A @ x, b, atol=tol))
 
 
+def tableau(A: np.array, b: np.array, c: np.array):
+    print(A, b.T, c.T)
+
 if __name__ == "__main__":
     A = np.array([[ 1,  1,  1,  1,  1,  0,  0],
                   [ 2,  1, -1, -1,  0, -1,  0],