knoppal101327/NeuNeuronalesNetz
1
0
Fork 0
generated from freudenreichan/info2Praktikum-NeuronalesNetz
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Verbesserungen nach Informatik-Stunde

Browse Source
This commit is contained in:
AD005\z004z3ez 2025-11-13 11:13:40 +01:00
parent b7de923066
commit d5466ae1fd
1 changed files with 184 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

247
matrix.c
View File

@ -5,17 +5,15 @@
// TODO Matrix-Funktionen implementieren
Matrix createMatrix(unsigned int rows, unsigned int cols) // Ergebnismatrix erstellen
{
//Matrix-Struktur initialisieren
enum addModes{sameDimensions, colVec, rowVec};
Matrix createMatrix(unsigned int rows, unsigned int cols)
{
Matrix m;
m.rows = rows;
m.cols = cols;
m.buffer = NULL;
//Prüfen auf 0-Zeilen oder Spalten -> wenn ja, Rückgabe leerer Matrix
if(rows == 0 || cols == 0)
{
@ -25,9 +23,8 @@ Matrix createMatrix(unsigned int rows, unsigned int cols) // Ergebnismatrix erst
return m;
}
//Speicher für Matrix reservieren -> wenn calloc fehlschlägt, wird wieder leere Matrix zurückgegeben
m.buffer = calloc(rows * cols, sizeof(MatrixType));
if (m.buffer == NULL)
{
@ -40,25 +37,42 @@ Matrix createMatrix(unsigned int rows, unsigned int cols) // Ergebnismatrix erst
return m;
}
void clearMatrix(Matrix *matrix) //dynamisch angelegte Matrix wird freigegeben
void clearMatrix(Matrix *matrix)
{
if (matrix->buffer == NULL)
{
matrix->rows = 0;
matrix->cols = 0;
matrix->buffer = NULL;
return matrix;
}
else
{
free(matrix->buffer);
matrix->rows = 0;
matrix->cols = 0;
matrix->buffer = NULL;
}
}
void setMatrixAt(MatrixType value, Matrix matrix, unsigned int rowIdx, unsigned int colIdx) //dient dazu einen Wert in der Matrix an bestimmte Position zu setzen
void setMatrixAt(MatrixType value, Matrix matrix, unsigned int rowIdx, unsigned int colIdx)
{
if(matrix.buffer == NULL || rowIdx >= matrix.rows || colIdx >= matrix.cols)
{
return;
}
else
{
matrix.buffer[(rowIdx * matrix.cols) + colIdx] = value; //wir setzen den data-Wert an der Stelle (rowIdx*Spalten + colIdx) auf den Wert von value
}
}
MatrixType getMatrixAt(const Matrix matrix, unsigned int rowIdx, unsigned int colIdx) //liest einen Wert an einer bestimmten Position aus der Matrix aus
MatrixType getMatrixAt(const Matrix matrix, unsigned int rowIdx, unsigned int colIdx)
{
//Prüfen, ob ein Buffer existiert & ob Zeilen- und Spaltenindex innerhalb der Grenzen ist
if(matrix.buffer == NULL || rowIdx >= matrix.rows || colIdx >= matrix.cols)
{
return UNDEFINED_MATRIX_VALUE;
@ -67,119 +81,145 @@ MatrixType getMatrixAt(const Matrix matrix, unsigned int rowIdx, unsigned int co
return matrix.buffer[(rowIdx * matrix.cols) + colIdx];
}
static int get_add_mode(Matrix matrix1, Matrix matrix2) {
static int can_add(Matrix matrix1, Matrix matrix2) //Prüft, ob und wie zwei Matrizen addiert werden können
{
int can_add;
int get_add_mode;
if(matrix1.cols == matrix2.cols && matrix1.rows == matrix2.rows){
can_add = 1;
get_add_mode = sameDimensions;
}
else if(matrix1.cols == 1 && matrix1.rows == matrix2.rows){
can_add = 2;
get_add_mode = colVec;
}
else if(matrix2.cols == 1 && matrix1.rows == matrix2.rows){
can_add = 3;
get_add_mode = colVec;
}
else if(matrix1.rows == 1 && matrix1.cols == matrix2.cols){
can_add = 4;
get_add_mode = rowVec;
}
else if(matrix2.rows == 1 && matrix1.cols == matrix2.cols){
can_add = 5;
get_add_mode = rowVec;
}
else{
can_add = 0;
return get_add_mode;
}
return can_add;
}
Matrix add(const Matrix matrix1, const Matrix matrix2) //wir addieren nur wenn beide Matrizen gleich groß sind oder eine von beiden eine Zeile oder eine Spalte besitzt
Matrix addSameDim(Matrix matrix1, Matrix matrix2)
{
//Anlegen einer Variable für die Fallunterscheidung der Addition
int ok = can_add(matrix1,matrix2);
//Gibt die Größe der Ergebnismatrix an
unsigned int erg_rows = (matrix1.rows == matrix2.rows) ? matrix1.rows : (matrix1.rows == 1 ? matrix2.rows : matrix1.rows);
unsigned int erg_cols = (matrix1.cols == matrix2.cols) ? matrix1.cols : (matrix1.cols == 1 ? matrix2.cols : matrix1.cols);
//Ergebnis-Matrix anlegen
Matrix matrix_erg = createMatrix(erg_rows, erg_cols);
switch(ok)
{
case 1:
Matrix matrix_erg = createMatrix(matrix1.rows, matrix1.cols);
for(int i = 0; i < (matrix1.rows * matrix1.cols); i++)
matrix_erg.buffer[i] = matrix1.buffer[i] + matrix2.buffer[i];
break;
case 2:
for(int i = 0; i < erg_rows; i++){
for(int j = 0; j < erg_cols; j++)
matrix_erg.buffer[i * erg_cols + j] = matrix1.buffer[i * erg_cols + j] + matrix2.buffer[i];
}
break;
case 3:
for(int i = 0; i < erg_rows; i++){
for(int j = 0; j < erg_cols; j++)
matrix_erg.buffer[i * erg_cols + j] = matrix1.buffer[i] + matrix2.buffer[i * erg_cols + j];
}
break;
case 4:
for(int i = 0; i < erg_rows; i++){
for(int j = 0; j < erg_cols; j++)
matrix_erg.buffer[i * erg_cols + j] = matrix1.buffer[i * erg_cols + j] + matrix2.buffer[j];
}
break;
case 5:
for(int i = 0; i < erg_rows; i++){
for(int j = 0; j < erg_cols; j++)
matrix_erg.buffer[i * erg_cols + j] = matrix1.buffer[j] + matrix2.buffer[i * erg_cols + j];
}
break;
default:
matrix_erg.rows = 0;
matrix_erg.cols = 0;
matrix_erg.buffer = NULL;
return matrix_erg;
}
Matrix addColVec(Matrix matrix1, Matrix matrix2)
{
Matrix matrix_erg;
if(matrix1.cols == 1)
{
matrix_erg = createMatrix(matrix2.rows, matrix2.cols);
for(int i = 0; i < matrix2.rows; i++)
{
for(int j = 0; j < matrix2.cols; j++)
matrix_erg.buffer[i * matrix2.cols + j] = matrix1.buffer[i * matrix2.cols + j] + matrix2.buffer[i];
}
}
if(matrix2.cols == 1)
{
matrix_erg = createMatrix(matrix1.rows, matrix1.cols);
for(int i = 0; i < matrix1.rows; i++)
{
for(int j = 0; j < matrix1.cols; j++)
matrix_erg.buffer[i * matrix1.cols + j] = matrix1.buffer[i] + matrix2.buffer[i * matrix1.cols + j];
}
}
return matrix_erg;
}
Matrix addRowVec(Matrix matrix1, Matrix matrix2)
{
Matrix matrix_erg;
if(matrix1.rows == 1)
{
matrix_erg = createMatrix(matrix2.rows, matrix2.cols);
for(int i = 0; i < matrix2.rows; i++)
{
for(int j = 0; j < matrix2.cols; j++)
matrix_erg.buffer[i * matrix2.cols + j] = matrix1.buffer[i * matrix2.cols + j] + matrix2.buffer[j];
}
}
if(matrix2.rows == 1)
{
matrix_erg = createMatrix(matrix1.rows, matrix1.cols);
for(int i = 0; i < matrix1.rows; i++)
{
for(int j = 0; j < matrix1.cols; j++)
matrix_erg.buffer[i * matrix1.cols + j] = matrix1.buffer[j] + matrix2.buffer[i * matrix1.cols + j];
}
}
return matrix_erg;
}
Matrix add(const Matrix matrix1, const Matrix matrix2)
{
int ok = get_add_mode(matrix1,matrix2);
Matrix matrix_erg = createMatrix(0, 0);
switch(ok)
{
case sameDimensions:
addSameDim(matrix1, matrix2);
break;
case colVec:
addColVec(matrix1, matrix2);
break;
case rowVec:
addRowVec(matrix1, matrix2);
break;
}
@ -188,9 +228,7 @@ return matrix_erg;
}
static int can_multiply (Matrix matrix1, Matrix matrix2) //Test, ob Matrixmultiplikation möglich
static int can_multiply (Matrix matrix1, Matrix matrix2)
{
int can_multiply = 0;
@ -203,19 +241,14 @@ static int can_multiply (Matrix matrix1, Matrix matrix2) //Test, ob Matrixmultip
Matrix multiply(const Matrix matrix1, const Matrix matrix2)
{
//Prüft, ob Matrixmultiplikation möglich -> Übergabe an Hilfsvariable
int ok = can_multiply(matrix1,matrix2);
//Größe der Matrix festlegen und an Ergebnismatrix übergeben
unsigned int erg_rows = matrix1.rows;
unsigned int erg_cols = matrix2.cols;
Matrix matrix_erg = createMatrix(erg_rows, erg_cols);
Matrix matrix_erg = createMatrix(0, 0);
if (ok == 1)
{
Matrix matrix_erg = createMatrix(erg_rows, erg_cols);
for (int i = 0; i < erg_rows; i++)
{
@ -225,22 +258,16 @@ Matrix multiply(const Matrix matrix1, const Matrix matrix2)
for (int k = 0; k < matrix1.cols; k++)
{
sum += matrix1.buffer[i * matrix1.cols + k] * matrix2.buffer[k * matrix2.cols + j];
sum += getMatrixAt(matrix1, k, j) * getMatrixAt(matrix2, j, k);
}
matrix_erg.buffer [i * erg_cols + j] = sum;
setMatrixAt(sum, matrix_erg, i, j);
}
}
return matrix_erg;
}
else
{
matrix_erg.rows = 0;
matrix_erg.cols = 0;
matrix_erg.buffer = NULL;
return matrix_erg;
}
}