From 40984fe981d7445f65bc13070b06b42e92a907e9 Mon Sep 17 00:00:00 2001 From: Simon Schuerer Date: Mon, 10 Nov 2025 09:27:23 +0000 Subject: [PATCH] matrixTests.c aktualisiert --- matrixTests.c | 199 +++++++++++++------------------------------------- 1 file changed, 52 insertions(+), 147 deletions(-) diff --git a/matrixTests.c b/matrixTests.c index 686db1e..90297b5 100644 --- a/matrixTests.c +++ b/matrixTests.c @@ -1,170 +1,75 @@ - -#include #include +#include #include "matrix.h" -#include "unity.h" +// TODO Matrix-Funktionen implementieren -void test_createMatrixFailsOnZeroDimensions(void) +MatrixTyp erstelleMatrix(unsigned int reihen, unsigned int spalten) { - Matrix matrixToTest1 = createMatrix(0, 1); - Matrix matrixToTest2 = createMatrix(1, 0); - TEST_ASSERT_NULL(matrixToTest1.buffer); - TEST_ASSERT_EQUAL_UINT32(0, matrixToTest1.rows); - TEST_ASSERT_EQUAL_UINT32(0, matrixToTest1.cols); - TEST_ASSERT_NULL(matrixToTest2.buffer); - TEST_ASSERT_EQUAL_UINT32(0, matrixToTest2.rows); - TEST_ASSERT_EQUAL_UINT32(0, matrixToTest2.cols); + MatrixTyp m; + m.reihen = reihen; + m.spalten = spalten; + m.werte = (MatrixWert *)malloc(reihen * spalten * sizeof(MatrixWert)); + for (unsigned int i = 0; i < reihen * spalten; ++i) { + m.werte[i] = UNDEFINIERTER_MATRIXWERT; + } + return m; } -void test_createMatrixReturnsCorrectMatrixDimensions(void) +void loescheMatrix(MatrixTyp *matrix) { - const unsigned int expectedRows = 15; - const unsigned int expectedCols = 10; - - Matrix matrixToTest = createMatrix(expectedRows, expectedCols); - TEST_ASSERT_EQUAL_UINT32(expectedRows, matrixToTest.rows); - TEST_ASSERT_EQUAL_UINT32(expectedCols, matrixToTest.cols); - free(matrixToTest.buffer); + free(matrix->werte); + matrix->werte = NULL; + matrix->reihen = 0; + matrix->spalten = 0; } -void test_clearMatrixSetsMembersToNull(void) +void setzeMatrixWert(MatrixWert wert, MatrixTyp matrix, unsigned int reiheIndex, unsigned int spalteIndex) { - Matrix matrixToTest = createMatrix(10, 10); - clearMatrix(&matrixToTest); - TEST_ASSERT_NULL(matrixToTest.buffer); - TEST_ASSERT_EQUAL_UINT32(0, matrixToTest.rows); - TEST_ASSERT_EQUAL_UINT32(0, matrixToTest.cols); + if (reiheIndex < matrix.reihen && spalteIndex < matrix.spalten) { + matrix.werte[reiheIndex * matrix.spalten + spalteIndex] = wert; + } } -void test_addReturnsCorrectResult(void) +MatrixWert holeMatrixWert(const MatrixTyp matrix, unsigned int reiheIndex, unsigned int spalteIndex) { - MatrixType buffer1[] = {1, 2, 3, 4, 5, 6}; - MatrixType buffer2[] = {7, 8, 9, 10, 11, 12}; - Matrix matrix1 = {.rows=2, .cols=3, .buffer=buffer1}; - Matrix matrix2 = {.rows=2, .cols=3, .buffer=buffer2}; - - Matrix result = add(matrix1, matrix2); - - float expectedResults[] = {8, 10, 12, 14, 16, 18}; - - TEST_ASSERT_EQUAL_UINT32(matrix1.rows, result.rows); - TEST_ASSERT_EQUAL_UINT32(matrix2.rows, result.rows); - TEST_ASSERT_EQUAL_UINT32(matrix1.cols, result.cols); - TEST_ASSERT_EQUAL_UINT32(matrix2.cols, result.cols); - TEST_ASSERT_EQUAL_INT(sizeof(expectedResults)/sizeof(expectedResults[0]), result.rows * result.cols); - TEST_ASSERT_EQUAL_FLOAT_ARRAY(expectedResults, result.buffer, result.cols * result.rows); - free(result.buffer); + if (reiheIndex < matrix.reihen && spalteIndex < matrix.spalten) { + return matrix.werte[reiheIndex * matrix.spalten + spalteIndex]; + } + return UNDEFINIERTER_MATRIXWERT; } -void test_addFailsOnDifferentInputDimensions(void) +MatrixTyp addiereMatrix(const MatrixTyp matrix1, const MatrixTyp matrix2) { - MatrixType buffer1[] = {1, 2, 3, 4, 5, 6}; - MatrixType buffer2[] = {7, 8, 9, 10, 11, 12}; - Matrix matrix1 = {.rows=2, .cols=3, .buffer=buffer1}; - Matrix matrix2 = {.rows=3, .cols=2, .buffer=buffer2}; - - Matrix result = add(matrix1, matrix2); + if (matrix1.reihen != matrix2.reihen || matrix1.spalten != matrix2.spalten) { + return erstelleMatrix(0, 0); + } - TEST_ASSERT_NULL(result.buffer); - TEST_ASSERT_EQUAL_UINT32(0, result.rows); - TEST_ASSERT_EQUAL_UINT32(0, result.cols); + MatrixTyp ergebnis = erstelleMatrix(matrix1.reihen, matrix1.spalten); + for (unsigned int i = 0; i < matrix1.reihen; ++i) { + for (unsigned int j = 0; j < matrix1.spalten; ++j) { + MatrixWert wert = holeMatrixWert(matrix1, i, j) + holeMatrixWert(matrix2, i, j); + setzeMatrixWert(wert, ergebnis, i, j); + } + } + return ergebnis; } -void test_multiplyReturnsCorrectResults(void) +MatrixTyp multipliziereMatrix(const MatrixTyp matrix1, const MatrixTyp matrix2) { - MatrixType buffer1[] = {1, 2, 3, 4, 5, 6}; - MatrixType buffer2[] = {7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18}; - Matrix matrix1 = {.rows=2, .cols=3, .buffer=buffer1}; - Matrix matrix2 = {.rows=3, .cols=4, .buffer=buffer2}; - - Matrix result = multiply(matrix1, matrix2); + if (matrix1.spalten != matrix2.reihen) { + return erstelleMatrix(0, 0); + } - float expectedResults[] = {74, 80, 86, 92, 173, 188, 203, 218}; - - TEST_ASSERT_EQUAL_UINT32(matrix1.rows, result.rows); - TEST_ASSERT_EQUAL_UINT32(matrix2.cols, result.cols); - TEST_ASSERT_EQUAL_INT(sizeof(expectedResults)/sizeof(expectedResults[0]), result.rows * result.cols); - TEST_ASSERT_EQUAL_FLOAT_ARRAY(expectedResults, result.buffer, result.cols * result.rows); - - free(result.buffer); -} - -void test_multiplyFailsOnWrongInputDimensions(void) -{ - MatrixType buffer1[] = {1, 2, 3, 4, 5, 6}; - MatrixType buffer2[] = {7, 8, 9, 10, 11, 12}; - Matrix matrix1 = {.rows=2, .cols=3, .buffer=buffer1}; - Matrix matrix2 = {.rows=2, .cols=3, .buffer=buffer2}; - - Matrix result = multiply(matrix1, matrix2); - - TEST_ASSERT_NULL(result.buffer); - TEST_ASSERT_EQUAL_UINT32(0, result.rows); - TEST_ASSERT_EQUAL_UINT32(0, result.cols); -} - -void test_getMatrixAtReturnsCorrectResult(void) -{ - MatrixType buffer[] = {1, 2, 3, 4, 5, 6}; - Matrix matrixToTest = {.rows=2, .cols=3, .buffer=buffer}; - int expectedResult = buffer[4]; - - TEST_ASSERT_EQUAL_INT(expectedResult, getMatrixAt(matrixToTest, 1, 1)); -} - -void test_getMatrixAtFailsOnIndicesOutOfRange(void) -{ - MatrixType buffer[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10}; - Matrix matrixToTest = {.rows=2, .cols=3, .buffer=buffer}; - - TEST_ASSERT_EQUAL_INT(UNDEFINED_MATRIX_VALUE, getMatrixAt(matrixToTest, 2, 3)); -} - -void test_setMatrixAtSetsCorrectValue(void) -{ - const int expectedResult = -1; - MatrixType buffer[] = {1, 2, 3, 4, 5, 6}; - Matrix matrixUnderTest = {.rows=2, .cols=3, .buffer=buffer}; - - setMatrixAt(expectedResult, matrixUnderTest, 1, 2); - TEST_ASSERT_EQUAL_INT(expectedResult, buffer[5]); -} - -void test_setMatrixAtFailsOnIndicesOutOfRange(void) -{ - const float expectedResults[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10}; - MatrixType buffer[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10}; - Matrix matrixToTest = {.rows=2, .cols=3, .buffer=buffer}; - - setMatrixAt(-1, matrixToTest, 2, 3); - TEST_ASSERT_EQUAL_FLOAT_ARRAY(expectedResults, matrixToTest.buffer, matrixToTest.cols * matrixToTest.rows); -} - -void setUp(void) { - // Falls notwendig, kann hier Vorbereitungsarbeit gemacht werden -} - -void tearDown(void) { - // Hier kann Bereinigungsarbeit nach jedem Test durchgeführt werden -} - -int main() -{ - UNITY_BEGIN(); - - printf("============================\nMatrix tests\n============================\n"); - RUN_TEST(test_createMatrixReturnsCorrectMatrixDimensions); - RUN_TEST(test_createMatrixFailsOnZeroDimensions); - RUN_TEST(test_clearMatrixSetsMembersToNull); - RUN_TEST(test_addReturnsCorrectResult); - RUN_TEST(test_addFailsOnDifferentInputDimensions); - RUN_TEST(test_multiplyReturnsCorrectResults); - RUN_TEST(test_multiplyFailsOnWrongInputDimensions); - RUN_TEST(test_getMatrixAtReturnsCorrectResult); - RUN_TEST(test_getMatrixAtFailsOnIndicesOutOfRange); - RUN_TEST(test_setMatrixAtSetsCorrectValue); - RUN_TEST(test_setMatrixAtFailsOnIndicesOutOfRange); - - return UNITY_END(); + MatrixTyp ergebnis = erstelleMatrix(matrix1.reihen, matrix2.spalten); + for (unsigned int i = 0; i < matrix1.reihen; ++i) { + for (unsigned int j = 0; j < matrix2.spalten; ++j) { + MatrixWert summe = 0; + for (unsigned int k = 0; k < matrix1.spalten; ++k) { + summe += holeMatrixWert(matrix1, i, k) * holeMatrixWert(matrix2, k, j); + } + setzeMatrixWert(summe, ergebnis, i, j); + } + } + return ergebnis; } \ No newline at end of file