Matrix überarbeitet

This commit is contained in:
Björn 2025-11-17 13:31:48 +01:00
parent 8c98197327
commit e3349f7f68

View File

@ -4,69 +4,103 @@
// TODO Matrix-Funktionen implementieren // TODO Matrix-Funktionen implementieren
// Matrix erzeugen
Matrix createMatrix(unsigned int rows, unsigned int cols) Matrix createMatrix(unsigned int rows, unsigned int cols)
{ {
// Allocate memory for the matrix structure Matrix matrix;
Matrix matrix;
matrix.rows = rows; matrix.rows = rows;
matrix.cols = cols; matrix.cols = cols;
if (rows == 0 || cols == 0) {
matrix.data = NULL;
return matrix;
}
matrix.data = (MatrixType *)malloc(rows * cols * sizeof(MatrixType)); matrix.data = (MatrixType *)malloc(rows * cols * sizeof(MatrixType));
if (matrix.data == NULL) if (matrix.data == NULL)
{ {
// Handle memory allocation failure
matrix.rows = 0; matrix.rows = 0;
matrix.cols = 0; matrix.cols = 0;
} }
return matrix;
} }
// Matrix Speicher freigeben
void clearMatrix(Matrix *matrix) void clearMatrix(Matrix *matrix)
{ {
// Free the allocated memory for the matrix data if (matrix->data != NULL)
if (matrix->data != NULL)
{ {
free(matrix->data); free(matrix->data);
matrix->data = NULL; matrix->data = NULL;
matrix->rows = 0;
matrix->cols = 0;
} }
matrix->rows = 0;
matrix->cols = 0;
} }
// Wert setzen
void setMatrixAt(MatrixType value, Matrix matrix, unsigned int rowIdx, unsigned int colIdx) void setMatrixAt(MatrixType value, Matrix matrix, unsigned int rowIdx, unsigned int colIdx)
{ {
// Set the value at the specified row and column index if (rowIdx < matrix.rows && colIdx < matrix.cols)
if (rowIdx < matrix.rows && colIdx < matrix.cols)
{ {
matrix.data[rowIdx * matrix.cols + colIdx] = value; matrix.data[rowIdx * matrix.cols + colIdx] = value;
} }
} }
// Wert auslesen
MatrixType getMatrixAt(const Matrix matrix, unsigned int rowIdx, unsigned int colIdx) MatrixType getMatrixAt(const Matrix matrix, unsigned int rowIdx, unsigned int colIdx)
{ {
// Get the value at the specified row and column index if (rowIdx < matrix.rows && colIdx < matrix.cols)
if (rowIdx < matrix.rows && colIdx < matrix.cols)
{ {
return matrix.data[rowIdx * matrix.cols + colIdx]; return matrix.data[rowIdx * matrix.cols + colIdx];
} }
return 0; // Fallback
} }
Matrix add(const Matrix matrix1, const Matrix matrix2) // Matrizen addieren
Matrix add(const Matrix m1, const Matrix m2)
{ {
// Add two matrices and return the result if (m1.rows != m2.rows || m1.cols != m2.cols)
if (matrix1.rows != matrix2.rows || matrix1.cols != matrix2.cols)
{ {
// Handle dimension mismatch return createMatrix(0, 0); // Dimension passt nicht
Matrix emptyMatrix = createMatrix(0, 0);
return emptyMatrix;
} }
Matrix result = createMatrix(m1.rows, m1.cols);
if (result.data == NULL) return result;
for (unsigned int r = 0; r < m1.rows; r++)
{
for (unsigned int c = 0; c < m1.cols; c++)
{
result.data[r * m1.cols + c] =
getMatrixAt(m1, r, c) + getMatrixAt(m2, r, c);
}
}
return result;
} }
Matrix multiply(const Matrix matrix1, const Matrix matrix2) // Matrizen multiplizieren
Matrix multiply(const Matrix m1, const Matrix m2)
{ {
// Multiply two matrices and return the result if (m1.cols != m2.rows)
if (matrix1.cols != matrix2.rows)
{ {
// Handle dimension mismatch return createMatrix(0, 0); // Falls Matrix-Dimensionen nicht passen
Matrix emptyMatrix = createMatrix(0, 0);
return emptyMatrix;
} }
Matrix result = createMatrix(m1.rows, m2.cols);
if (result.data == NULL) return result;
for (unsigned int r = 0; r < m1.rows; r++)
{
for (unsigned int c = 0; c < m2.cols; c++)
{
MatrixType sum = 0;
for (unsigned int k = 0; k < m1.cols; k++)
{
sum += getMatrixAt(m1, r, k) * getMatrixAt(m2, k, c);
}
result.data[r * m2.cols + c] = sum;
}
}
return result;
} }