ProjetMAM/Pivot
Archived
4
1
Fork 0
Code Issues Pull Requests Actions Releases 2 Activity

english name for symbols
Some checks failed
Linux arm64 / Build (push) Failing after 1m56s
Details

Browse Source
This commit is contained in:
Simon Pribylski
2024-02-23 11:03:38 +01:00
parent 99eca82b3a
commit 5a5c247019
7 changed files with 63 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
src/Matrix.cpp
View File

@@ -10,30 +10,30 @@ Matrix::Matrix(const std::string& fileNameInput) {
Load(fileNameInput);
}
Matrix::Matrix(std::size_t lignes, std::size_t colonnes) : m_Lignes(lignes), m_Colonnes(colonnes) {
m_Data.resize(m_Lignes * m_Colonnes);
Matrix::Matrix(std::size_t lignes, std::size_t colonnes) : m_Raws(lignes), m_Columns(colonnes) {
m_Data.resize(m_Raws * m_Columns);
}
Matrix::Matrix(std::size_t lignes, std::size_t colonnes, std::initializer_list<long double>&& initList) :
m_Lignes(lignes), m_Colonnes(colonnes) {
m_Raws(lignes), m_Columns(colonnes) {
m_Data = initList;
m_Data.resize(m_Lignes * m_Colonnes);
m_Data.resize(m_Raws * m_Columns);
}
Matrix::~Matrix() {}
Matrix Matrix::operator*(const Matrix& other) const {
if (m_Colonnes != other.m_Lignes) {
if (m_Columns != other.m_Raws) {
std::cerr << "Mutiplication impossible car la dimensions des matrices est incompatible" << std::endl;
return {1, 1, {0}};
}
Matrix result(m_Lignes, other.m_Colonnes);
Matrix result(m_Raws, other.m_Columns);
for (std::size_t i = 0; i < m_Lignes; ++i) {
for (std::size_t j = 0; j < other.m_Colonnes; ++j) {
for (std::size_t i = 0; i < m_Raws; ++i) {
for (std::size_t j = 0; j < other.m_Columns; ++j) {
long double sum = 0;
for (std::size_t k = 0; k < m_Colonnes; k++) {
for (std::size_t k = 0; k < m_Columns; k++) {
sum += at(i, k) * other.at(k, j);
}
result.at(i, j) = sum;
@@ -43,10 +43,10 @@ Matrix Matrix::operator*(const Matrix& other) const {
}
void Matrix::Print() const {
for (size_t i = 0; i < m_Lignes; ++i) {
for (size_t i = 0; i < m_Raws; ++i) {
std::cout << "[ ";
for (size_t j = 0; j < m_Colonnes; ++j) {
std::size_t indice = i * m_Lignes + j;
for (size_t j = 0; j < m_Columns; ++j) {
std::size_t indice = i * m_Raws + j;
std::cout << at(i, j) << " ";
}
std::cout << "]";
@@ -55,8 +55,8 @@ void Matrix::Print() const {
}
void Matrix::Insert() {
for (size_t i = 0; i < m_Lignes; ++i) {
for (size_t j = 0; j < m_Colonnes; ++j) {
for (size_t i = 0; i < m_Raws; ++i) {
for (size_t j = 0; j < m_Columns; ++j) {
std::cin >> at(i, j);
}
std::cout << std::endl;
@@ -82,9 +82,9 @@ void Matrix::Load(const std::string& filename) {
}
void Matrix::Transpose() {
Matrix result {m_Colonnes, m_Lignes};
for (std::size_t i = 0; i < m_Lignes; i++) {
for (std::size_t j = 0; j < m_Colonnes; j++) {
Matrix result {m_Columns, m_Raws};
for (std::size_t i = 0; i < m_Raws; i++) {
for (std::size_t j = 0; j < m_Columns; j++) {
result.at(j, i) = at(i, j);
}
}
@@ -101,19 +101,19 @@ Matrix Matrix::Identity(std::size_t taille) {
return id;
}
void Matrix::Augmenter(const Matrix& droite) {
assert(droite.m_Lignes == m_Lignes);
Matrix temp {m_Lignes, m_Colonnes + droite.m_Colonnes};
void Matrix::Augment(const Matrix& droite) {
assert(droite.m_Raws == m_Raws);
Matrix temp {m_Raws, m_Columns + droite.m_Columns};
for (std::size_t i = 0; i < m_Lignes; i++) {
for (std::size_t j = 0; j < m_Colonnes; j++) {
for (std::size_t i = 0; i < m_Raws; i++) {
for (std::size_t j = 0; j < m_Columns; j++) {
temp.at(i, j) = at(i, j);
}
}
for (std::size_t i = 0; i < m_Lignes; i++) {
for (std::size_t j = 0; j < droite.m_Colonnes; j++) {
temp.at(i, j + m_Colonnes) = droite.at(i, j);
for (std::size_t i = 0; i < m_Raws; i++) {
for (std::size_t j = 0; j < droite.m_Columns; j++) {
temp.at(i, j + m_Columns) = droite.at(i, j);
}
}
@@ -121,11 +121,11 @@ void Matrix::Augmenter(const Matrix& droite) {
}
bool Matrix::operator==(const Matrix& other) const {
if (m_Lignes != other.m_Lignes || m_Colonnes != other.m_Colonnes)
if (m_Raws != other.m_Raws || m_Columns != other.m_Columns)
return false;
for (std::size_t i = 0; i < m_Lignes; i++) {
for (std::size_t j = 0; j < m_Colonnes; j++) {
for (std::size_t i = 0; i < m_Raws; i++) {
for (std::size_t j = 0; j < m_Columns; j++) {
if (!IsEqualZero(at(i, j) - other.at(i, j)))
return false;
}
@@ -139,23 +139,23 @@ long double& Matrix::operator[](std::size_t indice) {
}
long double& Matrix::at(std::size_t ligne, std::size_t colonne) {
return m_Data[ligne * m_Colonnes + colonne];
return m_Data[ligne * m_Columns + colonne];
}
long double Matrix::at(std::size_t ligne, std::size_t colonne) const {
return m_Data[ligne * m_Colonnes + colonne];
return m_Data[ligne * m_Columns + colonne];
}
std::size_t Matrix::GetRawCount() const {
return m_Lignes;
return m_Raws;
}
std::size_t Matrix::GetColumnCount() const {
return m_Colonnes;
return m_Columns;
}
Matrix Matrix::SubMatrix(std::size_t origine_ligne, std::size_t origine_colonne, std::size_t ligne, std::size_t colonne) const {
assert(m_Lignes >= ligne && m_Colonnes >= colonne);
assert(m_Raws >= ligne && m_Columns >= colonne);
Matrix result {ligne, colonne};
for (std::size_t i = 0; i < ligne; i++) {
@@ -168,9 +168,9 @@ Matrix Matrix::SubMatrix(std::size_t origine_ligne, std::size_t origine_colonne,
}
std::ostream& operator<<(std::ostream& stream, const Matrix& mat) {
stream << mat.m_Lignes << " " << mat.m_Colonnes << "\n";
for (std::size_t i = 0; i < mat.m_Lignes; i++) {
for (std::size_t j = 0; j < mat.m_Colonnes; j++) {
stream << mat.m_Raws << " " << mat.m_Columns << "\n";
for (std::size_t i = 0; i < mat.m_Raws; i++) {
for (std::size_t j = 0; j < mat.m_Columns; j++) {
stream << mat.at(i, j) << " ";
}
stream << "\n";
@@ -179,10 +179,10 @@ std::ostream& operator<<(std::ostream& stream, const Matrix& mat) {
}
std::istream& operator>>(std::istream& stream, Matrix& mat) {
stream >> mat.m_Lignes >> mat.m_Colonnes;
mat.m_Data.resize(mat.m_Lignes * mat.m_Colonnes);
for (std::size_t i = 0; i < mat.m_Lignes; i++) {
for (std::size_t j = 0; j < mat.m_Colonnes; j++) {
stream >> mat.m_Raws >> mat.m_Columns;
mat.m_Data.resize(mat.m_Raws * mat.m_Columns);
for (std::size_t i = 0; i < mat.m_Raws; i++) {
for (std::size_t j = 0; j < mat.m_Columns; j++) {
stream >> mat.at(i, j);
}
}