hofmannjo99187/Neuronalesnetz
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Kleine Fixes

Browse Source
This commit is contained in:
Jens Burger 2025-11-18 10:18:07 +01:00
commit 5f52f6eef2
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
matrix.c
View File

@ -1,5 +1,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <stdio.h>
#include "matrix.h" #include "matrix.h"
// TODO Matrix-Funktionen implementieren // TODO Matrix-Funktionen implementieren
@ -24,28 +25,28 @@ Matrix createMatrix(unsigned int rows, unsigned int cols)
void clearMatrix(Matrix *matrix) void clearMatrix(Matrix *matrix)
{ {
free(matrix.buffer); free(matrix->buffer);
matrix->buffer = NULL; matrix->buffer = NULL;
matrix->rows = 0; matrix->rows = 0;
matrix->cols = 0; matrix->cols = 0;
} }
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(matrix->buffer == NULL) if(matrix.buffer == NULL)
{ {
printf("Fehler beim Setzen! Matrix nicht initialisiert"); printf("Fehler beim Setzen! Matrix nicht initialisiert");
return; return;
} }
if(rowIdx >= matrix->rows || colIdx >= matrix->cols) if(rowIdx >= matrix.rows || colIdx >= matrix.cols)
{ {
printf("Ungueltige Indizes beim Setzen!\n"); printf("Ungueltige Indizes beim Setzen!\n");
return; return;
} }
matrix->buffer[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)
@ -88,7 +89,7 @@ Matrix add(const Matrix matrix1, const Matrix matrix2)
matrix2Wert = getMatrixAt(matrix2, row, col); matrix2Wert = getMatrixAt(matrix2, row, col);
summe = matrix1Wert + matrix2Wert; summe = matrix1Wert + matrix2Wert;
setMatrixAt(summe, &ergebnisMatrix, row, col); setMatrixAt(summe, ergebnisMatrix, row, col);
} }
} }
@ -119,7 +120,7 @@ Matrix multiply(const Matrix matrix1, const Matrix matrix2)
erg += getMatrixAt(matrix1, row, k) * getMatrixAt(matrix2, k, col); erg += getMatrixAt(matrix1, row, k) * getMatrixAt(matrix2, k, col);
} }
setMatrixAt(erg, &ergebnisMatrix, row, col); setMatrixAt(erg, ergebnisMatrix, row, col);
} }
} }

2
matrixTests.c
View File

@ -164,7 +164,7 @@ void test_setMatrixAtFailsOnIndicesOutOfRange(void)
Matrix matrixToTest = {.rows=2, .cols=3, .buffer=buffer}; Matrix matrixToTest = {.rows=2, .cols=3, .buffer=buffer};
setMatrixAt(-1, matrixToTest, 2, 3); setMatrixAt(-1, matrixToTest, 2, 3);
TEST_ASSERT_EQUAL_FLOAT_ARRAY(expectedResults, matrixToTest.buffer, matrixToTest.cols * matrixToTest.rows); TEST_ASSERT_EQUAL_FLOAT_ARRAY(expectedResults, matrixToTest.buffer, sizeof(buffer)/sizeof(MatrixType));
} }
void setUp(void) { void setUp(void) {