freudenreichan/info2Praktikum-NeuronalesNetz
Template
1
1
Fork 14
Code Issues Pull Requests Packages Projects Releases Wiki Activity

first implementation of new broadcasting addition requirement

Browse Source
This commit is contained in:
Simon Wiesend 2025-11-11 19:05:03 +01:00
parent 721f5cc2d1
commit 645d471860
Signed by untrusted user who does not match committer: wiesendsi102436
GPG Key ID: C18A833054142CF0
1 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
matrix.c
View File

@ -58,13 +58,44 @@ MatrixType getMatrixAt(const Matrix matrix, unsigned int rowIdx, unsigned int co
Matrix add(const Matrix matrix1, const Matrix matrix2) Matrix add(const Matrix matrix1, const Matrix matrix2)
{ {
Matrix resMat = createMatrix(matrix1.rows, matrix1.cols); Matrix resMat = (matrix1.cols > matrix2.cols) ? createMatrix(matrix1.rows, matrix1.cols) : createMatrix(matrix2.rows, matrix2.cols);
// clear matrix and return if the dimensions of the input matrices differ from each other if (matrix1.cols != matrix2.cols)
if (matrix1.rows != matrix2.rows || matrix1.cols != matrix2.cols)
{ {
clearMatrix(&resMat); if (matrix1.rows != matrix2.rows)
return resMat; {
clearMatrix(&resMat);
return resMat;
}
else if (matrix1.cols == 1)
{
// broadcast vector
for (size_t m = 0; m < matrix2.rows; m++)
{
for (size_t n = 0; n < matrix2.cols; n++)
{
setMatrixAt(getMatrixAt(matrix2, m, n) + getMatrixAt(matrix1, m, 0), resMat, m, n);
}
}
return resMat;
}
else if (matrix2.cols == 1)
{
// broadcast vector
for (size_t m = 0; m < matrix1.rows; m++)
{
for (size_t n = 0; n < matrix1.cols; n++)
{
setMatrixAt(getMatrixAt(matrix1, m, n) + getMatrixAt(matrix2, m, 0), resMat, m, n);
}
}
return resMat;
}
else
{
clearMatrix(&resMat);
return resMat;
}
} }
for (size_t m = 0; m < matrix1.rows; m++) for (size_t m = 0; m < matrix1.rows; m++)