corrected else case in imageInput.c line 56

imageInput.c

@@ -16,33 +16,34 @@ 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      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(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              = calloc            (amountOfStatusInfoToRead, sizeof(GrayScaleImageSeries));
+        series->images      = calloc            (amountOfStatusInfoToRead, sizeof(GrayScaleImage));
 
-        series->images->buffer  = calloc((series->count) * numberOfBytesToRead, sizeof(GrayScalePixelType));
-        series->labels          = calloc((series->count),                       sizeof(&(series->labels)));
+        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)
         {
-            // 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].buffer    = calloc(numberOfBytesToRead, sizeof(unsigned char));
+            }
             
             for (int i = 0; i < series->count; i++)
             {
@@ -54,12 +55,14 @@ GrayScaleImageSeries *readImages(const char *path)
         }
         else
         {
-            series = NULL;
+            fclose(readSource);
+            return NULL;
         }
         
         fclose(readSource);
     }
     
+    
     return series;
 }
 
@@ -68,35 +71,36 @@ GrayScaleImageSeries *readImages(const char *path)
 void clearSeries(GrayScaleImageSeries * series)
 {
     int i = 0;
+    int j = 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++)
+
+    for (i = 0; i < series->count; i++)
     {
-        *(series->labels + i) = '\0';
+        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;
     }
     
-    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;
+    series->labels  = NULL;
     free(series->images);
-    series->images          = NULL;
+    series->images  = NULL;
     free(series);
-    series                  = NULL;
-
+    series          = NULL;
 }
 
 
@@ -119,15 +123,15 @@ unsigned int readStatusInfo(FILE *const source, GrayScaleImageSeries *const seri
 
 
 //  reads the imagebytes and the label of all images
-void readImagedata(FILE *const source, GrayScaleImageSeries *const series,  int const amountOfBytes)
+void readImagedata(FILE *const source, GrayScaleImageSeries *const series, int const amountToRead)
 {
-    int i = 0;
+    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);
+    {       
+        fread(&series->images[i].buffer[0], sizeof(*series->images->buffer), amountToRead,              source);
+        fread(&series->labels[i],           sizeof(*series->images->buffer), sizeof(*series->labels),   source);
     }
 }
 

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
-	$(CC) -o mnist $(BINARIES)/libmnist_complete.a $(BINARIES)/libraylib.a ${LDFLAGS}
+#mnist_initial: $(BINARIES)/libmnist_complete.a
+#	$(CC) -o mnist $(BINARIES)/libmnist_complete.a $(BINARIES)/libraylib.a ${LDFLAGS}
 
 # --------------------------
 # Selbst implementiertes Programm bauen

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,43 @@ 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)
+    // printf("hier0\n");
+    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;
+    // printf("hier1\n");
+    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;
     }
 
@@ -67,31 +77,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);
-            matrix2Wert = getMatrixAt(matrix2, row, col);
-            summe = matrix1Wert + matrix2Wert;
+            if(broadcasting == 0)
+            {
+                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 +212,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 +232,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,18 +170,19 @@ NeuralNetwork loadModel(const char *path)
 
 static Matrix imageBatchToMatrixOfImageVectors(const GrayScaleImage images[], unsigned int count)
 {
-    Matrix matrix = {NULL, 0, 0};
+    Matrix matrix = {/*NULL,*/ 0, 0, NULL};
 
     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);
                 }
             }
@@ -248,7 +249,7 @@ unsigned char *predict(const NeuralNetwork model, const GrayScaleImage images[],
     Matrix outputBatch = forward(model, inputBatch);
 
     unsigned char *result = argmax(outputBatch);
-    
+
     clearMatrix(&outputBatch);
     
     return result;