bruennerda98937/info2NeuronalesNetzBruennnerKobNew
1
0
Fork 0
generated from freudenreichan/info2Praktikum-NeuronalesNetz
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed UnitTest Errorrs in matrix.c

Browse Source
This commit is contained in:
= 2025-11-25 15:01:21 +01:00
parent 05a29b50c6
commit 82c335ca89
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
matrix.c
View File

@ -75,25 +75,30 @@ void clearMatrix(Matrix *matrix)
{
for (int i = 0; i < matrix->rows; i++) {
for (int j = 0; j < matrix->cols;j++) {
matrix->buffer[i + matrix->rows* j] = UNDEFINED_MATRIX_VALUE;
matrix->buffer[i + matrix->rows * j] = UNDEFINED_MATRIX_VALUE;
}
}
free(matrix->buffer);
matrix->rows = 0;
matrix->cols = 0;
matrix->buffer = NULL;
}
void setMatrixAt(MatrixType value, Matrix matrix, unsigned int rowIdx, unsigned int colIdx)
{
matrix.buffer[rowIdx-1 + matrix.rows*(colIdx-1)] = value;
//checks, if the given incies are allowed
if((rowIdx) < matrix.rows && (colIdx) < matrix.cols) matrix.buffer[rowIdx + matrix.rows*(colIdx)] = value;
}
MatrixType getMatrixAt(const Matrix matrix, unsigned int rowIdx, unsigned int colIdx)
{
MatrixType returnVal;
returnVal = matrix.buffer[rowIdx-1 + matrix.rows*(colIdx-1)];
return returnVal;
//checks, if the given indices are allowed
if((rowIdx) < matrix.rows && (colIdx) < matrix.cols) {
MatrixType returnVal;
returnVal = matrix.buffer[rowIdx + matrix.rows*(colIdx)];
return returnVal;
}
else return 0;
}
Matrix add(const Matrix matrix1, const Matrix matrix2)
@ -101,7 +106,8 @@ Matrix add(const Matrix matrix1, const Matrix matrix2)
//check if the matrices are able to be added (same size)
if (matrix1.cols == matrix2.cols && matrix1.rows == matrix2.rows){
//size of the matrices should be the same, if the addition is supposed to happen
Matrix outputMatrix = createMatrix(matrix1.rows, matrix1.cols);
// Matrix outputMatrix = createMatrix(matrix1.rows, matrix1.cols);
Matrix outputMatrix = createMatrix(matrix1.cols, matrix1.rows);
for (int i = 0; i < matrix1.rows;i++) {
for (int j = 0; j < matrix1.cols; j++) {
// how this should work in normal Matrix version:
@ -125,13 +131,14 @@ Matrix multiply(const Matrix matrix1, const Matrix matrix2)
{
//check, if the matrices can be multiplied
if (matrix1.rows == matrix2.cols) {
Matrix outputMatrix = createMatrix(matrix1.rows, matrix2.cols);
// Matrix outputMatrix = createMatrix(matrix1.rows, matrix2.cols);
Matrix outputMatrix = createMatrix(matrix2.cols, matrix1.rows);
for(int i = 0; i < matrix1.rows; i++) {
for (int j = 0; j < matrix2.cols; j++) {
for (int k = 0; k < matrix2.rows; k++) {
// how this should work in normal Matrix version:
// outputMatrix.buffer[i][j] = matrix1.buffer[i][k] * matrix2.buffer[k][j];
outputMatrix.buffer[i + outputMatrix.rows* j] = matrix1.buffer[i + matrix1.rows* k] * matrix2.buffer[k + matrix2.rows*j];
outputMatrix.buffer[i + outputMatrix.rows * j] = matrix1.buffer[i + matrix1.rows * k] * matrix2.buffer[k + matrix2.rows * j];
}
}
}