merge (inapropriately) detached2 to main

main.cpp

@@ -3,13 +3,43 @@
 #include "tools/math.h"
 #include "simplex.h"
 
+void manualInput() {
+    int ZLength;
+    std::cout << "Write how many x's the objective function has:" << std::endl;
+    std::cin >> ZLength;
+    Vector Z = {};
+}
+void printInitialInputs(Vector C, Matrix A, Vector b) {
+
+}
 int main() {
     // TODO: Initially should be positive
-    Vector C = {-5, -4, 0, 0, 0, 0};
-    Matrix A = {{6, 4, 1, 0, 0, 0}, {1, 2, 0, 1, 0, 0}, {-1, 1, 0, 0, 1, 0}, {0, 1, 0, 0, 0, 1}};
+    std::string doManual = "";
+    std::cout << "Enable manual input? (y/n)" << std::endl;
+    std::cin >> doManual ;
+    if (doManual == "y" or doManual == "Y") {
+        manualInput();
+    } else if (doManual == "n"){
+
+    }
+
+    Vector C = {5, 4, 0, 0, 0, 0};
+
+    Matrix A = {
+             {6, 4, 1, 0, 0, 0},
+             {1, 2, 0, 1, 0, 0},
+             {-1, 1, 0, 0, 1, 0},
+             {0, 1, 0, 0, 0, 1}
+                };
+
     Vector b = {24, 6, 1, 2};
 
-    Result result = Simplex(C, A, b);
+    //Matrix test = {{1, -1, -2}, {1, 1, -2}, {1, -1, 2}};
+
+    //showMatrix(test);
+    
+
+    Result result = Simplex(C, A, b, 0.1, true);
     if(result.state == bounded) {
 
         if(result.solution == nullptr) {
@@ -20,6 +50,9 @@ int main() {
 
         delete result.solution;
     }
+    //std::cout << "asdasd" << std::endl;
 
     return 0;
 }
+
+