imageInput now passes tests but still needs to be cleaned up

imageInput.c

@@ -6,12 +6,102 @@
 #define BUFFER_SIZE 100
 #define FILE_HEADER_STRING "__info2_image_file_format__"
 
+
+// Tests passed
+//      Rethink logic
+//      Cleanup Programm
+//      merge with others to test in entirity
+
+
+
+
+
+// Funktionen müssen noch auf Teilfunktionen 
+// übersichtlich aufgeteilt werden!
+
 // TODO Implementieren Sie geeignete Hilfsfunktionen für das Lesen der Bildserie aus einer Datei
+//void setupMemory();
+unsigned int readStatusInfo(FILE *source, char *const headerString, unsigned int *const imageCount, unsigned int *const imageWidth, unsigned int *const imageHeight, int const amountToRead);
+void readImagedata(FILE *source, GrayScaleImageSeries *series, int const amountToRead);
+unsigned int checkHeaderString(char header[]);
+
 
 // TODO Vervollständigen Sie die Funktion readImages unter Benutzung Ihrer Hilfsfunktionen
 GrayScaleImageSeries *readImages(const char *path)
 {
     GrayScaleImageSeries *series = NULL;
+
+    // selbst geschriebene Variablen
+    FILE                    *readSource;
+    unsigned int            numberOfBytesToRead         = 0;
+    const unsigned int      amountOfStatusInfoToRead    = 1;
+    unsigned int            expectedHeader              = 0;
+    char                    headerString[sizeof(FILE_HEADER_STRING)] = "";
+
+    /*
+    char curChar = 0;
+    int i = 0;
+    */
+    
+    readSource = fopen(path, "rb");
+    
+    if (readSource != NULL)
+    {
+        /*
+            // print entire source char by char
+            do
+            {
+                curChar = fgetc(readSource);
+                printf("%x ", curChar);
+                if (i >= 9)
+                {
+                    printf("\n");
+                    i = 0;
+                }
+                i++;
+            } while (curChar != EOF);
+        */
+
+        series                  = calloc(sizeof(unsigned int) + 3* sizeof(headerString),  amountOfStatusInfoToRead);
+        series->images          = calloc(2*sizeof(unsigned int) + sizeof(headerString),  amountOfStatusInfoToRead);
+        
+        numberOfBytesToRead     = readStatusInfo(readSource, headerString, &(series->count), &(series->images->width), &(series->images->height), amountOfStatusInfoToRead);
+        
+        expectedHeader          = checkHeaderString(headerString);
+
+        series->images->buffer  = calloc((series->count) * numberOfBytesToRead, sizeof(GrayScalePixelType));
+        series->labels          = calloc((series->count),                       sizeof(&(series->labels)));
+
+        if (expectedHeader)
+        {
+            //  reallocate memory so that each image width can be
+            //  saved seperately ???
+            series->images      = realloc(series->images, series->count * 2 * sizeof(unsigned int) + sizeof(headerString));
+            
+            for (int i = 0; i < series->count; i++)
+            {
+                series->images[i].width     = series->images->width;
+                series->images[i].height    = series->images->height;
+            }
+            
+            
+            // printf("%d\n", series->images[0].width);
+            // series->images[1].width is not being set
+            // implement setting several amoundt of status info
+            // for when several images are bing read
+            // also adjust amoung of memory allocated for 
+            // staus info based on the number of images to be read
+            // printf("%d\n", series->images[1].width);
+            readImagedata(readSource, series, numberOfBytesToRead);
+        }
+        else
+        {
+            fclose(readSource);
+            return NULL;
+        }
+        
+        fclose(readSource);
+    }
     
     return series;
 }
@@ -19,4 +109,115 @@ GrayScaleImageSeries *readImages(const char *path)
 // TODO Vervollständigen Sie die Funktion clearSeries, welche eine Bildserie vollständig aus dem Speicher freigibt
 void clearSeries(GrayScaleImageSeries *series)
 {
+    int i = 0;
+
+    /*
+    printf("count: %d ", series->count);
+    printf("width: %d ", series->images->width);
+    printf("height: %d ", series->images->height);
+    printf("sum: %d ", ((series->count) * (series->images->width) * (series->images->height)));
+    printf("sum in int: %d\n",((series->count) * (series->images->width) * (series->images->height)/4));
+    */
+    
+    // Write NULL into all memory spaces
+    for (i = 0; i < ((series->count) * (series->images->width) * (series->images->height) / 4); i++)
+    {   
+        *(series->images->buffer + i * 4 * (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);
+    series->images->buffer  = NULL;
+    free(series->labels);
+    series->labels          = NULL;
+    free(series->images);
+    series->images          = NULL;
+    free(series);
+    series                  = NULL;
+
 }
+
+
+//  reads string, pictureCount, pictureWidth, pictureHight
+unsigned int readStatusInfo(FILE *source, char *const headerString, unsigned int *const imageCount, unsigned int *const imageWidth, unsigned int *const imageHeight, int const amountToRead)
+{
+    unsigned int bytesToRead = 0;
+    
+    /*
+    int numred = 0;
+    int numred2 = 0;
+    int numred3 = 0;
+    int numred4 = 0;
+    */
+
+    //unsigned int imageCountBuffer = 0;
+    /*numred =*/ fread(headerString, 27,  1, source);
+    /*numred2 =*/ fread(imageCount,   2,      1, source);
+    /*numred3 =*/ fread(imageWidth,   2,     1, source);
+    /*numred4 =*/ fread(imageHeight,  2,    1, source);
+
+    bytesToRead = (*imageWidth) * (*imageHeight);
+    /*
+    printf("numred: %d\n", numred);
+    printf("stringsize: %lld\n", sizeof("__info2_image_file_format__"));
+    printf("string: %send\n", headerString);
+    printf("numred2: %d\n", numred2);
+    printf("count: %u\n", *imageCount);
+    printf("numred3: %d\n", numred3);
+    printf("width: %u\n", *imageWidth);
+    printf("numred4: %d\n", numred4);
+    printf("height %u\n", *imageHeight);
+    printf("bytes to read = %u\n", bytesToRead);
+    */
+    return bytesToRead;
+}
+
+//  reads the imagebytes and the label of all images
+void readImagedata(FILE *source, GrayScaleImageSeries *series,  int const amountOfBytes)
+{
+    int i = 0;
+
+    for (i = 0; i < series->count ; i++)
+    {
+        fread(&(series->images->buffer[i]), 1, amountOfBytes,  source);
+        fread(&(series->labels[i]),         2, 1,              source);
+    }
+
+    // No lable in images after the first one,
+    // so expectation is that they must all be set
+    // to the same lable
+    for (int i = 0; i < series->count; i++)
+    {
+        series->labels[i] = *series->labels;
+    }
+
+}
+
+unsigned int checkHeaderString(char 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

@@ -9,19 +9,18 @@
 static void prepareImageFile(const char *path, unsigned short int width, unsigned short int height, unsigned int short numberOfImages, unsigned char label)
 {
     FILE *file = fopen(path, "wb");
-
+    
     if(file != NULL)
     {
         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);
             fwrite(&numberOfImages, sizeof(numberOfImages), 1, file);
             fwrite(&width, sizeof(width), 1, file);
             fwrite(&height, sizeof(height), 1, file);
-
+            
             for(int i = 0; i < numberOfImages; i++)
             {
                 fwrite(zeroBuffer, sizeof(GrayScalePixelType), width * height, file);
@@ -30,7 +29,7 @@ static void prepareImageFile(const char *path, unsigned short int width, unsigne
 
             free(zeroBuffer);
         }
-
+        
         fclose(file);
     }
 }

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

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)