Compare commits

..

3 Commits

Author SHA1 Message Date
D2A62006
32cf681534 matrix createMatrix working 2025-11-20 16:47:34 +01:00
D2A62006
8b1eecfb5c asdf 2025-11-18 11:18:18 +01:00
D2A62006
cdd14986cf Define Matrix structure in matrix.h and remove duplicate definition from matrix.c 2025-11-15 18:28:56 +01:00
3 changed files with 45 additions and 13 deletions

1
.gitignore vendored
View File

@ -1,4 +1,5 @@
mnist mnist
runTests runTests
runMatrixTests
*.o *.o
*.exe *.exe

View File

@ -4,28 +4,24 @@
// TODO Matrix-Funktionen implementieren // TODO Matrix-Funktionen implementieren
typedef struct Matrix { /*
unsigned int xElement; Alte Funktion
unsigned int yElement;
int ** data;
} Matrix;
Matrix createMatrix(unsigned int rows, unsigned int cols) Matrix createMatrix(unsigned int rows, unsigned int cols)
{ {
Matrix m; Matrix m;
m.xElement = rows; m.rows = rows;
m.yElement = cols; m.cols = cols;
m.data = NULL; m.data = NULL;
if(rows == 0 || cols == 0){ if(rows == 0 || cols == 0){
m.xElement = m.yElement = 0; m.rows = m.cols = 0;
return m; return m;
} }
m.data = malloc(rows * sizeof *m.data); m.data = malloc(rows * sizeof *m.data);
if(!m.data){ if(!m.data){
m.xElement = m.yElement = 0; m.rows = m.cols = 0;
return m; return m;
} }
for(unsigned int i = 0; i < rows; i++){ for(unsigned int i = 0; i < rows; i++){
@ -37,13 +33,43 @@ Matrix createMatrix(unsigned int rows, unsigned int cols)
} }
free(m.data); free(m.data);
m.data = NULL; m.data = NULL;
m.xElement = m.yElement = 0; m.rows = m.cols = 0;
return m; return m;
} }
} }
return m; return m;
} }
*/
Matrix createMatrix(size_t cols, size_t rows)
{
Matrix m;
m.rows = rows;
m.cols = cols;
m.buffer = NULL;
if(rows == 0 || cols == 0){
m.rows = m.cols = 0;
return m;
}
// Single allocation for entire matrix
m.buffer = malloc(rows * cols * sizeof(MatrixType));
if(!m.buffer){
m.rows = m.cols = 0;
return m;
}
// Initialize (optional)
for(unsigned int i = 0; i < rows * cols; i++){
m.buffer[i] = UNDEFINED_MATRIX_VALUE;
}
return m;
}
void clearMatrix(Matrix *matrix) void clearMatrix(Matrix *matrix)
{ {

View File

@ -4,11 +4,16 @@
#define UNDEFINED_MATRIX_VALUE 0 #define UNDEFINED_MATRIX_VALUE 0
typedef float MatrixType; typedef float MatrixType;
// TODO Matrixtyp definieren // TODO Matrixtyp definieren
typedef struct Matrix {
size_t rows;
size_t cols;
MatrixType *buffer;
} Matrix;
Matrix createMatrix(unsigned int rows, unsigned int cols);
Matrix createMatrix(size_t rows, size_t cols);
void clearMatrix(Matrix *matrix); void clearMatrix(Matrix *matrix);
void setMatrixAt(MatrixType value, Matrix matrix, unsigned int rowIdx, unsigned int colIdx); void setMatrixAt(MatrixType value, Matrix matrix, unsigned int rowIdx, unsigned int colIdx);
MatrixType getMatrixAt(const Matrix matrix, unsigned int rowIdx, unsigned int colIdx); MatrixType getMatrixAt(const Matrix matrix, unsigned int rowIdx, unsigned int colIdx);