From fafbda4b030e124faf1b8be2719aae29e4babe86 Mon Sep 17 00:00:00 2001 From: Manuel Glock Date: Fri, 30 Oct 2026 12:54:07 +0100 Subject: [PATCH] =?UTF-8?q?Erste=20Matrix=20Funktionen=20implementiert,=20?= =?UTF-8?q?Test=20Pass=20f=C3=BCr=201,2,3=20und=205?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Startcode/matrix.c | 74 +++++++++++++++++++++++++++++++++++++++++----- Startcode/matrix.h | 9 ++++-- 2 files changed, 74 insertions(+), 9 deletions(-) diff --git a/Startcode/matrix.c b/Startcode/matrix.c index ad00628..dbc6ac2 100644 --- a/Startcode/matrix.c +++ b/Startcode/matrix.c @@ -2,34 +2,94 @@ #include #include "matrix.h" -// TODO Matrix-Funktionen implementieren - Matrix createMatrix(unsigned int rows, unsigned int cols) { - + Matrix matrix = {NULL, 0, 0}; // NUll init + + if(rows > 0 && cols > 0) + { + matrix.buffer = (MatrixType *)calloc((size_t)rows * cols, sizeof(MatrixType)); + + if(matrix.buffer != NULL) //sichergehn das Buffer holen geklappt hat, dann setzen + { + matrix.rows = rows; + matrix.cols = cols; + } + } + + return matrix; } void clearMatrix(Matrix *matrix) { - + if(matrix != NULL) //Check ob die Matrix nicht eh schon leer ist + { + free(matrix->buffer); //memory freen + matrix->buffer = NULL; // buffer entfernen + matrix->rows = 0; + matrix->cols = 0; + } +} + +// Helper Function, um zuschauen ob Index zugriff valide ist. +static int isValidIndex(const Matrix matrix, unsigned int rowIdx, unsigned int colIdx){ + return matrix.buffer != NULL && rowIdx < matrix.rows && colIdx < matrix.cols; } void setMatrixAt(MatrixType value, Matrix matrix, unsigned int rowIdx, unsigned int colIdx) { - + if(isValidIndex(matrix, rowIdx, colIdx)) + matrix.buffer[rowIdx * matrix.cols + colIdx] = value; } MatrixType getMatrixAt(const Matrix matrix, unsigned int rowIdx, unsigned int colIdx) { - + // Für Zugriff auf Row2, Col2, also m6, muss man im Buffer Die Positionen um 1 row + + MatrixType value; + + if(isValidIndex(matrix, rowIdx, colIdx)) + value = matrix.buffer[rowIdx * matrix.cols + colIdx]; + return value; } +static int haveSameDimensions(const Matrix matrix1, const Matrix matrix2) +{ + return matrix1.rows == matrix2.rows && matrix1.cols == matrix2.cols; +} + +Matrix addBroadcast(const Matrix matrix, const Matrix vector){ + // Broadcasting Add von Matrix + Vector + Matrix result = createMatrix(0, 0); +} + +static int isBroadcastable(const Matrix matrix1, const Matrix matrix2){ + // Check Broadcastable +} + +Matrix addElementwise(const Matrix matrix1, const Matrix matrix2){ + // addieren der Matrizen + Matrix result = createMatrix(0, 0); +} + + Matrix add(const Matrix matrix1, const Matrix matrix2) { - + Matrix result = {NULL, 0, 0}; + + if(matrix1.buffer != NULL && matrix2.buffer != NULL){ + if(haveSameDimensions(matrix1, matrix2)){ + result = NULL; //addElementwise + } else if(isBroadcastable(matrix1, matrix2)) { // Check ob Matrix2 ein Vector ist + result = NULL; //addBroadcast + } else if(isBroadcastable(matrix1, matrix2)) { // Check ob Matrix2 ein Vector ist + result = NULL; //addBroadcast + } + } + return result; } Matrix multiply(const Matrix matrix1, const Matrix matrix2) { + //kann man Matrizen multiplizieren, größen Check } \ No newline at end of file diff --git a/Startcode/matrix.h b/Startcode/matrix.h index cc640d1..3260b46 100644 --- a/Startcode/matrix.h +++ b/Startcode/matrix.h @@ -2,11 +2,16 @@ #define MATRIX_H #define UNDEFINED_MATRIX_VALUE 0 +#define MATRIX_COLS 4 +#define MATRIX_ROWS 4 typedef float MatrixType; -// TODO Matrixtyp definieren - +typedef struct { + MatrixType *buffer; + unsigned int rows; + unsigned int cols; +} Matrix; Matrix createMatrix(unsigned int rows, unsigned int cols); void clearMatrix(Matrix *matrix);