grafma98967/info2_pr_2_NeuronalesNetz
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

error fix matrix.c

Browse Source
This commit is contained in:
maxgrf 2025-11-15 03:58:42 +01:00
parent 89e99abf8e
commit b30c2a3808
1 changed files with 28 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
matrix.c
View File

@ -7,7 +7,7 @@
Matrix createMatrix(unsigned int rows, unsigned int cols) Matrix createMatrix(unsigned int rows, unsigned int cols)
{ {
Matrix m = {NULL, rows, cols} //Wahrscheinlich in Programm bereits enthalten; Matrix m = {NULL, rows, cols}; // Wahrscheinlich in Programm bereits enthalten;
if (rows > 0 && cols > 0) if (rows > 0 && cols > 0)
{ {
@ -22,7 +22,6 @@ Matrix createMatrix(unsigned int rows, unsigned int cols)
return m; return m;
} }
void clearMatrix(Matrix *matrix) void clearMatrix(Matrix *matrix)
{ {
@ -36,14 +35,12 @@ 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)
//not testet // Matrix matrix zu Matrix *matrix, empfehlung
{ {
if (rowIdx < matrix.rows && colIdx < matrix.cols && matrix.buffer != NULL) if (rowIdx < matrix.rows && colIdx < matrix.cols && matrix.buffer != NULL)
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)
{ {
if (rowIdx >= matrix.rows || colIdx >= matrix.cols || matrix.buffer == NULL) if (rowIdx >= matrix.rows || colIdx >= matrix.cols || matrix.buffer == NULL)
@ -51,56 +48,55 @@ MatrixType getMatrixAt(const Matrix matrix, unsigned int rowIdx, unsigned int co
return matrix.buffer[rowIdx * matrix.cols + colIdx]; return matrix.buffer[rowIdx * matrix.cols + colIdx];
} }
//TODO: Funktionen implementieren // TODO: Funktionen implementieren
Matrix add(const Matrix matrix1, const Matrix matrix2) Matrix add(const Matrix matrix1, const Matrix matrix2)
{ {
//Needed: rows/Zeilen, collums/Spalten // Needed: rows/Zeilen, collums/Spalten
//test, if two matrix has exact size // test, if two matrix has exact size
if (matrix1.rows != matrix2.rows || matrix1.cols != matrix2.cols)
return createMatrix(0, 0);
if(matrix1.rows != matrix2.rows || matrix1.cols != matrix2.cols)
return createMatrix(0,0);
Matrix result_add = createMatrix(matrix1.rows, matrix1.cols); Matrix result_add = createMatrix(matrix1.rows, matrix1.cols);
for(int r = 0; r < matrix1.rows; r++) for (int r = 0; r < matrix1.rows; r++)
{ {
for(int c = 0; c < matrix1.cols; c++) for (int c = 0; c < matrix1.cols; c++)
{ {
//TODO: matrix_add initialisieren // TODO: matrix_add initialisieren
//matrix_add[r][c] = matrix1[r][c] + matrix2[r][c] // matrix_add[r][c] = matrix1[r][c] + matrix2[r][c]
MatrixType sum = getMatrixAt(matrix1,r,c)+getMatrixAt(matrix2,r,c); MatrixType sum = getMatrixAt(matrix1, r, c) + getMatrixAt(matrix2, r, c);
setMatrixAt(sum,result_add,r,c) //evtl re setMatrixAt(sum, result_add, r, c); // evtl re
} }
} }
} }
Matrix multiply(const Matrix matrix1, const Matrix matrix2) Matrix multiply(const Matrix matrix1, const Matrix matrix2)
{ {
//Needed: rows/Zeilen, collums/Spalten // Needed: rows/Zeilen, collums/Spalten
MatrixType buffer_add = 0; //TODO: Datentyp achten, ist int richitg? MatrixType buffer_add;
Matrix result = {NULL, 0, 0}; //Leere Matrix, falls fehler // Probe ob Spalten1 = Zeilen2
//Probe ob Spalten1 = Zeilen2 if (matrix1.cols != matrix2.rows)
if(matrix1.cols != matrix2.rows) return createMatrix(0, 0);
return -1;
result = createMatrix(matrix1.rows, matrix2.cols); // "" Matrix result = createMatrix(matrix1.rows, matrix2.cols); // ""
for(int index = 0; index < matrix1.rows; index++) for (int index = 0; index < matrix1.rows; index++)
{ {
for(int shift = 0; shift < matrix2.cols; shift++) for (int shift = 0; shift < matrix2.cols; shift++)
{ {
for(int skalar = 0; skalar<matrix1.cols; skalar++) buffer_add = 0;
//TODO: matrix_add initialisieren for (int skalar = 0; skalar < matrix1.cols; skalar++)
// TODO: matrix_add initialisieren
{ {
//buffer_add += matrix1[index][skalar]*matrix2[skalar][index]; // buffer_add += matrix1[index][skalar]*matrix2[skalar][index];
buffer_add += getMatrixAt(matrix1, index, skalar) * getMatrixAt(matrix2, skalar, shift); buffer_add += getMatrixAt(matrix1, index, skalar) * getMatrixAt(matrix2, skalar, shift);
} }
//matrix_mul[index][shift] = buffer_add; // matrix_mul[index][shift] = buffer_add;
setMatrixAt(buffer_add,result,index,shift); //result als Pointer, also mit &result setMatrixAt(buffer_add, result, index, shift); // result als Pointer, also mit &result
} }
buffer_add = 0;
} }
} }