updating

Reviewed-on: freudenreichan/info2Praktikum-NeuronalesNetz#4

.gitignore

@@ -1,4 +1,61 @@
-mnist
+# ---> C
-runTests
+# Prerequisites
+*.d
+
+# Object files
 *.o
-*.exe
+*.ko
+*.obj
+*.elf
+
+# Linker output
+*.ilk
+*.map
+*.exp
+
+# Precompiled Headers
+*.gch
+*.pch
+
+# Libraries
+*.lib
+*.la
+*.lo
+
+# Shared objects (inc. Windows DLLs)
+*.dll
+*.so
+*.so.*
+*.dylib
+
+# Executables
+*.exe
+*.out
+*.app
+*.i*86
+*.x86_64
+*.hex
+Startcode/mnist
+Startcode/runTests
+
+# Debug files
+*.dSYM/
+*.su
+*.idb
+*.pdb
+
+# Kernel Module Compile Results
+*.mod*
+*.cmd
+.tmp_versions/
+modules.order
+Module.symvers
+Mkfile.old
+dkms.conf
+
+# IDE folders
+.vscode/
+.idea/
+
+# macOS
+.DS_Store

Startcode/imageInput.c

@@ -0,0 +1,22 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "imageInput.h"
+
+#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
+
+// TODO Vervollständigen Sie die Funktion readImages unter Benutzung Ihrer Hilfsfunktionen
+GrayScaleImageSeries *readImages(const char *path)
+{
+    GrayScaleImageSeries *series = NULL;
+    
+    return series;
+}
+
+// TODO Vervollständigen Sie die Funktion clearSeries, welche eine Bildserie vollständig aus dem Speicher freigibt
+void clearSeries(GrayScaleImageSeries *series)
+{
+}

Startcode/imageInputTests.c

@@ -54,7 +54,7 @@ void test_readImagesReturnsCorrectImageWidth(void)
     GrayScaleImageSeries *series = NULL;
     const unsigned short expectedWidth = 10;
     const char *path = "testFile.info2";
-    prepareImageFile(path, 8, expectedWidth, 2, 1);
+    prepareImageFile(path, expectedWidth, 8, 2, 1);
     series = readImages(path);
     TEST_ASSERT_NOT_NULL(series);
     TEST_ASSERT_NOT_NULL(series->images);
@@ -70,7 +70,7 @@ void test_readImagesReturnsCorrectImageHeight(void)
     GrayScaleImageSeries *series = NULL;
     const unsigned short expectedHeight = 10;
     const char *path = "testFile.info2";
-    prepareImageFile(path, expectedHeight, 8, 2, 1);
+    prepareImageFile(path, 8, expectedHeight, 2, 1);
     series = readImages(path);
     TEST_ASSERT_NOT_NULL(series);
     TEST_ASSERT_NOT_NULL(series->images);

Startcode/matrix.c

@@ -0,0 +1,35 @@
+#include <stdlib.h>
+#include <string.h>
+#include "matrix.h"
+
+// TODO Matrix-Funktionen implementieren
+
+Matrix createMatrix(unsigned int rows, unsigned int cols)
+{
+    
+}
+
+void clearMatrix(Matrix *matrix)
+{
+    
+}
+
+void setMatrixAt(MatrixType value, Matrix matrix, unsigned int rowIdx, unsigned int colIdx)
+{
+    
+}
+
+MatrixType getMatrixAt(const Matrix matrix, unsigned int rowIdx, unsigned int colIdx)
+{
+    
+}
+
+Matrix add(const Matrix matrix1, const Matrix matrix2)
+{
+    
+}
+
+Matrix multiply(const Matrix matrix1, const Matrix matrix2)
+{
+    
+}

Startcode/matrix.h

@@ -1,26 +1,19 @@
-#ifndef MATRIX_H
+#ifndef MATRIX_H
-#define MATRIX_H
+#define MATRIX_H
-
+
-#define UNDEFINED_MATRIX_VALUE 0
+#define UNDEFINED_MATRIX_VALUE 0
-
+
-typedef float MatrixType;
+typedef float MatrixType;
-
+
-// TODO Matrixtyp definieren
+// TODO Matrixtyp definieren
-
+
-typedef struct 
+
-{
+Matrix createMatrix(unsigned int rows, unsigned int cols);
-    unsigned int rows;   // Anzahl der Zeilen
+void clearMatrix(Matrix *matrix);
-    unsigned int cols;   // Anzahl der Spalten
+void setMatrixAt(MatrixType value, Matrix matrix, unsigned int rowIdx, unsigned int colIdx);
-    MatrixType *buffer;    // Zeiger auf die Matrixdaten 
+MatrixType getMatrixAt(const Matrix matrix, unsigned int rowIdx, unsigned int colIdx);
-} Matrix;
+Matrix add(const Matrix matrix1, const Matrix matrix2);
-
+Matrix multiply(const Matrix matrix1, const Matrix matrix2);
-
+
-Matrix createMatrix(unsigned int rows, unsigned int cols);
+
-void clearMatrix(Matrix *matrix);
+#endif
-void setMatrixAt(MatrixType value, Matrix matrix, unsigned int rowIdx, unsigned int colIdx);
-MatrixType getMatrixAt(const Matrix matrix, unsigned int rowIdx, unsigned int colIdx);
-Matrix add(const Matrix matrix1, const Matrix matrix2);
-Matrix multiply(const Matrix matrix1, const Matrix matrix2);
-
-
-#endif

Startcode/matrixTests.c

@@ -71,6 +71,32 @@ 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};
@@ -138,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, matrixToTest.cols * matrixToTest.rows);
+    TEST_ASSERT_EQUAL_FLOAT_ARRAY(expectedResults, matrixToTest.buffer, sizeof(buffer)/sizeof(MatrixType));
 }
 
 void setUp(void) {
@@ -159,6 +185,7 @@ 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);

imageInput.c

@@ -1,96 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "imageInput.h"
-
-#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
-
-// TODO Vervollständigen Sie die Funktion readImages unter Benutzung Ihrer Hilfsfunktionen
-GrayScaleImageSeries *readImages(const char *path)
-{
-    // GrayScaleImageSeries *series = NULL;
-    
-    // return series;
-
-    FILE *file = fopen(path, "rb");
-    if (file == NULL) {
-        return NULL;  // Datei existiert nicht oder konnte nicht geöffnet werden
-    }
-
-    // Überprüfe den Dateitag
-    char fileTag[25];
-    fread(fileTag, sizeof(fileTag[0]), 24, file);
-    fileTag[24] = '\0';  // Null-Terminierung des Strings
-
-    if (strcmp(fileTag, "__info2_image_file_format__") != 0) {
-        fclose(file);
-        return NULL;  // Ungültiges Dateiformat
-    }
-
-    // Lese die Metadaten: Anzahl der Bilder, Breite und Höhe
-    unsigned short numberOfImages, width, height;
-    fread(&numberOfImages, sizeof(numberOfImages), 1, file);
-    fread(&width, sizeof(width), 1, file);
-    fread(&height, sizeof(height), 1, file);
-
-    // Speicher für die Bildserie und die Bilddaten allozieren
-    GrayScaleImageSeries *series = (GrayScaleImageSeries *)malloc(sizeof(GrayScaleImageSeries));
-    if (series == NULL) {
-        fclose(file);
-        return NULL;  // Speicher konnte nicht allokiert werden
-    }
-
-    series->count = numberOfImages;
-    series->images = (GrayScaleImage *)malloc(numberOfImages * sizeof(GrayScaleImage));
-    series->labels = (unsigned char *)malloc(numberOfImages * sizeof(unsigned char));
-
-    if (series->images == NULL || series->labels == NULL) {
-        free(series);
-        fclose(file);
-        return NULL;  // Speicher konnte nicht allokiert werden
-    }
-
-    // Lese die Bilddaten und die Labels
-    for (int i = 0; i < numberOfImages; i++) {
-        series->images[i].width = width;
-        series->images[i].height = height;
-        series->images[i].buffer = (GrayScalePixelType *)malloc(width * height * sizeof(GrayScalePixelType));
-
-        if (series->images[i].buffer == NULL) {
-            // Fehlerbehandlung: Speicher freigeben, wenn Allocation fehlschlägt
-            for (int j = 0; j < i; j++) 
-            {
-                free(series->images[j].buffer);
-            }
-            free(series->images);
-            free(series->labels);
-            free(series);
-            fclose(file);
-            return NULL;
-        }
-
-        // Lese die Pixel-Daten und das Label
-        fread(series->images[i].buffer, sizeof(GrayScalePixelType), width * height, file);
-        fread(&series->labels[i], sizeof(unsigned char), 1, file);
-    }
-
-    fclose(file);
-    return series;
-}
-
-// TODO Vervollständigen Sie die Funktion clearSeries, welche eine Bildserie vollständig aus dem Speicher freigibt
-void clearSeries(GrayScaleImageSeries *series)
-{
-    if (series == NULL) return;
-
-    for (int i = 0; i < series->count; i++) {
-        free(series->images[i].buffer);  // Speicher für das Bild freigeben
-    }
-
-    free(series->images);   // Speicher für die Bild-Array freigeben
-    free(series->labels);   // Speicher für die Labels freigeben
-    free(series); 
-}

matrix.c

@@ -1,127 +0,0 @@
-#include <stdlib.h>
-#include <string.h>
-#include "matrix.h"
-
-// TODO Matrix-Funktionen implementieren
-
-Matrix createMatrix(unsigned int rows, unsigned int cols)
-{
-    Matrix m = {0, 0, NULL};
-
-    if (rows > 0 && cols > 0)
-    {
-        m.rows = rows;
-        m.cols = cols;
-        m.buffer = malloc(rows * cols * sizeof(int));
-    }
-
-    return m;
-}
-
-void clearMatrix(Matrix *matrix)
-{
-
-    if (matrix == NULL)
-    {
-        return;
-    }
-
-    // Speicher freigeben, falls vorhanden
-    free(matrix->buffer);
-    matrix->buffer = NULL;
-
-    // Metadaten zurücksetzen
-    matrix->rows = 0;
-    matrix->cols = 0;
-}
-
-void setMatrixAt(MatrixType value, Matrix matrix, unsigned int rowIdx, unsigned int colIdx)
-{
-    matrix.buffer[rowIdx * matrix.cols + colIdx] = value; // setzte Matrix auf den Wert value am Punkt (row col)
-}
-
-MatrixType getMatrixAt(const Matrix matrix, unsigned int rowIdx, unsigned int colIdx)
-{
-    MatrixType value = 0;
-
-    if (rowIdx < matrix.rows && colIdx < matrix.cols)
-    {
-        value = matrix.buffer[rowIdx * matrix.cols + colIdx]; // hole Wert value am Punkt (row col)
-    }
-
-    return value;
-}
-
-Matrix add(const Matrix matrix1, const Matrix matrix2)
-{
-    Matrix result = {0};
-
-    if (matrix1.rows != matrix2.rows || matrix1.cols != matrix2.cols)
-    {
-        return result;
-    }
-
-    result.rows = matrix1.rows;
-    result.cols = matrix1.cols;
-    result.buffer = malloc(result.rows * result.cols * sizeof(MatrixType));
-
-    // wenn buffer nicht allokiert werden kann dann zurücksetzen und abbrechen
-    if (result.buffer == NULL)
-    {
-        result.rows = result.cols = 0;
-
-        return result;
-    }
-
-    // Matritzenaddition
-    for (unsigned int i = 0; i < result.rows; i++)
-    {
-        for (unsigned int j = 0; j < result.cols; j++)
-        {
-            result.buffer[i * result.cols + j] = matrix1.buffer[i * matrix1.cols + j] + matrix2.buffer[i * matrix2.cols + j];
-        }
-    }
-    return result;
-}
-
-Matrix multiply(const Matrix matrix1, const Matrix matrix2)
-{
-    Matrix result = {0};
-
-    if (matrix1.cols != matrix2.rows)
-    {
-        return result;
-    }
-
-    result.rows = matrix1.rows;
-    result.cols = matrix2.cols;
-    result.buffer = malloc(result.rows * result.cols * sizeof(MatrixType));
-
-    // wenn buffer nicht allokiert werden kann dann zurücksetzen und abbrechen
-    if (result.buffer == NULL)
-    {
-        result.rows = result.cols = 0;
-
-        return result;
-    }
-
-    // Matritzenmultiplikation
-
-    for (int r = 0; r < result.rows; r++) // Zeile in Ergebnis
-    {
-        for (int m = 0; m < result.cols; m++) // Spalte in Ergebnis
-        {
-            MatrixType sum = 0;
-
-            for (int n = 0; n < matrix1.cols; n++)
-            {
-                sum += matrix1.buffer[r * matrix1.cols + n] *
-                       matrix2.buffer[n * matrix2.cols + m];
-            }
-
-            result.buffer[r * result.cols + m] = sum;
-        }
-    }
-
-    return result;
-}