diff --git a/.idea/editor.xml b/.idea/editor.xml
index ec90224..25c6c37 100644
--- a/.idea/editor.xml
+++ b/.idea/editor.xml
@@ -243,5 +243,102 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/matrix.c b/matrix.c
index 69ea352..5bdaacc 100644
--- a/matrix.c
+++ b/matrix.c
@@ -4,32 +4,157 @@
// TODO Matrix-Funktionen implementieren
+//Matrix dimensionieren
Matrix createMatrix(unsigned int rows, unsigned int cols)
{
-
+ Matrix m; //Struktur anlegen, Varibale m von Typ Matrix
+
+ //Sonderfall aus Unit-Test, wenn rows == 0 oder cols == 0, darf kein Speicher allokiert werden
+ if(rows==0 || cols==0){
+ m.rows = 0;
+ m.cols = 0;
+ m.buffer = NULL;
+ return m;
}
-void clear Matrix(Matrix *matrix)
+ //Normalfall
+ m.rows = rows; // strukurvariable.feldname --> Struktur-Zugriffsoperator
+ m.cols = cols;
+ m.buffer = malloc((rows * cols) * sizeof(MatrixType)); //Speicher reserviert für Elemente
+
+ return m;
+}
+
+void clearMatrix(Matrix *matrix)
{
-
+ // falls Speicher existiert (buffer NICHT NULL ist): freigeben
+ if(matrix->buffer != NULL)
+ {
+ free(matrix->buffer);// Speicher freigegeben aber zeigt irgendwo hin (dangling pointer)
+ }
+
+ //Matrix in definierten leeren Zustand setzen
+ matrix->buffer = NULL; // dangling pointer zurücksetzen
+ matrix->rows = 0;
+ matrix->cols = 0;
}
+//Wert in Matrix schreiben und wo genau
void setMatrixAt(MatrixType value, Matrix matrix, unsigned int rowIdx, unsigned int colIdx)
{
-
+ // Sicherheit: wenn buffer == NULL (kein gültiger Speicher) oder Index außerhalb der Matrix --> return
+ if(matrix.buffer == NULL || rowIdx >= matrix.rows || colIdx >= matrix.cols)
+ {
+ return;
+ }
+ //index = Zeile * Anzahl_Spalten + Spalte
+ unsigned int index = rowIdx * matrix.cols + colIdx;
+
+ // Schreibt value direkt an die berechnete Position im Matrixspeicher
+ matrix.buffer[index] = value;
}
MatrixType getMatrixAt(const Matrix matrix, unsigned int rowIdx, unsigned int colIdx)
{
-
+ if (matrix.buffer == NULL || rowIdx >= matrix.rows || colIdx >= matrix.cols)
+ {
+ return 0;
+ }
+
+ unsigned int index = rowIdx * matrix.cols + colIdx;
+
+ return matrix.buffer[index];
}
Matrix add(const Matrix matrix1, const Matrix matrix2)
{
-
+ Matrix result;
+
+ //Zeilen müssen gleich sein
+ if (matrix1.rows != matrix2.rows)
+ {
+ result.rows = 0;
+ result.cols = 0;
+ result.buffer = NULL;
+ return result;
+ }
+
+
+ //Spalten müssen gleich sein (mit broadcasting)
+ //Fälle: gleiche Spalten ok, matrix1 hat 1 Spalte, matrix2 hat 1 Spalte
+ //sonst inkompatibel
+ if (matrix1.cols != matrix2.cols && matrix1.cols != 1 && matrix2.cols != 1)
+ {
+ result.rows = 0;
+ result.cols = 0;
+ result.buffer = NULL;
+ return result;
+ }
+
+ result.rows = matrix1.rows;
+ result.cols = (matrix1.cols > matrix2.cols) ? matrix1.cols : matrix2.cols;
+
+ result.buffer = malloc(result.rows * result.cols * sizeof(MatrixType));
+
+ for (unsigned int r = 0; r < result.rows; r++)
+ {
+ for (unsigned int c = 0; c < result.cols; c++)
+ {
+ // Bestimme Spalte für matrix1:
+ // Wenn nur 1 Spalte -> immer Spalte 0 benutzen
+ unsigned int c1 = (matrix1.cols == 1) ? 0 : c;
+
+ // Bestimme Spalte für matrix2:
+ unsigned int c2 = (matrix2.cols == 1) ? 0 : c;
+
+ MatrixType v1 = getMatrixAt(matrix1, r, c1);
+ MatrixType v2 = getMatrixAt(matrix2, r, c2);
+
+ setMatrixAt(v1 + v2, result, r, c);
+ }
+ }
+
+ return result;
}
+
Matrix multiply(const Matrix matrix1, const Matrix matrix2)
{
-
-}
\ No newline at end of file
+ Matrix result;
+
+ if(matrix1.cols != matrix2.rows)
+ {
+ result.rows = 0;
+ result.cols = 0;
+ result.buffer = NULL;
+ return result;
+ }
+
+
+ result.rows = matrix1.rows;
+ result.cols = matrix2.cols;
+
+ result.buffer = malloc(result.rows * result.cols * sizeof(MatrixType));
+
+ for (unsigned int r = 0; r < result.rows; r++)
+ {
+ for (unsigned int c = 0; c < result.cols; c++)
+ {
+ MatrixType sum = 0;
+
+ // gemeinsame Dimension = matrix1.cols = matrix2.rows
+ for (unsigned int i = 0; i < matrix1.cols; i++)
+ {
+ MatrixType a = getMatrixAt(matrix1, r, i);
+ MatrixType b = getMatrixAt(matrix2, i, c);
+
+ sum += a * b;
+ }
+
+ setMatrixAt(sum, result, r, c);
+ }
+ }
+
+ return result;
+}
+
diff --git a/matrix.h b/matrix.h
index cc640d1..9acce0a 100644
--- a/matrix.h
+++ b/matrix.h
@@ -6,6 +6,11 @@
typedef float MatrixType;
// TODO Matrixtyp definieren
+typedef struct {
+ unsigned int rows;
+ unsigned int cols;
+ MatrixType* buffer; //buffer Pointer zeigt auf Heap, mit malloc dort dann Speicher reservieren
+} Matrix;
Matrix createMatrix(unsigned int rows, unsigned int cols);
diff --git a/matrix.o b/matrix.o
new file mode 100644
index 0000000..9119c55
Binary files /dev/null and b/matrix.o differ
diff --git a/runMatrixTests.exe b/runMatrixTests.exe
new file mode 100644
index 0000000..b67fff3
Binary files /dev/null and b/runMatrixTests.exe differ