generated from freudenreichan/info2Praktikum-NeuronalesNetz
matrix.c fully functional, matrixTests returning no errors
This commit is contained in:
parent
c99db0f96c
commit
0a549b7e0d
11
matrix.c
11
matrix.c
@ -111,12 +111,14 @@ Matrix multiply(const Matrix matrix1, const Matrix matrix2)
|
|||||||
result.rows = 0;
|
result.rows = 0;
|
||||||
result.cols = 0;
|
result.cols = 0;
|
||||||
result.buffer = NULL;
|
result.buffer = NULL;
|
||||||
if (matrix1.rows == matrix2.cols) {
|
|
||||||
|
if (matrix1.cols != matrix2.rows) {
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
result.rows = matrix1.rows;
|
result.rows = matrix1.rows;
|
||||||
result.cols = matrix2.cols;
|
result.cols = matrix2.cols;
|
||||||
|
|
||||||
if (matrix1.cols == matrix2.rows) {
|
|
||||||
|
|
||||||
result.buffer = malloc(result.rows * result.cols * sizeof(MatrixType));
|
result.buffer = malloc(result.rows * result.cols * sizeof(MatrixType));
|
||||||
|
|
||||||
for(int i = 0; i < result.rows; i++) {
|
for(int i = 0; i < result.rows; i++) {
|
||||||
@ -125,9 +127,8 @@ Matrix multiply(const Matrix matrix1, const Matrix matrix2)
|
|||||||
for(int k = 0; k < matrix1.cols; k++) {
|
for(int k = 0; k < matrix1.cols; k++) {
|
||||||
value += matrix1.buffer[i * matrix1.cols + k] * matrix2.buffer[k * matrix2.cols + j];
|
value += matrix1.buffer[i * matrix1.cols + k] * matrix2.buffer[k * matrix2.cols + j];
|
||||||
}
|
}
|
||||||
result.buffer[i * matrix1.cols + j] = value;
|
result.buffer[i * result.cols + j] = value;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
Loading…
x
Reference in New Issue
Block a user