Merge pull request 'matrixTests korrigiert.' (#4) from schroederen/info2Praktikum-NeuronalesNetz:main into main

Reviewed-on: freudenreichan/info2Praktikum-NeuronalesNetz#4

imageInput.c

@@ -8,127 +8,15 @@
 
 // TODO Implementieren Sie geeignete Hilfsfunktionen für das Lesen der Bildserie aus einer Datei
 
-static int read_header(FILE *file, unsigned short *count, unsigned short *width, unsigned short *height)
-{
-    size_t headerLEN = strlen(FILE_HEADER_STRING);
-    char buffer[BUFFER_SIZE];
-
-    if (headerLEN >= BUFFER_SIZE)
-    {
-        return 0;
-    }
-
-    if (fread(buffer, 1, headerLEN, file) != headerLEN)
-    {
-        return 0;
-    }
-
-    buffer[headerLEN] = '\0';
-
-    if (strcmp(buffer, FILE_HEADER_STRING) != 0)
-    {
-        return 0;
-    }
-
-    if (fread(count, sizeof(unsigned short), 1, file) != 1 || fread(width, sizeof(unsigned short), 1, file) != 1 ||
-        fread(height, sizeof(unsigned short), 1, file) != 1)
-    {
-        return 0;
-    }
-
-    return 1;
-}
-
-static int read_single_image(FILE *file, GrayScaleImage *image)
-{
-    unsigned int number_of_pixel = image->width * image->height;
-
-    if (fread(image->buffer, sizeof(GrayScalePixelType), number_of_pixel, file) != number_of_pixel) // fehler beim lesen
-    {
-        return 0;
-    }
-    return 1;
-}
-
 // TODO Vervollständigen Sie die Funktion readImages unter Benutzung Ihrer Hilfsfunktionen
 GrayScaleImageSeries *readImages(const char *path)
 {
-    FILE *file = fopen(path, "rb");
+    GrayScaleImageSeries *series = NULL;
-    if (!file)
-    {
-        return 0;
-    }
     
-    unsigned short count, width, height;
-
-    if (!read_header(file, &count, &width, &height))
-    {
-        fclose(file);
-        return 0;
-    }
-
-    GrayScaleImageSeries *series = malloc(sizeof(GrayScaleImageSeries));
-
-    if (!series)
-    {
-        fclose(file);
-        return 0;
-    }
-
-    series->count = count;
-    series->images = malloc(count * sizeof(GrayScaleImage));
-    series->labels = malloc(count * sizeof(unsigned char));
-
-    if (!series->images || !series->labels)
-    {
-        clearSeries(series);
-        fclose(file);
-        return 0;
-    }
-
-    for (int i = 0; i < count; i++)
-    {
-        series->images[i].width = width;
-        series->images[i].height = height;
-        series->images[i].buffer = malloc(width * height * sizeof(GrayScalePixelType));
-
-        if (!series->images[i].buffer)
-        {
-            clearSeries(series);
-            fclose(file);
-            return 0;
-        }
-
-        if (!read_single_image(file, &series->images[i]))
-        {
-            clearSeries(series);
-            fclose(file);
-            return 0;
-        }
-
-        if (fread(&series->labels[i], 1, 1, file) != 1)
-        {
-            clearSeries(series);
-            fclose(file);
-            return 0;
-        }
-    }
-
-    fclose(file);
     return series;
 }
 
 // TODO Vervollständigen Sie die Funktion clearSeries, welche eine Bildserie vollständig aus dem Speicher freigibt
 void clearSeries(GrayScaleImageSeries *series)
 {
-    if (series)
-    {
-        for (int i = 0; i < series->count; i++)
-        {
-            free(series->images[i].buffer);
-        }
-        free(series->images);
-        free(series->labels);
-        free(series);
-    }
 }

imageInputTests.c

@@ -5,6 +5,7 @@
 #include "unity.h"
 #include "imageInput.h"
 
+
 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");
@@ -12,33 +13,29 @@ static void prepareImageFile(const char *path, unsigned short int width, unsigne
     if(file != NULL)
     {
         const char *fileTag = "__info2_image_file_format__";
-        GrayScalePixelType *buffer = (GrayScalePixelType *)calloc(numberOfImages * width * height, sizeof(GrayScalePixelType));
+        GrayScalePixelType *zeroBuffer = (GrayScalePixelType *)calloc(numberOfImages * width * height, sizeof(GrayScalePixelType));
 
-        if (buffer != NULL)
+        if(zeroBuffer != NULL)
         {
-            for (int i = 0; i < width * height; i++)
+            fwrite(fileTag, sizeof(fileTag[0]), strlen(fileTag), file);
-            {    
-            buffer[i] = (GrayScalePixelType)i;                      // füllen des buffers mit Graustufen des Pixel für Test                              
-            }
-
-            fwrite(fileTag, 1, 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(buffer, sizeof(GrayScalePixelType), width * height, file);
+                fwrite(zeroBuffer, sizeof(GrayScalePixelType), width * height, file);
                 fwrite(&label, sizeof(unsigned char), 1, file);
             }
 
-            free(buffer);
+            free(zeroBuffer);
         }
 
         fclose(file);
     }
 }
 
+
 void test_readImagesReturnsCorrectNumberOfImages(void)
 {
     GrayScaleImageSeries *series = NULL;
@@ -95,8 +92,7 @@ void test_readImagesReturnsCorrectLabels(void)
     TEST_ASSERT_NOT_NULL(series);
     TEST_ASSERT_NOT_NULL(series->labels);
     TEST_ASSERT_EQUAL_UINT16(2, series->count);
-    for (int i = 0; i < 2; i++)
+    for (int i = 0; i < 2; i++) {
-    {
         TEST_ASSERT_EQUAL_UINT8(expectedLabel, series->labels[i]);
     }
     clearSeries(series);
@@ -123,36 +119,11 @@ void test_readImagesFailsOnWrongFileTag(void)
     remove(path);
 }
 
-// Test der Hilfsfunktionen
+void setUp(void) {
-
-void test_read_GrayScale_Pixel(void)
-{
-    GrayScaleImageSeries *series = NULL;
-    const char *path = "testFile.info2";
-
-    prepareImageFile(path, 8, 8, 1, 1);
-    series = readImages(path);
-
-    TEST_ASSERT_NOT_NULL(series);
-    TEST_ASSERT_NOT_NULL(series->images);
-    TEST_ASSERT_EQUAL_UINT16(1, series->count);
-
-    for (int i = 0; i < (8 * 8); i++)
-    {
-        TEST_ASSERT_EQUAL_UINT8((GrayScalePixelType)i, series->images->buffer[i]);
-    }
-
-    clearSeries(series);
-    remove(path);
-}
-
-void setUp(void)
-{
     // Falls notwendig, kann hier Vorbereitungsarbeit gemacht werden
 }
 
-void tearDown(void)
+void tearDown(void) {
-{
     // Hier kann Bereinigungsarbeit nach jedem Test durchgeführt werden
 }
 
@@ -167,7 +138,6 @@ int main()
     RUN_TEST(test_readImagesReturnsCorrectLabels);
     RUN_TEST(test_readImagesReturnsNullOnNotExistingPath);
     RUN_TEST(test_readImagesFailsOnWrongFileTag);
-    RUN_TEST(test_read_GrayScale_Pixel);
 
     return UNITY_END();
 }

matrix.c

@@ -1,178 +1,35 @@
 #include <stdlib.h>
 #include <string.h>
 #include "matrix.h"
-#include <stdio.h>
 
 // TODO Matrix-Funktionen implementieren
 
 Matrix createMatrix(unsigned int rows, unsigned int cols)
 {
-    Matrix matrix;
     
-    if (rows == 0 || cols == 0)
-    {
-        matrix.rows = 0;
-        matrix.cols = 0;
-        matrix.buffer = NULL;
-        return matrix;
-    }
-
-    matrix.rows = rows;
-    matrix.cols = cols;
-
-    matrix.buffer = (MatrixType *)malloc(rows * cols * sizeof(MatrixType));
-
-    if (matrix.buffer == NULL)
-    {
-
-        matrix.rows = 0;
-        matrix.cols = 0;
-
-        return matrix;
-    }
-
-    for (int i = 0; i < rows; i++)
-    {
-        for (int j = 0; j < cols; j++)
-        {
-            matrix.buffer[i * matrix.cols + j] = UNDEFINED_MATRIX_VALUE;
-        }
-    }
-    return matrix;
 }
 
 void clearMatrix(Matrix *matrix)
 {
-    if (matrix->buffer != NULL)
-    {
-        free(matrix->buffer);
-        matrix->buffer = NULL;
-    }
     
-    matrix->rows = 0;
-    matrix->cols = 0;
 }
 
 void setMatrixAt(MatrixType value, Matrix matrix, unsigned int rowIdx, unsigned int colIdx)
 {
-    if (rowIdx >= matrix.rows || colIdx >= matrix.cols)
-    {
-        fprintf(stderr, "Fehler: Ungültiger Index (%u, %u) bei Matrixgröße %u x %u\n", rowIdx, colIdx, matrix.rows, matrix.cols);
-        return; // abbruch falls fehler
-    }
     
-    matrix.buffer[rowIdx * matrix.cols + colIdx] = value;
 }
 
 MatrixType getMatrixAt(const Matrix matrix, unsigned int rowIdx, unsigned int colIdx)
 {
-    if (rowIdx >= matrix.rows || colIdx >= matrix.cols)
-    {
-        fprintf(stderr, "Fehler: Ungültiger Index (%u, %u) bei Matrixgröße %u x %u\n", rowIdx, colIdx, matrix.rows, matrix.cols);
-        return UNDEFINED_MATRIX_VALUE;
-    }
     
-    return matrix.buffer[rowIdx * matrix.cols + colIdx];
 }
 
 Matrix add(const Matrix matrix1, const Matrix matrix2)
 {
-    if (matrix1.rows == matrix2.rows && matrix1.cols == matrix2.cols) // gleiche Dimension
-    {
-        Matrix result = createMatrix(matrix1.rows, matrix1.cols);
     
-        if (result.buffer == NULL)
-        {
-            fprintf(stderr, "Fehler: Speicher konnte nicht reserviert werden!\n");
-            return result;
-        }
-
-        for (int i = 0; i < matrix1.rows; i++)
-        {
-            for (int j = 0; j < matrix1.cols; j++)
-            {
-                result.buffer[i * result.cols + j] = matrix1.buffer[i * matrix1.cols + j] + matrix2.buffer[i * matrix2.cols + j];
-            }
-        }
-        return result;
-    }
-        if (matrix1.rows == matrix2.rows && matrix2.cols == 1) // Matrix 2 hat eine Spalte
-        {
-            Matrix result = createMatrix(matrix1.rows, matrix1.cols);
-
-            if(result.buffer == NULL)
-            {
-                fprintf(stderr, "Fehler: Speicher konnte nicht reserviert werden!\n");
-                return result;
-            }
-            for (int i = 0; i < matrix1.rows; i++)
-            {
-                for (int j = 0; j < matrix1.cols; j++)
-                {
-                    result.buffer[i * result.cols + j] = matrix1.buffer[i * matrix1.cols + j] + matrix2.buffer[i];
-                }
-            }
-            return result;
-        }
-
-        if (matrix1.rows == matrix2.rows && matrix1.cols == 1) // Matrix 1 hat eine Spalte
-        {
-            Matrix result = createMatrix(matrix2.rows, matrix2.cols);
-
-            if(result.buffer == NULL)
-            {
-                fprintf(stderr, "Fehler: Speicher konnte nicht reserviert werden!\n");
-                return result;
-            }
-            for (int i = 0; i < matrix2.rows; i++)
-            {
-                for (int j = 0; j < matrix2.cols; j++)
-                {
-                    result.buffer[i * result.cols + j] = matrix1.buffer[i] + matrix2.buffer[i * matrix2.cols + j];
-                }
-            }
-            return result;
-        }
-    
-    // passt nicht
-    fprintf(stderr, "Fehler: Matrizen haben unterschiedliche Größen (%u x %u) und (%u x %u)\n",
-            matrix1.rows, matrix1.cols, matrix2.rows, matrix2.cols);
-
-    Matrix empty = {NULL, 0, 0};
-    return empty;
 }
 
 Matrix multiply(const Matrix matrix1, const Matrix matrix2)
 {
-    if (matrix1.cols != matrix2.rows)
-    {
-        fprintf(stderr, "Fehler: Matrizen der Dimension (%u x %u) und (%u x %u) koennen nicht multipliziert werden\n",
-                matrix1.rows, matrix1.cols, matrix2.rows, matrix2.cols);
     
-        Matrix empty = {NULL, 0, 0};
-        return empty;
-    }
-
-    Matrix result = createMatrix(matrix1.rows, matrix2.cols);
-
-    if (result.buffer == NULL)
-    {
-        fprintf(stderr, "Fehler: Speicher konnte nicht reserviert werden!\n");
-        return result;
-    }
-
-    for (int i = 0; i < matrix1.rows; i++)
-    {
-        for (int j = 0; j < matrix2.cols; j++)
-        {
-            MatrixType sum = 0.0;
-
-            for (int k = 0; k < matrix1.cols; k++)
-            {
-                sum += matrix1.buffer[i * matrix1.cols + k] * matrix2.buffer[k * matrix2.cols + j];
-            }
-            result.buffer[i * result.cols + j] = sum;
-        }
-    }
-    return result;
 }

matrix.h

@@ -7,13 +7,6 @@ typedef float MatrixType;
 
 // TODO Matrixtyp definieren
 
-typedef struct Matrix {
-    MatrixType *buffer;
-    unsigned int rows;
-    unsigned int cols;
-}   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) {

neuralNetworkTests.c

@@ -5,49 +5,10 @@
 #include "unity.h"
 #include "neuralNetwork.h"
 
+
 static void prepareNeuralNetworkFile(const char *path, const NeuralNetwork nn)
 {
-    FILE *f = fopen(path, "wb");
+    // TODO
-    if (!f) return;
-
-    const char *tag = "__info2_neural_network_file_format__";
-    fwrite(tag, 1, strlen(tag), f);
-
-    if (nn.numberOfLayers == 0) {
-        fclose(f);
-        return;
-    }                                                               // In localmodel Struktur Testdateu aufruf:
-                                                                    // Header --> Input Dim --> Output Dim
-                                                                    // i. Layer weights --> biases --> nächste Dim
-
-  
-    int input  = nn.layers[0].weights.cols;
-    int output = nn.layers[0].weights.rows;
-
-    fwrite(&input,  sizeof(int), 1, f);
-    fwrite(&output, sizeof(int), 1, f);
-
-    for (int i = 0; i < nn.numberOfLayers; i++)
-    {
-        const Layer *layer = &nn.layers[i];
-        int out = layer->weights.rows;
-        int in  = layer->weights.cols;
-
-        
-        fwrite(layer->weights.buffer, sizeof(MatrixType), out * in, f);
-
-        
-        fwrite(layer->biases.buffer, sizeof(MatrixType), out * 1, f);
-
-        
-        if (i + 1 < nn.numberOfLayers)
-        {
-            int nextOut = nn.layers[i + 1].weights.rows;
-            fwrite(&nextOut, sizeof(int), 1, f);
-        }
-    }
-
-    fclose(f);
 }
 
 void test_loadModelReturnsCorrectNumberOfLayers(void)
@@ -244,8 +205,8 @@ void test_predictReturnsCorrectLabels(void)
     Matrix biases1 = {.buffer=biasBuffer1, .rows=2, .cols=1};
     Matrix biases2 = {.buffer=biasBuffer2, .rows=3, .cols=1};
     Matrix biases3 = {.buffer=biasBuffer3, .rows=5, .cols=1};
-    Layer layers[] = {{.weights = weights1, .biases = biases1, .activation = someActivation},
+    Layer layers[] = {{.weights=weights1, .biases=biases1, .activation=someActivation}, \
-                      {.weights = weights2, .biases = biases2, .activation = someActivation},
+                      {.weights=weights2, .biases=biases2, .activation=someActivation}, \
                       {.weights=weights3, .biases=biases3, .activation=someActivation}};
     NeuralNetwork netUnderTest = {.layers=layers, .numberOfLayers=3};
     unsigned char *predictedLabels = predict(netUnderTest, inputImages, 2);
@@ -255,13 +216,11 @@ void test_predictReturnsCorrectLabels(void)
     free(predictedLabels);
 }
 
-void setUp(void)
+void setUp(void) {
-{
     // Falls notwendig, kann hier Vorbereitungsarbeit gemacht werden
 }
 
-void tearDown(void)
+void tearDown(void) {
-{
     // Hier kann Bereinigungsarbeit nach jedem Test durchgeführt werden
 }