Funktion aufgeteilt

imageInput.c

@@ -5,18 +5,204 @@
 
 #define BUFFER_SIZE 100
 #define FILE_HEADER_STRING "__info2_image_file_format__"
+#define HEADER_LEN (sizeof(FILE_HEADER_STRING) - 1) //-1, um \0 Character rauszufiltern
 
 // TODO Implementieren Sie geeignete Hilfsfunktionen für das Lesen der Bildserie aus einer Datei
 
+static int checkDimensions(unsigned int width, unsigned int height){
+
+    int ok = 0;
+    
+    if(width > 0 && height > 0)
+        return ok = 1;
+    
+    else 
+        return ok = 0;
+
+}
+
+static int checkHeader(const GrayScalePixelType *buffer){
+
+    int ok = 0;
+    char header[HEADER_LEN + 1]; //Array mit Platz für Header Länge + \0 Character -> String
+
+    // Jeder Byte in String kopieren
+    for(int i = 0; i < HEADER_LEN; i++){
+
+        header[i] = buffer[i];
+
+    }
+
+    header[HEADER_LEN] = '\0'; // Nullterminator am Ende anhängen
+
+    if(strcmp(header, FILE_HEADER_STRING) == 0) // wenn beide identische sind gibt cmp 0 zurück
+        return ok = 1;
+
+    else
+        return ok = 0;
+
+}
+
+static FILE *openImageFile(const char *path)
+{
+    return fopen(path, "rb");
+}
+
+static int readHeaderFromFile(FILE *fp, GrayScalePixelType *headerBuffer)
+{
+    if (fread(headerBuffer, sizeof(GrayScalePixelType),HEADER_LEN, fp) != HEADER_LEN)
+    {
+        return 0;
+    }
+    return 1;
+}
+
+static int readMetaData(FILE *fp, unsigned int *numImages, unsigned int *width, unsigned int *height)
+{
+    if (fread(numImages, sizeof(unsigned int), 1, fp) != 1 || fread(width, sizeof(unsigned int), 1, fp) != 1 || fread(height, sizeof(unsigned int), 1, fp) != 1)
+
+    {
+    return 0;
+    }
+    return 1;
+}
+
+static GrayScaleImageSeries *allocateSeriesStruct(void)
+{
+    GrayScaleImageSeries *series = malloc(sizeof(GrayScaleImageSeries));
+    return series;
+}
+
+static int allocateImageAndLabelArrays(GrayScaleImageSeries *series, unsigned int numImages, FILE *fp)
+{
+    series->count = numImages;
+    //Speicher für die Pointer an sich belegen
+    series->images = malloc(numImages * sizeof(GrayScaleImage));
+    series->labels = malloc(numImages * sizeof(unsigned char));
+
+    if (!series->images || !series->labels)
+    {
+        free(series->images); //wenn trotzdem was reingeschrieben wurde, dann freigeben
+        free(series->labels);
+        free(series);
+
+        fclose(fp);
+        return 0;
+    }
+
+    return 1;
+}
+
+static int allocateBufferForImages(GrayScaleImageSeries *series, unsigned int numImages, unsigned int width, unsigned int height, FILE *fp)
+{
+    for (unsigned int i = 0; i < numImages; i++)
+    {
+        series ->images[i].buffer = malloc(width * height);
+        if (series ->images[i].buffer == NULL) 
+        {
+            for (unsigned int j = 0; j < i; j++)
+            {
+                free(series->images[j].buffer);
+            }
+
+            free(series->images);
+            free(series->labels);
+            free(series);
+
+            fclose(fp);
+            return 0;
+        }
+    }
+    return 1;
+}
+
+static int readImagesAndLabels(FILE *fp, GrayScaleImageSeries *series, unsigned int numImages, unsigned int width, unsigned int height)
+{
+    for (unsigned int i = 0; i < numImages; i++)
+    {
+        series->images[i].width = width;
+        series->images[i].height = height;
+
+        if (fread(series->images[i].buffer, 1, width *height, fp) != (width * height))
+        {
+            clearSeries(series);
+            fclose(fp);
+            return 0;
+        }
+
+        fread(&series->labels[i], 1, 1, fp);
+    }
+
+    return 1;
+}
+
+
 // TODO Vervollständigen Sie die Funktion readImages unter Benutzung Ihrer Hilfsfunktionen
 GrayScaleImageSeries *readImages(const char *path)
 {
     GrayScaleImageSeries *series = NULL;
 
+    FILE *fp = openImageFile(path);
+    if (!fp)
+    return NULL;
+
+    GrayScalePixelType header[HEADER_LEN];
+
+    if (!readHeaderFromFile(fp, header))
+    {
+        fclose(fp);
+        return NULL;
+    }
+
+    if (!checkHeader(header))
+    {
+        fclose(fp);
+        return NULL;
+    }
+
+    unsigned int numImages, width, height;
+    if (!readMetaData(fp, &numImages, &width, &height))
+    {
+        fclos(fp);
+        return NULL;
+    }
+
+    if (!checkDimensions(width, height))
+    {
+        fclose(fp);
+        return NULL;
+    }
+
+    series = allocateSeriesStruct();
+    if (!series)
+    {
+        free(series);
+        fclose(fp);
+        return NULL;
+    }
+
+    if (!allocateImageAndLabelArrays(series, numImages, fp))
+    {
+        return NULL;
+    }
+
+    if (!allocateImageAndLabelImages(series, numImages, width, height, fp))
+    {
+        return NULL;
+    }
+
+    if (!readImagesAndLabels(fp, series, numImages, width, height))
+    {
+        return NULL;
+    }
+
     return series;
+
 }   
 
+
 // TODO Vervollständigen Sie die Funktion clearSeries, welche eine Bildserie vollständig aus dem Speicher freigibt
 void clearSeries(GrayScaleImageSeries *series)
 {
+
 }

matrix.c

@@ -5,160 +5,228 @@
  
 // TODO Matrix-Funktionen implementieren
  
+enum addModes{SAMEDIMENSIONS, COLVEC, ROWVEC};
+
+ 
 Matrix createMatrix(unsigned int rows, unsigned int cols)
 {
     Matrix m;
     m.rows = rows;
     m.cols = cols;
-    m.data = NULL;
+    m.buffer = NULL;
  
     if(rows == 0 || cols == 0)
     {
-        printf("Error");
+        m.rows = 0;
-        exit(EXIT_FAILURE);
+        m.cols = 0;
+        m.buffer = NULL;
+        return m;
     }
  
-    m.data = calloc(rows * cols, sizeof(MatrixType));
+    m.buffer = calloc(rows * cols, sizeof(MatrixType));
-    if (m.data == NULL)
+   
+    if (m.buffer == NULL)
     {
-        printf("Error");
+        m.rows = 0;
-        exit(EXIT_FAILURE);
+        m.cols = 0;
+        m.buffer = NULL;
+        return m;
     }
  
     return m;
 }
  
+
 void clearMatrix(Matrix *matrix)
 {
-    free(matrix->data);
 
-    matrix->rows = 0;
+    if (matrix->buffer == NULL)
-    matrix->cols = 0;
+    {
-    matrix->data = NULL;
+        matrix->rows = 0;
+        matrix->cols = 0;
+        matrix->buffer = NULL;
+        return;
+    }
+    else
+    {
+   
+        free(matrix->buffer);
+   
+        matrix->rows = 0;
+        matrix->cols = 0;
+        matrix->buffer = NULL;
+ 
+    }
 }
 
+ 
 void setMatrixAt(MatrixType value, Matrix matrix, unsigned int rowIdx, unsigned int colIdx)
 {
-   
+    if(matrix.buffer == NULL || rowIdx >= matrix.rows || colIdx >= matrix.cols)
-  matrix.data[(rowIdx * matrix.cols) + colIdx] = value;   //wir setzen den data-Wert an der Stelle (rowIdx*Spalten + colIdx) auf den Wert von value
+    {
+        return;
+    }
+    else
+    {
+        matrix.buffer[(rowIdx * matrix.cols) + colIdx] = value;   //wir setzen den data-Wert an der Stelle (rowIdx*Spalten + colIdx) auf den Wert von value
+    }
 }
  
+
 MatrixType getMatrixAt(const Matrix matrix, unsigned int rowIdx, unsigned int colIdx)
 {
-    return matrix.data[(rowIdx * matrix.cols) + colIdx];
+    if(matrix.buffer == NULL || rowIdx >= matrix.rows || colIdx >= matrix.cols)
+    {
+        return UNDEFINED_MATRIX_VALUE;
+    }
+   
+    return matrix.buffer[(rowIdx * matrix.cols) + colIdx];
 }
  
-static int can_add(Matrix matrix1, Matrix matrix2) {
 
-    int can_add;
+static int get_add_mode(Matrix matrix1, Matrix matrix2) 
-
-    if(matrix1.cols == matrix2.cols && matrix1.rows == matrix2.rows){
-
-        can_add = 1;
-
-    }
-    else if(matrix1.cols == 1 && matrix1.rows == matrix2.rows){
-
-        can_add = 2;
-
-    }
-    else if(matrix2.cols == 1 && matrix1.rows == matrix2.rows){
-
-        can_add = 3;
-
-    }
-    else if(matrix1.rows == 1 && matrix1.cols == matrix2.cols){
-
-        can_add = 4;
-
-    }
-    else if(matrix2.rows == 1 && matrix1.cols == matrix2.cols){
-
-        can_add = 5;
-
-    }
-    else{
-
-        can_add = 0;
-
-    }
-
-    return can_add;
-    }
-
-Matrix add(const Matrix matrix1, const Matrix matrix2) //wir addieren nur wenn beide Matrizen gleich groß sind oder eine von beiden eine Zeile oder eine Spalte besitzt
 {
-    int ok = can_add(matrix1,matrix2);
+    int get_add_mode = -1;
  
-    unsigned int erg_rows = (matrix1.rows == matrix2.rows) ? matrix1.rows : (matrix1.rows == 1 ? matrix2.rows : matrix1.rows);
+    if(matrix1.cols == matrix2.cols && matrix1.rows == matrix2.rows)
-    unsigned int erg_cols = (matrix1.cols == matrix2.cols) ? matrix1.cols : (matrix1.cols == 1 ? matrix2.cols : matrix1.cols);
+    {
+        get_add_mode = SAMEDIMENSIONS;
+    }
+    else if(matrix1.cols == 1 && matrix1.rows == matrix2.rows)
+    {
+        get_add_mode = COLVEC;
+    }
+    else if(matrix2.cols == 1 && matrix1.rows == matrix2.rows)
+    {
+        get_add_mode = COLVEC;
+    }
+    else if(matrix1.rows == 1 && matrix1.cols == matrix2.cols)
+    {
+        get_add_mode = ROWVEC;
+    }
+    else if(matrix2.rows == 1 && matrix1.cols == matrix2.cols)
+    {
+        get_add_mode = ROWVEC;
+    }
 
-    Matrix matrix_erg = createMatrix(erg_rows, erg_cols);
+    return get_add_mode;   
+}
+ 
+
+ 
+Matrix addSameDim(Matrix matrix1, Matrix matrix2)
+{
+    Matrix matrix_erg = createMatrix(matrix1.rows, matrix1.cols);
+ 
+    for(int i = 0; i < (matrix1.rows * matrix1.cols); i++)
+    {
+        matrix_erg.buffer[i] = matrix1.buffer[i] + matrix2.buffer[i];
+    }
+
+        return matrix_erg;    
+}
+ 
+
+Matrix addColVec(Matrix matrix1, Matrix matrix2)
+{
+    Matrix matrix_erg;
+
+    if(matrix1.cols == 1)
+    {
+        matrix_erg = createMatrix(matrix2.rows, matrix2.cols);
+ 
+        for(int i = 0; i < matrix2.rows; i++)
+        {
+            for(int j = 0; j < matrix2.cols; j++)
+            {
+                matrix_erg.buffer[i * matrix2.cols + j] = matrix1.buffer[i] + matrix2.buffer[i * matrix2.cols + j];
+            }
+        }  
+    }
+
+    if(matrix2.cols == 1)
+    {
+        matrix_erg = createMatrix(matrix1.rows, matrix1.cols);
+ 
+        for(int i = 0; i < matrix1.rows; i++)
+        {
+            for(int j = 0; j < matrix1.cols; j++)
+            {
+                matrix_erg.buffer[i * matrix1.cols + j] = matrix1.buffer[i * matrix1.cols + j] + matrix2.buffer[i];
+            }
+        }
+    }
+
+    return matrix_erg;
+}
+ 
+
+Matrix addRowVec(Matrix matrix1, Matrix matrix2)
+{
+    Matrix matrix_erg;
+
+    if(matrix1.rows == 1)
+    {
+        matrix_erg = createMatrix(matrix2.rows, matrix2.cols);
+ 
+        for(int i = 0; i < matrix2.rows; i++)
+        {
+            for(int j = 0; j < matrix2.cols; j++)
+            {
+                matrix_erg.buffer[i * matrix2.cols + j] = matrix1.buffer[j] + matrix2.buffer[i * matrix2.cols + j];
+            }
+        }       
+    }
+
+    if(matrix2.rows == 1)
+    {
+        matrix_erg = createMatrix(matrix1.rows, matrix1.cols);
+ 
+        for(int i = 0; i < matrix1.rows; i++)
+        {
+            for(int j = 0; j < matrix1.cols; j++)
+            {
+                matrix_erg.buffer[i * matrix1.cols + j] = matrix1.buffer[i * matrix1.cols + j] + matrix2.buffer[j];
+            }
+        }
+    }
+
+    return matrix_erg;
+}
+
+
+Matrix add(const Matrix matrix1, const Matrix matrix2)
+{
+    int ok = get_add_mode(matrix1,matrix2);
+    Matrix matrix_erg = createMatrix(0, 0);
    
     switch(ok)
     {
-    case 1: 
+    case SAMEDIMENSIONS:
-    
+        matrix_erg = addSameDim(matrix1, matrix2);
-        for(int i = 0; i < (matrix1.rows * matrix1.cols); i++)
-
-            matrix_erg.data[i] = matrix1.data[i] + matrix2.data[i];
-            
         break;
  
-    case 2:
+    case COLVEC:
-
+        matrix_erg = addColVec(matrix1, matrix2);
-        for(int i = 0; i < erg_rows; i++){
-            for(int j = 0; j < erg_cols; j++)
-
-                matrix_erg.data[i * erg_cols + j] = matrix1.data[i * erg_cols + j] + matrix2.data[i];
-        }
         break;
  
-    case 3:
+    case ROWVEC:
-    
+        matrix_erg = addRowVec(matrix1, matrix2);
-        for(int i = 0; i < erg_rows; i++){
-            for(int j = 0; j < erg_cols; j++)
-
-                matrix_erg.data[i * erg_cols + j] = matrix1.data[i] + matrix2.data[i * erg_cols + j];
-        }
         break;
-
-    case 4:
-
-        for(int i = 0; i < erg_rows; i++){
-            for(int j = 0; j < erg_cols; j++)
-
-                matrix_erg.data[i * erg_cols + j] = matrix1.data[i * erg_cols + j] + matrix2.data[j];
-        }
-        break;
-
-    case 5:
-    
-        for(int i = 0; i < erg_rows; i++){
-            for(int j = 0; j < erg_cols; j++)
-
-                matrix_erg.data[i * erg_cols + j] = matrix1.data[j] + matrix2.data[i * erg_cols + j];
-        }
-        break;
-
-    default: 
-        printf("Matrix addition not possible\n");
-        exit(EXIT_FAILURE);
-
-    
     }
  
-return matrix_erg;
+    return matrix_erg; 
-
-    
-    
 }
+
+
 static int can_multiply (Matrix matrix1, Matrix matrix2)
 {
     int can_multiply = 0;
  
     if(matrix1.cols == matrix2.rows)
+    {
         can_multiply = 1;
+    }
        
     return can_multiply;
 }
@@ -169,11 +237,11 @@ Matrix multiply(const Matrix matrix1, const Matrix matrix2)
     int ok = can_multiply(matrix1,matrix2);
     unsigned int erg_rows = matrix1.rows;
     unsigned int erg_cols = matrix2.cols;
-    Matrix matrix_erg = createMatrix(erg_rows, erg_cols);
+    Matrix matrix_erg = createMatrix(0, 0);
-    
    
     if (ok == 1)
     {
+        matrix_erg = createMatrix(erg_rows, erg_cols);
  
         for (int i = 0; i < erg_rows; i++)
         {
@@ -183,19 +251,15 @@ Matrix multiply(const Matrix matrix1, const Matrix matrix2)
                
                 for (int k = 0; k < matrix1.cols; k++)
                 {
-                    sum += matrix1.data[i * matrix1.cols + k] * matrix2.data[k * matrix2.cols + j];
+                    sum += getMatrixAt(matrix1, i, k) * getMatrixAt(matrix2, k, j);
                 }
                
-                matrix_erg.data [i * erg_cols + j] = sum;
+                setMatrixAt(sum, matrix_erg, i, j);
             }
  
         }  
+    } 
 
-        return matrix_erg;
+    return matrix_erg;
-    }  
-    else 
-    {
-        printf("Matrix multiplication not possible\n");
-        exit(EXIT_FAILURE);
-    }
 }
+ 

matrix.h

@@ -11,7 +11,7 @@ typedef struct
 {
     unsigned int rows;
     unsigned int cols;
-    MatrixType *data;
+    MatrixType *buffer;
 }Matrix;
 
 Matrix createMatrix(unsigned int rows, unsigned int cols);