Matrix noch ohne broadcasting

.gitignore

@@ -2,9 +2,3 @@ mnist
 runTests
 *.o
 *.exe
-.vscode/settings.json
-.vscode/launch.json
-.vscode/settings.json
-.vscode/settings.json
-runImageInputTests
-testFile.info2

.vscode/c_cpp_properties.json

@@ -0,0 +1,18 @@
+{
+  "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

@@ -0,0 +1,24 @@
+{
+  "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,3 +1,59 @@
 {
-    "makefile.configureOnOpen": false
+  "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
 }

imageInput.c

@@ -15,36 +15,10 @@ 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(*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++)
-    {
-
-    }
-
+    FILE *file = fopen("mnist_test.info2","rb");
+    char headOfFile;
+    series = malloc();
     return series;
 }
 

makefile

@@ -57,12 +57,12 @@ 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:
+#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 

matrix.c

@@ -41,28 +41,47 @@ MatrixType getMatrixAt(const Matrix matrix,
   return value;
 }
 Matrix add(const Matrix matrix1, const Matrix matrix2) {
+
+  // Ergebnismatrix
   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);
-            }
-        }
 
+
+  const int rowsEqual = (matrix1.rows==matrix2.rows) ? 1: 0;
+  const int colsEqual = (matrix1.cols==matrix2.cols) ? 1: 0;
+ 
+  // Broadcasting nur bei Vektor und Matrix, Fehlermeldung bei zwei unpassender
+  // Matrix
+  if (rowsEqual == 1 && colsEqual == 1){
+    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);
+      }
+    }
     return result;
   }
+  else if (rowsEqual ==1 && colsEqual == 0){
+
+  }
+  else if (rowsEqual == 0 && colsEqual == 1){
+
+  }
+  else {
+
+
+  }
+
+  // Speicher reservieren
+
+  // Matrix addieren
+
+  return result;
 }
 Matrix multiply(const Matrix matrix1, const Matrix matrix2) { return matrix1; }