imageInput.c

@@ -6,153 +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              = sizeof(unsigned short);
-    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            (amountOfStatusInfoToRead, sizeof(GrayScaleImageSeries));
-        series->images      = calloc            (amountOfStatusInfoToRead, sizeof(GrayScaleImage));
-
-        numberOfBytesToRead = readStatusInfo    (readSource, series, headerString, sizeOfStausInfoElementsInBytes, amountOfStatusInfoToRead);
-        expectedHeader      = checkHeaderString (headerString);
-
-        series->images      = realloc           (series->images,    series->count * sizeof(GrayScaleImage));
-        series->labels      = calloc            (series->count,     sizeof(&(series->labels)));
-        
-        if (expectedHeader)
-        {
-            for (int i = 0; i < series->count; i++)
-            {
-                series->images[i].buffer    = calloc(numberOfBytesToRead, sizeof(unsigned char));
-            }
-            
-            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
-        {
-            fclose(readSource);
-            return 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;
-    int j = 0;
-
-
-    for (i = 0; i < series->count; i++)
-    {
-        if (i >= 0)
-        {
-            for (j = 0; j < series->images[i].width * series->images[i].height; j++)
-            {
-                series->images[i].buffer[j] = 0;
-            }
-        }
-        
-        series->labels[i]           = 0;
-        series->images[i].width     = 0;
-        series->images[i].height    = 0;  
-    }
-    
-    for (i = 0; i < series->count; i++)
-    {
-        free(series->images[i].buffer);
-        series->images[i].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 amountToRead)
-{
-    int i           = 0;
-
-
-    for (i = 0; i < series->count ; i++)
-    {       
-        fread(&series->images[i].buffer[0], sizeof(*series->images->buffer), amountToRead,              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);
     }
 }

main.c

@@ -23,7 +23,7 @@ int main(int argc, char *argv[])
             printf("Loaded %u images ... \n", series->count);
 
             model = loadModel(pathToModel);
-            
+
             if(model.numberOfLayers > 0)
             {
                 unsigned char *predictions = NULL;

makefile

@@ -18,8 +18,8 @@ unityfolder = ./unity
 # --------------------------
 # Initiales Programm bauen (zum ausprobieren)
 # --------------------------
-#mnist_initial: $(BINARIES)/libmnist_complete.a
+mnist_initial: $(BINARIES)/libmnist_complete.a
-#	$(CC) -o mnist $(BINARIES)/libmnist_complete.a $(BINARIES)/libraylib.a ${LDFLAGS}
+	$(CC) -o mnist $(BINARIES)/libmnist_complete.a $(BINARIES)/libraylib.a ${LDFLAGS}
 
 # --------------------------
 # Selbst implementiertes Programm bauen

matrix.c

@@ -1,6 +1,5 @@
 #include <stdlib.h>
 #include <string.h>
-#include <stdio.h>
 #include "matrix.h"
 
 // TODO Matrix-Funktionen implementieren
@@ -8,13 +7,6 @@
 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;
@@ -22,7 +14,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;
     }
@@ -32,43 +24,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)
 {
-    // printf("hier0\n");
+    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;
     }
-    // printf("hier1\n");
+
-    matrix.buffer[rowIdx * matrix.cols + colIdx] = value;
+    matrix->buffer[rowIdx * matrix->cols + colIdx] = value;
-    // printf("hier2\n");
 }
 
 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;
     }
 
@@ -77,134 +67,31 @@ 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 broadcastedmatrix1 = {0,0,NULL};
+    Matrix ergebnisMatrix = createMatrix(matrix1.rows, matrix1.cols);
-    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++)
         {
-            if(broadcasting == 0)
+            matrix1Wert = getMatrixAt(matrix1, row, col);
-            {
+            matrix2Wert = getMatrixAt(matrix2, row, col);
-                matrix1Wert = getMatrixAt(matrix1, row, col);
+            summe = matrix1Wert + matrix2Wert;
-                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;
 }
 
@@ -212,7 +99,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;
     }
@@ -232,7 +119,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);
         }
     }
 

neuralNetwork.c

@@ -170,19 +170,18 @@ NeuralNetwork loadModel(const char *path)
 
 static Matrix imageBatchToMatrixOfImageVectors(const GrayScaleImage images[], unsigned int count)
 {
-    Matrix matrix = {/*NULL,*/ 0, 0, NULL};
+    Matrix matrix = {NULL, 0, 0};
 
     if(count > 0 && images != NULL)
     {
         matrix = createMatrix(images[0].height * images[0].width, count);
 
         if(matrix.buffer != NULL)
-        {   
+        {
             for(int i = 0; i < count; i++)
             {
                 for(int j = 0; j < images[i].width * images[i].height; j++)
                 {
-                    // printf("i %d, j %d \n", i,j);
                     setMatrixAt((MatrixType)images[i].buffer[j], matrix, j, i);
                 }
             }
@@ -249,7 +248,7 @@ unsigned char *predict(const NeuralNetwork model, const GrayScaleImage images[],
     Matrix outputBatch = forward(model, inputBatch);
 
     unsigned char *result = argmax(outputBatch);
-
+    
     clearMatrix(&outputBatch);
     
     return result;