muellerla101249/NeuralNetwork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

matrix.data zu matrix.buffer umgenannt, da Tests diese Bezeichnung erwarten. Test für get, set und multiply laufen PASS

Browse Source
This commit is contained in:
Laila Mueller 2025-11-10 13:43:55 +01:00
parent 147fd28bda
commit bb87d30e05
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
info2praktikum-neuronalesnetz/matrix.c
View File

@ -10,8 +10,8 @@ Matrix createMatrix(unsigned int rows, unsigned int cols)
Matrix matrix; Matrix matrix;
matrix.rows = rows; matrix.rows = rows;
matrix.cols = cols; matrix.cols = cols;
matrix.data = (float *)malloc(rows * cols * sizeof(MatrixType)); matrix.buffer = (float *)malloc(rows * cols * sizeof(MatrixType));
if (matrix.data != NULL) { if (matrix.buffer != NULL) {
} }
return matrix; return matrix;
@ -19,20 +19,20 @@ Matrix createMatrix(unsigned int rows, unsigned int cols)
void clearMatrix(Matrix *matrix) void clearMatrix(Matrix *matrix)
{ {
if (matrix->data != NULL) { if (matrix->buffer != NULL) {
free(matrix->data); free(matrix->buffer);
matrix->data = NULL; matrix->buffer = NULL;
} }
} }
void setMatrixAt(MatrixType value, Matrix* matrix, unsigned int rowIdx, unsigned int colIdx) void setMatrixAt(MatrixType value, Matrix matrix, unsigned int rowIdx, unsigned int colIdx)
{ {
if(rowIdx >= matrix->rows || colIdx >= matrix->cols){ if(rowIdx >= matrix.rows || colIdx >= matrix.cols){
return; return;
} }
matrix->data[rowIdx * matrix->cols + colIdx] = value; matrix.buffer[rowIdx * matrix.cols + colIdx] = value;
} }
MatrixType getMatrixAt(const Matrix matrix, unsigned int rowIdx, unsigned int colIdx) MatrixType getMatrixAt(const Matrix matrix, unsigned int rowIdx, unsigned int colIdx)
@ -41,7 +41,7 @@ MatrixType getMatrixAt(const Matrix matrix, unsigned int rowIdx, unsigned int co
return 0; return 0;
} }
MatrixType value; MatrixType value;
value = matrix.data[rowIdx * matrix.cols + colIdx]; value = matrix.buffer[rowIdx * matrix.cols + colIdx];
return value; return value;
} }
@ -54,7 +54,7 @@ Matrix multiply(const Matrix matrix1, const Matrix matrix2)
{ {
if (matrix1.cols != matrix2.rows){ if (matrix1.cols != matrix2.rows){
Matrix errorMatrix = createMatrix(0, 0); Matrix errorMatrix = createMatrix(0, 0);
errorMatrix.data = NULL; errorMatrix.buffer = NULL;
return errorMatrix; return errorMatrix;
} }
Matrix matrix3 = createMatrix(matrix1.rows, matrix2.cols); Matrix matrix3 = createMatrix(matrix1.rows, matrix2.cols);
@ -65,7 +65,7 @@ Matrix multiply(const Matrix matrix1, const Matrix matrix2)
for(size_t k = 0; k < matrix1.cols; k++){ for(size_t k = 0; k < matrix1.cols; k++){
sum += getMatrixAt(matrix1, i, k) * getMatrixAt(matrix2, k, j); sum += getMatrixAt(matrix1, i, k) * getMatrixAt(matrix2, k, j);
} }
setMatrixAt(sum, &matrix3, i, j); setMatrixAt(sum, matrix3, i, j);
} }
} }

2
info2praktikum-neuronalesnetz/matrix.h
View File

@ -6,7 +6,7 @@
typedef struct{ typedef struct{
size_t rows; size_t rows;
size_t cols; size_t cols;
float* data; float* buffer;
} Matrix; } Matrix;