Ad cool matrix visualization
This commit is contained in:
@@ -0,0 +1,82 @@
|
||||
#include "elimination.h"
|
||||
#include "math.h"
|
||||
|
||||
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::FracturedMatrix(Matrix A, Vector C, Vector 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;
|
||||
}
|
||||
|
||||
DestroyMatrix destroyGeneralMatrix(Matrix& generalMatrix) {
|
||||
int rows = generalMatrix.getRows();
|
||||
int cols = generalMatrix.getColumns();
|
||||
|
||||
Matrix A(rows - 1, cols - 1);
|
||||
Vector C(cols - 1);
|
||||
Vector b(rows - 1);
|
||||
|
||||
for (int j = 0; j < cols - 1; ++j) {
|
||||
C[j] = generalMatrix[0][j];
|
||||
}
|
||||
|
||||
for (int i = 1; i < rows; ++i) {
|
||||
b[i - 1] = generalMatrix[i - 1][cols - 1];
|
||||
}
|
||||
|
||||
for (int i = 1; i < rows; ++i) {
|
||||
for (int j = 0; j < cols - 1; ++j) {
|
||||
A[i - 1][j] = generalMatrix[i][j];
|
||||
}
|
||||
}
|
||||
|
||||
return {A, C, b};
|
||||
}
|
||||
|
||||
Matrix createGeneralMatrix(Matrix& A, Vector& C, Vector& b) {
|
||||
Matrix generalMatrix(A.getRows() + 1, A.getColumns() + 1);
|
||||
for (int i = 0; i < A.getColumns(); i++) {
|
||||
generalMatrix[0][i] = C[i];
|
||||
}
|
||||
|
||||
// For objective function (j=0) the value is set to zero automatically
|
||||
for (int j = 1; j < A.getRows() + 1; j++) {
|
||||
generalMatrix[j][A.getColumns()] = b[j-1];
|
||||
}
|
||||
|
||||
for (int i = 0; i < A.getRows(); i++) {
|
||||
for (int j = 0; j < A.getColumns(); j++) {
|
||||
generalMatrix[i + 1][j] = A[i][j];
|
||||
}
|
||||
}
|
||||
|
||||
return generalMatrix;
|
||||
}
|
||||
|
||||
void elimination(Matrix& generalMatrix, int pivot_row_index, int pivot_column_index) {
|
||||
|
||||
int rows = generalMatrix.getRows();
|
||||
int cols = generalMatrix.getColumns();
|
||||
|
||||
double pivotElement = generalMatrix[pivot_row_index][pivot_column_index];
|
||||
|
||||
for (int j = 0; j < cols; ++j) {
|
||||
generalMatrix[pivot_row_index][j] /= pivotElement;
|
||||
}
|
||||
|
||||
for (int i = 0; i < rows; ++i) {
|
||||
if (i == pivot_row_index)
|
||||
continue;
|
||||
|
||||
double pivotColumnCoefficient = generalMatrix[i][pivot_column_index];
|
||||
|
||||
for (int j = 0; j < cols; ++j) {
|
||||
generalMatrix[i][j] -= pivotColumnCoefficient * generalMatrix[pivot_row_index][j];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,30 @@
|
||||
#ifndef ELIMINATION_H
|
||||
#define ELIMINATION_H
|
||||
|
||||
#include "matrix.h"
|
||||
|
||||
|
||||
struct FracturedMatrix {
|
||||
Matrix A;
|
||||
Vector C;
|
||||
Vector b;
|
||||
int pivot_column_index;
|
||||
int pivot_row_index;
|
||||
FracturedMatrix() = default;
|
||||
FracturedMatrix(const FracturedMatrix& other);
|
||||
FracturedMatrix(Matrix A, Vector C, Vector b, int pivot_column_index, int pivot_row_index);
|
||||
FracturedMatrix& operator=(const FracturedMatrix& other);
|
||||
};
|
||||
|
||||
struct DestroyMatrix {
|
||||
Matrix A;
|
||||
Vector C;
|
||||
Vector b;
|
||||
};
|
||||
|
||||
DestroyMatrix destroyGeneralMatrix(Matrix& generalMatrix);
|
||||
void elimination(Matrix&, int pivot_row_index, int pivot_column_index);
|
||||
Matrix createGeneralMatrix(Matrix& A, Vector& C, Vector& b);
|
||||
|
||||
|
||||
#endif //ELIMINATION_H
|
||||
+110
@@ -0,0 +1,110 @@
|
||||
#include "math.h"
|
||||
|
||||
double min(Vector vector) {
|
||||
double temp = vector[0];
|
||||
for (int j = 0; j < vector.size(); j++) {
|
||||
if (vector[j] < temp) {
|
||||
temp = vector[j];
|
||||
}
|
||||
}
|
||||
return temp;
|
||||
}
|
||||
|
||||
double max(Vector vector) {
|
||||
double temp = vector[0];
|
||||
for (int j = 0; j < vector.size(); j++) {
|
||||
if (vector[j] > temp) {
|
||||
temp = vector[j];
|
||||
}
|
||||
}
|
||||
return temp;
|
||||
}
|
||||
|
||||
int min_index_positive(Vector vector) {
|
||||
int i = 0;
|
||||
while (i < vector.size() && vector[i] <= 0) {
|
||||
++i;
|
||||
}
|
||||
if (i >= vector.size()) {
|
||||
throw std::runtime_error("No positive min found");
|
||||
}
|
||||
int temp_index = i;
|
||||
double temp = vector[i];
|
||||
|
||||
for (int j = i + 1; j < vector.size(); j++) {
|
||||
if (vector[j] < temp && vector[j] > 0) {
|
||||
temp_index = j;
|
||||
temp = vector[j];
|
||||
}
|
||||
}
|
||||
return temp_index;
|
||||
}
|
||||
|
||||
int min_index(Vector vector) {
|
||||
int temp_index = 0;
|
||||
double temp = vector[0];
|
||||
for (int j = 0; j < vector.size(); j++) {
|
||||
if (vector[j] < temp) {
|
||||
temp_index = j;
|
||||
temp = vector[j];
|
||||
}
|
||||
}
|
||||
return temp_index;
|
||||
}
|
||||
|
||||
int max_index(Vector vector) {
|
||||
int temp_index = 0;
|
||||
double temp = vector[0];
|
||||
for (int j = 0; j < vector.size(); j++) {
|
||||
if (vector[j] > temp) {
|
||||
temp_index = j;
|
||||
temp = vector[j];
|
||||
}
|
||||
}
|
||||
return temp_index;
|
||||
}
|
||||
|
||||
double min(std::vector<double> array) {
|
||||
double temp = array[0];
|
||||
for (size_t i = 1; i < array.size(); i++) {
|
||||
if (array[i] < temp) {
|
||||
temp = array[i];
|
||||
}
|
||||
}
|
||||
return temp;
|
||||
}
|
||||
|
||||
double max(std::vector<double> array) {
|
||||
double temp = array[0];
|
||||
for (size_t i = 1; i < array.size(); i++) {
|
||||
if (array[i] > temp) {
|
||||
temp = array[i];
|
||||
}
|
||||
}
|
||||
return temp;
|
||||
}
|
||||
|
||||
int min_index(std::vector<double> array) {
|
||||
int temp_index = 0;
|
||||
double temp = array[0];
|
||||
for (size_t i = 1; i < array.size(); i++) {
|
||||
if (array[i] < temp) {
|
||||
temp_index = i;
|
||||
temp = array[i];
|
||||
}
|
||||
}
|
||||
return temp_index;
|
||||
}
|
||||
|
||||
|
||||
int max_index(std::vector<double> array) {
|
||||
int temp_index = 0;
|
||||
double temp = array[0];
|
||||
for (size_t i = 1; i < array.size(); i++) {
|
||||
if (array[i] > temp) {
|
||||
temp_index = i;
|
||||
temp = array[i];
|
||||
}
|
||||
}
|
||||
return temp_index;
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
#ifndef MATH_H
|
||||
#define MATH_H
|
||||
|
||||
#include <vector>
|
||||
#include "matrix.h"
|
||||
|
||||
double min(Vector vector);
|
||||
double max(Vector vector);
|
||||
int min_index(Vector vector);
|
||||
int min_index_positive(Vector vector);
|
||||
int max_index(Vector vector);
|
||||
double min(std::vector<double> array);
|
||||
double max(std::vector<double> array);
|
||||
int min_index(std::vector<double> array);
|
||||
int max_index(std::vector<double> array);
|
||||
|
||||
#endif // MATH_H
|
||||
@@ -0,0 +1,275 @@
|
||||
#include "matrix.h"
|
||||
|
||||
void showMatrix(Matrix matrix) {
|
||||
int maxNumberLength = 1;
|
||||
for (size_t y = 0; y < matrix.getRows(); y++) {
|
||||
for (size_t x = 0; x < matrix.getColumns(); x++) {
|
||||
if (std::to_string(matrix[y][x]).length() > maxNumberLength) {
|
||||
maxNumberLength = std::to_string(matrix[y][x]).length();
|
||||
}
|
||||
}
|
||||
}
|
||||
std::cout << maxNumberLength << std::endl;
|
||||
for (size_t y = 0; y < matrix.getRows(); y++) {
|
||||
std::string row = "";
|
||||
for (size_t x = 0; x < matrix.getColumns(); x++) {
|
||||
std::string strNumber = std::to_string(matrix[y][x]);
|
||||
bool spaceRight = true;
|
||||
while (strNumber.length() < maxNumberLength) {
|
||||
if (spaceRight) {
|
||||
strNumber += " ";
|
||||
}
|
||||
else {
|
||||
strNumber = " " + strNumber;
|
||||
}
|
||||
spaceRight = !spaceRight;
|
||||
strNumber = "" + strNumber;
|
||||
|
||||
}
|
||||
if (matrix[y][x] == 0) {
|
||||
row += "[\033[0m" + strNumber + "\033[0m] ";
|
||||
}
|
||||
else if(matrix[y][x] > 0) {
|
||||
row += "[\033[32m" + strNumber + "\033[0m] ";
|
||||
}else {
|
||||
row += "[\033[31m" + strNumber + "\033[0m] ";
|
||||
}
|
||||
|
||||
}
|
||||
std::cout << row << std::endl;
|
||||
}
|
||||
}
|
||||
|
||||
Vector::Vector(int n) {
|
||||
rows = n;
|
||||
columns = 1;
|
||||
vector.resize(n);
|
||||
}
|
||||
|
||||
Vector::Vector(const Vector& other) {
|
||||
rows = other.rows;
|
||||
columns = other.columns;
|
||||
vector = other.vector;
|
||||
}
|
||||
|
||||
Vector::Vector(std::initializer_list<double> init) {
|
||||
rows = init.size();
|
||||
columns = 1;
|
||||
vector = std::vector<double>(rows);
|
||||
|
||||
auto it = init.begin();
|
||||
|
||||
for (size_t i = 0; i < init.size(); ++i) {
|
||||
vector[i] = *it++;
|
||||
}
|
||||
}
|
||||
|
||||
int Vector::size() const {
|
||||
return rows;
|
||||
}
|
||||
|
||||
double& Vector::operator[](int row) {
|
||||
return vector[row];
|
||||
}
|
||||
|
||||
Vector& Vector::operator=(const Vector& other) {
|
||||
rows = other.rows;
|
||||
columns = other.columns;
|
||||
vector = other.vector;
|
||||
return *this;
|
||||
}
|
||||
|
||||
Vector Vector::operator+(Vector& other) {
|
||||
if (rows != other.rows) {
|
||||
throw std::runtime_error("Error: the dimensional problem occurred");
|
||||
}
|
||||
Vector result(rows);
|
||||
for (int i = 0; i < rows; ++i) {
|
||||
result[i] = vector[i] + other[i];
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
Vector Vector::operator-(Vector& other) {
|
||||
if (rows != other.rows) {
|
||||
throw std::runtime_error("Error: the dimensional problem occurred");
|
||||
}
|
||||
Vector result(rows);
|
||||
for (int i = 0; i < rows; ++i) {
|
||||
result[i] = vector[i] - other[i];
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
std::istream& operator>>(std::istream& cin, Vector& vectorObj) {
|
||||
for (int i = 0; i < vectorObj.rows; ++i) {
|
||||
cin >> vectorObj[i];
|
||||
}
|
||||
return cin;
|
||||
}
|
||||
|
||||
std::ostream& operator<<(std::ostream& cout, Vector& vectorObj) {
|
||||
for (int i = 0; i < vectorObj.rows; ++i) {
|
||||
if (i == vectorObj.rows - 1) {
|
||||
cout << vectorObj[i] << std::endl;
|
||||
}
|
||||
else {
|
||||
cout << vectorObj[i] << ' ';
|
||||
}
|
||||
}
|
||||
return cout;
|
||||
}
|
||||
|
||||
Matrix::Matrix(int n, int m) {
|
||||
rows = n;
|
||||
columns = m;
|
||||
matrix.resize(n, Vector(m));
|
||||
for (auto& row : matrix) {
|
||||
row = Vector(m);
|
||||
}
|
||||
}
|
||||
|
||||
Matrix::Matrix(const Matrix& other) {
|
||||
rows = other.rows;
|
||||
columns = other.columns;
|
||||
matrix = other.matrix;
|
||||
}
|
||||
|
||||
Matrix::Matrix(std::initializer_list<std::vector<double>> init) {
|
||||
rows = init.size();
|
||||
auto it = init.begin();
|
||||
columns = it->size();
|
||||
matrix = std::vector<Vector>(rows, Vector(columns));
|
||||
|
||||
for (int i = 0; i < rows; ++i) {
|
||||
for (int j = 0; j < columns; ++j) {
|
||||
matrix[i][j] = it->operator[](j);
|
||||
}
|
||||
++it;
|
||||
}
|
||||
}
|
||||
|
||||
int Matrix::getRows() const {
|
||||
return rows;
|
||||
}
|
||||
|
||||
int Matrix::getColumns() const {
|
||||
return columns;
|
||||
}
|
||||
|
||||
Vector& Matrix::operator[](int row) {
|
||||
return matrix[row];
|
||||
}
|
||||
|
||||
Matrix& Matrix::operator=(const Matrix& other) {
|
||||
rows = other.rows;
|
||||
columns = other.columns;
|
||||
matrix = other.matrix;
|
||||
return *this;
|
||||
}
|
||||
|
||||
Matrix Matrix::operator+(Matrix& other) const {
|
||||
if (rows != other.rows || columns != other.columns) {
|
||||
throw std::runtime_error("Error: the dimensional problem occurred");
|
||||
}
|
||||
Matrix result(rows, columns);
|
||||
for (int i = 0; i < rows; ++i) {
|
||||
for (int j = 0; j < columns; ++j) {
|
||||
auto x = matrix[i];
|
||||
auto y = other[i];
|
||||
result[i][j] = x[j] + y[j];
|
||||
}
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
Matrix Matrix::operator-(Matrix& other) const {
|
||||
if (rows != other.rows || columns != other.columns) {
|
||||
throw std::runtime_error("Error: the dimensional problem occurred");
|
||||
}
|
||||
Matrix result(rows, columns);
|
||||
for (int i = 0; i < rows; ++i) {
|
||||
for (int j = 0; j < columns; ++j) {
|
||||
auto x = matrix[i];
|
||||
auto y = other[i];
|
||||
result[i][j] = x[j] - y[j];
|
||||
}
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
Matrix Matrix::operator*(Matrix& other) const {
|
||||
if (columns != other.rows) {
|
||||
throw std::runtime_error("Error: the dimensional problem occurred");
|
||||
}
|
||||
|
||||
Matrix result(rows, other.columns);
|
||||
for (int i = 0; i < rows; ++i) {
|
||||
for (int j = 0; j < other.columns; ++j) {
|
||||
result[i][j] = 0;
|
||||
for (int k = 0; k < columns; ++k) {
|
||||
auto x = matrix[i];
|
||||
auto y = other[k];
|
||||
result[i][j] += x[k] * y[j];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
Vector Matrix::operator*(Vector other) const {
|
||||
if (columns != other.size()) {
|
||||
throw std::runtime_error("Error: the dimensional problem occurred");
|
||||
}
|
||||
|
||||
Vector result(rows);
|
||||
for (int i = 0; i < rows; ++i) {
|
||||
result[i] = 0;
|
||||
for (int k = 0; k < columns; ++k) {
|
||||
auto x = matrix[i];
|
||||
result[i] += x[k] * other[k];
|
||||
}
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
Matrix Matrix::transpose() const {
|
||||
Matrix result(columns, rows);
|
||||
for (int i = 0; i < rows; ++i) {
|
||||
for (int j = 0; j < columns; ++j) {
|
||||
auto x = matrix[i];
|
||||
result[j][i] = x[j];
|
||||
}
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
std::istream& operator>>(std::istream& cin, Matrix& matrixObj) {
|
||||
for (int i = 0; i < matrixObj.rows; ++i) {
|
||||
for (int j = 0; j < matrixObj.columns; ++j) {
|
||||
cin >> matrixObj[i][j];
|
||||
}
|
||||
}
|
||||
return cin;
|
||||
}
|
||||
|
||||
std::ostream& operator<<(std::ostream& cout, Matrix& matrixObj) {
|
||||
for (int i = 0; i < matrixObj.rows; ++i) {
|
||||
for (int j = 0; j < matrixObj.columns; ++j) {
|
||||
if (j == matrixObj.columns - 1) {
|
||||
cout << matrixObj[i][j] << std::endl;
|
||||
}
|
||||
else {
|
||||
cout << matrixObj[i][j] << ' ';
|
||||
}
|
||||
}
|
||||
}
|
||||
return cout;
|
||||
}
|
||||
+102
@@ -0,0 +1,102 @@
|
||||
#ifndef TOOLS_MATRIX_H
|
||||
#define TOOLS_MATRIX_H
|
||||
|
||||
// some functions for matrix interaction
|
||||
#include <iostream>
|
||||
#include <vector>
|
||||
|
||||
/**
|
||||
* Vector is a class to represent
|
||||
* a column vector with n rows.
|
||||
*/
|
||||
|
||||
|
||||
class Vector {
|
||||
protected:
|
||||
// Number of rows in vector
|
||||
int rows;
|
||||
// Number of columns in vector
|
||||
int columns;
|
||||
// Matrix representation as vector of vectors of integers
|
||||
std::vector<double> vector;
|
||||
public:
|
||||
Vector(int n);
|
||||
|
||||
Vector(const Vector& other);
|
||||
|
||||
Vector(std::initializer_list<double>);
|
||||
|
||||
/* Getter for the number of rows */
|
||||
int size() const;
|
||||
|
||||
double& operator[](int row);
|
||||
|
||||
Vector& operator=(const Vector& other);
|
||||
|
||||
Vector operator+(Vector& other);
|
||||
|
||||
Vector operator-(Vector& other);
|
||||
|
||||
/* Input operator reads element of vector */
|
||||
friend std::istream& operator>>(std::istream& cin, Vector& vectorObj);
|
||||
|
||||
/* Output operator prints elements of the vector
|
||||
* in a row separated with a space (no space at the end of the line)
|
||||
*/
|
||||
friend std::ostream& operator<<(std::ostream& cout, Vector& vectorObj);
|
||||
};
|
||||
|
||||
/**
|
||||
* Class Matrix represents
|
||||
* a matrix of size n x m
|
||||
* of type integer.
|
||||
*/
|
||||
class Matrix {
|
||||
protected:
|
||||
// Number of rows in matrix
|
||||
int rows;
|
||||
// Number of columns in matrix
|
||||
int columns;
|
||||
// Matrix representation as vector of vectors of integers
|
||||
std::vector<Vector> matrix;
|
||||
public:
|
||||
Matrix(int n, int m);
|
||||
|
||||
Matrix(const Matrix& other);
|
||||
|
||||
Matrix(std::initializer_list<std::vector<double>>);
|
||||
|
||||
/* Getter for the number of rows */
|
||||
int getRows() const;
|
||||
|
||||
/* Getter for the number of columns */
|
||||
int getColumns() const;
|
||||
|
||||
Vector& operator[](int row);
|
||||
|
||||
Matrix& operator=(const Matrix& other);
|
||||
|
||||
Matrix operator+(Matrix& other) const;
|
||||
|
||||
Matrix operator-(Matrix& other) const;
|
||||
|
||||
Matrix operator*(Matrix& other) const;
|
||||
|
||||
/* Matrix-Vector multiplication */
|
||||
Vector operator*(Vector other) const;
|
||||
|
||||
/* Produces transposed version of the matrix */
|
||||
Matrix transpose() const;
|
||||
|
||||
/* Input operator reads element of matrix row by row */
|
||||
friend std::istream& operator>>(std::istream& cin, Matrix& matrixObj);
|
||||
|
||||
/* Output operator prints elements of the matrix
|
||||
* row by row separated with a space (no space at the end of each line)
|
||||
*/
|
||||
friend std::ostream& operator<<(std::ostream& cout, Matrix& matrixObj);
|
||||
};
|
||||
|
||||
void showMatrix(Matrix);
|
||||
|
||||
#endif // TOOLS_MATRIX_H
|
||||
Reference in New Issue
Block a user