.gitignore

@@ -1,5 +1,4 @@
 mnist
 runTests
-runMatrixTests
 *.o
 *.exe

matrix.c

@@ -4,24 +4,28 @@
 
 // TODO Matrix-Funktionen implementieren
 
-/*
-Alte Funktion
+typedef struct Matrix {
+    unsigned int xElement;
+    unsigned int yElement;
+    int ** data;
+} Matrix;
+
 Matrix createMatrix(unsigned int rows, unsigned int cols)
 {
     Matrix m;
-    m.rows = rows;
-    m.cols = cols;
+    m.xElement = rows;
+    m.yElement = cols;
     m.data = NULL;
 
     if(rows == 0 || cols == 0){
-        m.rows = m.cols = 0;
+        m.xElement = m.yElement = 0;
         return m;
     }
 
     m.data = malloc(rows * sizeof *m.data);
     
     if(!m.data){
-        m.rows = m.cols = 0;
+        m.xElement = m.yElement = 0;
         return m;
     }
     for(unsigned int i = 0; i < rows; i++){
@@ -33,43 +37,13 @@ Matrix createMatrix(unsigned int rows, unsigned int cols)
         }
         free(m.data);
         m.data = NULL;
-        m.rows = m.cols = 0;
+        m.xElement = m.yElement = 0;
         return m;
       }
         
     }
     return m;
 }
-*/
-
-Matrix createMatrix(size_t cols, size_t rows)
-{
-    Matrix m;
-    m.rows = rows;
-    m.cols = cols;
-    m.buffer = NULL;
-
-    if(rows == 0 || cols == 0){
-        m.rows = m.cols = 0;
-        return m;
-    }
-
-    // Single allocation for entire matrix
-    m.buffer = malloc(rows * cols * sizeof(MatrixType));
-    
-    if(!m.buffer){
-        m.rows = m.cols = 0;
-        return m;
-    }
-    
-    // Initialize (optional)
-    for(unsigned int i = 0; i < rows * cols; i++){
-        m.buffer[i] = UNDEFINED_MATRIX_VALUE;
-    }
-    
-    return m;
-}
-
 
 void clearMatrix(Matrix *matrix)
 {

matrix.h

@@ -4,16 +4,11 @@
 #define UNDEFINED_MATRIX_VALUE 0
 
 typedef float MatrixType;
+
 // TODO Matrixtyp definieren
 
-typedef struct Matrix {
-    size_t rows;
-    size_t cols;
-    MatrixType *buffer;
-} Matrix;
 
-
-Matrix createMatrix(size_t rows, size_t cols);
+Matrix createMatrix(unsigned int rows, unsigned int cols);
 void clearMatrix(Matrix *matrix);
 void setMatrixAt(MatrixType value, Matrix matrix, unsigned int rowIdx, unsigned int colIdx);
 MatrixType getMatrixAt(const Matrix matrix, unsigned int rowIdx, unsigned int colIdx);