From 6524bf95e4348863ab9d874b680cca396bf09859 Mon Sep 17 00:00:00 2001 From: Niko Rost Date: Sat, 22 Nov 2025 16:06:10 +0100 Subject: [PATCH 1/3] Fixed Broadcastinng Issue in Add Function in matrix.c --- matrix.c | 48 +++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 39 insertions(+), 9 deletions(-) diff --git a/matrix.c b/matrix.c index 0e34db0..7751d04 100644 --- a/matrix.c +++ b/matrix.c @@ -55,14 +55,10 @@ MatrixType getMatrixAt(const Matrix matrix, unsigned int rowIdx, unsigned int co 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 j = 0; j < matrix1.cols; j++){ //Adding Matrix Elements of same row and col index together and store in new Matrix @@ -70,9 +66,43 @@ 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; + } + //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; + } - } - return MatrixErgebnis; } Matrix multiply(const Matrix matrix1, const Matrix matrix2) From c99db0f96cdd043c7dbb229d844f5e7bf7e6e36f Mon Sep 17 00:00:00 2001 From: Lukas Weber Date: Sun, 23 Nov 2025 22:23:45 +0100 Subject: [PATCH 2/3] Started fixing matrixMultiply --- matrix.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/matrix.c b/matrix.c index 7751d04..84a5450 100644 --- a/matrix.c +++ b/matrix.c @@ -108,10 +108,14 @@ Matrix add(const Matrix matrix1, const Matrix matrix2) Matrix multiply(const Matrix matrix1, const Matrix matrix2) { Matrix result; + result.rows = 0; + result.cols = 0; + result.buffer = NULL; + if (matrix1.rows == matrix2.cols) { result.rows = matrix1.rows; result.cols = matrix2.cols; - if (matrix1.rows == matrix2.cols) { + if (matrix1.cols == matrix2.rows) { result.buffer = malloc(result.rows * result.cols * sizeof(MatrixType)); @@ -124,8 +128,6 @@ Matrix multiply(const Matrix matrix1, const Matrix matrix2) result.buffer[i * matrix1.cols + j] = value; } } - return result; } - printf("Die angegebenen Matrizen haben keine passenden Dimensionen für die Multiplikation"); return result; } \ No newline at end of file From 0a549b7e0d4ea00d720af6545e1573f3a25ab830 Mon Sep 17 00:00:00 2001 From: Lukas Weber Date: Sun, 23 Nov 2025 22:30:13 +0100 Subject: [PATCH 3/3] matrix.c fully functional, matrixTests returning no errors --- matrix.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/matrix.c b/matrix.c index 84a5450..4e9be5c 100644 --- a/matrix.c +++ b/matrix.c @@ -111,12 +111,14 @@ Matrix multiply(const Matrix matrix1, const Matrix matrix2) result.rows = 0; result.cols = 0; result.buffer = NULL; - if (matrix1.rows == matrix2.cols) { + + if (matrix1.cols != matrix2.rows) { + return result; + } + result.rows = matrix1.rows; result.cols = matrix2.cols; - if (matrix1.cols == matrix2.rows) { - result.buffer = malloc(result.rows * result.cols * sizeof(MatrixType)); for(int i = 0; i < result.rows; i++) { @@ -125,9 +127,8 @@ Matrix multiply(const Matrix matrix1, const Matrix matrix2) for(int k = 0; k < matrix1.cols; k++) { value += matrix1.buffer[i * matrix1.cols + k] * matrix2.buffer[k * matrix2.cols + j]; } - result.buffer[i * matrix1.cols + j] = value; + result.buffer[i * result.cols + j] = value; } - } } return result; } \ No newline at end of file