diff --git a/main.cpp b/main.cpp index f4a38ed..1a0d58e 100644 --- a/main.cpp +++ b/main.cpp @@ -20,6 +20,6 @@ int main() { delete result.solution; } - + std::cout << "asdasd" << std::endl; return 0; } diff --git a/simplex.cpp b/simplex.cpp index 3d2b421..b39bc25 100644 --- a/simplex.cpp +++ b/simplex.cpp @@ -15,9 +15,24 @@ struct Result { double objective_function_value; }; +void ShowMatrix(Matrix matrix) { + for (size_t y = 0; y < matrix.getRows(); y++) { + std::string row = ""; + for (size_t x = 0; x < matrix.getColumns(); x++) { + row += std::to_string(matrix[y][x]) + " "; + } + std::cout << row << std::endl; + } +} + Result Simplex(Vector C, Matrix A, Vector b, double eps = 0.01, bool maximize=true) { - Result result{}; - Matrix generalMatrix = createGeneralMatrix(A, C, b); + if (maximize == false) { + for (int i = 0; i < C.size(); i++) { + C[i] = -C[i]; + } + } + Result result{}; + Matrix generalMatrix = createGeneralMatrix(A, C, b); std::vector basicVars(generalMatrix.getRows()); basicVars[0] = -1;