verbesserungen nach durchsprechen mit dozent

matrix.c

@@ -1,27 +1,37 @@
 #include <stdlib.h>
 #include <string.h>
+#include <stdio.h>
 #include "matrix.h"
 
 // TODO Matrix-Funktionen implementieren
 
+enum addModes{sameDimensions, colVec, rowVec};
+
 Matrix createMatrix(unsigned int rows, unsigned int cols)
 {
     Matrix m;
     m.rows = rows;
     m.cols = cols;
-    m.data = NULL;
+    m.buffer = NULL;
  
     if(rows == 0 || cols == 0) 
     {
-        printf("Error");
+        
-        exit(EXIT_FAILURE);
+        m.rows = 0;
+        m.cols = 0;
+        m.buffer = NULL;
+        return m;
     }
  
-    m.data = calloc(rows * cols, sizeof(MatrixType));
+    m.buffer = calloc(rows * cols, sizeof(MatrixType));
-    if (m.data == NULL)
+    
+    if (m.buffer == NULL)
     {
-        printf("Error");
+        
-        exit(EXIT_FAILURE);
+        m.rows = 0;
+        m.cols = 0;
+        m.buffer = NULL;
+        return m;
     }
  
     return m;
@@ -29,131 +39,234 @@ Matrix createMatrix(unsigned int rows, unsigned int cols)
 
 void clearMatrix(Matrix *matrix)
 {
-    free(matrix->data);
+    if (matrix->buffer == NULL)
+    {
+        matrix->rows = 0;
+        matrix->cols = 0;
+        matrix->buffer = NULL;
+        return matrix;
+    }
+    else
+    {
+    
+    free(matrix->buffer);
     
     matrix->rows = 0;
     matrix->cols = 0;
-    matrix->data = NULL;
+    matrix->buffer = 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
+    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)
 {
-    return matrix.data[(rowIdx * matrix.cols) + colIdx];
+    if(matrix.buffer == NULL || rowIdx >= matrix.rows || colIdx >= matrix.cols)
+    {
+        return UNDEFINED_MATRIX_VALUE;
+    }
+    
+    return matrix.buffer[(rowIdx * matrix.cols) + colIdx];
 }
 
-static int can_add(Matrix matrix1, Matrix matrix2) {
+static int get_add_mode(Matrix matrix1, Matrix matrix2) {
 
-    int can_add;
+    int get_add_mode; 
 
     if(matrix1.cols == matrix2.cols && matrix1.rows == matrix2.rows){
 
-        can_add = 1;
+        get_add_mode = sameDimensions;
 
     }
     else if(matrix1.cols == 1 && matrix1.rows == matrix2.rows){
 
-        can_add = 2;
+        get_add_mode = colVec;
 
     }
     else if(matrix2.cols == 1 && matrix1.rows == matrix2.rows){
 
-        can_add = 3;
+        get_add_mode = colVec;
 
     }
     else if(matrix1.rows == 1 && matrix1.cols == matrix2.cols){
 
-        can_add = 4;
+        get_add_mode = rowVec;
 
     }
     else if(matrix2.rows == 1 && matrix1.cols == matrix2.cols){
 
-        can_add = 5;
+        get_add_mode = rowVec;
 
     }
-    else{
+    return get_add_mode;
     
-        can_add = 0;
+}
 
-    }
 
-    return can_add;
+    Matrix addSameDim(Matrix matrix1, Matrix matrix2)
-    }
-
-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: 
+        Matrix matrix_erg = createMatrix(matrix1.rows, matrix1.cols);
 
         for(int i = 0; i < (matrix1.rows * matrix1.cols); i++)
 
-            matrix_erg.data[i] = matrix1.data[i] + matrix2.data[i];
+            matrix_erg.buffer[i] = matrix1.buffer[i] + matrix2.buffer[i];
 
-        break;
+        return matrix_erg;    
 
-    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:
+    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 < erg_rows; i++){
+            for(int i = 0; i < matrix2.rows; i++)
-            for(int j = 0; j < erg_cols; j++)
+            {
+                for(int j = 0; j < matrix2.cols; j++)
 
-                matrix_erg.data[i * erg_cols + j] = matrix1.data[i] + matrix2.data[i * erg_cols + j];
+                    matrix_erg.buffer[i * matrix2.cols + j] = matrix1.buffer[i * matrix2.cols + j] + matrix2.buffer[i];
             }
-        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;
+        if(matrix2.cols == 1)
+        {
+            matrix_erg = createMatrix(matrix1.rows, matrix1.cols);
 
-    case 5:
+            for(int i = 0; i < matrix1.rows; i++)
+            {
+                for(int j = 0; j < matrix1.cols; j++)
 
-        for(int i = 0; i < erg_rows; i++){
+                    matrix_erg.buffer[i * matrix1.cols + j] = matrix1.buffer[i] + matrix2.buffer[i * matrix1.cols + j];
-            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;
+        }
-
+        return matrix_erg;
-    default: 
-        printf("Matrix addition not possible\n");
-        exit(EXIT_FAILURE);
 
 
     }
 
-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[i * matrix2.cols + j] + matrix2.buffer[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[j] + matrix2.buffer[i * matrix1.cols + 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 sameDimensions: 
+    
+        addSameDim(matrix1, matrix2);
+            
+        break;
+
+    case colVec:
+
+        addColVec(matrix1, matrix2);
+
+        break;
+
+    case rowVec:
+    
+        addRowVec(matrix1, matrix2);
+
+        break;
+
+    }
+
+    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(0, 0);
+    
+    if (ok == 1)
+    {
+        Matrix matrix_erg = createMatrix(erg_rows, erg_cols);
+
+        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 += getMatrixAt(matrix1, k, j) * getMatrixAt(matrix2, j, k);
+                }
+                
+                setMatrixAt(sum, matrix_erg, i, j);
+            }
+ 
+        }
+
+        return matrix_erg;
+    }  
     
 }

matrix.h

@@ -11,7 +11,7 @@ typedef struct
 {
     unsigned int rows;
     unsigned int cols;
-    MatrixType *data;
+    MatrixType *buffer;
 }Matrix;
 
 Matrix createMatrix(unsigned int rows, unsigned int cols);