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

Compare commits

base: ehrnspergersi95041:4963a32fb10c7e3c235033cdaafbbf300a92a62a
Branches Tags
ehrnspergersi95041:main
ehrnspergersi95041:Simon's-Branch
..
compare: ehrnspergersi95041:31e3d1f6d31b0c6d55196b5346fba9a2460db023
Branches Tags
ehrnspergersi95041:Simon's-Branch
ehrnspergersi95041:main

No commits in common. "4963a32fb10c7e3c235033cdaafbbf300a92a62a" and "31e3d1f6d31b0c6d55196b5346fba9a2460db023" have entirely different histories.
4963a32fb1 ... 31e3d1f6d3

2 changed files with 8 additions and 86 deletions
Show Stats Expand all files Collapse all files

85
Start_Windows/matrix.c
View File

@ -4,103 +4,32 @@
// TODO Matrix-Funktionen implementieren // TODO Matrix-Funktionen implementieren
#define EMPTY_CHAR 0 Matrix createMatrix(unsigned int rows, unsigned int cols)
Matrix createMatrix(unsigned int rows, unsigned int cols)
{ {
Matrix matrix;
matrix.rows = rows;
matrix.cols = cols;
matrix.data = EMPTY_CHAR;
if(rows > 0 && cols > 0)
{
matrix.data = (MatrixType*) calloc(rows * cols, sizeof(MatrixType));
}
return matrix;
} }
void clearMatrix(Matrix *matrix) void clearMatrix(Matrix *matrix)
{ {
if(matrix && matrix->data)
{
free(matrix->data);
matrix->data = EMPTY_CHAR;
matrix->rows = 0;
matrix->cols = 0;
}
} }
void setMatrixAt(MatrixType value, Matrix *matrix, unsigned int rowIdx, unsigned int colIdx) void setMatrixAt(MatrixType value, Matrix matrix, unsigned int rowIdx, unsigned int colIdx)
{ {
if(matrix && matrix->data && rowIdx < matrix->rows && colIdx < matrix->cols)
{
matrix->data[rowIdx * matrix->cols + colIdx] = value;
}
} }
MatrixType getMatrixAt(const Matrix matrix, unsigned int rowIdx, unsigned int colIdx) MatrixType getMatrixAt(const Matrix matrix, unsigned int rowIdx, unsigned int colIdx)
{ {
if(matrix.data && rowIdx < matrix.rows && colIdx < matrix.cols)
{
return matrix.data[rowIdx * matrix.cols + colIdx];
}
return UNDEFINED_MATRIX_VALUE;
} }
Matrix add(const Matrix matrix1, const Matrix matrix2) Matrix add(const Matrix matrix1, const Matrix matrix2)
{ {
if(matrix1.rows != matrix2.rows || matrix1.cols != matrix2.cols)
{
return createMatrix(0,0);
}
Matrix result = createMatrix(matrix1.rows, matrix1.cols);
for(unsigned int i = 0; i < result.rows; ++i)
{
for(unsigned int j = 0; j < result.cols; ++j)
{
MatrixType val = getMatrixAt(matrix1, i, j) + getMatrixAt(matrix2, i, j);
setMatrixAt(val, &result, i, j);
}
}
return result;
} }
Matrix multiply(const Matrix matrix1, const Matrix matrix2) Matrix multiply(const Matrix matrix1, const Matrix matrix2)
{ {
if(matrix1.cols != matrix2.rows)
{
return createMatrix(0, 0);
}
Matrix result = createMatrix(matrix1.rows, matrix2.cols);
for(unsigned int i = 0; i < result.rows; ++i)
{
for(unsigned int j = 0; j < result.cols; ++j)
{
MatrixType sum = 0;
for(unsigned int k = 0; k < matrix1.cols; ++k)
{
sum += getMatrixAt(matrix1, i, k) * getMatrixAt(matrix2, k, j);
}
setMatrixAt(sum, &result, i, j);
}
}
return result;
} }
//Vergleich der MatrixReihen/Zeilen
// if((sizeof(matrix1) / sizeof(matrix1[0])) == sizeof(matrix2) / sizeof(matrix2[0]))
// {
// if(sizeof(matrix1[0]) / sizeof(matrix1[0][0]) == sizeof(matrix2[0] / sizeof(matrix2[0][0])))
// {
// }
//}

9
Start_Windows/matrix.h
View File

@ -7,17 +7,10 @@ typedef float MatrixType;
// TODO Matrixtyp definieren // TODO Matrixtyp definieren
typedef struct {
MatrixType* data;
unsigned int cols;
unsigned int rows;
}Matrix;
Matrix createMatrix(unsigned int rows, unsigned int cols); Matrix createMatrix(unsigned int rows, unsigned int cols);
void clearMatrix(Matrix *matrix); void clearMatrix(Matrix *matrix);
void setMatrixAt(MatrixType value, Matrix *matrix, unsigned int rowIdx, unsigned int colIdx); void setMatrixAt(MatrixType value, Matrix matrix, unsigned int rowIdx, unsigned int colIdx);
MatrixType getMatrixAt(const Matrix matrix, unsigned int rowIdx, unsigned int colIdx); MatrixType getMatrixAt(const Matrix matrix, unsigned int rowIdx, unsigned int colIdx);
Matrix add(const Matrix matrix1, const Matrix matrix2); Matrix add(const Matrix matrix1, const Matrix matrix2);
Matrix multiply(const Matrix matrix1, const Matrix matrix2); Matrix multiply(const Matrix matrix1, const Matrix matrix2);