working on imageinput

Reviewed-on: #1

.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

.vscode/c_cpp_properties.json

@@ -1,18 +0,0 @@
-{
-  "configurations": [
-    {
-      "name": "windows-gcc-x64",
-      "includePath": [
-        "${workspaceFolder}/**"
-      ],
-      "compilerPath": "C:/ProgramData/mingw64/mingw64/bin/gcc.exe",
-      "cStandard": "${default}",
-      "cppStandard": "${default}",
-      "intelliSenseMode": "windows-gcc-x64",
-      "compilerArgs": [
-        ""
-      ]
-    }
-  ],
-  "version": 4
-}

.vscode/launch.json

@@ -1,24 +0,0 @@
-{
-  "version": "0.2.0",
-  "configurations": [
-    {
-      "name": "C/C++ Runner: Debug Session",
-      "type": "cppdbg",
-      "request": "launch",
-      "args": [],
-      "stopAtEntry": false,
-      "externalConsole": true,
-      "cwd": "c:/Users/Max-R/I2Pr/repoKachelto/I2-Pr_neuronalesNetz/info2Praktikum-NeuronalesNetz",
-      "program": "c:/Users/Max-R/I2Pr/repoKachelto/I2-Pr_neuronalesNetz/info2Praktikum-NeuronalesNetz/build/Debug/outDebug",
-      "MIMode": "gdb",
-      "miDebuggerPath": "gdb",
-      "setupCommands": [
-        {
-          "description": "Enable pretty-printing for gdb",
-          "text": "-enable-pretty-printing",
-          "ignoreFailures": true
-        }
-      ]
-    }
-  ]
-}

.vscode/settings.json

@@ -1,59 +1,3 @@
 {
-  "C_Cpp_Runner.cCompilerPath": "gcc",
-  "C_Cpp_Runner.cppCompilerPath": "g++",
-  "C_Cpp_Runner.debuggerPath": "gdb",
-  "C_Cpp_Runner.cStandard": "",
-  "C_Cpp_Runner.cppStandard": "",
-  "C_Cpp_Runner.msvcBatchPath": "C:/Program Files/Microsoft Visual Studio/VR_NR/Community/VC/Auxiliary/Build/vcvarsall.bat",
-  "C_Cpp_Runner.useMsvc": false,
-  "C_Cpp_Runner.warnings": [
-    "-Wall",
-    "-Wextra",
-    "-Wpedantic",
-    "-Wshadow",
-    "-Wformat=2",
-    "-Wcast-align",
-    "-Wconversion",
-    "-Wsign-conversion",
-    "-Wnull-dereference"
-  ],
-  "C_Cpp_Runner.msvcWarnings": [
-    "/W4",
-    "/permissive-",
-    "/w14242",
-    "/w14287",
-    "/w14296",
-    "/w14311",
-    "/w14826",
-    "/w44062",
-    "/w44242",
-    "/w14905",
-    "/w14906",
-    "/w14263",
-    "/w44265",
-    "/w14928"
-  ],
-  "C_Cpp_Runner.enableWarnings": true,
-  "C_Cpp_Runner.warningsAsError": false,
-  "C_Cpp_Runner.compilerArgs": [],
-  "C_Cpp_Runner.linkerArgs": [],
-  "C_Cpp_Runner.includePaths": [],
-  "C_Cpp_Runner.includeSearch": [
-    "*",
-    "**/*"
-  ],
-  "C_Cpp_Runner.excludeSearch": [
-    "**/build",
-    "**/build/**",
-    "**/.*",
-    "**/.*/**",
-    "**/.vscode",
-    "**/.vscode/**"
-  ],
-  "C_Cpp_Runner.useAddressSanitizer": false,
-  "C_Cpp_Runner.useUndefinedSanitizer": false,
-  "C_Cpp_Runner.useLeakSanitizer": false,
-  "C_Cpp_Runner.showCompilationTime": false,
-  "C_Cpp_Runner.useLinkTimeOptimization": false,
-  "C_Cpp_Runner.msvcSecureNoWarnings": false
+    "makefile.configureOnOpen": false
 }

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");
-    char headOfFile;
-    series = malloc();
+    FILE *file = fopen(*path,"rb");
+    char * headOfFile;
+
+    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

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

matrix.c

@@ -1,42 +1,68 @@
+#include "matrix.h"
 #include <stdlib.h>
 #include <string.h>
-#include "matrix.h"
-
 // TODO Matrix-Funktionen implementieren
-
-Matrix createMatrix(unsigned int rows, unsigned int cols)
-{
-    MatrixType*data= malloc(rows*cols*sizeof(MatrixType));  //Speicher reservieren
-    Matrix newMatrix = {rows,cols,data};
-    return newMatrix;
+/*typedef struct {
+    unsigned int rows;  //Zeilen
+    unsigned int cols; //Spalten
+    MatrixType *buffer; //Zeiger auf Speicherbereich Reihen*Spalten
+} Matrix;*/
+Matrix createMatrix(unsigned int rows, unsigned int cols) {
+  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->data = UNDEFINED_MATRIX_VALUE;        //Auf 0 setzen
-    matrix->rows = UNDEFINED_MATRIX_VALUE;
-    matrix->cols = UNDEFINED_MATRIX_VALUE;
-
-    free((*matrix).data); //Speicher freigeben
-    
+void clearMatrix(Matrix *matrix) {
+  matrix->buffer = UNDEFINED_MATRIX_VALUE;
+  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) {
 
-void setMatrixAt(MatrixType value, Matrix matrix, unsigned int rowIdx, unsigned int colIdx)
-{
-    
+  matrix.buffer[rowIdx * matrix.cols + 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 getMatrixAt(const Matrix matrix, unsigned int rowIdx, unsigned int colIdx)
-{
-    
+  MatrixType value = matrix.buffer[rowIdx * matrix.cols + colIdx];
+
+  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);
+            }
+        }
 
-Matrix add(const Matrix matrix1, const Matrix matrix2)
-{
-    
+        return result;
+    }
 }
-
-Matrix multiply(const Matrix matrix1, const Matrix matrix2)
-{
-    
-}
+Matrix multiply(const Matrix matrix1, const Matrix matrix2) { return matrix1; }

matrix.h

@@ -6,20 +6,20 @@
 typedef float MatrixType;
 
 // TODO Matrixtyp definieren
-typedef struct
-{
-    unsigned int rows;
-    unsigned int cols;
-    MatrixType *data;
-} Matrix;
+typedef struct {
+  unsigned int rows;
+  unsigned int cols;
+  MatrixType *buffer;
 
+} Matrix;
 
 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);
+void setMatrixAt(MatrixType value, 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