generated from freudenreichan/info2Praktikum-NeuronalesNetz
fixed some spacing
This commit is contained in:
parent
9bd18d3681
commit
e7373fe73a
7
matrix.c
7
matrix.c
@ -147,7 +147,6 @@ Matrix add(const Matrix matrix1, const Matrix matrix2)
|
|||||||
|
|
||||||
|
|
||||||
//size of the matrices should be the same, if the addition is supposed to happen
|
//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);
|
Matrix outputMatrix = createMatrix(matrix1.rows, matrix1.cols);
|
||||||
|
|
||||||
if(!outputMatrix.buffer){
|
if(!outputMatrix.buffer){
|
||||||
@ -212,16 +211,12 @@ Matrix multiply(const Matrix matrix1, const Matrix matrix2)
|
|||||||
//Matrix outputMatrix = createMatrix(matrix2.cols, matrix1.rows);
|
//Matrix outputMatrix = createMatrix(matrix2.cols, matrix1.rows);
|
||||||
for(int i = 0; i < matrix1.rows; i++) {
|
for(int i = 0; i < matrix1.rows; i++) {
|
||||||
for (int j = 0; j < matrix2.cols; j++) {
|
for (int j = 0; j < matrix2.cols; j++) {
|
||||||
MatrixType sum = 0;
|
|
||||||
|
|
||||||
for (int k = 0; k < matrix1.cols; k++) {
|
for (int k = 0; k < matrix1.cols; k++) {
|
||||||
// how this should work in normal Matrix version:
|
// how this should work in normal Matrix version:
|
||||||
// outputMatrix.buffer[i][j] = matrix1.buffer[i][k] * matrix2.buffer[k][j];
|
// 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.rows * j] += matrix1.buffer[i + matrix1.rows * k] * matrix2.buffer[k + matrix2.rows * j];
|
||||||
sum += matrix1.buffer[i * matrix1.cols + k] * matrix2.buffer[j + matrix2.cols * k];
|
outputMatrix.buffer[i * outputMatrix.cols + j] += matrix1.buffer[i * matrix1.cols + k] * matrix2.buffer[j + matrix2.cols * k];
|
||||||
}
|
}
|
||||||
outputMatrix.buffer[i * outputMatrix.cols + j] = sum;
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return outputMatrix;
|
return outputMatrix;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user