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

@@ -62,4 +62,7 @@ ifeq ($(OS),Windows_NT)
 	del /f *.o *.exe
 else
 	rm -f *.o mnist runMatrixTests runNeuralNetworkTests runImageInputTests
-endif
+endif
+ clean für windows
+clean:
+	rm -f *.o *.exe 

matrix.c

@@ -1,8 +1,6 @@
 #include "matrix.h"
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-
 // TODO Matrix-Funktionen implementieren
 /*typedef struct {
     unsigned int rows;  //Zeilen
@@ -10,12 +8,6 @@
     MatrixType *buffer; //Zeiger auf Speicherbereich Reihen*Spalten
 } Matrix;*/
 Matrix createMatrix(unsigned int rows, unsigned int cols) {
-
-  Matrix errorMatrix = {0, 0, NULL};
-  if (rows == 0 || cols == 0) {
-
-    return errorMatrix;
-  }
   MatrixType *buffer =
       malloc(rows * cols * sizeof(MatrixType)); // Speicher reservieren, malloc
                                                 // liefert Zeiger auf Speicher
@@ -28,7 +20,6 @@ void clearMatrix(Matrix *matrix) {
   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) {
@@ -49,168 +40,29 @@ MatrixType getMatrixAt(const Matrix matrix,
 
   return value;
 }
-
-Matrix broadCastCols(const Matrix matrix, const unsigned int rows,
-                     const unsigned int cols) {
-
-  Matrix copy = createMatrix(
-      rows, cols); // Matrix 1 Kopie erstellen mit Dimensionen von Matrix2
-  for (int r = 0; r < rows; r++) {
-
-    MatrixType value = getMatrixAt(matrix, r, 0);
-    for (int c = 0; c < cols; c++) {
-
-      setMatrixAt(value, copy, r, c);
-    }
-  }
-
-  return copy;
-}
-Matrix broadCastRows(const Matrix matrix, const unsigned int rows,
-                     const unsigned int cols) {
-
-  Matrix copy = createMatrix(rows, cols);
-
-  for (int c = 0; c < cols; c++) {
-    MatrixType value = getMatrixAt(matrix, 0, c);
-
-    for (int r = 0; r < rows; r++) {
-
-      setMatrixAt(value, copy, r, c);
-    }
-  }
-
-  return copy;
-}
-
 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);
+            }
+        }
 
-  // Broadcasting nur bei Vektor und Matrix, Fehlermeldung bei zwei unpassenden
+        return result;
-  // Matrizen
-
-  const unsigned int rows1 = matrix1.rows;
-  const unsigned int rows2 = matrix2.rows;
-  const unsigned int cols1 = matrix1.cols;
-  const unsigned int cols2 = matrix2.cols;
-
-  const int rowsEqual = ((rows1 == rows2) ? 1 : 0);
-
-  const int colsEqual = ((cols1 == cols2) ? 1 : 0);
-
-  if (rowsEqual && colsEqual) // addieren
-
-  {
-    Matrix result = createMatrix(rows1, cols1); // Speicher reservieren
-
-    for (int i = 0; i < (rows1 * cols1); i++) { // addieren
-
-      result.buffer[i] =
-          (matrix1.buffer[i] +
-           matrix2.buffer[i]); // buffer[i]  ⇔  *(buffer + i) Adresse =
-                               // Startadresse + (i * sizeof(MatrixType))
     }
-
-    return result; // zurückgeben
-  }
-
-  else if (rowsEqual && !colsEqual) {
-
-    if (cols1 == 1) {
-
-      Matrix result = createMatrix(rows2, cols2);
-
-      Matrix copy1 = broadCastCols(matrix1, rows2, cols2);
-
-      for (int i = 0; i < (rows2 * cols2); i++) { // addieren
-
-        result.buffer[i] =
-            (copy1.buffer[i] +
-             matrix2.buffer[i]); // buffer[i]  ⇔  *(buffer + i) Adresse =
-                                 // Startadresse + (i * sizeof(MatrixType))
-      }
-      return result;
-
-      // add und return
-
-    } else if (cols2 == 1) {
-
-      Matrix result = createMatrix(rows1, cols1);
-
-      Matrix copy2 = broadCastCols(matrix2, rows1, cols1);
-
-      for (int i = 0; i < (rows1 * cols1); i++) { // addieren
-
-        result.buffer[i] =
-            (matrix1.buffer[i] +
-             copy2.buffer[i]); // buffer[i]  ⇔  *(buffer + i) Adresse =
-                               // Startadresse + (i * sizeof(MatrixType))
-      }
-      return result;
-      // add und return
-
-    }
-
-    else {
-
-      printf("Fehlermeldung"); // vielleicht Fehlermeldung ändern zu
-                               // Programmabbruch
-      Matrix error = {0, 0, NULL};
-      return error;
-    }
-
-  }
-
-  else if (!rowsEqual && colsEqual) {
-
-    if (rows1 == 1) {
-
-      Matrix result = createMatrix(rows2, cols2);
-
-      Matrix copy1 = broadCastRows(matrix1, rows2, cols2);
-
-      for (int i = 0; i < (rows2 * cols2); i++) { // addieren
-
-        result.buffer[i] =
-            (copy1.buffer[i] +
-             matrix2.buffer[i]); // buffer[i]  ⇔  *(buffer + i) Adresse =
-                                 // Startadresse + (i * sizeof(MatrixType))
-      }
-      return result;
-
-      // add und return
-
-    } else if (rows2 == 1) {
-
-      Matrix result = createMatrix(rows1, cols1);
-
-      Matrix copy2 = broadCastCols(matrix2, rows1, cols1);
-      // add und return
-
-      for (int i = 0; i < (rows1 * cols1); i++) { // addieren
-
-        result.buffer[i] =
-            (matrix1.buffer[i] +
-             copy2.buffer[i]); // buffer[i]  ⇔  *(buffer + i) Adresse =
-                               // Startadresse + (i * sizeof(MatrixType))
-      }
-      return result;
-
-    }
-
-    else {
-
-      printf("Fehlermeldung"); // vielleicht Fehlermeldung ändern zu
-                               // Programmabbruch
-      Matrix error = {0, 0, NULL};
-      return error;
-    }
-  }
-
-  else {
-    printf(
-        "Fehlermeldung"); // vielleicht Fehlermeldung ändern zu Programmabbruch
-    Matrix error = {0, 0, NULL};
-    return error;
-  }
 }
 Matrix multiply(const Matrix matrix1, const Matrix matrix2) { return matrix1; }

matrix.h

@@ -19,11 +19,6 @@ void setMatrixAt(MatrixType value, Matrix matrix, unsigned int rowIdx,
                  unsigned int colIdx);
 MatrixType getMatrixAt(const Matrix matrix, unsigned int rowIdx,
                        unsigned int colIdx);
-
-Matrix broadCastCols(const Matrix matrix, const unsigned int rows,
-                     const unsigned int cols);
-Matrix broadCastRows(const Matrix matrix, const unsigned int rows,
-                     const unsigned int cols);
 Matrix add(const Matrix matrix1, const Matrix matrix2);
 Matrix multiply(const Matrix matrix1, const Matrix matrix2);