Multiply Funktion in matrix.c

Startcode/imageInput.c

@@ -8,13 +8,13 @@
 
 // TODO Implementieren Sie geeignete Hilfsfunktionen für das Lesen der Bildserie aus einer Datei
 
-/* Liest den Datei-Header sowie Anzahl und Abmessungen der Bilder. */
+/* Liest den Dateitag sowie Anzahl und Abmessungen der Bilder. */
 static int readFileHeader(FILE *file, unsigned short *count, unsigned short *width, unsigned short *height)
 {
     char tag[sizeof(FILE_HEADER_STRING) - 1];
 
     return fread(tag, sizeof(tag), 1, file) == 1 &&
-           memcmp(tag, FILE_HEADER_STRING, sizeof(tag)) == 0 && /* vergleicht File-Header  mit dem erwarteten Wert */
+           memcmp(tag, FILE_HEADER_STRING, sizeof(tag)) == 0 &&
            fread(count, sizeof(*count), 1, file) == 1 &&
            fread(width, sizeof(*width), 1, file) == 1 &&
            fread(height, sizeof(*height), 1, file) == 1 &&
@@ -25,7 +25,8 @@ static int readFileHeader(FILE *file, unsigned short *count, unsigned short *wid
 static int readImage(FILE *file, GrayScaleImage *image, unsigned char *label, size_t pixelCount)
 {
     image->buffer = (GrayScalePixelType *)malloc(pixelCount);
-    if (image->buffer == NULL || fread(image->buffer, sizeof(*image->buffer), pixelCount, file) != pixelCount || fread(label, sizeof(*label), 1, file) != 1) /*Prüft ob Speicher korrekt reserviert wurde */
+    if (image->buffer == NULL || fread(image->buffer, sizeof(*image->buffer), pixelCount, file) != pixelCount ||
+        fread(label, sizeof(*label), 1, file) != 1)
     {
         free(image->buffer);
         image->buffer = NULL;
@@ -37,11 +38,11 @@ static int readImage(FILE *file, GrayScaleImage *image, unsigned char *label, si
 /* Gibt auch bereits teilweise geladene Serien und deren Pixelpuffer frei. */
 static void freeImages(GrayScaleImageSeries *series)
 {
-    if (series == NULL) /*Prüft ob Serie übergeben Wurde*/
+    if (series == NULL)
         return;
     if (series->images != NULL)
     {
-        for (unsigned int i = 0; i < series->count; ++i) /* Prüft jedes bIld der Serie*/
+        for (unsigned int i = 0; i < series->count; ++i)
             free(series->images[i].buffer);
     }
     free(series->images);
@@ -56,11 +57,11 @@ GrayScaleImageSeries *readImages(const char *path)
     size_t pixelCount;
     FILE *file;
 
-    if (path == NULL || (file = fopen(path, "rb")) == NULL)   /*prüft ob sich Pfad öffnen lässt*/
+    if (path == NULL || (file = fopen(path, "rb")) == NULL)
         return 0;
 
-    /* Zuerst den Header prüfen, bevor Speicher reserviert wird */
-    if (!readFileHeader(file, &count, &width, &height)) 
+    /* Zuerst den Header validieren, bevor Speicher reserviert wird */
+    if (!readFileHeader(file, &count, &width, &height))
     {
         fclose(file);
         freeImages(series);
@@ -68,7 +69,7 @@ GrayScaleImageSeries *readImages(const char *path)
     }
 
     pixelCount = (size_t)width * height;
-    series = (GrayScaleImageSeries *)calloc(1, sizeof(*series)); /*Speicher für Serie reservieren*/
+    series = (GrayScaleImageSeries *)calloc(1, sizeof(*series));
     if (series == NULL)
     {
 
@@ -77,7 +78,7 @@ GrayScaleImageSeries *readImages(const char *path)
         return 0;
     }
 
-    series->count = count; /*speicher die anzahl der Bilder*/
+    series->count = count;
     series->images = (GrayScaleImage *)calloc(count, sizeof(*series->images));
     series->labels = (unsigned char *)malloc(count * sizeof(*series->labels));
     if (series->images == NULL || series->labels == NULL)
@@ -87,7 +88,7 @@ GrayScaleImageSeries *readImages(const char *path)
         return 0;
     }
 
-    /*Parameter jedes Bildes einlesen*/
+    /* Ein Datensatz besteht jeweils aus Pixeln, gefolgt von einem Labelbyte. */
     for (unsigned int i = 0; i < count; ++i)
     {
         series->images[i].width = width;

Startcode/imageInputTests.c

@@ -6,102 +6,96 @@
 #include "imageInput.h"
 
 
-static void prepareImageFile(const char *path, unsigned short int width, unsigned short int height, unsigned int short numberOfImages, unsigned char label)
+static void writeHeader(FILE *file, unsigned short count, unsigned short width, unsigned short height)
 {
-    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);
-                fwrite(&label, sizeof(unsigned char), 1, file);
-            }
-
-            free(zeroBuffer);
-        }
-
-        fclose(file);
-    }
+    const char *tag = "__info2_image_file_format__";
+    fwrite(tag, 1, strlen(tag), file);
+    fwrite(&count, sizeof(count), 1, file);
+    fwrite(&width, sizeof(width), 1, file);
+    fwrite(&height, sizeof(height), 1, file);
 }
 
+static void prepareImageFile(const char *path, unsigned short width, unsigned short height,
+                             unsigned short count, unsigned char label)
+{
+    FILE *file = fopen(path, "wb");
+    if (file == NULL) return;
+
+    writeHeader(file, count, width, height);
+    size_t pixelCount = (size_t)width * height;
+    GrayScalePixelType *pixels = (GrayScalePixelType *)calloc(pixelCount, sizeof(*pixels));
+    if (pixels != NULL)
+    {
+        for (unsigned int i = 0; i < count; ++i)
+        {
+            fwrite(pixels, sizeof(*pixels), pixelCount, file);
+            fwrite(&label, sizeof(label), 1, file);
+        }
+        free(pixels);
+    }
+    fclose(file);
+}
 
 void test_readImagesReturnsCorrectNumberOfImages(void)
 {
-    GrayScaleImageSeries *series = NULL;
-    const unsigned short expectedNumberOfImages = 2;
     const char *path = "testFile.info2";
-    prepareImageFile(path, 8, 8, expectedNumberOfImages, 1);
-    series = readImages(path);
+    const unsigned short expectedCount = 2;
+    prepareImageFile(path, 8, 8, expectedCount, 1);
+    GrayScaleImageSeries *series = readImages(path);
     TEST_ASSERT_NOT_NULL(series);
-    TEST_ASSERT_EQUAL_UINT16(expectedNumberOfImages, series->count);
+    TEST_ASSERT_EQUAL_UINT16(expectedCount, series->count);
     clearSeries(series);
     remove(path);
 }
 
-void test_readImagesReturnsCorrectImageWidth(void)
+void test_readImagesReturnsCorrectImageDimensions(void)
 {
-    GrayScaleImageSeries *series = NULL;
-    const unsigned short expectedWidth = 10;
     const char *path = "testFile.info2";
-    prepareImageFile(path, expectedWidth, 8, 2, 1);
-    series = readImages(path);
+    prepareImageFile(path, 10, 9, 2, 1);
+    GrayScaleImageSeries *series = readImages(path);
     TEST_ASSERT_NOT_NULL(series);
-    TEST_ASSERT_NOT_NULL(series->images);
-    TEST_ASSERT_EQUAL_UINT16(2, series->count);
-    TEST_ASSERT_EQUAL_UINT16(expectedWidth, series->images[0].width);
-    TEST_ASSERT_EQUAL_UINT16(expectedWidth, series->images[1].width);
-    clearSeries(series);
-    remove(path);
-}
-
-void test_readImagesReturnsCorrectImageHeight(void)
-{
-    GrayScaleImageSeries *series = NULL;
-    const unsigned short expectedHeight = 10;
-    const char *path = "testFile.info2";
-    prepareImageFile(path, 8, expectedHeight, 2, 1);
-    series = readImages(path);
-    TEST_ASSERT_NOT_NULL(series);
-    TEST_ASSERT_NOT_NULL(series->images);
-    TEST_ASSERT_EQUAL_UINT16(2, series->count);
-    TEST_ASSERT_EQUAL_UINT16(expectedHeight, series->images[0].height);
-    TEST_ASSERT_EQUAL_UINT16(expectedHeight, series->images[1].height);
+    TEST_ASSERT_EQUAL_UINT16(10, series->images[0].width);
+    TEST_ASSERT_EQUAL_UINT16(10, series->images[1].width);
+    TEST_ASSERT_EQUAL_UINT16(9, series->images[0].height);
+    TEST_ASSERT_EQUAL_UINT16(9, series->images[1].height);
     clearSeries(series);
     remove(path);
 }
 
 void test_readImagesReturnsCorrectLabels(void)
 {
-    const unsigned char expectedLabel = 15;
-
-    GrayScaleImageSeries *series = NULL;
     const char *path = "testFile.info2";
-    prepareImageFile(path, 8, 8, 2, expectedLabel);
-    series = readImages(path);
+    prepareImageFile(path, 8, 8, 2, 15);
+    GrayScaleImageSeries *series = readImages(path);
     TEST_ASSERT_NOT_NULL(series);
-    TEST_ASSERT_NOT_NULL(series->labels);
-    TEST_ASSERT_EQUAL_UINT16(2, series->count);
-    for (int i = 0; i < 2; i++) {
-        TEST_ASSERT_EQUAL_UINT8(expectedLabel, series->labels[i]);
-    }
+    TEST_ASSERT_EQUAL_UINT8(15, series->labels[0]);
+    TEST_ASSERT_EQUAL_UINT8(15, series->labels[1]);
     clearSeries(series);
     remove(path);
 }
 
-void test_readImagesReturnsNullOnNotExistingPath(void)
+void test_readImagesReturnsPixelData(void)
 {
-    const char *path = "testFile.txt";
+    const char *path = "testFile.info2";
+    const unsigned char pixels[] = { 0, 17, 128, 255 };
+    const unsigned char label = 7;
+    FILE *file = fopen(path, "wb");
+    TEST_ASSERT_NOT_NULL(file);
+    writeHeader(file, 1, 2, 2);
+    fwrite(pixels, sizeof(pixels), 1, file);
+    fwrite(&label, sizeof(label), 1, file);
+    fclose(file);
+
+    GrayScaleImageSeries *series = readImages(path);
+    TEST_ASSERT_NOT_NULL(series);
+    TEST_ASSERT_EQUAL_UINT8_ARRAY(pixels, series->images[0].buffer, sizeof(pixels));
+    clearSeries(series);
+    remove(path);
+}
+
+void test_readImagesReturnsNullOnMissingPath(void)
+{
+    const char *path = "missingTestFile.info2";
     remove(path);
     TEST_ASSERT_NULL(readImages(path));
 }
@@ -109,47 +103,39 @@ void test_readImagesReturnsNullOnNotExistingPath(void)
 void test_readImagesFailsOnWrongFileTag(void)
 {
     const char *path = "testFile.info2";
-    FILE *file = fopen(path, "w");
-    if(file != NULL)
-    {
-        fprintf(file, "some_tag                  ");
-        fclose(file);
-        TEST_ASSERT_NULL(readImages(path));
-    }
+    FILE *file = fopen(path, "wb");
+    TEST_ASSERT_NOT_NULL(file);
+    fputs("wrong tag", file);
+    fclose(file);
+    TEST_ASSERT_NULL(readImages(path));
     remove(path);
 }
 
-void test_readImagesFailsOnZeroWidth(void)
+void test_readImagesFailsOnTruncatedImage(void)
 {
     const char *path = "testFile.info2";
-
-    prepareImageFile(path, 0, 8, 1, 1);
-
+    const unsigned char partialPixels[] = { 1, 2 };
+    FILE *file = fopen(path, "wb");
+    TEST_ASSERT_NOT_NULL(file);
+    writeHeader(file, 1, 2, 2);
+    fwrite(partialPixels, sizeof(partialPixels), 1, file);
+    fclose(file);
     TEST_ASSERT_NULL(readImages(path));
-
     remove(path);
 }
 
-void setUp(void) {
-    // Falls notwendig, kann hier Vorbereitungsarbeit gemacht werden
-}
+void setUp(void) {}
+void tearDown(void) {}
 
-void tearDown(void) {
-    // Hier kann Bereinigungsarbeit nach jedem Test durchgeführt werden
-}
-
-int main()
+int main(void)
 {
     UNITY_BEGIN();
-    
-    printf("\n============================\nImage input tests\n============================\n");
     RUN_TEST(test_readImagesReturnsCorrectNumberOfImages);
-    RUN_TEST(test_readImagesReturnsCorrectImageWidth);
-    RUN_TEST(test_readImagesReturnsCorrectImageHeight);
+    RUN_TEST(test_readImagesReturnsCorrectImageDimensions);
     RUN_TEST(test_readImagesReturnsCorrectLabels);
-    RUN_TEST(test_readImagesReturnsNullOnNotExistingPath);
+    RUN_TEST(test_readImagesReturnsPixelData);
+    RUN_TEST(test_readImagesReturnsNullOnMissingPath);
     RUN_TEST(test_readImagesFailsOnWrongFileTag);
-    RUN_TEST(test_readImagesFailsOnZeroWidth);
-
+    RUN_TEST(test_readImagesFailsOnTruncatedImage);
     return UNITY_END();
-}
+}

Startcode/matrix.c

@@ -6,124 +6,35 @@
 
 Matrix createMatrix(unsigned int rows, unsigned int cols)
 {
-    if (rows == 0 || cols == 0) {
-        return (Matrix){0}; // Setzt rows, cols und den Puffer auf 0/NULL
-    }
-    Matrix m;
-    m.rows = rows;
-    m.cols = cols;
-    
-    // Speicher reservieren und mit 0 initialisieren
-    m.buffer = (MatrixType *)calloc((size_t)rows * cols, sizeof(MatrixType));
-    
-    // Falls Arbeitsspeicher voll ist
-    if (m.buffer == NULL) {
-        m.rows = 0;
-        m.cols = 0;
-    }
-    
-    return m;
     
 }
 
 void clearMatrix(Matrix *matrix)
 {
-    //prüfen ob pointer exisitert und ob es einen buffer gibt
-    if (matrix != NULL && matrix->buffer != NULL)
-    {
-        // Speicher freigeben
-        free(matrix->buffer);
-        
-        // Werte zurücksetzen
-        matrix->buffer = NULL;
-        matrix->rows = 0;
-        matrix->cols = 0;
-    }
     
 }
 
 void setMatrixAt(MatrixType value, Matrix matrix, unsigned int rowIdx, unsigned int colIdx)
 {
-    // Sind Idx innerhalb der Matrix?
-    if (matrix.buffer != NULL && rowIdx < matrix.rows && colIdx < matrix.cols)
-    {
-        // Umrechnung von 2D auf 1D
-        matrix.buffer[rowIdx * matrix.cols + colIdx] = value;
-    }
     
 }
 
 MatrixType getMatrixAt(const Matrix matrix, unsigned int rowIdx, unsigned int colIdx)
 {
-    // Sicherheitsprüfung wie beim setzen
-    if (matrix.buffer != NULL && rowIdx < matrix.rows && colIdx < matrix.cols)
-    {
-        return matrix.buffer[rowIdx * matrix.cols + colIdx];
-    }
     
-    // Fehlerwert, falls außerhalb der grenzen
-    return UNDEFINED_MATRIX_VALUE;
 }
 
 Matrix add(const Matrix matrix1, const Matrix matrix2)
 {
-    // Prüfen ob Zeilenanzahl gleich ist und ob buffer existieren
-    if (matrix1.buffer == NULL || matrix2.buffer == NULL || matrix1.rows != matrix2.rows)
-    {
-        return (Matrix){0};
-    }
-    // Wenn beide Matrixen gleich groß sind:
-    if (matrix1.cols == matrix2.cols)
-    {
-        Matrix result = createMatrix(matrix1.rows, matrix1.cols);
-        if (result.buffer == NULL) return (Matrix){0};
-
-        unsigned int totalElements = matrix1.rows * matrix1.cols;
-        for (unsigned int i = 0; i < totalElements; i++)
-        {
-            result.buffer[i] = matrix1.buffer[i] + matrix2.buffer[i];
-        }
-        return result;
-    }
-    //Wenn matrix2 ein Spaltenvektor ist 
-    else if (matrix2.cols == 1)
-    {
-        Matrix result = createMatrix(matrix1.rows, matrix1.cols);
-        if (result.buffer == NULL) return (Matrix){0};
-
-        for (unsigned int r = 0; r < matrix1.rows; r++)
-        {
-            for (unsigned int c = 0; c < matrix1.cols; c++)
-            {
-                // Wert mit r und c aus m1 + Wert mit r aus m2
-                result.buffer[r * matrix1.cols + c] = matrix1.buffer[r * matrix1.cols + c] + matrix2.buffer[r];
-            }
-        }
-        return result;
-    }
-    //Wenn matrix1 ein Spaltenvektor ist
-    else if (matrix1.cols == 1)
-    {
-        Matrix result = createMatrix(matrix2.rows, matrix2.cols);
-        if (result.buffer == NULL) return (Matrix){0};
-
-        for (unsigned int r = 0; r < matrix2.rows; r++)
-        {
-            for (unsigned int c = 0; c < matrix2.cols; c++)
-            {
-                //gleich wie davor nur m1 und m2 getauscht
-                result.buffer[r * matrix2.cols + c] = matrix2.buffer[r * matrix2.cols + c] + matrix1.buffer[r];
-            }
-        }
-        return result;
-    }
-
-    return (Matrix){0};
-
+    
 }
 
 Matrix multiply(const Matrix matrix1, const Matrix matrix2)
 {
+<<<<<<< Updated upstream
+=======
+    
+>>>>>>> Stashed changes
     // Überprüfen, ob die Matrizen gültig sind und ob ihre Dimensionen eine Multiplikation erlauben
     if (matrix1.buffer == NULL || matrix2.buffer == NULL || matrix1.cols != matrix2.rows)
     {
@@ -154,7 +65,7 @@ Matrix multiply(const Matrix matrix1, const Matrix matrix2)
                        matrix2.buffer[k * matrix2.cols + j];
             }
 
-           // Berechneten Wert in der Ergebnismatrix speichern
+            // Berechneten Wert in der Ergebnismatrix speichern
             result.buffer[i * result.cols + j] = sum;
         }
     }

Startcode/matrix.h

@@ -7,9 +7,9 @@ typedef float MatrixType;
 
 // TODO Matrixtyp definieren
 typedef struct {
-    MatrixType *buffer;
     unsigned int rows;
     unsigned int cols;
+    MatrixType *buffer; // Speichert die Matrixwerte in einem Array, die Speicheradresse des ersten Matrixwerts
 } Matrix;
 
 

imageInput.c

@@ -1,110 +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
-
-/* Liest den Datei-Header sowie Anzahl und Abmessungen der Bilder. */
-static int readFileHeader(FILE *file, unsigned short *count, unsigned short *width, unsigned short *height)
-{
-    char tag[sizeof(FILE_HEADER_STRING) - 1];
-
-    return fread(tag, sizeof(tag), 1, file) == 1 &&
-           memcmp(tag, FILE_HEADER_STRING, sizeof(tag)) == 0 && /* vergleicht File-Header  mit dem erwarteten Wert */
-           fread(count, sizeof(*count), 1, file) == 1 &&
-           fread(width, sizeof(*width), 1, file) == 1 &&
-           fread(height, sizeof(*height), 1, file) == 1 &&
-           *count > 0 && *width > 0 && *height > 0;
-}
-
-/* Liest die Pixel und das unmittelbar folgende Label eines Bildes. */
-static int readImage(FILE *file, GrayScaleImage *image, unsigned char *label, size_t pixelCount)
-{
-    image->buffer = (GrayScalePixelType *)malloc(pixelCount);
-    if (image->buffer == NULL || fread(image->buffer, sizeof(*image->buffer), pixelCount, file) != pixelCount || fread(label, sizeof(*label), 1, file) != 1) /*Prüft ob Speicher korrekt reserviert wurde */
-    {
-        free(image->buffer);
-        image->buffer = NULL;
-        return 0;
-    }
-    return 1;
-}
-
-/* Gibt auch bereits teilweise geladene Serien und deren Pixelpuffer frei. */
-static void freeImages(GrayScaleImageSeries *series)
-{
-    if (series == NULL) /*Prüft ob Serie übergeben Wurde*/
-        return;
-    if (series->images != NULL)
-    {
-        for (unsigned int i = 0; i < series->count; ++i) /* Prüft jedes bIld der Serie*/
-            free(series->images[i].buffer);
-    }
-    free(series->images);
-    free(series->labels);
-    free(series);
-}
-// TODO Vervollständigen Sie die Funktion readImages unter Benutzung Ihrer Hilfsfunktionen
-GrayScaleImageSeries *readImages(const char *path)
-{
-    GrayScaleImageSeries *series = NULL;
-    unsigned short count, width, height;
-    size_t pixelCount;
-    FILE *file;
-
-    if (path == NULL || (file = fopen(path, "rb")) == NULL)   /*prüft ob sich Pfad öffnen lässt*/
-        return 0;
-
-    /* Zuerst den Header prüfen, bevor Speicher reserviert wird */
-    if (!readFileHeader(file, &count, &width, &height)) 
-    {
-        fclose(file);
-        freeImages(series);
-        return 0;
-    }
-
-    pixelCount = (size_t)width * height;
-    series = (GrayScaleImageSeries *)calloc(1, sizeof(*series)); /*Speicher für Serie reservieren*/
-    if (series == NULL)
-    {
-
-        fclose(file);
-        freeImages(series);
-        return 0;
-    }
-
-    series->count = count; /*speicher die anzahl der Bilder*/
-    series->images = (GrayScaleImage *)calloc(count, sizeof(*series->images));
-    series->labels = (unsigned char *)malloc(count * sizeof(*series->labels));
-    if (series->images == NULL || series->labels == NULL)
-    {
-        fclose(file);
-        freeImages(series);
-        return 0;
-    }
-
-    /*Parameter jedes Bildes einlesen*/
-    for (unsigned int i = 0; i < count; ++i)
-    {
-        series->images[i].width = width;
-        series->images[i].height = height;
-        if (!readImage(file, &series->images[i], &series->labels[i], pixelCount))
-        {
-            fclose(file);
-            freeImages(series);
-            return 0;
-        }
-    }
-
-    fclose(file);
-    return series;
-}
-
-void clearSeries(GrayScaleImageSeries *series)
-{
-    freeImages(series);
-}