pseudocode zum imageInput erstellt

imageInput.c

@@ -13,6 +13,43 @@ GrayScaleImageSeries *readImages(const char *path)
 {
     GrayScaleImageSeries *series = NULL;
 
+    FILE *readSource;
+    unsigned int sizeOfByteInBytes = 1;
+    unsigned int numberOfBytesToRead = 1;
+    readSource = fopen(path, "rb");
+    if (readSource = NULL)
+    {
+        //error datei nicht gefunden
+    }
+    
+    //  dateiaufbau:
+    
+    //      string __info2_image_file_format__
+    fread(/*pufferHier*/, /*Stringsize*/, 1, readSource);
+    //      INT - Anzahl der Bilder
+    fread(/*pufferHier*/, /*sizeOf(int)*/, 1, readSource);
+    //      INT - Breite eines Bildes (Pixel)
+    fread(/*pufferHier*/, /*sizeOf(int)*/, 1, readSource);
+    //      INT - Höhe eines Bildes (Pixel)
+    fread(/*pufferHier*/, /*sizeOf(int)*/, 1, readSource);
+    //  Bis hier alles nur einmal durchführen
+
+    //  AB HIER Schleife implementieren die für 
+    //  anzahl der Bytes Byte einließt
+    //      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)
+    //      BYTES - Je mit GraustufenInfo von 0-255 
+    //              bytezahl = breite_Pixel * höhe_Pixel
+    fread(/*pufferHier*/, sizeOfByteInBytes, numberOfBytesToRead, readSource);
+    //      INT - Label welche Zahl dargestellt ist (0-9)
+    //  AB HIER Schleifenende
+
+    //  folgendes nur einmal ausführen
+    fread(/*pufferHier*/, /*sizeOf(unsigned char)*/, 1, readSource);
+
+    //fclose(readSource);
     return series;
 }
 

matrix.c

@@ -6,122 +6,30 @@
 
 Matrix createMatrix(unsigned int rows, unsigned int cols)
 {
-    Matrix matrix;
     
-    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)
+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)
 {
-    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;
-
-    Matrix ergebnisMatrix = createMatrix(matrix1.rows, matrix1.cols);
-
-    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;
-
-            setMatrixAt(summe, &ergebnisMatrix, row, col);
-        }
-    }
-
-    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

@@ -71,32 +71,6 @@ void test_addFailsOnDifferentInputDimensions(void)
     TEST_ASSERT_EQUAL_UINT32(0, result.cols);
 }
 
-void test_addSupportsBroadcasting(void)
-{
-    MatrixType buffer1[] = {1, 2, 3, 4, 5, 6};
-    MatrixType buffer2[] = {7, 8};
-    Matrix matrix1 = {.rows=2, .cols=3, .buffer=buffer1};
-    Matrix matrix2 = {.rows=2, .cols=1, .buffer=buffer2};
-
-    Matrix result1 = add(matrix1, matrix2);
-    Matrix result2 = add(matrix2, matrix1);
-
-    float expectedResults[] = {8, 9, 10, 12, 13, 14};
-
-    TEST_ASSERT_EQUAL_UINT32(matrix1.rows, result1.rows);
-    TEST_ASSERT_EQUAL_UINT32(matrix1.cols, result1.cols);
-    TEST_ASSERT_EQUAL_UINT32(matrix1.rows, result2.rows);
-    TEST_ASSERT_EQUAL_UINT32(matrix1.cols, result2.cols);
-
-    TEST_ASSERT_EQUAL_INT(sizeof(expectedResults)/sizeof(expectedResults[0]), result1.rows * result1.cols);
-    TEST_ASSERT_EQUAL_FLOAT_ARRAY(expectedResults, result1.buffer, result1.cols * result1.rows);
-    TEST_ASSERT_EQUAL_INT(sizeof(expectedResults)/sizeof(expectedResults[0]), result2.rows * result2.cols);
-    TEST_ASSERT_EQUAL_FLOAT_ARRAY(expectedResults, result2.buffer, result2.cols * result2.rows);
-
-    free(result1.buffer);
-    free(result2.buffer);
-}
-
 void test_multiplyReturnsCorrectResults(void)
 {
     MatrixType buffer1[] = {1, 2, 3, 4, 5, 6};
@@ -164,7 +138,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) {
@@ -185,7 +159,6 @@ int main()
     RUN_TEST(test_clearMatrixSetsMembersToNull);
     RUN_TEST(test_addReturnsCorrectResult);
     RUN_TEST(test_addFailsOnDifferentInputDimensions);
-    RUN_TEST(test_addSupportsBroadcasting);
     RUN_TEST(test_multiplyReturnsCorrectResults);
     RUN_TEST(test_multiplyFailsOnWrongInputDimensions);
     RUN_TEST(test_getMatrixAtReturnsCorrectResult);

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)