ein #include und exit failiure bei matrixMultiply hinzugefügt

matrix.c

@@ -1,5 +1,6 @@
 #include <stdlib.h>
 #include <string.h>
+#include <stdio.h>
 #include "matrix.h"
 
 // TODO Matrix-Funktionen implementieren
@@ -29,25 +30,172 @@ Matrix createMatrix(unsigned int rows, unsigned int cols)
 
 void clearMatrix(Matrix *matrix)
 {
+    free(matrix->data);
     
+    matrix->rows = 0;
+    matrix->cols = 0;
+    matrix->data = NULL;
 }
 
 void setMatrixAt(MatrixType value, Matrix matrix, unsigned int rowIdx, unsigned int colIdx)
 {
    
+  matrix.data[(rowIdx * matrix.cols) + colIdx] = value;   //wir setzen den data-Wert an der Stelle (rowIdx*Spalten + colIdx) auf den Wert von value
 }
 
 MatrixType getMatrixAt(const Matrix matrix, unsigned int rowIdx, unsigned int colIdx)
 {
+    return matrix.data[(rowIdx * matrix.cols) + colIdx];
+}
+
+static int can_add(Matrix matrix1, Matrix matrix2) {
+
+    int can_add;
+
+    if(matrix1.cols == matrix2.cols && matrix1.rows == matrix2.rows){
+
+        can_add = 1;
+
+    }
+    else if(matrix1.cols == 1 && matrix1.rows == matrix2.rows){
+
+        can_add = 2;
+
+    }
+    else if(matrix2.cols == 1 && matrix1.rows == matrix2.rows){
+
+        can_add = 3;
+
+    }
+    else if(matrix1.rows == 1 && matrix1.cols == matrix2.cols){
+
+        can_add = 4;
+
+    }
+    else if(matrix2.rows == 1 && matrix1.cols == matrix2.cols){
+
+        can_add = 5;
+
+    }
+    else{
+
+        can_add = 0;
 
     }
 
-Matrix add(const Matrix matrix1, const Matrix matrix2)
+    return can_add;
+    }
+
+Matrix add(const Matrix matrix1, const Matrix matrix2) //wir addieren nur wenn beide Matrizen gleich groß sind oder eine von beiden eine Zeile oder eine Spalte besitzt
 {
+    int ok = can_add(matrix1,matrix2);
+    
+    unsigned int erg_rows = (matrix1.rows == matrix2.rows) ? matrix1.rows : (matrix1.rows == 1 ? matrix2.rows : matrix1.rows);
+    unsigned int erg_cols = (matrix1.cols == matrix2.cols) ? matrix1.cols : (matrix1.cols == 1 ? matrix2.cols : matrix1.cols);
+    
+    Matrix matrix_erg = createMatrix(erg_rows, erg_cols);
+
+    switch(ok)
+    {
+    case 1: 
+    
+        for(int i = 0; i < (matrix1.rows * matrix1.cols); i++)
+
+            matrix_erg.data[i] = matrix1.data[i] + matrix2.data[i];
+            
+        break;
+
+    case 2:
+
+        for(int i = 0; i < erg_rows; i++){
+            for(int j = 0; j < erg_cols; j++)
+
+                matrix_erg.data[i * erg_cols + j] = matrix1.data[i * erg_cols + j] + matrix2.data[i];
+        }
+        break;
+
+    case 3:
+    
+        for(int i = 0; i < erg_rows; i++){
+            for(int j = 0; j < erg_cols; j++)
+
+                matrix_erg.data[i * erg_cols + j] = matrix1.data[i] + matrix2.data[i * erg_cols + j];
+        }
+        break;
+
+    case 4:
+
+        for(int i = 0; i < erg_rows; i++){
+            for(int j = 0; j < erg_cols; j++)
+
+                matrix_erg.data[i * erg_cols + j] = matrix1.data[i * erg_cols + j] + matrix2.data[j];
+        }
+        break;
+
+    case 5:
+    
+        for(int i = 0; i < erg_rows; i++){
+            for(int j = 0; j < erg_cols; j++)
+
+                matrix_erg.data[i * erg_cols + j] = matrix1.data[j] + matrix2.data[i * erg_cols + j];
+        }
+        break;
+
+    default: 
+        printf("Matrix addition not possible\n");
+        exit(EXIT_FAILURE);
+
     
     }
 
+return matrix_erg;
+
+    
+    
+}
+static int can_multiply (Matrix matrix1, Matrix matrix2)
+{
+    int can_multiply = 0;
+
+    if(matrix1.cols == matrix2.rows)
+        can_multiply = 1;
+        
+    return can_multiply;
+}
+
+
 Matrix multiply(const Matrix matrix1, const Matrix matrix2)
 {
+    int ok = can_multiply(matrix1,matrix2);
+    unsigned int erg_rows = matrix1.rows;
+    unsigned int erg_cols = matrix2.cols;
+    Matrix matrix_erg = createMatrix(erg_rows, erg_cols);
+    
+    
+    if (ok == 1)
+    {
+
+        for (int i = 0; i < erg_rows; i++)
+        {
+            for (int j = 0; j < erg_cols; j++)
+            {
+                MatrixType sum = 0;
+                
+                for (int k = 0; k < matrix1.cols; k++)
+                {
+                    sum += matrix1.data[i * matrix1.cols + k] * matrix2.data[k * matrix2.cols + j];
+                }
+                
+                matrix_erg.data [i * erg_cols + j] = sum;
+            }
  
         }
+
+        return matrix_erg;
+    }  
+    else 
+    {
+        printf("Matrix multiplication not possible\n");
+        exit(EXIT_FAILURE);
+    }
+}