merge upstream

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "makefile.configureOnOpen": false
+}

README.md

@@ -0,0 +1,2 @@
+# Projekt 2 für Informatik 2 Praktikum
+  

matrix.c

@@ -6,12 +6,13 @@
 
 Matrix createMatrix(unsigned int rows, unsigned int cols)
 {
-    
+    MatrixType* data = malloc(rows * cols * sizeof(MatrixType));
+    Matrix newMatrix = {rows, cols, data};
+    return newMatrix; 
 }
 
 void clearMatrix(Matrix *matrix)
 {
-    
 }
 
 void setMatrixAt(MatrixType value, Matrix matrix, unsigned int rowIdx, unsigned int colIdx)

matrix.h

@@ -6,6 +6,12 @@
 typedef float MatrixType;
 
 // TODO Matrixtyp definieren
+typedef struct
+{
+    unsigned int rows;
+    unsigned int cols;
+    MatrixType *data;
+} Matrix;
 
 
 Matrix createMatrix(unsigned int rows, unsigned int cols);

matrixTests.c

@@ -164,7 +164,7 @@ void test_setMatrixAtFailsOnIndicesOutOfRange(void)
     Matrix matrixToTest = {.rows=2, .cols=3, .buffer=buffer};
 
     setMatrixAt(-1, matrixToTest, 2, 3);
-    TEST_ASSERT_EQUAL_FLOAT_ARRAY(expectedResults, matrixToTest.buffer, sizeof(buffer)/sizeof(MatrixType));
+    TEST_ASSERT_EQUAL_FLOAT_ARRAY(expectedResults, matrixToTest.buffer, matrixToTest.cols * matrixToTest.rows);
 }
 
 void setUp(void) {