gramppto99138/NeuesNeuesNeuralesNetzwerk
1
0
Fork 0
generated from freudenreichan/info2Praktikum-NeuronalesNetz
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed Broadcastinng Issue in Add Function in matrix.c

Browse Source
This commit is contained in:
Niko Rost 2025-11-22 16:06:10 +01:00
parent c13c8bd6f6
commit 6524bf95e4
1 changed files with 39 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
matrix.c
View File

@ -55,14 +55,10 @@ 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 MatrixErgebnis = createMatrix(matrix1.rows, matrix1.cols); //Creating Result Matrix
if(matrix1.cols != matrix2.cols || matrix1.rows != matrix2.rows){
printf("Matrix dimensions do not match\n"); //Error Message if dimensions of Input Matrixes are not identical
clearMatrix(&MatrixErgebnis);
return MatrixErgebnis;
}
else{
//If rows and cols of both Matrixes are the same the normal addition starts
if (matrix1.rows == matrix2.rows && matrix1.cols == matrix2.cols){
Matrix MatrixErgebnis = createMatrix(matrix1.rows, matrix1.cols);
for (unsigned int i = 0; i < matrix1.rows; i++){ for (unsigned int i = 0; i < matrix1.rows; i++){
for (unsigned int j = 0; j < matrix1.cols; j++){ for (unsigned int j = 0; j < matrix1.cols; j++){
//Adding Matrix Elements of same row and col index together and store in new Matrix //Adding Matrix Elements of same row and col index together and store in new Matrix
@ -70,10 +66,44 @@ Matrix add(const Matrix matrix1, const Matrix matrix2)
} }
} }
return MatrixErgebnis;
}
//if matrix1 is a Vektor it adds elements to first col of matrix2
else if (matrix1.cols == 1 && matrix1.rows == matrix2.rows){
Matrix MatrixErgebnis = createMatrix(matrix2.rows, matrix2.cols);
for (unsigned int i = 0; i < matrix2.rows; i++) {
for (unsigned int j = 0; j < matrix2.cols; j++) {
//Copy Matrix2 to ErgebnisMatrix
MatrixErgebnis.buffer[i * matrix2.cols + j] = getMatrixAt(matrix2, i, j);
//Adding Elements of first col of Matrix 1 (Vector) to all Elements of MatrixErgebnis
MatrixErgebnis.buffer[i * matrix2.cols + j] += matrix1.buffer[i];
}
} }
return MatrixErgebnis; return MatrixErgebnis;
} }
//if matrix2 is a Vektor it adds elements to first col of matrix1
else if (matrix2.cols == 1 && matrix1.rows == matrix2.rows){
Matrix MatrixErgebnis = createMatrix(matrix1.rows, matrix1.cols);
for (unsigned int i = 0; i < matrix1.rows; i++) {
for (unsigned int j = 0; j < matrix1.cols; j++) {
//Copy Matrix1 to ErgebnisMatrix
MatrixErgebnis.buffer[i * matrix1.cols + j] = getMatrixAt(matrix1, i, j);
//Adding Elements of first col of Matrix 2 (Vector) to first col of MatrixErgebnis
MatrixErgebnis.buffer[i * matrix1.cols + j] += matrix2.buffer[i];
}
}
return MatrixErgebnis;
}
else{
printf("Matrix dimensions do not match\n"); //Error Message if dimensions of Input Matrixes are not identical
Matrix MatrixErgebnis = createMatrix(0, 0);
clearMatrix(&MatrixErgebnis);
return MatrixErgebnis;
}
}
Matrix multiply(const Matrix matrix1, const Matrix matrix2) Matrix multiply(const Matrix matrix1, const Matrix matrix2)
{ {