makefile

@@ -57,12 +57,10 @@ imageInputTests: imageInput.o imageInputTests.c $(unityfolder)/unity.c
 # --------------------------
 # Clean
 # --------------------------
-#clean:
-#ifeq ($(OS),Windows_NT)
-#	del /f *.o *.exe
-#else
-#	rm -f *.o mnist runMatrixTests runNeuralNetworkTests runImageInputTests
-#endif
-# clean für windows
 clean:
-	rm -f *.o *.exe 
+ifeq ($(OS),Windows_NT)
+	del /f *.o *.exe
+else
+	rm -f *.o mnist runMatrixTests runNeuralNetworkTests runImageInputTests
+endif
+

matrix.c

@@ -1,65 +1,36 @@
-#include "matrix.h"
 #include <stdlib.h>
 #include <string.h>
+#include "matrix.h"
+
 // TODO Matrix-Funktionen implementieren
-/*typedef struct {
+
-    unsigned int rows;  //Zeilen
+Matrix createMatrix(unsigned int rows, unsigned int cols)
-    unsigned int cols; //Spalten
+{
-    MatrixType *buffer; //Zeiger auf Speicherbereich Reihen*Spalten
+    MatrixType* data = malloc(rows * cols * sizeof(MatrixType));
-} Matrix;*/
+    Matrix newMatrix = {rows, cols, data};
-Matrix createMatrix(unsigned int rows, unsigned int cols) {
+    return newMatrix; 
-  MatrixType *buffer =
-      malloc(rows * cols * sizeof(MatrixType)); // Speicher reservieren, malloc
-                                                // liefert Zeiger auf Speicher
-  Matrix newMatrix = {rows, cols, buffer};      // neue Matrix nach struct
-  return newMatrix;
 }
-void clearMatrix(Matrix *matrix) {
+
-  matrix->buffer = UNDEFINED_MATRIX_VALUE;
+void clearMatrix(Matrix *matrix)
-  matrix->rows = UNDEFINED_MATRIX_VALUE;
+{
-  matrix->cols = UNDEFINED_MATRIX_VALUE;
-  free((*matrix).buffer); // Speicher freigeben
 }
-void setMatrixAt(const MatrixType value, Matrix matrix,
-                 const unsigned int rowIdx, // Kopie der Matrix wird übergeben
-                 const unsigned int colIdx) {
 
-  matrix.buffer[rowIdx * matrix.cols + colIdx] =
+void setMatrixAt(MatrixType value, Matrix matrix, unsigned int rowIdx, unsigned int colIdx)
-      value; // rowIdx * matrix.cols -> Beginn der Zeile colIdx ->Spalte
+{
-             // innerhalb der Zeile
+    
 }
-MatrixType getMatrixAt(const Matrix matrix,
-                       unsigned int rowIdx, // Kopie der Matrix wird übergeben
-                       unsigned int colIdx) {
-  if (rowIdx >= matrix.rows ||
-      colIdx >= matrix.cols) { // Speichergröße nicht überschreiten
-    return 0;
-  }
 
-  MatrixType value = matrix.buffer[rowIdx * matrix.cols + colIdx];
+MatrixType getMatrixAt(const Matrix matrix, unsigned int rowIdx, unsigned int colIdx)
+{
     
-  return value;
 }
-Matrix add(const Matrix matrix1, const Matrix matrix2) {
 
-  // Ergebnismatrix
+Matrix add(const Matrix matrix1, const Matrix matrix2)
-  Matrix result;
+{
+    
+}
+
+Matrix multiply(const Matrix matrix1, const Matrix matrix2)
+{
     
-  // Broadcasting nur bei Vektor und Matrix, Fehlermeldung bei zwei unpassender
-  // Matrix
-  if (matrix1.rows != matrix2.rows) {
-
-    // check, which one is smaller
-    // realloc
-  }
-
-  if (matrix1.cols != matrix2.cols) {
-  }
-
-  // Speicher reservieren
-
-  // Matrix addieren
-
-  return result;
 }
-Matrix multiply(const Matrix matrix1, const Matrix matrix2) { return matrix1; }

matrix.h

@@ -6,20 +6,20 @@
 typedef float MatrixType;
 
 // TODO Matrixtyp definieren
-typedef struct {
+typedef struct
-  unsigned int rows;
+{
-  unsigned int cols;
+    unsigned int rows;
-  MatrixType *buffer;
+    unsigned int cols;
-
+    MatrixType *data;
 } Matrix;
 
+
 Matrix createMatrix(unsigned int rows, unsigned int cols);
 void clearMatrix(Matrix *matrix);
-void setMatrixAt(MatrixType value, Matrix matrix, unsigned int rowIdx,
+void setMatrixAt(MatrixType value, Matrix matrix, unsigned int rowIdx, unsigned int colIdx);
-                 unsigned int colIdx);
+MatrixType getMatrixAt(const Matrix matrix, unsigned int rowIdx, unsigned int colIdx);
-MatrixType getMatrixAt(const Matrix matrix, unsigned int rowIdx,
-                       unsigned int colIdx);
 Matrix add(const Matrix matrix1, const Matrix matrix2);
 Matrix multiply(const Matrix matrix1, const Matrix matrix2);
 
+
 #endif