generated from freudenreichan/info2Praktikum-NeuronalesNetz
finished matrixMultiply() Vers 1, starting testing phase
This commit is contained in:
parent
ebc5ff0216
commit
6124b38e8d
22
matrix.c
22
matrix.c
@ -13,7 +13,7 @@ typedef struct Matrix {
|
|||||||
|
|
||||||
Matrix createMatrix(unsigned int rows, unsigned int cols)
|
Matrix createMatrix(unsigned int rows, unsigned int cols)
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void clearMatrix(Matrix *matrix)
|
void clearMatrix(Matrix *matrix)
|
||||||
@ -38,5 +38,23 @@ Matrix add(const Matrix matrix1, const Matrix matrix2)
|
|||||||
|
|
||||||
Matrix multiply(const Matrix matrix1, const Matrix matrix2)
|
Matrix multiply(const Matrix matrix1, const Matrix matrix2)
|
||||||
{
|
{
|
||||||
|
if (matrix1.rows == matrix2.cols) {
|
||||||
|
Matrix result;
|
||||||
|
result.rows = matrix1.rows;
|
||||||
|
result.cols = matrix2.cols;
|
||||||
|
|
||||||
|
result.buffer = malloc(result.rows * result.cols * sizeof(MatrixType));
|
||||||
|
|
||||||
|
for(int i = 0; i < rows; i++) {
|
||||||
|
for(int j = 0; j < cols; j++) {
|
||||||
|
MatrixType value = 0;
|
||||||
|
for(int k = 0; k < matrix1.cols; k++) {
|
||||||
|
value += matrix1[i][k] * matrix2[k][j];
|
||||||
|
}
|
||||||
|
result.buffer[i][i] = value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
return result;
|
||||||
}
|
}
|
||||||
Loading…
x
Reference in New Issue
Block a user