Fix the incorrect output error.
Implement epsilon (but doesn't work correctly for now). Start making the correct implementation of I/O.
This commit is contained in:
emil
@@ -3,10 +3,27 @@
|
||||
#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
|
||||
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};
|
||||
}
|
||||
|
||||
Vector C = {5, 4, 0, 0, 0, 0};
|
||||
|
||||
Matrix A = {
|
||||
{6, 4, 1, 0, 0, 0},
|
||||
@@ -22,7 +39,7 @@ int main() {
|
||||
//showMatrix(test);
|
||||
|
||||
|
||||
Result result = Simplex(C, A, b);
|
||||
Result result = Simplex(C, A, b, 0.1, true);
|
||||
if(result.state == bounded) {
|
||||
|
||||
if(result.solution == nullptr) {
|
||||
@@ -37,3 +54,5 @@ int main() {
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
+91
-18
@@ -18,7 +18,7 @@ struct Result {
|
||||
|
||||
|
||||
Result Simplex(Vector C, Matrix A, Vector b, double eps = 0.01, bool maximize=true) {
|
||||
if (maximize == false) {
|
||||
if (maximize == true) {
|
||||
for (int i = 0; i < C.size(); i++) {
|
||||
C[i] = -C[i];
|
||||
}
|
||||
@@ -33,32 +33,63 @@ Result Simplex(Vector C, Matrix A, Vector b, double eps = 0.01, bool maximize=tr
|
||||
for (size_t i = 1; i < basicVars.size(); i++) {
|
||||
basicVars[i] = static_cast<int>(basicVars.size()) + i;
|
||||
}
|
||||
|
||||
int iterationCount = 0;
|
||||
while (true) {
|
||||
//3
|
||||
iterationCount++;
|
||||
std::cout << "Iteration: ";
|
||||
std::cout << iterationCount << std::endl;
|
||||
int pivot_column_index = 0;
|
||||
pivot_column_index = min_index(generalMatrix[0]);
|
||||
if (maximize) {
|
||||
|
||||
if (generalMatrix[0][pivot_column_index] >= 0) {
|
||||
DestroyMatrix destroyedGeneralMatrix = destroyGeneralMatrix(generalMatrix);
|
||||
Matrix _A = destroyedGeneralMatrix.A;
|
||||
Vector _C = destroyedGeneralMatrix.C;
|
||||
Vector _b = destroyedGeneralMatrix.b;
|
||||
pivot_column_index = min_index(generalMatrix[0]);
|
||||
|
||||
result.state = bounded;
|
||||
result.solution = new Vector(C.size());
|
||||
for (int i = 0; i < C.size(); i++) {
|
||||
result.solution->operator[](i) = 0;
|
||||
}
|
||||
for (size_t i = 1; i < basicVars.size(); i++) {
|
||||
if (basicVars[i] <= C.size()) {
|
||||
result.solution->operator[](basicVars[i]) = _b[i];
|
||||
if (generalMatrix[0][pivot_column_index] >= 0) {
|
||||
DestroyMatrix destroyedGeneralMatrix = disassembleGeneralMatrix(generalMatrix);
|
||||
Matrix _A = destroyedGeneralMatrix.A;
|
||||
Vector _C = destroyedGeneralMatrix.C;
|
||||
Vector _b = destroyedGeneralMatrix.b;
|
||||
|
||||
result.state = bounded;
|
||||
result.solution = new Vector(C.size());
|
||||
for (int i = 0; i < C.size(); i++) {
|
||||
result.solution->operator[](i) = 0;
|
||||
}
|
||||
for (size_t i = 1; i < basicVars.size(); i++) {
|
||||
if (basicVars[i] <= C.size()) {
|
||||
result.solution->operator[](basicVars[i]) = _b[i];
|
||||
}
|
||||
}
|
||||
result.objective_function_value = _C[_C.size()];
|
||||
return result;
|
||||
}
|
||||
result.objective_function_value = b[0];
|
||||
return result;
|
||||
}
|
||||
|
||||
if (maximize == false) {
|
||||
pivot_column_index = max_index(generalMatrix[0]);
|
||||
|
||||
if (generalMatrix[0][pivot_column_index] < 0) {
|
||||
DestroyMatrix destroyedGeneralMatrix = disassembleGeneralMatrix(generalMatrix);
|
||||
Matrix _A = destroyedGeneralMatrix.A;
|
||||
Vector _C = destroyedGeneralMatrix.C;
|
||||
Vector _b = destroyedGeneralMatrix.b;
|
||||
|
||||
result.state = bounded;
|
||||
result.solution = new Vector(C.size());
|
||||
for (int i = 0; i < C.size(); i++) {
|
||||
result.solution->operator[](i) = 0;
|
||||
}
|
||||
for (size_t i = 1; i < basicVars.size(); i++) {
|
||||
if (basicVars[i] <= C.size()) {
|
||||
result.solution->operator[](basicVars[i]) = _b[i];
|
||||
}
|
||||
}
|
||||
result.objective_function_value = _C[_C.size()];
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
//4
|
||||
Vector ratio_vector(generalMatrix.getRows());
|
||||
for (int i = 1; i < generalMatrix.getRows(); i++) {
|
||||
@@ -78,6 +109,48 @@ Result Simplex(Vector C, Matrix A, Vector b, double eps = 0.01, bool maximize=tr
|
||||
elimination(generalMatrix, pivot_row_index, pivot_column_index);
|
||||
std::cout << "After:" << std::endl;
|
||||
showMatrix(generalMatrix);
|
||||
|
||||
if (maximize) {
|
||||
bool thereIsNegative = false;
|
||||
for (int j = 0; j < generalMatrix.getColumns()-1; ++j) {
|
||||
if (generalMatrix[0][j] < 0) {
|
||||
thereIsNegative = true;
|
||||
}
|
||||
}
|
||||
if (thereIsNegative) {
|
||||
for (int j = 0; j < generalMatrix.getColumns()-1; ++j) {
|
||||
if (generalMatrix[0][j] > 0) {
|
||||
if (generalMatrix[0][j] < (eps * (-1))) {
|
||||
showMatrix(generalMatrix);
|
||||
std::cout << generalMatrix[0][j] << std::endl;
|
||||
return result;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if (maximize == false) {
|
||||
bool thereIsPositive = false;
|
||||
for (int j = 0; j < generalMatrix.getColumns()-1; ++j) {
|
||||
if (generalMatrix[0][j] > 0) {
|
||||
thereIsPositive = true;
|
||||
}
|
||||
}
|
||||
if (thereIsPositive) {
|
||||
for (int j = 0; j < generalMatrix.getColumns()-1; ++j) {
|
||||
if (generalMatrix[0][j] > 0) {
|
||||
if (generalMatrix[0][j] < eps) {
|
||||
showMatrix(generalMatrix);
|
||||
std::cout << generalMatrix[0][j] << std::endl;
|
||||
return result;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
return result;
|
||||
|
||||
@@ -12,7 +12,7 @@ FracturedMatrix& FracturedMatrix::operator=(const FracturedMatrix& other) {
|
||||
return *this;
|
||||
}
|
||||
|
||||
DestroyMatrix destroyGeneralMatrix(Matrix& generalMatrix) {
|
||||
DestroyMatrix disassembleGeneralMatrix(Matrix& generalMatrix) {
|
||||
int rows = generalMatrix.getRows();
|
||||
int cols = generalMatrix.getColumns();
|
||||
|
||||
|
||||
+1
-1
@@ -22,7 +22,7 @@ struct DestroyMatrix {
|
||||
Vector b;
|
||||
};
|
||||
|
||||
DestroyMatrix destroyGeneralMatrix(Matrix& generalMatrix);
|
||||
DestroyMatrix disassembleGeneralMatrix(Matrix& generalMatrix);
|
||||
void elimination(Matrix&, int pivot_row_index, int pivot_column_index);
|
||||
Matrix createGeneralMatrix(Matrix& A, Vector& C, Vector& b);
|
||||
|
||||
|
||||
+3
-1
@@ -9,7 +9,8 @@ void showMatrix(Matrix matrix) {
|
||||
}
|
||||
}
|
||||
}
|
||||
std::cout << maxNumberLength << std::endl;
|
||||
//std::cout << maxNumberLength << std::endl;
|
||||
std::cout << std::endl;
|
||||
for (size_t y = 0; y < matrix.getRows(); y++) {
|
||||
std::string row = "";
|
||||
for (size_t x = 0; x < matrix.getColumns(); x++) {
|
||||
@@ -38,6 +39,7 @@ void showMatrix(Matrix matrix) {
|
||||
}
|
||||
std::cout << row << std::endl;
|
||||
}
|
||||
std::cout << std::endl;
|
||||
}
|
||||
|
||||
Vector::Vector(int n) {
|
||||
|
||||
Reference in New Issue
Block a user