matrix.c

@@ -7,96 +7,29 @@
 Matrix createMatrix(unsigned int rows, unsigned int cols)
 {
     
-    Matrix m = {NULL, rows, cols}; // Wahrscheinlich in Programm bereits enthalten;
-
-    if (rows > 0 && cols > 0)
-    {
-        m.buffer = (MatrixType *)calloc(rows * cols, sizeof(MatrixType));
-        if (m.buffer == NULL)
-        {
-            m.rows = 0;
-            m.cols = 0;
-        }
-    }
-
-    return m;
 }
 
 void clearMatrix(Matrix *matrix)
 {
     
-    if (matrix != NULL)
-    {
-        free(matrix->buffer);
-        matrix->buffer = NULL;
-        matrix->rows = 0;
-        matrix->cols = 0;
-    }
 }
 
 void setMatrixAt(MatrixType value, Matrix matrix, unsigned int rowIdx, unsigned int colIdx)
-// Matrix matrix zu Matrix *matrix, empfehlung
 {
-    if (rowIdx < matrix.rows && colIdx < matrix.cols && matrix.buffer != NULL)
+    
-        matrix.buffer[rowIdx * matrix.cols + colIdx] = value;
 }
 
 MatrixType getMatrixAt(const Matrix matrix, unsigned int rowIdx, unsigned int colIdx)
 {
-    if (rowIdx >= matrix.rows || colIdx >= matrix.cols || matrix.buffer == NULL)
-        return 0; // Sicherheitscheck
-    return matrix.buffer[rowIdx * matrix.cols + colIdx];
-}
     
-// TODO: Funktionen implementieren
+}
 
 Matrix add(const Matrix matrix1, const Matrix matrix2)
 {
-    // test, if two matrix has exact size
     
-    if (matrix1.rows != matrix2.rows || matrix1.cols != matrix2.cols)
-        return createMatrix(0, 0);
-
-    Matrix result_add = createMatrix(matrix1.rows, matrix1.cols);
-
-    for (int r = 0; r < matrix1.rows; r++)
-    {
-        for (int c = 0; c < matrix1.cols; c++)
-        {
-            // TODO: matrix_add initialisieren
-            // matrix_add[r][c] = matrix1[r][c] + matrix2[r][c]
-
-            MatrixType sum = getMatrixAt(matrix1, r, c) + getMatrixAt(matrix2, r, c);
-            setMatrixAt(sum, result_add, r, c); // evtl re
-        }
-    }
-    return result_add;
 }
 
 Matrix multiply(const Matrix matrix1, const Matrix matrix2)
 {
-    // Needed: rows/Zeilen, collums/Spalten
-    MatrixType buffer_add;
-    // Probe ob Spalten1 = Zeilen2
-    if (matrix1.cols != matrix2.rows)
-        return createMatrix(0, 0);
     
-    Matrix result_mul = createMatrix(matrix1.rows, matrix2.cols); // ""
-
-    for (int index = 0; index < matrix1.rows; index++)
-    {
-        for (int shift = 0; shift < matrix2.cols; shift++)
-        {
-            buffer_add = 0;
-            for (int skalar = 0; skalar < matrix1.cols; skalar++)
-            // TODO: matrix_add initialisieren
-            {
-                // buffer_add += matrix1[index][skalar]*matrix2[skalar][index];
-                buffer_add += getMatrixAt(matrix1, index, skalar) * getMatrixAt(matrix2, skalar, shift);
-            }
-            // matrix_mul[index][shift] = buffer_add;
-            setMatrixAt(buffer_add, result_mul, index, shift); // result als Pointer, also mit &result
-        }
-    }
-    return result_mul;
 }

matrix.h

@@ -6,11 +6,6 @@
 typedef float MatrixType;
 
 // TODO Matrixtyp definieren
-typedef struct {
-    MatrixType *buffer;
-    unsigned int rows;
-    unsigned int cols;
-} Matrix;
 
 
 Matrix createMatrix(unsigned int rows, unsigned int cols);