working on imageinput

.gitignore

@@ -1,4 +1,10 @@
 mnist
 runTests
 *.o
-*.exe
+*.exe
+.vscode/settings.json
+.vscode/launch.json
+.vscode/settings.json
+.vscode/settings.json
+runImageInputTests
+testFile.info2

imageInput.c

@@ -15,10 +15,36 @@ GrayScaleImage readImage()
 // TODO Vervollständigen Sie die Funktion readImages unter Benutzung Ihrer Hilfsfunktionen
 GrayScaleImageSeries *readImages(const char *path)
 {
+    unsigned short * numImages;
+    unsigned short * breiteBilder;
+    unsigned short * laengeBilder;
+
     GrayScaleImageSeries *series = NULL;
-    FILE *file = fopen("mnist_test.info2","rb");
+    FILE *file = fopen(*path,"rb");
-    char headOfFile;
+    char * headOfFile;
-    series = malloc();
+
+    fread(headOfFile, sizeof(FILE_HEADER_STRING),1, file); //liest den header ein und überprüft ob korrekte datei
+    
+    if(strcmp(headOfFile, FILE_HEADER_STRING) != 0)
+        return NULL;
+    
+        // liest numIMages, breite und länge der Bilder ein
+    fseek(file, sizeof(FILE_HEADER_STRING), SEEK_SET);
+    fread(numImages, sizeof(short), 1, file);
+
+    fseek(file, sizeof(short), SEEK_CUR);
+    fread(breiteBilder, sizeof(short), 1, file);
+
+    fseek(file, sizeof(short), SEEK_CUR);
+    fread(laengeBilder, sizeof(short), 1, file);
+
+    series = malloc(*numImages * *breiteBilder * *laengeBilder * sizeof(short));
+
+    for(int i = 0; i < numImages; i++)
+    {
+
+    }
+
     return series;
 }
 

makefile

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

matrix.c

@@ -41,25 +41,28 @@ MatrixType getMatrixAt(const Matrix matrix,
   return value;
 }
 Matrix add(const Matrix matrix1, const Matrix matrix2) {
+    Matrix result;
+    const int cols1 = matrix1.cols;
+    const int rows1 = matrix1.rows;
+    const int cols2 = matrix2.cols;
+    const int rows2 = matrix2.rows;
+    const int colsEqu = (matrix1.cols == matrix2.cols) ? 1 : 0;
+    const int rowsEqu = (matrix1.rows == matrix2.rows) ? 1 : 0;
+    if(colsEqu && rowsEqu)
+    {
+        Matrix result = createMatrix(matrix1.rows, matrix1.cols);
+        for(int i = 0; i < rows1; i++)
+        {
+            for (int j = 0; j < cols1; j++)
+            {
+                int valueM1 = getMatrixAt(matrix1, i, j);
+                int valueM2 =getMatrixAt(matrix2, i, j);
+                int sum = valueM1 + valueM2;
+                setMatrixAt(sum, result,i,j);
+            }
+        }
 
-  // Ergebnismatrix
+        return result;
-  Matrix result;
+    }
-
-  // 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; }