generated from freudenreichan/info2Praktikum-NeuronalesNetz
Compare commits
No commits in common. "98aa5f354a40767a748eb1b27d79cbaf73183ed1" and "5ce0982e17ca1ff13e1321c57f489971978ae619" have entirely different histories.
98aa5f354a
...
5ce0982e17
7
matrix.c
7
matrix.c
@ -150,6 +150,7 @@ Matrix add(const Matrix matrix1, const Matrix matrix2)
|
||||
|
||||
|
||||
//size of the matrices should be the same, if the addition is supposed to happen
|
||||
// Matrix outputMatrix = createMatrix(matrix1.rows, matrix1.cols);
|
||||
Matrix outputMatrix = createMatrix(matrix1.rows, matrix1.cols);
|
||||
|
||||
if(!outputMatrix.buffer){
|
||||
@ -265,12 +266,16 @@ Matrix multiply(const Matrix matrix1, const Matrix matrix2)
|
||||
//Matrix outputMatrix = createMatrix(matrix2.cols, matrix1.rows);
|
||||
for(int i = 0; i < matrix1.rows; i++) {
|
||||
for (int j = 0; j < matrix2.cols; j++) {
|
||||
MatrixType sum = 0;
|
||||
|
||||
for (int k = 0; k < matrix1.cols; k++) {
|
||||
// how this should work in normal Matrix version:
|
||||
// outputMatrix.buffer[i][j] = matrix1.buffer[i][k] * matrix2.buffer[k][j];
|
||||
//outputMatrix.buffer[i + outputMatrix.rows * j] += matrix1.buffer[i + matrix1.rows * k] * matrix2.buffer[k + matrix2.rows * j];
|
||||
outputMatrix.buffer[i * outputMatrix.cols + j] += matrix1.buffer[i * matrix1.cols + k] * matrix2.buffer[j + matrix2.cols * k];
|
||||
sum += matrix1.buffer[i * matrix1.cols + k] * matrix2.buffer[j + matrix2.cols * k];
|
||||
}
|
||||
outputMatrix.buffer[i * outputMatrix.cols + j] = sum;
|
||||
|
||||
}
|
||||
}
|
||||
return outputMatrix;
|
||||
|
||||
@ -1 +0,0 @@
|
||||
make clean && make matrixTests && ./runMatrixTests
|
||||
Loading…
x
Reference in New Issue
Block a user