created support-Function 'readStatusInfo'

imageInput.c

@@ -6,17 +6,101 @@
 #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
 
+
+int readStatusInfo(FILE **source, char *const headerString, int *const imageCount, int *const imageWidth, int *const imageHeight, int const amountToRead);
+
+
 // TODO Vervollständigen Sie die Funktion readImages unter Benutzung Ihrer Hilfsfunktionen
 GrayScaleImageSeries *readImages(const char *path)
 {
     GrayScaleImageSeries *series = NULL;
 
+    // selbst geschriebene Variablen
+    FILE                    *readSource;
+    int                     i                           = 0;
+    unsigned int            numberOfBytesToRead         = 0;
+    const unsigned int      amountOfStatusInfoToRead    = 1;
+    char                    headerString[sizeof("__info2_image_file_format__")];
+
+
+    readSource = fopen(path, "rb");
+
+    if (readSource != NULL)
+    {
+
+        numberOfBytesToRead = readStatusInfo(&readSource, headerString, &series->count, &series->images->width, &series->images->height, amountOfStatusInfoToRead);
+        
+        //  bufferspeicher anlegen der unsigned char pointer
+        //      mit anzahl der pixel als größe ist um dann 
+        //      grauwerte in diesen buffer zu schreiben
+        //      (grayscale pixeltype in grayscale image series)
+        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);
+            fread((series->labels + i),                                 sizeof(&(series->labels)),          amountOfStatusInfoToRead,   readSource);
+        }
+    }
+
+    fclose(readSource);
+    
+
     return series;
 }
 
 // TODO Vervollständigen Sie die Funktion clearSeries, welche eine Bildserie vollständig aus dem Speicher freigibt
 void clearSeries(GrayScaleImageSeries *series)
 {
+    int i = 0;
+
+
+    // Write NULL into all memory spaces
+    for (i = 0; i < ((series->count) * (series->images->width) * (series->images->height)); i++)
+    {
+        *(series->images->buffer + i * (series->images->width) * (series->images->height)) = '\0';
+    }
+    for (i = 0; i < (series->count); i++)
+    {
+        *(series->labels + i) = '\0';
+    }
+    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->images          = NULL;
+    series->labels          = NULL;
+    free(series);
+    series                  = NULL;
+
+}
+
+
+//  reads string, pictureCount, pictureWidth, pictureHight
+int readStatusInfo(FILE **source, char *const headerString, int *const imageCount, int *const imageWidth, int *const imageHeight, int const amountToRead)
+{
+    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);
+
+    return bytesToRead;
 }

matrix.c

@@ -6,122 +6,30 @@
 
 Matrix createMatrix(unsigned int rows, unsigned int cols)
 {
-    Matrix matrix;
     
-    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)
+void setMatrixAt(MatrixType value, Matrix matrix, unsigned int rowIdx, unsigned int colIdx)
 {
-    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;
-    }
-
-    matrix->buffer[rowIdx * matrix->cols + colIdx] = value;
 }
 
 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)
 {
-    if((matrix1.rows != matrix2.rows) || (matrix1.cols != matrix2.cols))
-    {
-        printf("Fehler bei Addition: Matrix Dimensionen passen nicht ueberein!\n");
-        Matrix empty = {0, 0, NULL};
-        return empty;
-    }
     
-    float matrix1Wert = 0;
-    float matrix2Wert = 0;
-    float summe = 0;
-
-    Matrix ergebnisMatrix = createMatrix(matrix1.rows, matrix1.cols);
-
-    for(int row = 0; row < ergebnisMatrix.rows; row++)
-    {
-        for(int col = 0; col < ergebnisMatrix.cols; col++)
-        {
-            matrix1Wert = getMatrixAt(matrix1, row, col);
-            matrix2Wert = getMatrixAt(matrix2, row, col);
-            summe = matrix1Wert + matrix2Wert;
-
-            setMatrixAt(summe, &ergebnisMatrix, row, col);
-        }
-    }
-
-    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,12 +6,7 @@
 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, sizeof(buffer)/sizeof(MatrixType));
+    TEST_ASSERT_EQUAL_FLOAT_ARRAY(expectedResults, matrixToTest.buffer, matrixToTest.cols * matrixToTest.rows);
 }
 
 void setUp(void) {

neuralNetworkTests.c

@@ -5,45 +5,10 @@
 #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)