updating

Reviewed-on: freudenreichan/info2Praktikum-NeuronalesNetz#4

.gitignore

@@ -1,4 +1,61 @@
-mnist
+# ---> C
-runTests
+# Prerequisites
+*.d
+
+# Object files
 *.o
-*.exe
+*.ko
+*.obj
+*.elf
+
+# Linker output
+*.ilk
+*.map
+*.exp
+
+# Precompiled Headers
+*.gch
+*.pch
+
+# Libraries
+*.lib
+*.la
+*.lo
+
+# Shared objects (inc. Windows DLLs)
+*.dll
+*.so
+*.so.*
+*.dylib
+
+# Executables
+*.exe
+*.out
+*.app
+*.i*86
+*.x86_64
+*.hex
+Startcode/mnist
+Startcode/runTests
+
+# Debug files
+*.dSYM/
+*.su
+*.idb
+*.pdb
+
+# Kernel Module Compile Results
+*.mod*
+*.cmd
+.tmp_versions/
+modules.order
+Module.symvers
+Mkfile.old
+dkms.conf
+
+# IDE folders
+.vscode/
+.idea/
+
+# macOS
+.DS_Store

.vscode/settings.json

@@ -1,3 +0,0 @@
-{
-    "makefile.configureOnOpen": false
-}

README.md

@@ -1,2 +0,0 @@
-# Projekt 2 für Informatik 2 Praktikum
-  

Startcode/makefile

@@ -57,11 +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:
-	rm -f *.o *.exe
+ifeq ($(OS),Windows_NT)
+	del /f *.o *.exe
+else
+	rm -f *.o mnist runMatrixTests runNeuralNetworkTests runImageInputTests
+endif
+

Startcode/matrix.c

@@ -0,0 +1,35 @@
+#include <stdlib.h>
+#include <string.h>
+#include "matrix.h"
+
+// TODO Matrix-Funktionen implementieren
+
+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)
+{
+    
+}
+
+Matrix add(const Matrix matrix1, const Matrix matrix2)
+{
+    
+}
+
+Matrix multiply(const Matrix matrix1, const Matrix matrix2)
+{
+    
+}

Startcode/matrix.h

@@ -6,20 +6,14 @@
 typedef float MatrixType;
 
 // TODO Matrixtyp definieren
-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,
+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

Startcode/matrixTests.c

@@ -71,6 +71,32 @@ void test_addFailsOnDifferentInputDimensions(void)
     TEST_ASSERT_EQUAL_UINT32(0, result.cols);
 }
 
+void test_addSupportsBroadcasting(void)
+{
+    MatrixType buffer1[] = {1, 2, 3, 4, 5, 6};
+    MatrixType buffer2[] = {7, 8};
+    Matrix matrix1 = {.rows=2, .cols=3, .buffer=buffer1};
+    Matrix matrix2 = {.rows=2, .cols=1, .buffer=buffer2};
+
+    Matrix result1 = add(matrix1, matrix2);
+    Matrix result2 = add(matrix2, matrix1);
+
+    float expectedResults[] = {8, 9, 10, 12, 13, 14};
+
+    TEST_ASSERT_EQUAL_UINT32(matrix1.rows, result1.rows);
+    TEST_ASSERT_EQUAL_UINT32(matrix1.cols, result1.cols);
+    TEST_ASSERT_EQUAL_UINT32(matrix1.rows, result2.rows);
+    TEST_ASSERT_EQUAL_UINT32(matrix1.cols, result2.cols);
+
+    TEST_ASSERT_EQUAL_INT(sizeof(expectedResults)/sizeof(expectedResults[0]), result1.rows * result1.cols);
+    TEST_ASSERT_EQUAL_FLOAT_ARRAY(expectedResults, result1.buffer, result1.cols * result1.rows);
+    TEST_ASSERT_EQUAL_INT(sizeof(expectedResults)/sizeof(expectedResults[0]), result2.rows * result2.cols);
+    TEST_ASSERT_EQUAL_FLOAT_ARRAY(expectedResults, result2.buffer, result2.cols * result2.rows);
+
+    free(result1.buffer);
+    free(result2.buffer);
+}
+
 void test_multiplyReturnsCorrectResults(void)
 {
     MatrixType buffer1[] = {1, 2, 3, 4, 5, 6};
@@ -138,7 +164,7 @@ void test_setMatrixAtFailsOnIndicesOutOfRange(void)
     Matrix matrixToTest = {.rows=2, .cols=3, .buffer=buffer};
 
     setMatrixAt(-1, matrixToTest, 2, 3);
-    TEST_ASSERT_EQUAL_FLOAT_ARRAY(expectedResults, matrixToTest.buffer, matrixToTest.cols * matrixToTest.rows);
+    TEST_ASSERT_EQUAL_FLOAT_ARRAY(expectedResults, matrixToTest.buffer, sizeof(buffer)/sizeof(MatrixType));
 }
 
 void setUp(void) {
@@ -159,6 +185,7 @@ int main()
     RUN_TEST(test_clearMatrixSetsMembersToNull);
     RUN_TEST(test_addReturnsCorrectResult);
     RUN_TEST(test_addFailsOnDifferentInputDimensions);
+    RUN_TEST(test_addSupportsBroadcasting);
     RUN_TEST(test_multiplyReturnsCorrectResults);
     RUN_TEST(test_multiplyFailsOnWrongInputDimensions);
     RUN_TEST(test_getMatrixAtReturnsCorrectResult);

matrix.c

@@ -1,47 +0,0 @@
-#include "matrix.h"
-#include <stdlib.h>
-#include <string.h>
-// TODO Matrix-Funktionen implementieren
-/*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->buffer = UNDEFINED_MATRIX_VALUE;
-  matrix->rows = UNDEFINED_MATRIX_VALUE;
-  matrix->cols = UNDEFINED_MATRIX_VALUE;
-  free((*matrix).buffer); // Speicher freigeben
-}
-void setMatrixAt(MatrixType value, Matrix matrix,
-                 unsigned int rowIdx, // Kopie der Matrix wird übergeben
-                 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 value = matrix.buffer[rowIdx * matrix.cols + colIdx];
-
-  return value;
-}
-Matrix add(const Matrix matrix1, const Matrix matrix2) {
-  // broadcasting
-  return matrix1;
-}
-Matrix multiply(const Matrix matrix1, const Matrix matrix2) { return matrix1; }