Matrix noch ohne broadcasting

Reviewed-on: #1

makefile

@@ -57,10 +57,12 @@ imageInputTests: imageInput.o imageInputTests.c $(unityfolder)/unity.c
 # --------------------------
 # Clean
 # --------------------------
+#clean:
+#ifeq ($(OS),Windows_NT)
+#	del /f *.o *.exe
+#else
+#	rm -f *.o mnist runMatrixTests runNeuralNetworkTests runImageInputTests
+#endif
+# clean für windows
 clean:
-ifeq ($(OS),Windows_NT)
-	del /f *.o *.exe
-else
-	rm -f *.o mnist runMatrixTests runNeuralNetworkTests runImageInputTests
-endif
-
+	rm -f *.o *.exe 

matrix.c

@@ -1,42 +1,87 @@
+#include "matrix.h"
 #include <stdlib.h>
 #include <string.h>
-#include "matrix.h"
-
 // TODO Matrix-Funktionen implementieren
-
-Matrix createMatrix(unsigned int rows, unsigned int cols)
-{
-    MatrixType*data= malloc(rows*cols*sizeof(MatrixType));  //Speicher reservieren
-    Matrix newMatrix = {rows,cols,data};
+/*typedef struct {
+    unsigned int rows;  //Zeilen
+    unsigned int cols; //Spalten
+    MatrixType *buffer; //Zeiger auf Speicherbereich Reihen*Spalten
+} Matrix;*/
+Matrix createMatrix(unsigned int rows, unsigned int cols) {
+  MatrixType *buffer =
+      malloc(rows * cols * sizeof(MatrixType)); // Speicher reservieren, malloc
+                                                // liefert Zeiger auf Speicher
+  Matrix newMatrix = {rows, cols, buffer};      // neue Matrix nach struct
   return newMatrix;
 }
-
-void clearMatrix(Matrix *matrix)
-{
-    matrix->data = UNDEFINED_MATRIX_VALUE;        //Auf 0 setzen
+void clearMatrix(Matrix *matrix) {
+  matrix->buffer = UNDEFINED_MATRIX_VALUE;
   matrix->rows = UNDEFINED_MATRIX_VALUE;
   matrix->cols = UNDEFINED_MATRIX_VALUE;
+  free((*matrix).buffer); // Speicher freigeben
+}
+void setMatrixAt(const MatrixType value, Matrix matrix,
+                 const unsigned int rowIdx, // Kopie der Matrix wird übergeben
+                 const unsigned int colIdx) {
+
+  matrix.buffer[rowIdx * matrix.cols + colIdx] =
+      value; // rowIdx * matrix.cols -> Beginn der Zeile colIdx ->Spalte
+             // innerhalb der Zeile
+}
+MatrixType getMatrixAt(const Matrix matrix,
+                       unsigned int rowIdx, // Kopie der Matrix wird übergeben
+                       unsigned int colIdx) {
+  if (rowIdx >= matrix.rows ||
+      colIdx >= matrix.cols) { // Speichergröße nicht überschreiten
+    return 0;
+  }
+
+  MatrixType value = matrix.buffer[rowIdx * matrix.cols + colIdx];
+
+  return value;
+}
+Matrix add(const Matrix matrix1, const Matrix matrix2) {
+
+  // Ergebnismatrix
+  Matrix result;
+  const int cols1 = matrix1.cols;
+  const int rows1 = matrix1.rows;
+  const int cols2 = matrix2.cols;
+  const int rows2 = matrix2.rows;
+
+
+  const int rowsEqual = (matrix1.rows==matrix2.rows) ? 1: 0;
+  const int colsEqual = (matrix1.cols==matrix2.cols) ? 1: 0;
+ 
+  // Broadcasting nur bei Vektor und Matrix, Fehlermeldung bei zwei unpassender
+  // Matrix
+  if (rowsEqual == 1 && colsEqual == 1){
+    Matrix result = createMatrix(matrix1.rows, matrix1.cols);
+    for (int i = 0; i< rows1; i++) {
+      for (int j= 0; j< cols1; j++){
+        int valueM1= getMatrixAt(matrix1, i, j);
+        int valueM2= getMatrixAt(matrix2, i, j);
+        int sum = valueM1 + valueM2;
+        setMatrixAt(sum, result, i, j);
+      }
+    }
+    return result;
+  }
+  else if (rowsEqual ==1 && colsEqual == 0){
+
+  }
+  else if (rowsEqual == 0 && colsEqual == 1){
+
+  }
+  else {
 
-    free((*matrix).data); //Speicher freigeben
 
   }
 
-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)
-{
+  // Speicher reservieren
 
+  // Matrix addieren
+
+  return result;
 }
+Matrix multiply(const Matrix matrix1, const Matrix matrix2) { return matrix1; }

matrix.h

@@ -6,20 +6,20 @@
 typedef float MatrixType;
 
 // TODO Matrixtyp definieren
-typedef struct
-{
+typedef struct {
   unsigned int rows;
   unsigned int cols;
-    MatrixType *data;
-} Matrix;
+  MatrixType *buffer;
 
+} Matrix;
 
 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);
+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