adapt matrix struct to existing tests

.gitignore

@@ -3,6 +3,3 @@ runTests
 *.o
 *.exe
 runMatrixTests
-runImageInputTests
-runNeuralNetworkTests
-.vscode

imageInput.c

@@ -6,156 +6,107 @@
 #define BUFFER_SIZE 100
 #define FILE_HEADER_STRING "__info2_image_file_format__"
 
-typedef enum
+//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) {
-    IMG_SUCCESS = 0,
+    FILE *file = fopen(path, "rb");
-    IMG_ERR_INVALID_HEADER, // Header did not match
+    if (!file) {
-    IMG_ERR_READ,           // Failed to read from file, maybe it's too short
+        return NULL;
-    IMG_ERR,                // General Error
+    }
-} ImageError;
+    size_t headerLength = strlen(FILE_HEADER_STRING);
-
+    char *header = malloc (headerLength + 1);
-static ImageError checkHeader(FILE *file);
+    if(!header) {
-static ImageError readPictureParams(unsigned short *number, unsigned short *width, unsigned short *height, FILE *file);
-static ImageError readImage(size_t numPixels, GrayScalePixelType *pixelBuffer, unsigned char *label, FILE *file);
-static ImageError parseImageFile(FILE *file, GrayScaleImageSeries *series);
-
-GrayScaleImageSeries *readImages(const char *path)
-{
-    GrayScaleImageSeries *series = calloc(1, sizeof(GrayScaleImageSeries));
-    if (series == NULL)
-    {
         return NULL;
     }
 
-    FILE *file = fopen(path, "rb");
+    if (fread(header, sizeof(char), headerLength, file) != headerLength) {
-    if (file == NULL)
+        free (header);
-    {
+        return NULL;
-        clearSeries(series);
-        series = NULL;
-        return NULL; // fopen failed
     }
 
-    if (parseImageFile(file, series))
+    header[headerLength] = '\0';
-    {
+
-        clearSeries(series);
+    if (strcmp (header, FILE_HEADER_STRING) != 0) {
-        series = NULL;
+        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)
+{
+    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;
 }
 
-static ImageError parseImageFile(FILE *file, GrayScaleImageSeries *series)
+//Bereinigt den Speicher
-{
-    if (checkHeader(file))
-    {
-        return IMG_ERR; // header check failed
-    }
-
-    unsigned short number, width, height;
-    if (readPictureParams(&number, &width, &height, file))
-    {
-        return IMG_ERR; // read failed
-    }
-    size_t pixels = width * height;
-
-    // now setup the image series
-    series->images = calloc(number, sizeof(GrayScaleImage));
-    if (series->images == NULL)
-    {
-        return IMG_ERR;
-    }
-
-    series->labels = malloc(number * sizeof(unsigned char));
-    if (series->labels == NULL)
-    {
-        return IMG_ERR;
-    }
-
-    series->count = number;
-    for (size_t imageIdx = 0; imageIdx < number; imageIdx++)
-    {
-        GrayScaleImage *curImage = &series->images[imageIdx];
-
-        curImage->buffer = malloc(sizeof(GrayScalePixelType) * pixels);
-        if (curImage->buffer == NULL)
-        {
-            return IMG_ERR;
-        }
-
-        curImage->width = width;
-        curImage->height = height;
-
-        if (readImage(pixels, curImage->buffer, &series->labels[imageIdx], file))
-        {
-            return IMG_ERR;
-        }
-    }
-    return IMG_SUCCESS;
-}
-
-static ImageError checkHeader(FILE *file)
-{
-    size_t len = strlen(FILE_HEADER_STRING);
-    char headerBuf[len + 1];
-    size_t charsRead = fread(headerBuf, 1, len, file);
-    if (charsRead < len)
-    {
-        return IMG_ERR_READ;
-    }
-    headerBuf[len] = '\0';
-    return strcmp(headerBuf, FILE_HEADER_STRING) == 0 ? IMG_SUCCESS : IMG_ERR_INVALID_HEADER;
-}
-
-static ImageError readPictureParams(unsigned short *number, unsigned short *width, unsigned short *height, FILE *file)
-{
-    if (1 != fread(number, sizeof(unsigned short), 1, file))
-    {
-        return IMG_ERR_READ;
-    }
-
-    if (1 != fread(width, sizeof(unsigned short), 1, file))
-    {
-        return IMG_ERR_READ;
-    }
-
-    if (1 != fread(height, sizeof(unsigned short), 1, file))
-    {
-        return IMG_ERR_READ;
-    }
-
-    return IMG_SUCCESS;
-}
-
-static ImageError readImage(size_t numPixels, GrayScalePixelType *pixelBuffer, unsigned char *label, FILE *file)
-{
-    if (numPixels > fread(pixelBuffer, sizeof(GrayScalePixelType), numPixels, file))
-    {
-        return IMG_ERR_READ;
-    }
-
-    if (1 != fread(label, sizeof(unsigned char), 1, file))
-    {
-        return IMG_ERR_READ;
-    }
-
-    return IMG_SUCCESS;
-}
-
-// frees memory for each image buffer, image, label and finally series
 void clearSeries(GrayScaleImageSeries *series)
 {
-    if (series)
+    for (unsigned int i = 0; i < series->count; i++) {
-    {
+        free(series->images[i].buffer);
-
-        int seriesLen = series->count;
-        for (size_t imageIdx = 0; imageIdx < seriesLen; imageIdx++)
-        {
-            free(series->images[imageIdx].buffer);
     }
 
     free(series->images);
     free(series->labels);
     free(series);
 }
-}

matrix.c

@@ -109,6 +109,7 @@ Matrix add(const Matrix matrix1, const Matrix matrix2)
     {
         for (size_t n = 0; n < matrix1.cols; n++)
         {
+            // this is unnecessarily complicated because at this point we already know that the matrices are compatible
             setMatrixAt(getMatrixAt(matrix1, m, n) + getMatrixAt(matrix2, m, n), resMat, m, n);
         }
     }
@@ -116,37 +117,32 @@ Matrix add(const Matrix matrix1, const Matrix matrix2)
     return resMat;
 }
 
-Matrix multiply(const Matrix A, const Matrix B)
+Matrix multiply(const Matrix matrix1, const Matrix matrix2)
 {
-    if (A.cols != B.rows || A.buffer == NULL || B.buffer == NULL)
+    if (matrix1.cols != matrix2.rows || matrix1.buffer == NULL || matrix2.buffer == NULL)
     {
         return createMatrix(0, 0);
     }
 
-    int rows = A.rows, cols = B.cols;
+    int rows = matrix1.rows, cols = matrix2.cols;
-    Matrix C = createMatrix(rows, cols);
+    Matrix resMat = createMatrix(rows, cols);
 
-    if (C.buffer == NULL)
+    if (resMat.buffer == NULL)
     {
         return createMatrix(0, 0);
     }
 
-    // M = Rows, K = Common Dim, N = Cols
+    for (size_t rowIdx = 0; rowIdx < rows; rowIdx++)
-    size_t M = A.rows, K = A.cols, N = B.cols;
-
-    for (size_t i = 0; i < M; i++)
     {
-        for (size_t k = 0; k < K; k++)
+        for (size_t colIdx = 0; colIdx < cols; colIdx++)
-
         {
-            MatrixType valA = A.buffer[i * K + k];
+            int curCellVal = 0;
-            for (size_t j = 0; j < N; j++)
+            for (size_t k = 0; k < matrix1.cols; k++)
             {
-                // C[i, j] += A[i, k] * B[k, j];
+                curCellVal += getMatrixAt(matrix1, rowIdx, k) * getMatrixAt(matrix2, k, colIdx);
-                // M x N,     M x K,    K x N
+            }
-                C.buffer[i * N + j] += valA * B.buffer[k * N + j];
+            setMatrixAt(curCellVal, resMat, rowIdx, colIdx);
         }
     }
-    }
+    return resMat;
-    return C;
 }

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

neuralNetworkTests.c

@@ -6,30 +6,9 @@
 #include "neuralNetwork.h"
 
 
-static void erzeugeMatrix(FILE *file, const Matrix *m)
-{
-    fwrite(&m->rows, sizeof(int), 1, file);
-    fwrite(&m->cols, sizeof(int), 1, file);
-    fwrite(m->buffer, sizeof(MatrixType), m->rows * m->cols, file);
-}
-
 static void prepareNeuralNetworkFile(const char *path, const NeuralNetwork nn)
 {
-    FILE *file = fopen(path, "wb");
+    // TODO
-    if (!file)
-        return;
-
-    const char *header = "__info2_neural_network_file_format__";
-    fwrite(header, sizeof(char), strlen(header), file);
-    fwrite(&nn.numberOfLayers, sizeof(int), 1, file);
-
-    for (int i = 0; i < nn.numberOfLayers; i++)
-    {
-        erzeugeMatrix(file, &nn.layers[i].weights);
-        erzeugeMatrix(file, &nn.layers[i].biases);
-    }
-
-    fclose(file);
 }
 
 void test_loadModelReturnsCorrectNumberOfLayers(void)

testFile.info2

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