bugfixes und Formatierung (in neuem Zweig)

matrix.c

@@ -5,6 +5,9 @@
  
 // TODO Matrix-Funktionen implementieren
  
+enum addModes{SAMEDIMENSIONS, COLVEC, ROWVEC};
+
+ 
 Matrix createMatrix(unsigned int rows, unsigned int cols)
 {
     Matrix m;
@@ -14,7 +17,6 @@ Matrix createMatrix(unsigned int rows, unsigned int cols)
  
     if(rows == 0 || cols == 0)
     {
-        
         m.rows = 0;
         m.cols = 0;
         m.buffer = NULL;
@@ -22,9 +24,9 @@ Matrix createMatrix(unsigned int rows, unsigned int cols)
     }
  
     m.buffer = calloc(rows * cols, sizeof(MatrixType));
+   
     if (m.buffer == NULL)
     {
-        
         m.rows = 0;
         m.cols = 0;
         m.buffer = NULL;
@@ -34,21 +36,43 @@ Matrix createMatrix(unsigned int rows, unsigned int cols)
     return m;
 }
  
+
 void clearMatrix(Matrix *matrix)
 {
+
+    if (matrix->buffer == NULL)
+    {
+        matrix->rows = 0;
+        matrix->cols = 0;
+        matrix->buffer = NULL;
+        return;
+    }
+    else
+    {
+   
         free(matrix->buffer);
    
         matrix->rows = 0;
         matrix->cols = 0;
         matrix->buffer = NULL;
+ 
+    }
 }
 
+ 
 void setMatrixAt(MatrixType value, Matrix matrix, unsigned int rowIdx, unsigned int colIdx)
 {
-   
+    if(matrix.buffer == NULL || rowIdx >= matrix.rows || colIdx >= matrix.cols)
+    {
+        return;
+    }
+    else
+    {
         matrix.buffer[(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)
 {
     if(matrix.buffer == NULL || rowIdx >= matrix.rows || colIdx >= matrix.cols)
@@ -59,120 +83,150 @@ MatrixType getMatrixAt(const Matrix matrix, unsigned int rowIdx, unsigned int co
     return matrix.buffer[(rowIdx * matrix.cols) + colIdx];
 }
  
-static int can_add(Matrix matrix1, Matrix matrix2) {
 
-    int can_add;
+static int get_add_mode(Matrix matrix1, Matrix matrix2) 
-
-    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;
-
-    }
-
-    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);
+    int get_add_mode = -1;
  
-    unsigned int erg_rows = (matrix1.rows == matrix2.rows) ? matrix1.rows : (matrix1.rows == 1 ? matrix2.rows : matrix1.rows);
+    if(matrix1.cols == matrix2.cols && matrix1.rows == matrix2.rows)
-    unsigned int erg_cols = (matrix1.cols == matrix2.cols) ? matrix1.cols : (matrix1.cols == 1 ? matrix2.cols : matrix1.cols);
+    {
+        get_add_mode = SAMEDIMENSIONS;
+    }
+    else if(matrix1.cols == 1 && matrix1.rows == matrix2.rows)
+    {
+        get_add_mode = COLVEC;
+    }
+    else if(matrix2.cols == 1 && matrix1.rows == matrix2.rows)
+    {
+        get_add_mode = COLVEC;
+    }
+    else if(matrix1.rows == 1 && matrix1.cols == matrix2.cols)
+    {
+        get_add_mode = ROWVEC;
+    }
+    else if(matrix2.rows == 1 && matrix1.cols == matrix2.cols)
+    {
+        get_add_mode = ROWVEC;
+    }
 
-    Matrix matrix_erg = createMatrix(erg_rows, erg_cols);
+    return get_add_mode;   
+}
+ 
+
+ 
+Matrix addSameDim(Matrix matrix1, Matrix matrix2)
+{
+    Matrix matrix_erg = createMatrix(matrix1.rows, matrix1.cols);
+ 
+    for(int i = 0; i < (matrix1.rows * matrix1.cols); i++)
+    {
+        matrix_erg.buffer[i] = matrix1.buffer[i] + matrix2.buffer[i];
+    }
+
+        return matrix_erg;    
+}
+ 
+
+Matrix addColVec(Matrix matrix1, Matrix matrix2)
+{
+    Matrix matrix_erg;
+
+    if(matrix1.cols == 1)
+    {
+        matrix_erg = createMatrix(matrix2.rows, matrix2.cols);
+ 
+        for(int i = 0; i < matrix2.rows; i++)
+        {
+            for(int j = 0; j < matrix2.cols; j++)
+            {
+                matrix_erg.buffer[i * matrix2.cols + j] = matrix1.buffer[i] + matrix2.buffer[i * matrix2.cols + j];
+            }
+        }  
+    }
+
+    if(matrix2.cols == 1)
+    {
+        matrix_erg = createMatrix(matrix1.rows, matrix1.cols);
+ 
+        for(int i = 0; i < matrix1.rows; i++)
+        {
+            for(int j = 0; j < matrix1.cols; j++)
+            {
+                matrix_erg.buffer[i * matrix1.cols + j] = matrix1.buffer[i * matrix1.cols + j] + matrix2.buffer[i];
+            }
+        }
+    }
+
+    return matrix_erg;
+}
+ 
+
+Matrix addRowVec(Matrix matrix1, Matrix matrix2)
+{
+    Matrix matrix_erg;
+
+    if(matrix1.rows == 1)
+    {
+        matrix_erg = createMatrix(matrix2.rows, matrix2.cols);
+ 
+        for(int i = 0; i < matrix2.rows; i++)
+        {
+            for(int j = 0; j < matrix2.cols; j++)
+            {
+                matrix_erg.buffer[i * matrix2.cols + j] = matrix1.buffer[j] + matrix2.buffer[i * matrix2.cols + j];
+            }
+        }       
+    }
+
+    if(matrix2.rows == 1)
+    {
+        matrix_erg = createMatrix(matrix1.rows, matrix1.cols);
+ 
+        for(int i = 0; i < matrix1.rows; i++)
+        {
+            for(int j = 0; j < matrix1.cols; j++)
+            {
+                matrix_erg.buffer[i * matrix1.cols + j] = matrix1.buffer[i * matrix1.cols + j] + matrix2.buffer[j];
+            }
+        }
+    }
+
+    return matrix_erg;
+}
+
+
+Matrix add(const Matrix matrix1, const Matrix matrix2)
+{
+    int ok = get_add_mode(matrix1,matrix2);
+    Matrix matrix_erg = createMatrix(0, 0);
    
     switch(ok)
     {
-    case 1: 
+    case SAMEDIMENSIONS:
-    
+        matrix_erg = addSameDim(matrix1, matrix2);
-        for(int i = 0; i < (matrix1.rows * matrix1.cols); i++)
-
-            matrix_erg.buffer[i] = matrix1.buffer[i] + matrix2.buffer[i];
-            
         break;
  
-    case 2:
+    case COLVEC:
+        matrix_erg = addColVec(matrix1, matrix2);
+        break;
  
-        for(int i = 0; i < erg_rows; i++){
+    case ROWVEC:
-            for(int j = 0; j < erg_cols; j++)
+        matrix_erg = addRowVec(matrix1, matrix2);
-
+        break;
-                matrix_erg.buffer[i * erg_cols + j] = matrix1.buffer[i * erg_cols + j] + matrix2.buffer[i];
     }
-        break;
  
-    case 3:
-    
-        for(int i = 0; i < erg_rows; i++){
-            for(int j = 0; j < erg_cols; j++)
-
-                matrix_erg.buffer[i * erg_cols + j] = matrix1.buffer[i] + matrix2.buffer[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.buffer[i * erg_cols + j] = matrix1.buffer[i * erg_cols + j] + matrix2.buffer[j];
-        }
-        break;
-
-    case 5:
-    
-        for(int i = 0; i < erg_rows; i++){
-            for(int j = 0; j < erg_cols; j++)
-
-                matrix_erg.buffer[i * erg_cols + j] = matrix1.buffer[j] + matrix2.buffer[i * erg_cols + j];
-        }
-        break;
-
-    default:
-        
-        matrix_erg.rows = 0;
-        matrix_erg.cols = 0;
-        matrix_erg.buffer = NULL;
     return matrix_erg; 
-
-    
-    }
-
-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;
 }
@@ -183,11 +237,11 @@ 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);
+    Matrix matrix_erg = createMatrix(0, 0);
-    
    
     if (ok == 1)
     {
+        matrix_erg = createMatrix(erg_rows, erg_cols);
  
         for (int i = 0; i < erg_rows; i++)
         {
@@ -197,22 +251,15 @@ Matrix multiply(const Matrix matrix1, const Matrix matrix2)
                
                 for (int k = 0; k < matrix1.cols; k++)
                 {
-                    sum += matrix1.buffer[i * matrix1.cols + k] * matrix2.buffer[k * matrix2.cols + j];
+                    sum += getMatrixAt(matrix1, i, k) * getMatrixAt(matrix2, k, j);
                 }
                
-                matrix_erg.buffer [i * erg_cols + j] = sum;
+                setMatrixAt(sum, matrix_erg, i, j);
             }
  
         }  
+    } 
 
     return matrix_erg;
-    }  
-    else 
-    {
-        
-        matrix_erg.rows = 0;
-        matrix_erg.cols = 0;
-        matrix_erg.buffer = NULL;
-        return matrix_erg;
-    }
 }
+