Merge branch 'main' into Simon's-Branch
This commit is contained in:
commit
b06bbd0de0
@ -114,6 +114,7 @@ Matrix add(const Matrix matrix1, const Matrix matrix2)
|
|||||||
return createMatrix(0, 0);
|
return createMatrix(0, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
for(unsigned int i = 0; i < resRows; ++i)
|
for(unsigned int i = 0; i < resRows; ++i)
|
||||||
{
|
{
|
||||||
for(unsigned int j = 0; j < resCols; ++j)
|
for(unsigned int j = 0; j < resCols; ++j)
|
||||||
@ -124,6 +125,7 @@ Matrix add(const Matrix matrix1, const Matrix matrix2)
|
|||||||
unsigned int i2 = (matrix2.rows == 1) ? 0 : i;
|
unsigned int i2 = (matrix2.rows == 1) ? 0 : i;
|
||||||
unsigned int j2 = (matrix2.cols == 1) ? 0 : j;
|
unsigned int j2 = (matrix2.cols == 1) ? 0 : j;
|
||||||
|
|
||||||
|
|
||||||
MatrixType val = getMatrixAt(matrix1, i1, j1) + getMatrixAt(matrix2, i2, j2);
|
MatrixType val = getMatrixAt(matrix1, i1, j1) + getMatrixAt(matrix2, i2, j2);
|
||||||
setMatrixAt(val, &result, i, j);
|
setMatrixAt(val, &result, i, j);
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user