From 6594829227e5724c69359d3d8c6acf5bdd7507ea Mon Sep 17 00:00:00 2001
From: Jens Burger <burgerje99206@TechnischeHochschuleN.onmicrosoft.com>
Date: Sun, 16 Nov 2025 14:46:33 +0100
Subject: [PATCH] =?UTF-8?q?Addition=20und=20Multiplikation=20hinzugef?=
 =?UTF-8?q?=C3=BCgt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 matrix.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 58 insertions(+), 7 deletions(-)

diff --git a/matrix.c b/matrix.c
index 86fd5ab..02f2473 100644
--- a/matrix.c
+++ b/matrix.c
@@ -31,21 +31,21 @@ void clearMatrix(Matrix *matrix)
     matrix->cols = 0;
 }
 
-void setMatrixAt(MatrixType value, Matrix matrix, unsigned int rowIdx, unsigned int colIdx)
+void setMatrixAt(MatrixType value, Matrix *matrix, unsigned int rowIdx, unsigned int colIdx)
 {
-    if(matrix.buffer == NULL)
+    if(matrix->buffer == NULL)
     {
         printf("Fehler beim Setzen! Matrix nicht initialisiert");
         return;
     }
 
-    if(rowIdx >= matrix.rows || colIdx >= matrix.cols)
+    if(rowIdx >= matrix->rows || colIdx >= matrix->cols)
     {
         printf("Ungueltige Indizes beim Setzen!\n");
         return;
     }
 
-    matrix.buffer[rowIdx * matrix.cols + colIdx] = value;
+    matrix->buffer[rowIdx * matrix->cols + colIdx] = value;
 }
 
 MatrixType getMatrixAt(const Matrix matrix, unsigned int rowIdx, unsigned int colIdx)
@@ -67,10 +67,61 @@ MatrixType getMatrixAt(const Matrix matrix, unsigned int rowIdx, unsigned int co
 
 Matrix add(const Matrix matrix1, const Matrix matrix2)
 {
-    
+    if((matrix1.rows != matrix2.rows) || (matrix1.cols != matrix2.cols))
+    {
+        printf("Fehler bei Addition: Matrix Dimensionen passen nicht ueberein!\n");
+        Matrix empty = {0, 0, NULL};
+        return empty;
+    }
+
+    float matrix1Wert = 0;
+    float matrix2Wert = 0;
+    float summe = 0;
+
+    Matrix ergebnisMatrix = createMatrix(matrix1.rows, matrix1.cols);
+
+    for(int row = 0; row < ergebnisMatrix.rows; row++)
+    {
+        for(int col = 0; col < ergebnisMatrix.cols; col++)
+        {
+            matrix1Wert = getMatrixAt(matrix1, row, col);
+            matrix2Wert = getMatrixAt(matrix2, row, col);
+            summe = matrix1Wert + matrix2Wert;
+
+            setMatrixAt(summe, &ergebnisMatrix, row, col);
+        }
+    }
+
+    return ergebnisMatrix;
 }
 
 Matrix multiply(const Matrix matrix1, const Matrix matrix2)
 {
-    
-}
\ No newline at end of file
+    if(matrix1.cols != matrix2.rows)
+    {
+        printf("Fehler bei Multiplikation: Matrix Dimensionen passen nicht ueberein!\n");
+        Matrix empty = {0, 0, NULL};
+        return empty;
+    }
+
+    float erg = 0;
+
+    Matrix ergebnisMatrix = createMatrix(matrix1.rows, matrix2.cols);
+
+    for(int row = 0; row < ergebnisMatrix.rows; row++)
+    {
+        for(int col = 0; col < ergebnisMatrix.cols; col++)
+        {
+            erg = 0;
+
+            for(int k = 0; k < matrix1.cols; k++)
+            {
+                erg += getMatrixAt(matrix1, row, k) * getMatrixAt(matrix2, k, col);
+            }
+
+            setMatrixAt(erg, &ergebnisMatrix, row, col);
+        }
+    }
+
+    return ergebnisMatrix;
+}