schöne Version

imageInput.c

@@ -33,7 +33,6 @@ GrayScaleImageSeries *readImages(const char *path)
         return NULL;
     }
     //liest die Anzahl der Bilder aus
-    series->count = 0;
     fread(&series->count, sizeof(unsigned short),1, data);
     series->images = malloc(series->count * sizeof(GrayScaleImage));
     if (series->images == NULL){

imageInput.h

@@ -12,7 +12,7 @@ typedef struct
 
 typedef struct
 {
-    GrayScaleImage *images;
+    GrayScaleImage *images; //in sich verschachtelte Struktur
     unsigned char *labels;
     unsigned int count;
 } GrayScaleImageSeries;

imageInputTests.c

@@ -123,8 +123,7 @@ void setUp(void) {
     // Falls notwendig, kann hier Vorbereitungsarbeit gemacht werden
 }
 
-void tearDown(void) 
+void tearDown(void) {
-{
     // Hier kann Bereinigungsarbeit nach jedem Test durchgeführt werden
 }
 

matrix.c

@@ -2,22 +2,20 @@
 #include <string.h>
 #include "matrix.h"
 
-// TODO Matrix-Funktionen implementieren
-
 Matrix createMatrix(unsigned int rows, unsigned int cols)
 {
-    Matrix matrix = {NULL, 0, 0};
+    Matrix m = {NULL, 0, 0};
 
     if (rows == 0 || cols == 0)
-        return matrix;   //gibt leere Matrix zurück
+        return m;
 
-    matrix.buffer = (MatrixType *)calloc(rows * cols, sizeof(MatrixType));
+    m.buffer = (MatrixType *)calloc(rows * cols, sizeof(MatrixType));
-    if (matrix.buffer == NULL) //auf verfügbaren Speicherplatz prüfen
+    if (m.buffer == NULL)
-        return matrix;
+        return m;
 
-    matrix.rows = rows;  
+    m.rows = rows;
-    matrix.cols = cols;
+    m.cols = cols;
-    return matrix;   //Matrix zurückgeben
+    return m;
 }
 
 void clearMatrix(Matrix *matrix)
@@ -25,18 +23,18 @@ void clearMatrix(Matrix *matrix)
 
     if (matrix != NULL)
     {
-        free(matrix->buffer);   //Speicherplatz bereinigen
+        free(matrix->buffer);
-        matrix->buffer = NULL;  //Werte auf 0 setzen
+        matrix->buffer = NULL;
         matrix->rows = 0;
         matrix->cols = 0;
     }
 }
 
-void setMatrixAt(MatrixType value, Matrix matrix, unsigned int rowIdx, unsigned int colIdx) 
+void setMatrixAt(MatrixType value, Matrix matrix, unsigned int rowIdx, unsigned int colIdx)
+// Matrix matrix zu Matrix *matrix, empfehlung
 {
-    if (rowIdx < matrix.rows && colIdx < matrix.cols && matrix.buffer != NULL) //Prüft ob Zugriff möglich
+    if (rowIdx < matrix.rows && colIdx < matrix.cols && matrix.buffer != NULL)
-        matrix.buffer[rowIdx * matrix.cols + colIdx] = value; 
+        matrix.buffer[rowIdx * matrix.cols + colIdx] = value;
-        //schreibt 2D element in 1D Liste: Element_Reihe*Matrix_Spalten + Element_Spalte
 }
 
 MatrixType getMatrixAt(const Matrix matrix, unsigned int rowIdx, unsigned int colIdx)
@@ -47,10 +45,11 @@ MatrixType getMatrixAt(const Matrix matrix, unsigned int rowIdx, unsigned int co
 }
 
 // TODO: Funktionen implementieren
+
 Matrix add(const Matrix matrix1, const Matrix matrix2)
 {
-    //  immer Probe, gleiche Zeilen der Matrizen
+    //  check, equal rows
-    // "Elementweise Addition": Probe, ob matrix gleiche größe hat
+    // "Elementweise Addition": test, if two matrix has exact size
     if (matrix1.rows == matrix2.rows && matrix1.cols == matrix2.cols)
     {
         Matrix result_add = createMatrix(matrix1.rows, matrix1.cols);
@@ -65,7 +64,7 @@ Matrix add(const Matrix matrix1, const Matrix matrix2)
         }
         return result_add;
     }
-    // "Broadcasting": matrix1 hat 1 Spalte
+    // "Broadcasting": matrix1 has 1 collum
     if (matrix1.rows == matrix2.rows && matrix1.cols == 1)
     {
         Matrix result_add = createMatrix(matrix1.rows, matrix2.cols);
@@ -79,7 +78,7 @@ Matrix add(const Matrix matrix1, const Matrix matrix2)
         }
         return result_add;
     }
-    // "Broadcasting": matrix2 hat 1 Spalte
+    // "Broadcasting": matrix2 has 1 collum
     if (matrix1.rows == matrix2.rows && matrix2.cols == 1)
     {
         Matrix result_add = createMatrix(matrix1.rows, matrix1.cols);
@@ -99,14 +98,13 @@ Matrix add(const Matrix matrix1, const Matrix matrix2)
 
 Matrix multiply(const Matrix matrix1, const Matrix matrix2)
 {
+    // Needed: rows/Zeilen, collums/Spalten
     MatrixType buffer_add;
-    
+    // Probe ob Spalten1 = Zeilen2
-    if (!matrix1.buffer || !matrix2.buffer) // Probe ob leere Matrize vorliegt 
+    if (matrix1.cols != matrix2.rows)
-        return createMatrix(0, 0);
-    if (matrix1.cols != matrix2.rows) // Probe ob Spalten1 = Zeilen2
         return createMatrix(0, 0);
 
-    Matrix result_mul = createMatrix(matrix1.rows, matrix2.cols);
+    Matrix result_mul = createMatrix(matrix1.rows, matrix2.cols); // ""
 
     for (unsigned int index = 0; index < matrix1.rows; index++)
     {
@@ -115,10 +113,12 @@ Matrix multiply(const Matrix matrix1, const Matrix matrix2)
             buffer_add = 0;
             for (unsigned int skalar = 0; skalar < matrix1.cols; skalar++)
             {
+                // buffer_add += matrix1[index][skalar]*matrix2[skalar][shift];
                 buffer_add += getMatrixAt(matrix1, index, skalar) * getMatrixAt(matrix2, skalar, shift);
             }
-            setMatrixAt(buffer_add, result_mul, index, shift);
+            // matrix_mul[index][shift] = buffer_add;
+            setMatrixAt(buffer_add, result_mul, index, shift); // result als Pointer, also mit &result
         }
     }
     return result_mul;
-}
+}

matrix.h

@@ -7,10 +7,10 @@ typedef float MatrixType;
 
 // TODO Matrixtyp definieren
 typedef struct {
-    MatrixType *buffer;
+    MatrixType *matrix;
     unsigned int rows;
     unsigned int cols;
-} Matrix;
+}Matrix;
 
 
 Matrix createMatrix(unsigned int rows, unsigned int cols);

neuralNetworkTests.c

@@ -5,49 +5,10 @@
 #include "unity.h"
 #include "neuralNetwork.h"
 
+
 static void prepareNeuralNetworkFile(const char *path, const NeuralNetwork nn)
 {
-    FILE *file = fopen(path, "wb");
+    // TODO
-    if (!file)
-        return;
-
-    const char *tag = "__info2_neural_network_file_format__";
-    fwrite(tag, 1, strlen(tag), file);
-
-    // Überprüfung, ob es Layer gibt
-    if (nn.numberOfLayers == 0)
-    {
-        fclose(file);
-        return;
-    }
-
-    // Schreibe die Eingabe- und Ausgabegrößen des Netzwerks
-    int input = nn.layers[0].weights.cols;
-    int output = nn.layers[0].weights.rows;
-
-    fwrite(&input, sizeof(int), 1, file);
-    fwrite(&output, sizeof(int), 1, file);
-
-    // Schreibe die Layer-Daten
-    for (int i = 0; i < nn.numberOfLayers; i++)
-    {
-        const Layer *layer = &nn.layers[i];
-        int out = layer->weights.rows;
-        int in = layer->weights.cols;
-
-        fwrite(layer->weights.buffer, sizeof(MatrixType), out * in, file);
-
-        fwrite(layer->biases.buffer, sizeof(MatrixType), out * 1, file);
-
-        if (i + 1 < nn.numberOfLayers)
-        {
-            int nextOut = nn.layers[i + 1].weights.rows;
-            fwrite(&nextOut, sizeof(int), 1, file);
-        }
-    }
-    fclose(file);
-
-   
 }
 
 void test_loadModelReturnsCorrectNumberOfLayers(void)
@@ -55,15 +16,15 @@ void test_loadModelReturnsCorrectNumberOfLayers(void)
     const char *path = "some__nn_test_file.info2";
     MatrixType buffer1[] = {1, 2, 3, 4, 5, 6};
     MatrixType buffer2[] = {1, 2, 3, 4, 5, 6};
-    Matrix weights1 = {.buffer = buffer1, .rows = 3, .cols = 2};
+    Matrix weights1 = {.buffer=buffer1, .rows=3, .cols=2};
-    Matrix weights2 = {.buffer = buffer2, .rows = 2, .cols = 3};
+    Matrix weights2 = {.buffer=buffer2, .rows=2, .cols=3};
     MatrixType buffer3[] = {1, 2, 3};
     MatrixType buffer4[] = {1, 2};
-    Matrix biases1 = {.buffer = buffer3, .rows = 3, .cols = 1};
+    Matrix biases1 = {.buffer=buffer3, .rows=3, .cols=1};
-    Matrix biases2 = {.buffer = buffer4, .rows = 2, .cols = 1};
+    Matrix biases2 = {.buffer=buffer4, .rows=2, .cols=1};
-    Layer layers[] = {{.weights = weights1, .biases = biases1}, {.weights = weights2, .biases = biases2}};
+    Layer layers[] = {{.weights=weights1, .biases=biases1}, {.weights=weights2, .biases=biases2}};
 
-    NeuralNetwork expectedNet = {.layers = layers, .numberOfLayers = 2};
+    NeuralNetwork expectedNet = {.layers=layers, .numberOfLayers=2};
     NeuralNetwork netUnderTest;
 
     prepareNeuralNetworkFile(path, expectedNet);
@@ -79,12 +40,12 @@ void test_loadModelReturnsCorrectWeightDimensions(void)
 {
     const char *path = "some__nn_test_file.info2";
     MatrixType weightBuffer[] = {1, 2, 3, 4, 5, 6};
-    Matrix weights = {.buffer = weightBuffer, .rows = 3, .cols = 2};
+    Matrix weights = {.buffer=weightBuffer, .rows=3, .cols=2};
     MatrixType biasBuffer[] = {7, 8, 9};
-    Matrix biases = {.buffer = biasBuffer, .rows = 3, .cols = 1};
+    Matrix biases = {.buffer=biasBuffer, .rows=3, .cols=1};
-    Layer layers[] = {{.weights = weights, .biases = biases}};
+    Layer layers[] = {{.weights=weights, .biases=biases}};
 
-    NeuralNetwork expectedNet = {.layers = layers, .numberOfLayers = 1};
+    NeuralNetwork expectedNet = {.layers=layers, .numberOfLayers=1};
     NeuralNetwork netUnderTest;
 
     prepareNeuralNetworkFile(path, expectedNet);
@@ -102,12 +63,12 @@ void test_loadModelReturnsCorrectBiasDimensions(void)
 {
     const char *path = "some__nn_test_file.info2";
     MatrixType weightBuffer[] = {1, 2, 3, 4, 5, 6};
-    Matrix weights = {.buffer = weightBuffer, .rows = 3, .cols = 2};
+    Matrix weights = {.buffer=weightBuffer, .rows=3, .cols=2};
     MatrixType biasBuffer[] = {7, 8, 9};
-    Matrix biases = {.buffer = biasBuffer, .rows = 3, .cols = 1};
+    Matrix biases = {.buffer=biasBuffer, .rows=3, .cols=1};
-    Layer layers[] = {{.weights = weights, .biases = biases}};
+    Layer layers[] = {{.weights=weights, .biases=biases}};
 
-    NeuralNetwork expectedNet = {.layers = layers, .numberOfLayers = 1};
+    NeuralNetwork expectedNet = {.layers=layers, .numberOfLayers=1};
     NeuralNetwork netUnderTest;
 
     prepareNeuralNetworkFile(path, expectedNet);
@@ -125,12 +86,12 @@ void test_loadModelReturnsCorrectWeights(void)
 {
     const char *path = "some__nn_test_file.info2";
     MatrixType weightBuffer[] = {1, 2, 3, 4, 5, 6};
-    Matrix weights = {.buffer = weightBuffer, .rows = 3, .cols = 2};
+    Matrix weights = {.buffer=weightBuffer, .rows=3, .cols=2};
     MatrixType biasBuffer[] = {7, 8, 9};
-    Matrix biases = {.buffer = biasBuffer, .rows = 3, .cols = 1};
+    Matrix biases = {.buffer=biasBuffer, .rows=3, .cols=1};
-    Layer layers[] = {{.weights = weights, .biases = biases}};
+    Layer layers[] = {{.weights=weights, .biases=biases}};
 
-    NeuralNetwork expectedNet = {.layers = layers, .numberOfLayers = 1};
+    NeuralNetwork expectedNet = {.layers=layers, .numberOfLayers=1};
     NeuralNetwork netUnderTest;
 
     prepareNeuralNetworkFile(path, expectedNet);
@@ -150,12 +111,12 @@ void test_loadModelReturnsCorrectBiases(void)
 {
     const char *path = "some__nn_test_file.info2";
     MatrixType weightBuffer[] = {1, 2, 3, 4, 5, 6};
-    Matrix weights = {.buffer = weightBuffer, .rows = 3, .cols = 2};
+    Matrix weights = {.buffer=weightBuffer, .rows=3, .cols=2};
     MatrixType biasBuffer[] = {7, 8, 9};
-    Matrix biases = {.buffer = biasBuffer, .rows = 3, .cols = 1};
+    Matrix biases = {.buffer=biasBuffer, .rows=3, .cols=1};
-    Layer layers[] = {{.weights = weights, .biases = biases}};
+    Layer layers[] = {{.weights=weights, .biases=biases}};
 
-    NeuralNetwork expectedNet = {.layers = layers, .numberOfLayers = 1};
+    NeuralNetwork expectedNet = {.layers=layers, .numberOfLayers=1};
     NeuralNetwork netUnderTest;
 
     prepareNeuralNetworkFile(path, expectedNet);
@@ -177,7 +138,7 @@ void test_loadModelFailsOnWrongFileTag(void)
     NeuralNetwork netUnderTest;
     FILE *file = fopen(path, "wb");
 
-    if (file != NULL)
+    if(file != NULL)
     {
         const char *fileTag = "info2_neural_network_file_format";
 
@@ -198,12 +159,12 @@ void test_clearModelSetsMembersToNull(void)
 {
     const char *path = "some__nn_test_file.info2";
     MatrixType weightBuffer[] = {1, 2, 3, 4, 5, 6};
-    Matrix weights = {.buffer = weightBuffer, .rows = 3, .cols = 2};
+    Matrix weights = {.buffer=weightBuffer, .rows=3, .cols=2};
     MatrixType biasBuffer[] = {7, 8, 9};
-    Matrix biases = {.buffer = biasBuffer, .rows = 3, .cols = 1};
+    Matrix biases = {.buffer=biasBuffer, .rows=3, .cols=1};
-    Layer layers[] = {{.weights = weights, .biases = biases}};
+    Layer layers[] = {{.weights=weights, .biases=biases}};
 
-    NeuralNetwork expectedNet = {.layers = layers, .numberOfLayers = 1};
+    NeuralNetwork expectedNet = {.layers=layers, .numberOfLayers=1};
     NeuralNetwork netUnderTest;
 
     prepareNeuralNetworkFile(path, expectedNet);
@@ -220,7 +181,7 @@ void test_clearModelSetsMembersToNull(void)
 
 static void someActivation(Matrix *matrix)
 {
-    for (int i = 0; i < matrix->rows * matrix->cols; i++)
+    for(int i = 0; i < matrix->rows * matrix->cols; i++)
     {
         matrix->buffer[i] = fabs(matrix->buffer[i]);
     }
@@ -231,23 +192,23 @@ void test_predictReturnsCorrectLabels(void)
     const unsigned char expectedLabels[] = {4, 2};
     GrayScalePixelType imageBuffer1[] = {10, 30, 25, 17};
     GrayScalePixelType imageBuffer2[] = {20, 40, 10, 128};
-    GrayScaleImage inputImages[] = {{.buffer = imageBuffer1, .width = 2, .height = 2}, {.buffer = imageBuffer2, .width = 2, .height = 2}};
+    GrayScaleImage inputImages[] = {{.buffer=imageBuffer1, .width=2, .height=2}, {.buffer=imageBuffer2, .width=2, .height=2}};
     MatrixType weightsBuffer1[] = {1, -2, 3, -4, 5, -6, 7, -8};
     MatrixType weightsBuffer2[] = {-9, 10, 11, 12, 13, 14};
     MatrixType weightsBuffer3[] = {-15, 16, 17, 18, -19, 20, 21, 22, 23, -24, 25, 26, 27, -28, -29};
-    Matrix weights1 = {.buffer = weightsBuffer1, .rows = 2, .cols = 4};
+    Matrix weights1 = {.buffer=weightsBuffer1, .rows=2, .cols=4};
-    Matrix weights2 = {.buffer = weightsBuffer2, .rows = 3, .cols = 2};
+    Matrix weights2 = {.buffer=weightsBuffer2, .rows=3, .cols=2};
-    Matrix weights3 = {.buffer = weightsBuffer3, .rows = 5, .cols = 3};
+    Matrix weights3 = {.buffer=weightsBuffer3, .rows=5, .cols=3};
     MatrixType biasBuffer1[] = {200, 0};
     MatrixType biasBuffer2[] = {0, -100, 0};
     MatrixType biasBuffer3[] = {0, -1000, 0, 2000, 0};
-    Matrix biases1 = {.buffer = biasBuffer1, .rows = 2, .cols = 1};
+    Matrix biases1 = {.buffer=biasBuffer1, .rows=2, .cols=1};
-    Matrix biases2 = {.buffer = biasBuffer2, .rows = 3, .cols = 1};
+    Matrix biases2 = {.buffer=biasBuffer2, .rows=3, .cols=1};
-    Matrix biases3 = {.buffer = biasBuffer3, .rows = 5, .cols = 1};
+    Matrix biases3 = {.buffer=biasBuffer3, .rows=5, .cols=1};
-    Layer layers[] = {{.weights = weights1, .biases = biases1, .activation = someActivation},
+    Layer layers[] = {{.weights=weights1, .biases=biases1, .activation=someActivation}, \
-                      {.weights = weights2, .biases = biases2, .activation = someActivation},
+                      {.weights=weights2, .biases=biases2, .activation=someActivation}, \
-                      {.weights = weights3, .biases = biases3, .activation = someActivation}};
+                      {.weights=weights3, .biases=biases3, .activation=someActivation}};
-    NeuralNetwork netUnderTest = {.layers = layers, .numberOfLayers = 3};
+    NeuralNetwork netUnderTest = {.layers=layers, .numberOfLayers=3};
     unsigned char *predictedLabels = predict(netUnderTest, inputImages, 2);
     TEST_ASSERT_NOT_NULL(predictedLabels);
     int n = (int)(sizeof(expectedLabels) / sizeof(expectedLabels[0]));
@@ -255,13 +216,11 @@ void test_predictReturnsCorrectLabels(void)
     free(predictedLabels);
 }
 
-void setUp(void)
+void setUp(void) {
-{
     // Falls notwendig, kann hier Vorbereitungsarbeit gemacht werden
 }
 
-void tearDown(void)
+void tearDown(void) {
-{
     // Hier kann Bereinigungsarbeit nach jedem Test durchgeführt werden
 }