fix bug

This reverts commit 6ba9ba3195.

imageInput.c

@@ -6,17 +6,107 @@
 #define BUFFER_SIZE 100
 #define FILE_HEADER_STRING "__info2_image_file_format__"
 
-// TODO Implementieren Sie geeignete Hilfsfunktionen für das Lesen der Bildserie aus einer Datei
+//Datei öffnen, Header, Anzahl, Höhe und Breite lesen, geöffnete Datei zurückgeben
+static FILE* openAndReadShort (const char *path, unsigned short *count, unsigned short *width, unsigned short *height) {
+    FILE *file = fopen(path, "rb");
+    if (!file) {
+        return NULL;
+    }
+    size_t headerLength = strlen(FILE_HEADER_STRING);
+    char *header = malloc (headerLength + 1);
+    if(!header) {
+        return NULL;
+    }
 
-// TODO Vervollständigen Sie die Funktion readImages unter Benutzung Ihrer Hilfsfunktionen
+    if (fread(header, sizeof(char), headerLength, file) != headerLength) {
+        free (header);
+        return NULL;
+    }
+
+    header[headerLength] = '\0';
+
+    if (strcmp (header, FILE_HEADER_STRING) != 0) {
+        free(header);
+        return NULL;
+    }
+    
+    free (header);
+
+    fread(count, sizeof(unsigned short), 1, file);
+    fread(width, sizeof(unsigned short), 1, file);
+    fread(height, sizeof(unsigned short), 1, file);
+
+    return file;
+}
+
+//Speicher anlegen und Pixel eines Bildes einlesen
+static GrayScaleImage* readPixles (FILE *file, unsigned short *width, unsigned short *height) {
+    GrayScaleImage *image = malloc (sizeof(GrayScaleImage));
+    image->width = *width;
+    image->height = *height;
+    image->buffer = malloc ((*width) * (*height) * sizeof(GrayScalePixelType));
+    if (!image->buffer) {
+        free(image);
+        return NULL;
+    }
+
+    for (unsigned int i = 0; i < (*width) * (*height); i++) {
+        unsigned char pixel;
+        if (fread(&pixel, sizeof(unsigned char), 1, file) != 1) {
+            free(image->buffer);
+            free(image);
+            return NULL;
+        }
+    image->buffer[i] = pixel;
+    }
+
+    return image;
+}
+
+//Ausführen von openAndReadShort, Anlegen des Speichers für Bilderserie, readPixles wird für jedes Bild ausgeführt
+//Nach jedem Bild wird das zugehörige Label gelesen, bei sämtlichen Fehlern wird NULL zurückgegeben und Speicher durch clearSeries bereinigt
 GrayScaleImageSeries *readImages(const char *path)
 {
-    GrayScaleImageSeries *series = NULL;
+    unsigned short count = 0, width = 0, height = 0;
+
+    FILE *file = openAndReadShort(path, &count, &width, &height);
+    if (file == 0) {
+        return NULL;
+    }
+    GrayScaleImageSeries *series = malloc(sizeof(GrayScaleImageSeries));
+    if (!series) {
+        fclose(file);
+        return NULL;
+    }
+    series->count = count;
+
+    series->images = malloc(count * sizeof(GrayScaleImage));
+    series->labels = malloc(count* sizeof(unsigned char));
+
+    for (unsigned int i = 0; i < series->count; i++) {
+       GrayScaleImage *image = readPixles(file, &width, &height);
+       series->images[i] = *image;
+       free(image);
+
+       if (fread(&series->labels[i], sizeof(unsigned char), 1, file) != 1) {
+            clearSeries(series); 
+            fclose(file); 
+            return NULL; 
+        }
+    }
+    fclose(file);
     
     return series;
 }
 
-// TODO Vervollständigen Sie die Funktion clearSeries, welche eine Bildserie vollständig aus dem Speicher freigibt
+//Bereinigt den Speicher
 void clearSeries(GrayScaleImageSeries *series)
 {
+    for (unsigned int i = 0; i < series->count; i++) {
+        free(series->images[i].buffer);
+    }
+
+    free(series->images);
+    free(series->labels);
+    free(series);
 }

matrix.c

@@ -1,6 +1,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "matrix.h"
+#include <stdio.h>
 
 Matrix createMatrix(unsigned int rows, unsigned int cols)
 {
@@ -20,6 +21,7 @@ Matrix createMatrix(unsigned int rows, unsigned int cols)
     if (mat.buffer == NULL)
     {
         clearMatrix(&mat);
+        perror("could not allocate memory");
     }
 
     return mat;
@@ -58,15 +60,57 @@ MatrixType getMatrixAt(const Matrix matrix, unsigned int rowIdx, unsigned int co
 
 Matrix add(const Matrix matrix1, const Matrix matrix2)
 {
-    Matrix resMat = createMatrix(matrix1.rows, matrix1.cols);
+    Matrix resMat = (matrix1.cols > matrix2.cols) ? createMatrix(matrix1.rows, matrix1.cols) : createMatrix(matrix2.rows, matrix2.cols);
 
-    // clear matrix and return if the dimensions of the input matrices differ from each other
-    if (matrix1.rows != matrix2.rows || matrix1.cols != matrix2.cols)
+    if (resMat.buffer == NULL)
+    {
+        return createMatrix(0, 0);
+    }
+
+    // matrices not compatible
+    if (matrix1.rows != matrix2.rows)
     {
         clearMatrix(&resMat);
         return resMat;
     }
 
+    // check if broadcasting is possible
+    if (matrix1.cols != matrix2.cols)
+    {
+        // matrix1 is a vector
+        if (matrix1.cols == 1)
+        {
+            // broadcast vector
+            for (size_t m = 0; m < matrix2.rows; m++)
+            {
+                for (size_t n = 0; n < matrix2.cols; n++)
+                {
+                    setMatrixAt(getMatrixAt(matrix2, m, n) + getMatrixAt(matrix1, m, 0), resMat, m, n);
+                }
+            }
+            return resMat;
+        }
+        // matrix2 is a vector
+        else if (matrix2.cols == 1)
+        {
+            // broadcast vector
+            for (size_t m = 0; m < matrix1.rows; m++)
+            {
+                for (size_t n = 0; n < matrix1.cols; n++)
+                {
+                    setMatrixAt(getMatrixAt(matrix1, m, n) + getMatrixAt(matrix2, m, 0), resMat, m, n);
+                }
+            }
+            return resMat;
+        }
+        // addition not possible
+        else
+        {
+            clearMatrix(&resMat);
+            return resMat;
+        }
+    }
+
     for (size_t m = 0; m < matrix1.rows; m++)
     {
         for (size_t n = 0; n < matrix1.cols; n++)
@@ -79,7 +123,32 @@ Matrix add(const Matrix matrix1, const Matrix matrix2)
     return resMat;
 }
 
-// TODO implement
 Matrix multiply(const Matrix matrix1, const Matrix matrix2)
 {
+    if (matrix1.cols != matrix2.rows || matrix1.buffer == NULL || matrix2.buffer == NULL)
+    {
+        return createMatrix(0, 0);
+    }
+
+    int rows = matrix1.rows, cols = matrix2.cols;
+    Matrix resMat = createMatrix(rows, cols);
+
+    if (resMat.buffer == NULL)
+    {
+        return createMatrix(0, 0);
+    }
+
+    for (size_t rowIdx = 0; rowIdx < rows; rowIdx++)
+    {
+        for (size_t colIdx = 0; colIdx < cols; colIdx++)
+        {
+            int curCellVal = 0;
+            for (size_t k = 0; k < matrix1.cols; k++)
+            {
+                curCellVal += getMatrixAt(matrix1, rowIdx, k) * getMatrixAt(matrix2, k, colIdx);
+            }
+            setMatrixAt(curCellVal, resMat, rowIdx, colIdx);
+        }
+    }
+    return resMat;
 }

matrix.h

@@ -8,10 +8,9 @@ typedef float MatrixType;
 // Matrixtyp
 typedef struct Matrix
 {
+    MatrixType *buffer;
     size_t rows;
     size_t cols;
-    MatrixType *buffer;
-
 } Matrix;
 
 Matrix createMatrix(unsigned int rows, unsigned int cols);

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);

neuralNetworkTests.c

@@ -5,10 +5,46 @@
 #include "unity.h"
 #include "neuralNetwork.h"
 
+static void writeLayer(FILE *file, const Matrix weights, const Matrix biases, unsigned int inputDim)
+{
+    unsigned int outputDim = (unsigned int)weights.rows;
+    fwrite(&outputDim, sizeof(unsigned int), 1, file);
+    if (weights.buffer != NULL)
+        fwrite(weights.buffer, sizeof(MatrixType), outputDim * inputDim, file);
+
+    if (biases.buffer != NULL)
+        fwrite(biases.buffer, sizeof(MatrixType), outputDim, file);
+}
+
 
 static void prepareNeuralNetworkFile(const char *path, const NeuralNetwork nn)
 {
-    // TODO
+    FILE *file = fopen(path, "wb");
+    if (!file) return;
+
+    const char tag[] = "__info2_neural_network_file_format__";
+    fwrite(tag, sizeof(char), strlen(tag), file);
+
+    if (nn.numberOfLayers == 0)
+    {
+        unsigned int zero = 0;
+        fwrite(&zero, sizeof(unsigned int), 1, file);
+        fclose(file);
+        return;
+    }
+
+    unsigned int inputDim = (unsigned int)nn.layers[0].weights.cols;
+    fwrite(&inputDim, sizeof(unsigned int), 1, file);
+
+    for (int i = 0; i < nn.numberOfLayers; i++)
+    {
+        writeLayer(file, nn.layers[i].weights, nn.layers[i].biases, inputDim);
+        inputDim = (unsigned int)nn.layers[i].weights.rows;
+    }
+    unsigned int zero = 0;
+    fwrite(&zero, sizeof(unsigned int), 1, file);
+
+    fclose(file);
 }
 
 void test_loadModelReturnsCorrectNumberOfLayers(void)

testFile.info2

@@ -0,0 +1 @@
+some_tag