added comment in imageInput.c

imageInput.c

@@ -6,17 +6,91 @@
 #define BUFFER_SIZE 100
 #define FILE_HEADER_STRING "__info2_image_file_format__"
 
+// Funktionen müssen noch auf Teilfunktionen 
+// übersichtlich aufgeteilt werden!
+
 // TODO Implementieren Sie geeignete Hilfsfunktionen für das Lesen der Bildserie aus einer Datei
 
 // TODO Vervollständigen Sie die Funktion readImages unter Benutzung Ihrer Hilfsfunktionen
 GrayScaleImageSeries *readImages(const char *path)
 {
     GrayScaleImageSeries *series = NULL;
+
+    // selbst geschriebene Variablen
+    FILE            *readSource;
+    int             i                           = 0;
+    unsigned int    numberOfBytesToRead         = 0;
+    unsigned int    amountOfStatusInfoToRead    = 1;
+    char headerString[sizeof("__info2_image_file_format__")];
+
+
+    readSource = fopen(path, "rb");
+    if (readSource != NULL)
+    {
+
+        //  dateiaufbau:
     
+        //      string __info2_image_file_format__
+        fread(headerString,                 sizeof(headerString),           amountOfStatusInfoToRead, readSource);
+        //      INT - Anzahl der Bilder
+        fread(&(series->count),             sizeof(series->count),          amountOfStatusInfoToRead, readSource);
+        //      INT - Breite eines Bildes (Pixel)
+        fread(&(series->images->width),     sizeof(series->images->width),  amountOfStatusInfoToRead, readSource);
+        //      INT - Höhe eines Bildes (Pixel)
+        fread(&(series->images->height),    sizeof(series->images->height), amountOfStatusInfoToRead, readSource);
+        //  Bis hier alles nur einmal durchführen
+
+        numberOfBytesToRead = (series->images->width) * (series->images->height);
+        //  bufferspeicher anlegen der unsigned char pointer
+        //      mit anzahl der pixel als größe ist um dann 
+        //      grauwerte in diesen buffer zu schreiben
+        //      (grayscale pixeltype in grayscale image series)
+        series->images->buffer  = calloc((series->count) * numberOfBytesToRead, sizeof(GrayScalePixelType));
+        //  zusätzlich auch speicher anlegen der für die labels da ist
+        series->labels          = calloc((series->count),                       sizeof(&(series->labels)));
+        //  AB HIER Schleife die für 
+        //  anzahl der Bilder je die Bytes und das Label einließt
+        for (i = 0; i <= (series->count); i++)
+        {
+            fread((series->images->buffer + i * numberOfBytesToRead),   sizeof(&(series->images->buffer)),  numberOfBytesToRead,        readSource);
+            fread((series->labels + i),                                 sizeof(&(series->labels)),          amountOfStatusInfoToRead,   readSource);
+        }
+    }
+
+    fclose(readSource);
+    
+
     return series;
 }
 
 // TODO Vervollständigen Sie die Funktion clearSeries, welche eine Bildserie vollständig aus dem Speicher freigibt
 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)); i++)
+    {
+        *(series->images->buffer + i * (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);
+    free(series->labels);
+    series->images->buffer  = NULL;
+    series->images          = NULL;
+    series->labels          = NULL;
+    free(series);
+    series                  = NULL;
+
 }

matrix.c

@@ -1,238 +1,35 @@
 #include <stdlib.h>
 #include <string.h>
-#include <stdio.h>
 #include "matrix.h"
 
 // TODO Matrix-Funktionen implementieren
 
 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;
-    matrix.buffer = malloc(rows * cols * sizeof(float));
-
-    if(matrix.buffer == NULL)
-    {
-        //printf("Fehler bei der Speicherreservierung! Keine Matrix erstellt!");
-        matrix.rows = 0;
-        matrix.cols = 0;
-    }
-
-    return matrix;
+    
 }
 
 void clearMatrix(Matrix *matrix)
 {
-    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(matrix.buffer == NULL)
-    {
-        //printf("Fehler beim Setzen! Matrix nicht initialisiert");
-        return;
-    }
-
-    if(rowIdx >= matrix.rows || colIdx >= matrix.cols)
-    {
-        //printf("Ungueltige Indizes beim Setzen!\n");
-        return;
-    }
-
-    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");
-        return 0;
-    }
-
-    if(rowIdx >= matrix.rows || colIdx >= matrix.cols)
-    {
-        //printf("Ungueltige Indizes beim Lesen!\n");
-        return 0;
-    }
-
-    return matrix.buffer[rowIdx * matrix.cols + colIdx];
+    
 }
 
 Matrix add(const Matrix matrix1, const Matrix matrix2)
 {
-    float matrix1Wert = 0;
-    float matrix2Wert = 0;
-    float summe = 0;
-    int broadcasting = 0;
-
-    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++)
-        {
-            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);
-        }
-    }
-
-    clearMatrix(&broadcastedmatrix1);
-    clearMatrix(&broadcastedmatrix2);
-
-    return ergebnisMatrix;
+    
 }
 
 Matrix multiply(const Matrix matrix1, const Matrix matrix2)
 {
-    if(matrix1.cols != matrix2.rows)
-    {
-        //printf("Fehler bei Multiplikation: Matrix Dimensionen passen nicht ueberein!\n");
-        Matrix empty = {0, 0, NULL};
-        return empty;
-    }
-
-    float erg = 0;
-
-    Matrix ergebnisMatrix = createMatrix(matrix1.rows, matrix2.cols);
-
-    for(int row = 0; row < ergebnisMatrix.rows; row++)
-    {
-        for(int col = 0; col < ergebnisMatrix.cols; col++)
-        {
-            erg = 0;
-
-            for(int k = 0; k < matrix1.cols; k++)
-            {
-                erg += getMatrixAt(matrix1, row, k) * getMatrixAt(matrix2, k, col);
-            }
-
-            setMatrixAt(erg, ergebnisMatrix, row, col);
-        }
-    }
-
-    return ergebnisMatrix;
-}
+    
+}

matrix.h

@@ -6,12 +6,7 @@
 typedef float MatrixType;
 
 // TODO Matrixtyp definieren
-typedef struct
-{
-    int rows;
-    int cols;
-    float *buffer;
-} 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, sizeof(buffer)/sizeof(MatrixType));
+    TEST_ASSERT_EQUAL_FLOAT_ARRAY(expectedResults, matrixToTest.buffer, matrixToTest.cols * matrixToTest.rows);
 }
 
 void setUp(void) {