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

Compare commits

base: hallerni98888:42e92f278f38fec5db0234f7ad548b775c26fdc0
Branches Tags
hallerni98888:main
freudenreichan:main
..
compare: hallerni98888:ebff958c4e2e81783eeecc81241ad6ec2470cfea
Branches Tags
hallerni98888:main
freudenreichan:main

No commits in common. "42e92f278f38fec5db0234f7ad548b775c26fdc0" and "ebff958c4e2e81783eeecc81241ad6ec2470cfea" have entirely different histories.
42e92f278f ... ebff958c4e

1 changed files with 7 additions and 10 deletions
Show Stats Expand all files Collapse all files

17
matrix.c
View File

@ -94,7 +94,7 @@ Matrix multiply(const Matrix matrix1, const Matrix matrix2)
} }
result.rows = matrix1.rows; result.rows = matrix1.rows;
result.cols = matrix2.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
@ -106,19 +106,16 @@ Matrix multiply(const Matrix matrix1, const Matrix matrix2)
} }
// Matritzenmultiplikation // Matritzenmultiplikation
for (int r = 0; r < result.rows; r++) // Zeile in Ergebnis for (unsigned int i = 0; i < result.rows; i++)
{ {
for (int m = 0; m < result.cols; m++) // Spalte in Ergebnis for (unsigned int j = 0; j < result.cols; j++)
{ {
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[r * matrix1.cols + n] * sum += matrix1.buffer[i * matrix1.cols + k] * matrix2.buffer[k * matrix2.cols + j];
matrix2.buffer[n * matrix2.cols + m];
} }
result.buffer[i * result.cols + j] = sum;
result.buffer[r * result.cols + m] = sum;
} }
} }