hallerni98888/info2Praktikum-NeuronalesNetz
1
0
Fork 0
forked from freudenreichan/info2Praktikum-NeuronalesNetz
Code Pull Requests Activity

multiply fix

Browse Source
This commit is contained in:
Nick Haller 2025-11-08 15:23:56 +01:00
parent c560fd5241
commit 14388a5637
1 changed files with 29 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
matrix.c
View File

@ -14,7 +14,7 @@ Matrix createMatrix(unsigned int rows, unsigned int cols)
if (rows > 0 || cols > 0) if (rows > 0 || cols > 0)
{ {
m.buffer = malloc (rows * cols * sizeof(int)); m.buffer = malloc(rows * cols * sizeof(int));
} }
return m; return m;
@ -23,7 +23,8 @@ Matrix createMatrix(unsigned int rows, unsigned int cols)
void clearMatrix(Matrix *matrix) void clearMatrix(Matrix *matrix)
{ {
if (matrix == NULL) { if (matrix == NULL)
{
return; return;
} }
@ -38,21 +39,21 @@ 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)
{ {
matrix.buffer[rowIdx * matrix.cols + colIdx] = value; //setzte Matrix auf den Wert value am Punkt (row col) matrix.buffer[rowIdx * matrix.cols + colIdx] = value; // setzte Matrix auf den Wert value am Punkt (row col)
} }
MatrixType getMatrixAt(const Matrix matrix, unsigned int rowIdx, unsigned int colIdx) MatrixType getMatrixAt(const Matrix matrix, unsigned int rowIdx, unsigned int colIdx)
{ {
MatrixType value = 0; MatrixType value = 0;
return value = matrix.buffer[rowIdx * matrix.cols + colIdx]; //hole Wert value am Punkt (row col) return value = matrix.buffer[rowIdx * matrix.cols + colIdx]; // hole Wert value am Punkt (row col)
} }
Matrix add(const Matrix matrix1, const Matrix matrix2) Matrix add(const Matrix matrix1, const Matrix matrix2)
{ {
Matrix result = {0}; Matrix result = {0};
if(matrix1.rows != matrix2.rows || matrix1.cols != matrix2.cols) if (matrix1.rows != matrix2.rows || matrix1.cols != matrix2.cols)
{ {
return result; return result;
} }
@ -61,21 +62,20 @@ Matrix add(const Matrix matrix1, const Matrix matrix2)
result.cols = matrix1.cols; result.cols = matrix1.cols;
result.buffer = malloc(result.rows * result.cols * sizeof(MatrixType)); result.buffer = malloc(result.rows * result.cols * sizeof(MatrixType));
//wenn buffer nicht allokiert werden kann dann zurücksetzen und abbrechen // wenn buffer nicht allokiert werden kann dann zurücksetzen und abbrechen
if(result.buffer == NULL) if (result.buffer == NULL)
{ {
result.rows = result.cols = 0; result.rows = result.cols = 0;
return result; return result;
} }
//Matritzenaddition // Matritzenaddition
for (unsigned int i = 0; i < result.rows; i++) for (unsigned int i = 0; i < result.rows; i++)
{ {
for (unsigned int j = 0; j < result.cols; j++) for (unsigned int j = 0; j < result.cols; j++)
{ {
result.buffer[i * result.cols + j] = matrix1.buffer[i * matrix1.cols + j] + matrix2.buffer[i * matrix2.cols + j]; result.buffer[i * result.cols + j] = matrix1.buffer[i * matrix1.cols + j] + matrix2.buffer[i * matrix2.cols + j];
} }
} }
return result; return result;
@ -85,34 +85,37 @@ Matrix multiply(const Matrix matrix1, const Matrix matrix2)
{ {
Matrix result = {0}; Matrix result = {0};
if(matrix1.rows != matrix2.rows || matrix1.cols != matrix2.cols) if (matrix1.cols != matrix2.rows)
{ {
return result; return result;
} }
result.rows = matrix1.rows; result.rows = matrix1.rows;
result.cols = matrix1.cols; result.cols = matrix2.cols;
result.buffer = malloc(result.rows * result.cols * sizeof(MatrixType)); result.buffer = malloc(result.rows * result.cols * sizeof(MatrixType));
//wenn buffer nicht allokiert werden kann dann zurücksetzen und abbrechen // wenn buffer nicht allokiert werden kann dann zurücksetzen und abbrechen
if(result.buffer == NULL) if (result.buffer == NULL)
{ {
result.rows = result.cols = 0; result.rows = result.cols = 0;
return result; return result;
} }
//Matritzenmultiplikation // Matritzenmultiplikation
for (unsigned int i = 0; i < result.rows; i++) for (int r = 0; r < result.rows; r++) // Zeile in Ergebnis
{ {
for (unsigned int j = 0; j < result.cols; j++) for (int m = 0; m < result.cols; m++) // Spalte in Ergebnis
{ {
MatrixType sum = 0; MatrixType sum = 0;
for (unsigned int k = 0; k < matrix1.cols; k++)
for (int n = 0; n < matrix1.cols; n++)
{ {
sum += matrix1.buffer[i * matrix1.cols + k] * matrix2.buffer[k * matrix2.cols + j]; sum += matrix1.buffer[r * matrix1.cols + n] *
matrix2.buffer[n * matrix2.cols + m];
} }
result.buffer[i * result.cols + j] = sum;
result.buffer[r * result.cols + m] = sum;
} }
} }