matrix.c

@@ -6,18 +6,18 @@
 
 Matrix createMatrix(unsigned int rows, unsigned int cols)
 {
-    Matrix matrix = {NULL, 0, 0};
+    Matrix m = {NULL, 0, 0};
 
     if (rows == 0 || cols == 0)
-        return matrix;   //gibt leere Matrix zurück
+        return m;
 
-    matrix.buffer = (MatrixType *)calloc(rows * cols, sizeof(MatrixType));
+    m.buffer = (MatrixType *)calloc(rows * cols, sizeof(MatrixType));
-    if (matrix.buffer == NULL) //auf verfügbaren Speicherplatz prüfen
+    if (m.buffer == NULL)
-        return matrix;
+        return m;
 
-    matrix.rows = rows;  
+    m.rows = rows;
-    matrix.cols = cols;
+    m.cols = cols;
-    return matrix;   //Matrix zurückgeben
+    return m;
 }
 
 void clearMatrix(Matrix *matrix)
@@ -25,18 +25,18 @@ void clearMatrix(Matrix *matrix)
 
     if (matrix != NULL)
     {
-        free(matrix->buffer);   //Speicherplatz bereinigen
+        free(matrix->buffer);
-        matrix->buffer = NULL;  //Werte auf 0 setzen
+        matrix->buffer = NULL;
         matrix->rows = 0;
         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)     //Problematisch Call-by-Value --> Call-by-Pointer
+// Matrix matrix zu Matrix *matrix, empfehlung
 {
-    if (rowIdx < matrix.rows && colIdx < matrix.cols && matrix.buffer != NULL) //Prüft ob Zugriff möglich
+    if (rowIdx < matrix.rows && colIdx < matrix.cols && matrix.buffer != NULL)
-        matrix.buffer[rowIdx * matrix.cols + colIdx] = value; 
+        matrix.buffer[rowIdx * matrix.cols + colIdx] = value;
-        //schreibt 2D element in 1D Liste: Element_Reihe*Matrix_Spalten + Element_Spalte
 }
 
 MatrixType getMatrixAt(const Matrix matrix, unsigned int rowIdx, unsigned int colIdx)
@@ -47,10 +47,11 @@ MatrixType getMatrixAt(const Matrix matrix, unsigned int rowIdx, unsigned int co
 }
 
 // TODO: Funktionen implementieren
+
 Matrix add(const Matrix matrix1, const Matrix matrix2)
 {
-    //  immer Probe, gleiche Zeilen der Matrizen
+    //  check, equal rows
-    // "Elementweise Addition": Probe, ob matrix gleiche größe hat
+    // "Elementweise Addition": test, if two matrix has exact size
     if (matrix1.rows == matrix2.rows && matrix1.cols == matrix2.cols)
     {
         Matrix result_add = createMatrix(matrix1.rows, matrix1.cols);
@@ -65,7 +66,7 @@ Matrix add(const Matrix matrix1, const Matrix matrix2)
         }
         return result_add;
     }
-    // "Broadcasting": matrix1 hat 1 Spalte
+    // "Broadcasting": matrix1 has 1 collum
     if (matrix1.rows == matrix2.rows && matrix1.cols == 1)
     {
         Matrix result_add = createMatrix(matrix1.rows, matrix2.cols);
@@ -79,7 +80,7 @@ Matrix add(const Matrix matrix1, const Matrix matrix2)
         }
         return result_add;
     }
-    // "Broadcasting": matrix2 hat 1 Spalte
+    // "Broadcasting": matrix2 has 1 collum
     if (matrix1.rows == matrix2.rows && matrix2.cols == 1)
     {
         Matrix result_add = createMatrix(matrix1.rows, matrix1.cols);
@@ -99,6 +100,7 @@ Matrix add(const Matrix matrix1, const Matrix matrix2)
 
 Matrix multiply(const Matrix matrix1, const Matrix matrix2)
 {
+    // Needed: rows/Zeilen, collums/Spalten
     MatrixType buffer_add;
     
     if (!matrix1.buffer || !matrix2.buffer) // Probe ob leere Matrize vorliegt 
@@ -115,8 +117,10 @@ Matrix multiply(const Matrix matrix1, const Matrix matrix2)
             buffer_add = 0;
             for (unsigned int skalar = 0; skalar < matrix1.cols; skalar++)
             {
+                // buffer_add += matrix1[index][skalar]*matrix2[skalar][shift];
                 buffer_add += getMatrixAt(matrix1, index, skalar) * getMatrixAt(matrix2, skalar, shift);
             }
+            // matrix_mul[index][shift] = buffer_add;
             setMatrixAt(buffer_add, result_mul, index, shift);
         }
     }