forked from freudenreichan/info2Praktikum-NeuronalesNetz
Compare commits
3
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e30fc66453 | ||
|
|
5583ecd1ba | ||
|
|
e4c7ec1a59 |
No files matched your search
@@ -31,5 +31,44 @@ Matrix add(const Matrix matrix1, const Matrix matrix2)
|
|||||||
|
|
||||||
Matrix multiply(const Matrix matrix1, const Matrix matrix2)
|
Matrix multiply(const Matrix matrix1, const Matrix matrix2)
|
||||||
{
|
{
|
||||||
|
<<<<<<< Updated upstream
|
||||||
|
=======
|
||||||
|
|
||||||
|
>>>>>>> Stashed changes
|
||||||
|
// Überprüfen, ob die Matrizen gültig sind und ob ihre Dimensionen eine Multiplikation erlauben
|
||||||
|
if (matrix1.buffer == NULL || matrix2.buffer == NULL || matrix1.cols != matrix2.rows)
|
||||||
|
{
|
||||||
|
return (Matrix){0};
|
||||||
|
}
|
||||||
|
|
||||||
|
// Ergebnismatrix erstellen
|
||||||
|
Matrix result = createMatrix(matrix1.rows, matrix2.cols);
|
||||||
|
|
||||||
|
// Überprüfen, ob die Speicherreservierung erfolgreich war
|
||||||
|
if (result.buffer == NULL)
|
||||||
|
{
|
||||||
|
return (Matrix){0};
|
||||||
|
}
|
||||||
|
|
||||||
|
// Jede Zeile der ersten Matrix durchlaufen
|
||||||
|
for (unsigned int i = 0; i < matrix1.rows; i++)
|
||||||
|
{
|
||||||
|
// Jede Spalte der zweiten Matrix durchlaufen
|
||||||
|
for (unsigned int j = 0; j < matrix2.cols; j++)
|
||||||
|
{
|
||||||
|
MatrixType sum = 0;
|
||||||
|
|
||||||
|
// Summe der Produkte berechnen
|
||||||
|
for (unsigned int k = 0; k < matrix1.cols; k++)
|
||||||
|
{
|
||||||
|
sum += matrix1.buffer[i * matrix1.cols + k] *
|
||||||
|
matrix2.buffer[k * matrix2.cols + j];
|
||||||
|
}
|
||||||
|
|
||||||
|
// Berechneten Wert in der Ergebnismatrix speichern
|
||||||
|
result.buffer[i * result.cols + j] = sum;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return result;
|
||||||
}
|
}
|
||||||
+1
-1
@@ -9,7 +9,7 @@ typedef float MatrixType;
|
|||||||
typedef struct {
|
typedef struct {
|
||||||
unsigned int rows;
|
unsigned int rows;
|
||||||
unsigned int cols;
|
unsigned int cols;
|
||||||
MatrixType *buffer;
|
MatrixType *buffer; // Speichert die Matrixwerte in einem Array, die Speicheradresse des ersten Matrixwerts
|
||||||
} Matrix;
|
} Matrix;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user