diff --git a/matrix.c b/matrix.c index 85f5b80..e5095b2 100644 --- a/matrix.c +++ b/matrix.c @@ -7,7 +7,7 @@ Matrix createMatrix(unsigned int rows, unsigned int cols) { - Matrix m = {NULL, rows, cols} //Wahrscheinlich in Programm bereits enthalten; + Matrix m = {NULL, rows, cols}; // Wahrscheinlich in Programm bereits enthalten; if (rows > 0 && cols > 0) { @@ -22,7 +22,6 @@ Matrix createMatrix(unsigned int rows, unsigned int cols) return m; } - void clearMatrix(Matrix *matrix) { @@ -36,14 +35,12 @@ void clearMatrix(Matrix *matrix) } void setMatrixAt(MatrixType value, Matrix matrix, unsigned int rowIdx, unsigned int colIdx) - //not testet +// Matrix matrix zu Matrix *matrix, empfehlung { if (rowIdx < matrix.rows && colIdx < matrix.cols && matrix.buffer != NULL) matrix.buffer[rowIdx * matrix.cols + colIdx] = value; } - - MatrixType getMatrixAt(const Matrix matrix, unsigned int rowIdx, unsigned int colIdx) { if (rowIdx >= matrix.rows || colIdx >= matrix.cols || matrix.buffer == NULL) @@ -51,56 +48,55 @@ MatrixType getMatrixAt(const Matrix matrix, unsigned int rowIdx, unsigned int co return matrix.buffer[rowIdx * matrix.cols + colIdx]; } -//TODO: Funktionen implementieren +// TODO: Funktionen implementieren Matrix add(const Matrix matrix1, const Matrix matrix2) { - //Needed: rows/Zeilen, collums/Spalten + // Needed: rows/Zeilen, collums/Spalten - //test, if two matrix has exact size + // test, if two matrix has exact size + + if (matrix1.rows != matrix2.rows || matrix1.cols != matrix2.cols) + return createMatrix(0, 0); - if(matrix1.rows != matrix2.rows || matrix1.cols != matrix2.cols) - return createMatrix(0,0); - Matrix result_add = createMatrix(matrix1.rows, matrix1.cols); - for(int r = 0; r < matrix1.rows; r++) + for (int r = 0; r < matrix1.rows; r++) { - for(int c = 0; c < matrix1.cols; c++) + for (int c = 0; c < matrix1.cols; c++) { - //TODO: matrix_add initialisieren - //matrix_add[r][c] = matrix1[r][c] + matrix2[r][c] + // TODO: matrix_add initialisieren + // matrix_add[r][c] = matrix1[r][c] + matrix2[r][c] - MatrixType sum = getMatrixAt(matrix1,r,c)+getMatrixAt(matrix2,r,c); - setMatrixAt(sum,result_add,r,c) //evtl re + MatrixType sum = getMatrixAt(matrix1, r, c) + getMatrixAt(matrix2, r, c); + setMatrixAt(sum, result_add, r, c); // evtl re } } } Matrix multiply(const Matrix matrix1, const Matrix matrix2) { - //Needed: rows/Zeilen, collums/Spalten - MatrixType buffer_add = 0; //TODO: Datentyp achten, ist int richitg? - Matrix result = {NULL, 0, 0}; //Leere Matrix, falls fehler - //Probe ob Spalten1 = Zeilen2 - if(matrix1.cols != matrix2.rows) - return -1; + // Needed: rows/Zeilen, collums/Spalten + MatrixType buffer_add; + // Probe ob Spalten1 = Zeilen2 + if (matrix1.cols != matrix2.rows) + return createMatrix(0, 0); - result = createMatrix(matrix1.rows, matrix2.cols); // "" + Matrix result = createMatrix(matrix1.rows, matrix2.cols); // "" - for(int index = 0; index < matrix1.rows; index++) + for (int index = 0; index < matrix1.rows; index++) { - for(int shift = 0; shift < matrix2.cols; shift++) + for (int shift = 0; shift < matrix2.cols; shift++) { - for(int skalar = 0; skalar