corrected else case in imageInput.c line 56

imageInput.c

@@ -6,101 +6,153 @@
 #define BUFFER_SIZE 100
 #define FILE_HEADER_STRING "__info2_image_file_format__"
 
-// Funktionen müssen noch auf Teilfunktionen 
-// übersichtlich aufgeteilt werden!
 
-// TODO Implementieren Sie geeignete Hilfsfunktionen für das Lesen der Bildserie aus einer Datei
+// DONE Implementieren Sie geeignete Hilfsfunktionen für das Lesen der Bildserie aus einer Datei
+unsigned int    readStatusInfo      (FILE *const source, GrayScaleImageSeries *const series, char *const headerString, int const sizeToRead, int const amountToRead);
+void            readImagedata       (FILE *const source, GrayScaleImageSeries *const series, int const amountToRead);
+unsigned int    checkHeaderString   (const char *const header);
 
 
-int readStatusInfo(FILE **source, char *const headerString, int *const imageCount, int *const imageWidth, int *const imageHeight, int const amountToRead);
+// DONE Vervollständigen Sie die Funktion readImages unter Benutzung Ihrer Hilfsfunktionen
-
-
-// TODO Vervollständigen Sie die Funktion readImages unter Benutzung Ihrer Hilfsfunktionen
 GrayScaleImageSeries *readImages(const char *path)
 {
-    GrayScaleImageSeries *series = NULL;
+    GrayScaleImageSeries    *series                                     = NULL;
-
+    FILE                    *readSource                                 = 0;
-    // selbst geschriebene Variablen
+    const unsigned int      sizeOfStausInfoElementsInBytes              = sizeof(unsigned short);
-    FILE                    *readSource;
+    const unsigned int      amountOfStatusInfoToRead                    = 1;
-    int                     i                           = 0;
+    unsigned int            numberOfBytesToRead                         = 0;
-    unsigned int            numberOfBytesToRead         = 0;
+    unsigned int            expectedHeader                              = 0;
-    const unsigned int      amountOfStatusInfoToRead    = 1;
+    char                    headerString[sizeof(FILE_HEADER_STRING)]    = "";
-    char                    headerString[sizeof("__info2_image_file_format__")];
 
 
     readSource = fopen(path, "rb");
     
     if (readSource != NULL)
     {
+        series              = calloc            (amountOfStatusInfoToRead, sizeof(GrayScaleImageSeries));
+        series->images      = calloc            (amountOfStatusInfoToRead, sizeof(GrayScaleImage));
 
-        numberOfBytesToRead = readStatusInfo(&readSource, headerString, &series->count, &series->images->width, &series->images->height, amountOfStatusInfoToRead);
+        numberOfBytesToRead = readStatusInfo    (readSource, series, headerString, sizeOfStausInfoElementsInBytes, amountOfStatusInfoToRead);
+        expectedHeader      = checkHeaderString (headerString);
 
-        //  bufferspeicher anlegen der unsigned char pointer
+        series->images      = realloc           (series->images,    series->count * sizeof(GrayScaleImage));
-        //      mit anzahl der pixel als größe ist um dann 
+        series->labels      = calloc            (series->count,     sizeof(&(series->labels)));
-        //      grauwerte in diesen buffer zu schreiben
+        
-        //      (grayscale pixeltype in grayscale image series)
+        if (expectedHeader)
-        series->images->buffer  = calloc((series->count) * numberOfBytesToRead, sizeof(GrayScalePixelType));
-        //  zusätzlich auch speicher anlegen der für die labels da ist
-        series->labels          = calloc((series->count),                       sizeof(&(series->labels)));
-        //  AB HIER Schleife die für 
-        //  anzahl der Bilder je die Bytes und das Label einließt
-        for (i = 0; i <= (series->count); i++)
         {
-            fread((series->images->buffer + i * numberOfBytesToRead),   sizeof(&(series->images->buffer)),  numberOfBytesToRead,        readSource);
+            for (int i = 0; i < series->count; i++)
-            fread((series->labels + i),                                 sizeof(&(series->labels)),          amountOfStatusInfoToRead,   readSource);
+            {
-        }
+                series->images[i].buffer    = calloc(numberOfBytesToRead, sizeof(unsigned char));
-    }
+            }
             
-    fclose(readSource);
+            for (int i = 0; i < series->count; i++)
+            {
+                series->images[i].width     = series->images->width;
+                series->images[i].height    = series->images->height;
+            }
+            
+            readImagedata(readSource, series, numberOfBytesToRead);
+        }
+        else
+        {
+            fclose(readSource);
+            return NULL;
+        }
+        
+        fclose(readSource);
+    }
     
     
     return series;
 }
 
-// TODO Vervollständigen Sie die Funktion clearSeries, welche eine Bildserie vollständig aus dem Speicher freigibt
+
-void clearSeries(GrayScaleImageSeries *series)
+// DONE Vervollständigen Sie die Funktion clearSeries, welche eine Bildserie vollständig aus dem Speicher freigibt
+void clearSeries(GrayScaleImageSeries * series)
 {
     int i = 0;
+    int j = 0;
 
 
-    // Write NULL into all memory spaces
+    for (i = 0; i < series->count; i++)
-    for (i = 0; i < ((series->count) * (series->images->width) * (series->images->height)); i++)
     {
-        *(series->images->buffer + i * (series->images->width) * (series->images->height)) = '\0';
+        if (i >= 0)
+        {
+            for (j = 0; j < series->images[i].width * series->images[i].height; j++)
+            {
+                series->images[i].buffer[j] = 0;
+            }
+        }
+        
+        series->labels[i]           = 0;
+        series->images[i].width     = 0;
+        series->images[i].height    = 0;  
     }
-    for (i = 0; i < (series->count); i++)
+    
+    for (i = 0; i < series->count; i++)
     {
-        *(series->labels + i) = '\0';
+        free(series->images[i].buffer);
+        series->images[i].buffer = NULL;
     }
-    series->count           = 0;
-    series->images->width   = 0;
-    series->images->height  = 0;
     
-    // Closse all allocated memory
-    // AND write NULL into every pointer
-    // so they can't be accessed
-    free(series->images->buffer);
     free(series->labels);
-    series->images->buffer  = NULL;
+    series->labels  = NULL;
-    series->images          = NULL;
+    free(series->images);
-    series->labels          = NULL;
+    series->images  = NULL;
     free(series);
-    series                  = NULL;
+    series          = NULL;
-
 }
 
 
-//  reads string, pictureCount, pictureWidth, pictureHight
+//  reads headerString, pictureCount, pictureWidth, pictureHight
-int readStatusInfo(FILE **source, char *const headerString, int *const imageCount, int *const imageWidth, int *const imageHeight, int const amountToRead)
+unsigned int readStatusInfo(FILE *const source, GrayScaleImageSeries *const series, char *const headerString, int const sizeToRead, int const amountToRead)
 {
-    int bytesToRead = 0;
+    unsigned int bytesToRead = 0;
 
-    fread(headerString, sizeof(*headerString),   amountToRead, *source);
-    fread(imageCount,   sizeof(*imageCount),     amountToRead, *source);
-    fread(imageWidth,   sizeof(*imageWidth),     amountToRead, *source);
-    fread(imageHeight,  sizeof(*imageHeight),    amountToRead, *source);
 
-    bytesToRead = (*imageWidth) * (*imageHeight);
+    fread(headerString,                 sizeof(FILE_HEADER_STRING) - 1,     amountToRead, source);
+    fread(&(series->count),             sizeToRead,                         amountToRead, source);
+    fread(&(series->images->width),     sizeToRead,                         amountToRead, source);
+    fread(&(series->images->height),    sizeToRead,                         amountToRead, source);
+
+    bytesToRead = (series->images->width) * (series->images->height);
+
 
     return bytesToRead;
 }
+
+
+//  reads the imagebytes and the label of all images
+void readImagedata(FILE *const source, GrayScaleImageSeries *const series, int const amountToRead)
+{
+    int i           = 0;
+
+
+    for (i = 0; i < series->count ; i++)
+    {       
+        fread(&series->images[i].buffer[0], sizeof(*series->images->buffer), amountToRead,              source);
+        fread(&series->labels[i],           sizeof(*series->images->buffer), sizeof(*series->labels),   source);
+    }
+}
+
+
+// checks if the read headerString matches the expected headerString
+unsigned int checkHeaderString(const char *const header)
+{
+    int i                                           = 0;
+    int notIdenticall                               = 0;
+    char expectedHeader[sizeof(FILE_HEADER_STRING)] = FILE_HEADER_STRING;
+
+
+    for (i = 0; i < sizeof(FILE_HEADER_STRING); i++)
+    {
+        if (header[i] != expectedHeader[i])
+        {
+            notIdenticall = 1;
+        }
+    }
+    
+
+    return !notIdenticall;
+}
+

imageInputTests.c

@@ -14,7 +14,6 @@ static void prepareImageFile(const char *path, unsigned short int width, unsigne
     {
         const char *fileTag = "__info2_image_file_format__";
         GrayScalePixelType *zeroBuffer = (GrayScalePixelType *)calloc(numberOfImages * width * height, sizeof(GrayScalePixelType));
-
         if(zeroBuffer != NULL)
         {
             fwrite(fileTag, sizeof(fileTag[0]), strlen(fileTag), file);

makefile

@@ -18,8 +18,8 @@ unityfolder = ./unity
 # --------------------------
 # Initiales Programm bauen (zum ausprobieren)
 # --------------------------
-mnist_initial: $(BINARIES)/libmnist_complete.a
+#mnist_initial: $(BINARIES)/libmnist_complete.a
-	$(CC) -o mnist $(BINARIES)/libmnist_complete.a $(BINARIES)/libraylib.a ${LDFLAGS}
+#	$(CC) -o mnist $(BINARIES)/libmnist_complete.a $(BINARIES)/libraylib.a ${LDFLAGS}
 
 # --------------------------
 # Selbst implementiertes Programm bauen

matrix.c

@@ -1,35 +1,240 @@
 #include <stdlib.h>
 #include <string.h>
+#include <stdio.h>
 #include "matrix.h"
 
 // TODO Matrix-Funktionen implementieren
 
 Matrix createMatrix(unsigned int rows, unsigned int cols)
 {
+    Matrix matrix;
+    Matrix empty = {0, 0, NULL};
 
+    if(rows == 0 || cols == 0)
+    {
+        //print("Fehler: Dimensionen muessen >= 1 sein!");
+        return empty;
+    }
+
+    matrix.rows = rows;
+    matrix.cols = cols;
+    matrix.buffer = malloc(rows * cols * sizeof(float));
+
+    if(matrix.buffer == NULL)
+    {
+        //printf("Fehler bei der Speicherreservierung! Keine Matrix erstellt!");
+        matrix.rows = 0;
+        matrix.cols = 0;
+    }
+
+    return matrix;
 }
 
 void clearMatrix(Matrix *matrix)
 {
+    free(matrix->buffer);
 
+    matrix->buffer = NULL;
+    matrix->rows = 0;
+    matrix->cols = 0;
 }
 
 void setMatrixAt(MatrixType value, Matrix matrix, unsigned int rowIdx, unsigned int colIdx)
 {
+    // printf("hier0\n");
+    if(matrix.buffer == NULL)
+    {
+        // printf("Fehler beim Setzen! Matrix nicht initialisiert");
+        return;
+    }
     
+    if(rowIdx >= matrix.rows || colIdx >= matrix.cols)
+    {
+        // printf("Ungueltige Indizes beim Setzen!\n");
+        return;
+    }
+    // printf("hier1\n");
+    matrix.buffer[rowIdx * matrix.cols + colIdx] = value;
+    // printf("hier2\n");
 }
 
 MatrixType getMatrixAt(const Matrix matrix, unsigned int rowIdx, unsigned int colIdx)
 {
+    if(matrix.buffer == NULL)
+    {
+        //printf("Fehler beim Lesen! Matrix nicht initialisiert");
+        return 0;
+    }
 
+    if(rowIdx >= matrix.rows || colIdx >= matrix.cols)
+    {
+        //printf("Ungueltige Indizes beim Lesen!\n");
+        return 0;
+    }
+
+    return matrix.buffer[rowIdx * matrix.cols + colIdx];
 }
 
 Matrix add(const Matrix matrix1, const Matrix matrix2)
 {
+    float matrix1Wert = 0;
+    float matrix2Wert = 0;
+    float summe = 0;
+    int broadcasting = 0;
 
+    Matrix broadcastedmatrix1 = {0,0,NULL};
+    Matrix broadcastedmatrix2 = {0,0,NULL};
+
+    if((matrix1.rows != matrix2.rows) || (matrix1.cols != matrix2.cols))
+    {
+        if((matrix1.rows != matrix2.rows) && (matrix1.cols == matrix2.cols))
+        {
+            if(matrix1.rows == 1)
+            {
+                broadcastedmatrix1 = createMatrix(matrix2.rows, matrix2.cols);
+
+                for(int row = 0; row<matrix2.rows; row++)
+                {
+                    for(int col = 0; col<matrix2.cols; col++)
+                    {
+                        matrix1Wert = getMatrixAt(matrix1, 0, col);
+                        setMatrixAt(matrix1Wert, broadcastedmatrix1, row, col);
+                    }
+                }
+
+                broadcasting = 1;
+            }
+            else if(matrix2.rows == 1)
+            {
+                broadcastedmatrix2 = createMatrix(matrix1.rows, matrix1.cols);
+                
+                for(int row = 0; row<matrix1.rows; row++)
+                {
+                    for(int col = 0; col<matrix1.cols; col++)
+                    {
+                        matrix2Wert = getMatrixAt(matrix2, 0, col);
+                        setMatrixAt(matrix2Wert, broadcastedmatrix2, row, col);
+                    }
+                }
+
+                broadcasting = 2;
+            }
+        }
+        else if((matrix1.rows == matrix2.rows) && (matrix1.cols != matrix2.cols))
+        {
+            if(matrix1.cols == 1)
+            {
+                broadcastedmatrix1 = createMatrix(matrix2.rows, matrix2.cols);
+
+                for(int row = 0; row<matrix2.rows; row++)
+                {
+                    for(int col = 0; col<matrix2.cols; col++)
+                    {
+                        matrix1Wert = getMatrixAt(matrix1, row, 0);
+                        setMatrixAt(matrix1Wert, broadcastedmatrix1, row, col);
+                    }
+                }
+
+                broadcasting = 1;
+            }
+            else if(matrix2.cols == 1)
+            {
+                broadcastedmatrix2 = createMatrix(matrix1.rows, matrix1.cols);
+
+                for(int row = 0; row<matrix1.rows; row++)
+                {
+                    for(int col = 0; col<matrix1.cols; col++)
+                    {
+                        matrix2Wert = getMatrixAt(matrix2, row, 0);
+                        setMatrixAt(matrix2Wert, broadcastedmatrix2, row, col);
+                    }
+                }
+
+                broadcasting = 2;
+            }
+        }
+        else
+        {
+        //printf("Fehler bei Addition: Matrix Dimensionen stimmen nicht ueberein!\n");
+        Matrix empty = {0, 0, NULL};
+        return empty;
+        }
+    }
+
+    Matrix ergebnisMatrix;
+
+    switch (broadcasting)
+    {
+        case 0:
+        case 2:
+            ergebnisMatrix = createMatrix(matrix1.rows, matrix1.cols);
+        break;
+
+        case 1:
+            ergebnisMatrix = createMatrix(matrix2.rows, matrix2.cols);
+        break;
+    }
+
+    for(int row = 0; row < ergebnisMatrix.rows; row++)
+    {
+        for(int col = 0; col < ergebnisMatrix.cols; col++)
+        {
+            if(broadcasting == 0)
+            {
+                matrix1Wert = getMatrixAt(matrix1, row, col);
+                matrix2Wert = getMatrixAt(matrix2, row, col);
+                summe = matrix1Wert + matrix2Wert;
+            }
+            else if(broadcasting == 1)
+            {
+                matrix1Wert = getMatrixAt(broadcastedmatrix1, row, col);
+                matrix2Wert = getMatrixAt(matrix2, row, col);
+                summe = matrix1Wert + matrix2Wert;
+            }
+            else if(broadcasting == 2)
+            {
+                matrix1Wert = getMatrixAt(matrix1, row, col);
+                matrix2Wert = getMatrixAt(broadcastedmatrix2, row, col);
+                summe = matrix1Wert + matrix2Wert;
+            }
+
+            setMatrixAt(summe, ergebnisMatrix, row, col);
+        }
+    }
+
+    clearMatrix(&broadcastedmatrix1);
+    clearMatrix(&broadcastedmatrix2);
+
+    return ergebnisMatrix;
 }
 
 Matrix multiply(const Matrix matrix1, const Matrix matrix2)
 {
+    if(matrix1.cols != matrix2.rows)
+    {
+        //printf("Fehler bei Multiplikation: Matrix Dimensionen passen nicht ueberein!\n");
+        Matrix empty = {0, 0, NULL};
+        return empty;
+    }
 
+    float erg = 0;
+
+    Matrix ergebnisMatrix = createMatrix(matrix1.rows, matrix2.cols);
+
+    for(int row = 0; row < ergebnisMatrix.rows; row++)
+    {
+        for(int col = 0; col < ergebnisMatrix.cols; col++)
+        {
+            erg = 0;
+
+            for(int k = 0; k < matrix1.cols; k++)
+            {
+                erg += getMatrixAt(matrix1, row, k) * getMatrixAt(matrix2, k, col);
+            }
+
+            setMatrixAt(erg, ergebnisMatrix, row, col);
+        }
+    }
+
+    return ergebnisMatrix;
 }

matrix.h

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

matrixTests.c

@@ -164,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) {

neuralNetwork.c

@@ -170,7 +170,7 @@ NeuralNetwork loadModel(const char *path)
 
 static Matrix imageBatchToMatrixOfImageVectors(const GrayScaleImage images[], unsigned int count)
 {
-    Matrix matrix = {NULL, 0, 0};
+    Matrix matrix = {/*NULL,*/ 0, 0, NULL};
 
     if(count > 0 && images != NULL)
     {
@@ -182,6 +182,7 @@ static Matrix imageBatchToMatrixOfImageVectors(const GrayScaleImage images[], un
             {
                 for(int j = 0; j < images[i].width * images[i].height; j++)
                 {
+                    // printf("i %d, j %d \n", i,j);
                     setMatrixAt((MatrixType)images[i].buffer[j], matrix, j, i);
                 }
             }

neuralNetworkTests.c

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