grafma98967/info2_pr_2_NeuronalesNetz
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

angepasste Kommentare

Browse Source
This commit is contained in:
maxgrf 2025-11-20 14:12:47 +01:00
parent 89262e4763
commit b998717e19
1 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
matrix.c
View File

@ -6,18 +6,18 @@
Matrix createMatrix(unsigned int rows, unsigned int cols)
{
Matrix m = {NULL, 0, 0};
Matrix matrix = {NULL, 0, 0};
if (rows == 0 || cols == 0)
return m;
return matrix; //gibt leere Matrix zurück
m.buffer = (MatrixType *)calloc(rows * cols, sizeof(MatrixType));
if (m.buffer == NULL)
return m;
matrix.buffer = (MatrixType *)calloc(rows * cols, sizeof(MatrixType));
if (matrix.buffer == NULL) //auf verfügbaren Speicherplatz prüfen
return matrix;
m.rows = rows;
m.cols = cols;
return m;
matrix.rows = rows;
matrix.cols = cols;
return matrix; //Matrix zurückgeben
}
void clearMatrix(Matrix *matrix)
@ -25,33 +25,31 @@ void clearMatrix(Matrix *matrix)
if (matrix != NULL)
{
free(matrix->buffer);
matrix->buffer = NULL;
free(matrix->buffer); //Speicherplatz bereinigen
matrix->buffer = NULL; //Werte auf 0 setzen
matrix->rows = 0;
matrix->cols = 0;
}
}
void setMatrixAt(MatrixType value, Matrix matrix, unsigned int rowIdx, unsigned int colIdx) //Problematisch Call-by-Value --> Call-by-Pointer
// Matrix matrix zu Matrix *matrix, empfehlung
void setMatrixAt(MatrixType value, Matrix matrix, unsigned int rowIdx, unsigned int colIdx)
{
if (rowIdx < matrix.rows && colIdx < matrix.cols && matrix.buffer != NULL)
matrix.buffer[rowIdx * matrix.cols + colIdx] = value;
matrix.buffer[rowIdx * matrix.cols + colIdx] = value; //gibt xxxxxxxxxx
}
MatrixType getMatrixAt(const Matrix matrix, unsigned int rowIdx, unsigned int colIdx)
{
if (rowIdx >= matrix.rows || colIdx >= matrix.cols || matrix.buffer == NULL)
return 0; // Sicherheitscheck
return matrix.buffer[rowIdx * matrix.cols + colIdx];
return matrix.buffer[rowIdx * matrix.cols + colIdx]; //xxxxxxxxxxxx
}
// TODO: Funktionen implementieren
Matrix add(const Matrix matrix1, const Matrix matrix2)
{
// check, equal rows
// "Elementweise Addition": test, if two matrix has exact size
// immer Probe, gleiche Zeilen der Matrizen
// "Elementweise Addition": Probe, ob matrix gleiche größe hat
if (matrix1.rows == matrix2.rows && matrix1.cols == matrix2.cols)
{
Matrix result_add = createMatrix(matrix1.rows, matrix1.cols);
@ -66,7 +64,7 @@ Matrix add(const Matrix matrix1, const Matrix matrix2)
}
return result_add;
}
// "Broadcasting": matrix1 has 1 collum
// "Broadcasting": matrix1 hat 1 Spalte
if (matrix1.rows == matrix2.rows && matrix1.cols == 1)
{
Matrix result_add = createMatrix(matrix1.rows, matrix2.cols);
@ -80,7 +78,7 @@ Matrix add(const Matrix matrix1, const Matrix matrix2)
}
return result_add;
}
// "Broadcasting": matrix2 has 1 collum
// "Broadcasting": matrix2 hat 1 Spalte
if (matrix1.rows == matrix2.rows && matrix2.cols == 1)
{
Matrix result_add = createMatrix(matrix1.rows, matrix1.cols);
@ -100,7 +98,6 @@ Matrix add(const Matrix matrix1, const Matrix matrix2)
Matrix multiply(const Matrix matrix1, const Matrix matrix2)
{
// Needed: rows/Zeilen, collums/Spalten
MatrixType buffer_add;
if (!matrix1.buffer || !matrix2.buffer) // Probe ob leere Matrize vorliegt
@ -117,10 +114,8 @@ Matrix multiply(const Matrix matrix1, const Matrix matrix2)
buffer_add = 0;
for (unsigned int skalar = 0; skalar < matrix1.cols; skalar++)
{
// buffer_add += matrix1[index][skalar]*matrix2[skalar][shift];
buffer_add += getMatrixAt(matrix1, index, skalar) * getMatrixAt(matrix2, skalar, shift);
}
// matrix_mul[index][shift] = buffer_add;
setMatrixAt(buffer_add, result_mul, index, shift);
}
}