Compare commits
13 Commits
7e35b218d9
...
main
Author | SHA1 | Date | |
---|---|---|---|
fba09a5c40 | |||
7a2b42e06d | |||
91348e7c09 | |||
2d2d6afcfb | |||
e8f843a420 | |||
a4dabb247d | |||
a3db9391d3 | |||
44b726f3f6 | |||
077702eb73 | |||
57fa219441 | |||
3c596e9601 | |||
e4026b8d60 | |||
b919f4a249 |
2
.gitignore
vendored
2
.gitignore
vendored
@ -1,2 +1,4 @@
|
||||
build/*
|
||||
.vscode/*
|
||||
main.cpp
|
||||
main.exe
|
19
README.md
19
README.md
@ -9,6 +9,7 @@ LeMA will eventually be used for graphical and machine learning usage in my othe
|
||||
- **Easy to Use**: Intuitive functions.
|
||||
- **Somewhat complete**: Supports addition, subtraction, multiplication, and more.
|
||||
- **Ready to Integrate**: Designed to work seamlessly with C++ code.
|
||||
- **Not a movie**: Is **not** about the 1999 hit movie by the Wachowski transexual sisters.
|
||||
|
||||
## Getting Started
|
||||
|
||||
@ -24,7 +25,7 @@ LeMA will eventually be used for graphical and machine learning usage in my othe
|
||||
#include "matrices.h"
|
||||
```
|
||||
|
||||
That's it! You're ready to use Lema.
|
||||
That's it! You're ready to use LeMA.
|
||||
|
||||
### Example Usage
|
||||
|
||||
@ -45,18 +46,15 @@ int main() {
|
||||
|
||||
```cpp
|
||||
#include "matrices.h"
|
||||
#include <iostream>
|
||||
|
||||
int main() {
|
||||
Matrix a(2,2);
|
||||
Matrix b(2,2);
|
||||
a.Set(2.0F); // Fill A with 2s
|
||||
|
||||
a.Set(2.0F); // Fill both matrices
|
||||
b.Set(3.0F);
|
||||
Matrix b = a;
|
||||
Matrix result = a + &b; // Basic operations are possible with pointers
|
||||
|
||||
a.Add(&b);
|
||||
|
||||
a.Print("A + B");
|
||||
result.Print("A + B"); // Is full of 4s !
|
||||
return 0;
|
||||
}
|
||||
```
|
||||
@ -65,15 +63,14 @@ int main() {
|
||||
|
||||
```cpp
|
||||
#include "matrices.h"
|
||||
#include <iostream>
|
||||
|
||||
int main() {
|
||||
Matrix a(3, 3);
|
||||
Matrix b(3, 1); // Let's multiply by a vector
|
||||
|
||||
Matrix result = a.Multiply(&b);
|
||||
Matrix result = a * &b;
|
||||
|
||||
result.Print("A x B");
|
||||
result.Print("A x B"); // Result is a 3 by 1 vector
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
19
main.cpp
19
main.cpp
@ -1,19 +0,0 @@
|
||||
#include "matrices.h"
|
||||
// using namespace std;
|
||||
|
||||
int main()
|
||||
{
|
||||
srand(time(0));
|
||||
|
||||
Matrix a(3,2);
|
||||
a.Randomize();
|
||||
Matrix b = a;
|
||||
|
||||
a.Print("A");
|
||||
b.Print("B");
|
||||
|
||||
Matrix result = a + &b;
|
||||
result.Print("A + B");
|
||||
|
||||
return 0;
|
||||
}
|
92
matrices.h
92
matrices.h
@ -16,7 +16,7 @@ class Matrix{
|
||||
|
||||
inline Matrix Swap(const Matrix*);
|
||||
|
||||
inline void Multiply(float);
|
||||
inline Matrix Multiply(float);
|
||||
inline Matrix Multiply(const Matrix*);
|
||||
|
||||
inline void Hadamard(const Matrix*);
|
||||
@ -24,17 +24,24 @@ class Matrix{
|
||||
inline Matrix Add(float);
|
||||
inline Matrix Add(const Matrix*);
|
||||
|
||||
inline void Substract(float);
|
||||
inline void Substract(const Matrix*);
|
||||
inline Matrix Substract(float);
|
||||
inline Matrix Substract(const Matrix*);
|
||||
|
||||
inline Matrix Function(float (*f)(float));
|
||||
|
||||
inline void Print(std::string_view);
|
||||
|
||||
inline Matrix Transpose();
|
||||
|
||||
// --- Operators
|
||||
// Assign
|
||||
// Operators
|
||||
inline Matrix operator=(const Matrix*);
|
||||
inline Matrix operator+(const Matrix*);
|
||||
inline Matrix operator-(const Matrix*);
|
||||
inline Matrix operator*(const Matrix*);
|
||||
|
||||
inline Matrix operator+(float);
|
||||
inline Matrix operator-(float);
|
||||
inline Matrix operator*(float);
|
||||
|
||||
// Constructors
|
||||
inline Matrix(int, int);
|
||||
@ -49,6 +56,37 @@ Matrix Matrix::operator+(const Matrix* other){
|
||||
return this->Add(other);
|
||||
}
|
||||
|
||||
Matrix Matrix::operator-(const Matrix* other){
|
||||
return this->Substract(other);
|
||||
}
|
||||
|
||||
Matrix Matrix::operator*(const Matrix* other){
|
||||
return this->Multiply(other);
|
||||
}
|
||||
|
||||
Matrix Matrix::operator+(float value){
|
||||
return this->Add(value);
|
||||
}
|
||||
|
||||
Matrix Matrix::operator-(float value){
|
||||
return this->Substract(value);
|
||||
}
|
||||
|
||||
Matrix Matrix::operator*(float value){
|
||||
return this->Multiply(value);
|
||||
}
|
||||
|
||||
Matrix Matrix::Function(float (*f)(float)){
|
||||
Matrix result = this;
|
||||
for(int m = 0; m < result.values.size(); m++){
|
||||
for(int n = 0; n < result.values[m].size(); n++){
|
||||
// Execute function on every value
|
||||
result.values[m][n] = f(result.values[m][n]);
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
// Constructs a zero matrix
|
||||
Matrix::Matrix(int rows, int cols){
|
||||
for(int m = 0; m < rows; m++){
|
||||
@ -118,21 +156,26 @@ Matrix Matrix::Add(const Matrix* other){
|
||||
}
|
||||
|
||||
// Substract 2 matrices
|
||||
void Matrix::Substract(const Matrix* other){
|
||||
Matrix Matrix::Substract(const Matrix* other){
|
||||
// Matrices need to be the same size
|
||||
assertm(this->values.size() == other->values.size() &&
|
||||
this->values[0].size() == other->values[0].size(),
|
||||
"Wrong matrix size");
|
||||
for(int m = 0; m < this->values.size(); m++){
|
||||
for(int n = 0; n < this->values[m].size(); n++){
|
||||
this->values[m][n] -= other->values[m][n];
|
||||
|
||||
Matrix result = this;
|
||||
|
||||
for(int m = 0; m < result.values.size(); m++){
|
||||
for(int n = 0; n < result.values[m].size(); n++){
|
||||
result.values[m][n] -= other->values[m][n];
|
||||
}
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
// Print a matrix in terminal, with a title
|
||||
void Matrix::Print(std::string_view titre){
|
||||
std::cout << titre << std::endl;
|
||||
void Matrix::Print(std::string_view title){
|
||||
std::cout << title << std::endl;
|
||||
for(int m = 0; m < values.size(); m++){
|
||||
std::cout << '|';
|
||||
for(int n = 0; n < values[m].size(); n++){
|
||||
@ -154,27 +197,34 @@ Matrix Matrix::Add(float value){
|
||||
}
|
||||
|
||||
// Substract a constant value to every matrix case
|
||||
void Matrix::Substract(float value){
|
||||
for(int m = 0; m < this->values.size(); m++){
|
||||
for(int n = 0; n < this->values[m].size(); n++){
|
||||
this->values[m][n] -= value;
|
||||
Matrix Matrix::Substract(float value){
|
||||
Matrix result = this;
|
||||
for(int m = 0; m < result.values.size(); m++){
|
||||
for(int n = 0; n < result.values[m].size(); n++){
|
||||
result.values[m][n] -= value;
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
// Multiply every matrix case by a given factor
|
||||
void Matrix::Multiply(float value){
|
||||
for(int m = 0; m < this->values.size(); m++){
|
||||
for(int n = 0; n < this->values[m].size(); n++){
|
||||
this->values[m][n] *= value;
|
||||
Matrix Matrix::Multiply(float value){
|
||||
Matrix result = this;
|
||||
for(int m = 0; m < result.values.size(); m++){
|
||||
for(int n = 0; n < result.values[m].size(); n++){
|
||||
result.values[m][n] *= value;
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
// Set a matrix to a given value
|
||||
void Matrix::Set(float value){
|
||||
this->Multiply(0.0F);
|
||||
this->Add(value);
|
||||
for(int m = 0; m < this->values.size(); m++){
|
||||
for(int n = 0; n < this->values[m].size(); n++){
|
||||
this->values[m][n] = value;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Transpose a matrix
|
||||
|
Reference in New Issue
Block a user