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

enhanced math.cpp and made while loop for iterative evaluation

Browse Source
This commit is contained in:
emil28092005
2024-09-22 17:51:55 +03:00
parent 3cba9318ef
commit df12b44d35
3 changed files with 95 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simplex.cpp
+35 -11
View File
@@ -1,6 +1,7 @@
#include <algorithm>
#include <iostream>
#include "tools/matrix.h"
#include "tools/math.h"
enum solver_state {
unbounded,
@@ -10,7 +11,26 @@ enum solver_state {
struct Result {
solver_state state;
ColumnVector *solution;
double objective_fucntion_value;
double objective_function_value;
};
struct FracturedMatrix {
Matrix A;
ColumnVector C;
ColumnVector b;
int pivot_column_index;
int pivot_row_index;
FracturedMatrix();
FracturedMatrix(const FracturedMatrix& other) : A(other.A), C(other.C), b(other.b), pivot_column_index(other.pivot_column_index), pivot_row_index(other.pivot_row_index) {}
FracturedMatrix(Matrix A, ColumnVector C, ColumnVector b, int pivot_column_index, int pivot_row_index) : A(A), C(C), b(b), pivot_column_index(pivot_column_index), pivot_row_index(pivot_row_index) {}
FracturedMatrix& FracturedMatrix::operator=(const FracturedMatrix& other) {
A = other.A;
C = other.C;
b = other.b;
pivot_column_index = other.pivot_column_index;
pivot_row_index = other.pivot_row_index;
return *this;
}
};
Result Simplex(ColumnVector C, Matrix A, ColumnVector b, double eps = 0.01, bool maximize=true) {
@@ -22,19 +42,23 @@ Result Simplex(ColumnVector C, Matrix A, ColumnVector b, double eps = 0.01, bool
int n = C.getRows();
int m = A.getColumns();
ColumnVector ratio_vector(m);
while (b[0] < eps) {
//3
int pivot_column_index = 0;
pivot_column_index = Math::max_index(C);
int pivot_column_index = 0;
//4
ColumnVector ratio_vector(m);
for (int i = 0; i < m; i++) {
ratio_vector[i] = b[i] / A[i][pivot_column_index];
}
int pivot_row_index = Math::min_index(ratio_vector);
pivot_column_index = max(C);
//5
struct FracturedMatrix fractured_matrix();
fractured_matrix = eleminate(A, C, b, pivot_column_index, pivot_row_index);
}
for (int i = 0; i < m; i++) {
ratio_vector[i] = b[i] / A[i][pivot_column_index];
}
int pivot_row_index = min(ratio_vector);
eleminate(A, C, b, pivot_column_index, pivot_row_index);
/*
Result result;
std::vector<int> basicVars(A.getColumns() - A.getRows());