Fixed Broadcastinng Issue in Add Function in matrix.c

imageInput.c

@@ -8,15 +8,80 @@
 
 // TODO Implementieren Sie geeignete Hilfsfunktionen für das Lesen der Bildserie aus einer Datei
 
+int checkString (FILE *file){ //Checks if String at the start of File equals expected Format (0 for wrong 1 for right)
+	if (file == NULL){ //returns 0 for empty file
+		return 0;
+	}
+	char expectedString[] = FILE_HEADER_STRING;
+	char actualString[BUFFER_SIZE];
+
+	rewind(file);
+	size_t bytesRead = fread(actualString, 1,27 , file); //Stores Bytes of start of File to actualString
+	if (bytesRead != 27){
+		return 0;
+	} //Returns 0 if File is to short
+	actualString[27] = '\0';
+
+	if (strcmp(actualString, expectedString) != 0){
+		return 0;
+	}
+	else{
+		return 1;
+	}	
+}
+
+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 = fopen(path, "rb");
+	// 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);
+	//allocateMemoryLabels();
+	for(int i = (series->images->width * series->images->height) - 1; i <= 0; i--)
+	{
+		fread(&(series->images->buffer[i]), sizeof(GrayScalePixelType), 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)
 {
+	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];
+	// TODO allocate memory for labels array (in imageInput.h) -> Done in allocate Memory
+	
+	// TODO read from file and write in 2d arry, write label in labels array, repeat for imageCount	-> done in readImages	
+}
+// 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
+		s->labels = malloc(width * height * sizeof(unsigned char));
+	}
 }

matrix.c

@@ -1,61 +1,131 @@
 #include <stdlib.h>
 #include <string.h>
+#include <stdio.h>
 #include "matrix.h"
 
 // TODO Matrix-Funktionen implementieren
 
-typedef struct Matrix {
-    unsigned int rows;
-    unsigned int cols;
-    MatrixType* buffer;
-} Matrix;
-
-
 Matrix createMatrix(unsigned int rows, unsigned int cols)
 {
+    Matrix newMatrix;
+	if (rows == 0 || cols == 0) {
+		newMatrix.rows = 0;
+		newMatrix.cols = 0;
+		newMatrix.buffer = NULL;
+		return newMatrix;
+	}
 
+	newMatrix.rows = rows;
+	newMatrix.cols = cols;
+
+	newMatrix.buffer = calloc(rows*cols, sizeof(MatrixType));
+	return newMatrix;
 }
 
 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)
 {
-    
+    if (rowIdx >= matrix.rows || colIdx >= matrix.cols){
+        printf("Index out of bounds\n"); //Error Message because Index Input exceeds Matrix
+	}
+    else{
+        matrix.buffer[rowIdx * matrix.cols + colIdx] = value; //Writes Value of value variable in the selected place in Matrix
+	}
 }
 
 MatrixType getMatrixAt(const Matrix matrix, unsigned int rowIdx, unsigned int colIdx)
 {
-    
+    if (rowIdx >= matrix.rows || colIdx >= matrix.cols){
+       printf("Index out of bounds\n");
+       return 0;
+    }
+    else{
+
+       MatrixType value = matrix.buffer[rowIdx * matrix.cols + colIdx]; //Stores value of selected place of Matrix in value variable
+        return value;
+	}
 }
 
 Matrix add(const Matrix matrix1, const Matrix matrix2)
 {
-    
+
+    //If rows and cols of both Matrixes are the same the normal addition starts
+    if (matrix1.rows == matrix2.rows && matrix1.cols == matrix2.cols){
+        Matrix MatrixErgebnis = createMatrix(matrix1.rows, matrix1.cols);
+        for (unsigned int i = 0; i < matrix1.rows; i++){
+            for (unsigned int j = 0; j < matrix1.cols; j++){
+                //Adding Matrix Elements of same row and col index together and store in new Matrix
+                MatrixErgebnis.buffer[i * matrix1.cols + j] = matrix1.buffer[i * matrix1.cols + j] + matrix2.buffer[i * matrix1.cols + j];
+
+            }
+        }
+        return MatrixErgebnis;
+    }
+
+    //if matrix1 is a Vektor it adds elements to first col of matrix2
+    else if (matrix1.cols == 1 && matrix1.rows == matrix2.rows){
+        Matrix MatrixErgebnis = createMatrix(matrix2.rows, matrix2.cols);
+        for (unsigned int i = 0; i < matrix2.rows; i++) {
+          for (unsigned int j = 0; j < matrix2.cols; j++) {
+            //Copy Matrix2 to ErgebnisMatrix
+            MatrixErgebnis.buffer[i * matrix2.cols + j] = getMatrixAt(matrix2, i, j);
+            //Adding Elements of first col of Matrix 1 (Vector) to all Elements of MatrixErgebnis
+            MatrixErgebnis.buffer[i * matrix2.cols + j] += matrix1.buffer[i];
+           }
+        }
+    return MatrixErgebnis;
+    }
+    //if matrix2 is a Vektor it adds elements to first col of matrix1
+    else if (matrix2.cols == 1 && matrix1.rows == matrix2.rows){
+        Matrix MatrixErgebnis = createMatrix(matrix1.rows, matrix1.cols);
+        for (unsigned int i = 0; i < matrix1.rows; i++) {
+            for (unsigned int j = 0; j < matrix1.cols; j++) {
+                //Copy Matrix1 to ErgebnisMatrix
+                MatrixErgebnis.buffer[i * matrix1.cols + j] = getMatrixAt(matrix1, i, j);
+                //Adding Elements of first col of Matrix 2 (Vector) to first col of MatrixErgebnis
+                MatrixErgebnis.buffer[i * matrix1.cols + j] += matrix2.buffer[i];
+
+            }
+        }
+    return MatrixErgebnis;
+    }
+    else{
+           printf("Matrix dimensions do not match\n"); //Error Message if dimensions of Input Matrixes are not identical
+           Matrix MatrixErgebnis = createMatrix(0, 0);
+           clearMatrix(&MatrixErgebnis);
+           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) {
-        Matrix result;
-	    result.rows = matrix1.rows;
-        result.cols = matrix2.cols;
 
         result.buffer = malloc(result.rows * result.cols * sizeof(MatrixType));
 
-        for(int i = 0; i < rows; i++) {
+        for(int i = 0; i < result.rows; i++) {
-            for(int j = 0; j < cols; j++) {
+            for(int j = 0; j < result.cols; j++) {
                 MatrixType value = 0;
                 for(int k = 0; k < matrix1.cols; k++) {
-                    value += matrix1[i][k] * matrix2[k][j];
+                    value += matrix1.buffer[i * matrix1.cols + k] * matrix2.buffer[k * matrix2.cols + j];
                 }
-                result.buffer[i][i] = value;
+                result.buffer[i * matrix1.cols + j] = value;
             }
         }
         return result;
     }
     printf("Die angegebenen Matrizen haben keine passenden Dimensionen für die Multiplikation");
-    return NULL;
+    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;