Optisch leicht verbessert

imageInput.c

@@ -6,149 +6,17 @@
 #define BUFFER_SIZE 100
 #define FILE_HEADER_STRING "__info2_image_file_format__"
 
+// 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
+// TODO Vervollständigen Sie die Funktion readImages unter Benutzung Ihrer Hilfsfunktionen
-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);
-
-
-// DONE Vervollständigen Sie die Funktion readImages unter Benutzung Ihrer Hilfsfunktionen
 GrayScaleImageSeries *readImages(const char *path)
 {
-    GrayScaleImageSeries *series                                        = NULL;
+    GrayScaleImageSeries *series = NULL;
-    FILE                    *readSource                                 = 0;
-    const unsigned int      sizeOfStausInfoElementsInBytes              = 2;
-    const unsigned int      amountOfStatusInfoToRead                    = 1;
-    unsigned int            numberOfBytesToRead                         = 0;
-    unsigned int            expectedHeader                              = 0;
-    char                    headerString[sizeof(FILE_HEADER_STRING)]    = "";
-    
-    
-    readSource = fopen(path, "rb");
-    
-    if (readSource != NULL)
-    {
-        series                  = calloc(sizeof(unsigned int) + 3* sizeof(headerString),  amountOfStatusInfoToRead);
-        series->images          = calloc(2*sizeof(unsigned int) + sizeof(headerString),  amountOfStatusInfoToRead);
-        
-        numberOfBytesToRead     = readStatusInfo(readSource, series, headerString, sizeOfStausInfoElementsInBytes, 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;
-            }
-            
-            readImagedata(readSource, series, numberOfBytesToRead);
-        }
-        else
-        {
-            series = NULL;
-        }
-        
-        fclose(readSource);
-    }
     
     return series;
 }
 
-
+// TODO Vervollständigen Sie die Funktion clearSeries, welche eine Bildserie vollständig aus dem Speicher freigibt
-// DONE Vervollständigen Sie die Funktion clearSeries, welche eine Bildserie vollständig aus dem Speicher freigibt
+void clearSeries(GrayScaleImageSeries *series)
-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) / 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 headerString, pictureCount, pictureWidth, pictureHight
-unsigned int readStatusInfo(FILE *const source, GrayScaleImageSeries *const series, char *const headerString, int const sizeToRead, int const amountToRead)
-{
-    unsigned int bytesToRead = 0;
-
-
-    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 amountOfBytes)
-{
-    int i = 0;
-
-
-    for (i = 0; i < series->count ; i++)
-    {
-        fread(&(series->images->buffer[i]), sizeof(*series->images->buffer), amountOfBytes,             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

@@ -9,18 +9,19 @@
 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);
@@ -29,7 +30,7 @@ static void prepareImageFile(const char *path, unsigned short int width, unsigne
 
             free(zeroBuffer);
         }
-        
+
         fclose(file);
     }
 }

matrix.c

@@ -1,5 +1,6 @@
 #include <stdlib.h>
 #include <string.h>
+#include <stdio.h>
 #include "matrix.h"
 
 // TODO Matrix-Funktionen implementieren
@@ -7,6 +8,13 @@
 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;
@@ -14,7 +22,7 @@ Matrix createMatrix(unsigned int rows, unsigned int cols)
 
     if(matrix.buffer == NULL)
     {
-        printf("Fehler bei der Speicherreservierung! Keine Matrix erstellt!");
+        //printf("Fehler bei der Speicherreservierung! Keine Matrix erstellt!");
         matrix.rows = 0;
         matrix.cols = 0;
     }
@@ -24,41 +32,41 @@ Matrix createMatrix(unsigned int rows, unsigned int cols)
 
 void clearMatrix(Matrix *matrix)
 {
-    free(matrix.buffer);
+    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)
+    if(matrix.buffer == NULL)
     {
-        printf("Fehler beim Setzen! Matrix nicht initialisiert");
+        //printf("Fehler beim Setzen! Matrix nicht initialisiert");
         return;
     }
 
-    if(rowIdx >= matrix->rows || colIdx >= matrix->cols)
+    if(rowIdx >= matrix.rows || colIdx >= matrix.cols)
     {
-        printf("Ungueltige Indizes beim Setzen!\n");
+        //printf("Ungueltige Indizes beim Setzen!\n");
         return;
     }
 
-    matrix->buffer[rowIdx * matrix->cols + colIdx] = value;
+    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");
+        //printf("Fehler beim Lesen! Matrix nicht initialisiert");
         return 0;
     }
 
     if(rowIdx >= matrix.rows || colIdx >= matrix.cols)
     {
-        printf("Ungueltige Indizes beim Lesen!\n");
+        //printf("Ungueltige Indizes beim Lesen!\n");
         return 0;
     }
 
@@ -67,31 +75,134 @@ MatrixType getMatrixAt(const Matrix matrix, unsigned int rowIdx, unsigned int co
 
 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;
+    int broadcasting = 0;
 
-    Matrix ergebnisMatrix = createMatrix(matrix1.rows, matrix1.cols);
+    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++)
         {
-            matrix1Wert = getMatrixAt(matrix1, row, col);
+            if(broadcasting == 0)
-            matrix2Wert = getMatrixAt(matrix2, row, col);
+            {
-            summe = matrix1Wert + matrix2Wert;
+                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);
+            setMatrixAt(summe, ergebnisMatrix, row, col);
         }
     }
 
+    clearMatrix(&broadcastedmatrix1);
+    clearMatrix(&broadcastedmatrix2);
+
     return ergebnisMatrix;
 }
 
@@ -99,7 +210,7 @@ Matrix multiply(const Matrix matrix1, const Matrix matrix2)
 {
     if(matrix1.cols != matrix2.rows)
     {
-        printf("Fehler bei Multiplikation: Matrix Dimensionen passen nicht ueberein!\n");
+        //printf("Fehler bei Multiplikation: Matrix Dimensionen passen nicht ueberein!\n");
         Matrix empty = {0, 0, NULL};
         return empty;
     }
@@ -119,7 +230,7 @@ Matrix multiply(const Matrix matrix1, const Matrix matrix2)
                 erg += getMatrixAt(matrix1, row, k) * getMatrixAt(matrix2, k, col);
             }
 
-            setMatrixAt(erg, &ergebnisMatrix, row, col);
+            setMatrixAt(erg, ergebnisMatrix, row, col);
         }
     }
 

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)