still fixed changes related to matrix

imageInput.c

@@ -29,10 +29,21 @@ int checkString (FILE *file){ //Checks if String at the start of File equals exp
 }
 }
 
+void setParameters(FILE* file, unsigned int* imageCount, unsigned int* width, unsigned int* height);
+void allocateMemory(GrayScaleImageSeries *s, const int imageCount, const int width, const int height);
 // TODO Vervollständigen Sie die Funktion readImages unter Benutzung Ihrer Hilfsfunktionen
 GrayScaleImageSeries *readImages(const char *path)
 {
+	FILE * file;
+	// TODO open binary file from file name
     GrayScaleImageSeries *series = NULL;
+	if(!(checkString(file)))
+		return NULL;
+
+    unsigned int* imageCount = &(series->count); // sets a pointer for int variable count in struct
+
+    setParameters(file, imageCount, &(series->images->width), &(series->images->height));
+    allocateMemory(series, *imageCount, series->images->width, series->images->height);
 
     return series;
 }
@@ -40,4 +51,27 @@ GrayScaleImageSeries *readImages(const char *path)
 // TODO Vervollständigen Sie die Funktion clearSeries, welche eine Bildserie vollständig aus dem Speicher freigibt
 void clearSeries(GrayScaleImageSeries *series)
 {
+	for(size_t i = series->count - 1; i >= 0; i--)
+	{
+		free(series->images+series->count*sizeof(GrayScaleImage)*i);
+		free(series->labels+series->count*sizeof(unsigned char)*i);
+	}
+	series->images = NULL;
+	series->labels = NULL;
+}
+void setParameters(FILE* file, unsigned int* imageCount, unsigned int* width, unsigned int* height) { // sets the parameters
+	char buffer[3];
+
+	fseek(file, 27, SEEK_SET);
+	fread(buffer, 1, 3, file);
+
+	*imageCount = (int) buffer[0];
+    *width = (int) buffer[1];
+    *height = (int) buffer[2];
+}
+// change this to createMatrix?
+void allocateMemory(GrayScaleImageSeries* s, const int imageCount, const int width, const int height) {
+	for (int i = 0; i < imageCount; i++) {
+		s->images[i].buffer = (unsigned char *) malloc(width * height * sizeof(unsigned char)); // allocates memory for every image in the series
+	}
 }

matrix.c

@@ -1,5 +1,6 @@
 #include <stdlib.h>
 #include <string.h>
+#include <stdio.h>
 #include "matrix.h"
 
 // TODO Matrix-Funktionen implementieren
@@ -16,14 +17,14 @@ Matrix createMatrix(unsigned int rows, unsigned int cols)
     Matrix newMatrix;
 	newMatrix.rows = rows;
 	newMatrix.cols = cols;
-	newMatrix.buffer = calloc(rows*cols, sizeof(MatrixType))
+	newMatrix.buffer = calloc(rows*cols, sizeof(MatrixType));
 	return newMatrix;
 }
 
 void clearMatrix(Matrix *matrix)
 {
-    free(*matrix.buffer);
+    free(matrix->buffer);
-	*matrix.buffer = NULL;
+	matrix->buffer = NULL;
 }
 
 void setMatrixAt(MatrixType value, Matrix matrix, unsigned int rowIdx, unsigned int colIdx)
@@ -54,7 +55,7 @@ Matrix add(const Matrix matrix1, const Matrix matrix2)
     Matrix MatrixErgebnis = createMatrix(matrix1.rows, matrix1.cols); //Creating Result Matrix
     if(matrix1.cols != matrix2.cols || matrix1.rows != matrix2.rows){
         printf("Matrix dimensions do not match\n"); //Error Message if dimensions of Input Matrixes are not identical
-        MatrixErgebnis = clearMatrix(MatrixErgebnis);
+        clearMatrix(&MatrixErgebnis);
         return MatrixErgebnis;
     }
     else{
@@ -73,5 +74,25 @@ return MatrixErgebnis;
 
 Matrix multiply(const Matrix matrix1, const Matrix matrix2)
 {
+    Matrix result;
+    result.rows = matrix1.rows;
+    result.cols = matrix2.cols;
 
+    if (matrix1.rows == matrix2.cols) {
+
+        result.buffer = malloc(result.rows * result.cols * sizeof(MatrixType));
+
+        for(int i = 0; i < result.rows; i++) {
+            for(int j = 0; j < result.cols; j++) {
+                MatrixType value = 0;
+                for(int k = 0; k < matrix1.cols; k++) {
+                    value += matrix1.buffer[i * matrix1.cols + k] * matrix2.buffer[k * matrix2.cols + j];
+                }
+                result.buffer[i * matrix1.cols + j] = value;
+            }
+        }
+        return result;
+    }
+    printf("Die angegebenen Matrizen haben keine passenden Dimensionen für die Multiplikation");
+    return result;
 }

matrix.h

@@ -7,7 +7,11 @@ typedef float MatrixType;
 
 // TODO Matrixtyp definieren
 
-typedef struct Matrix;
+typedef struct Matrix{
+    unsigned int rows;
+    unsigned int cols;
+    MatrixType* buffer;
+}Matrix;