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

Compare commits

base: bruennerda98937:a2f2be559223dff6823703d5d4bbf9c7e00fa42b
Branches Tags
bruennerda98937:main
bruennerda98937:copilot_running_version
bruennerda98937:devKob
bruennerda98937:dev_kob
bruennerda98937:dev_brünner_1
..
compare: bruennerda98937:f8456a7d5ecd80dbd7c738fc849ec3ac94735ada
Branches Tags
bruennerda98937:main
bruennerda98937:copilot_running_version
bruennerda98937:devKob
bruennerda98937:dev_kob
bruennerda98937:dev_brünner_1

No commits in common. "a2f2be559223dff6823703d5d4bbf9c7e00fa42b" and "f8456a7d5ecd80dbd7c738fc849ec3ac94735ada" have entirely different histories.
a2f2be5592 ... f8456a7d5e

1 changed files with 9 additions and 16 deletions
Show Stats Expand all files Collapse all files

17
matrix.c
View File

@ -81,33 +81,27 @@ void clearMatrix(Matrix *matrix)
free(matrix->buffer); free(matrix->buffer);
matrix->rows = 0; matrix->rows = 0;
matrix->cols = 0; matrix->cols = 0;
matrix->buffer = NULL;
} }
void setMatrixAt(MatrixType value, Matrix matrix, unsigned int rowIdx, unsigned int colIdx) void setMatrixAt(MatrixType value, Matrix matrix, unsigned int rowIdx, unsigned int colIdx)
{ {
//checks, if the given incies are allowed matrix.buffer[rowIdx-1 + matrix.rows*(colIdx-1)] = value;
if((rowIdx) < matrix.rows && (colIdx) < matrix.cols) matrix.buffer[rowIdx + matrix.rows*(colIdx)] = value;
} }
MatrixType getMatrixAt(const Matrix matrix, unsigned int rowIdx, unsigned int colIdx) MatrixType getMatrixAt(const Matrix matrix, unsigned int rowIdx, unsigned int colIdx)
{ {
//checks, if the given indices are allowed
if((rowIdx) < matrix.rows && (colIdx) < matrix.cols) {
MatrixType returnVal; MatrixType returnVal;
returnVal = matrix.buffer[rowIdx + matrix.rows*(colIdx)]; returnVal = matrix.buffer[rowIdx-1 + matrix.rows*(colIdx-1)];
return returnVal; return returnVal;
} }
else return 0;
}
Matrix add(const Matrix matrix1, const Matrix matrix2) Matrix add(const Matrix matrix1, const Matrix matrix2)
{ {
//check if the matrices are able to be added (same size) //check if the matrices are able to be added (same size)
if (matrix1.cols == matrix2.cols && matrix1.rows == matrix2.rows){ if (matrix1.cols == matrix2.cols && matrix1.rows == matrix2.rows){
//size of the matrices should be the same, if the addition is supposed to happen //size of the matrices should be the same, if the addition is supposed to happen
// Matrix outputMatrix = createMatrix(matrix1.rows, matrix1.cols); Matrix outputMatrix = createMatrix(matrix1.rows, matrix1.cols);
Matrix outputMatrix = createMatrix(matrix1.cols, matrix1.rows);
for (int i = 0; i < matrix1.rows;i++) { for (int i = 0; i < matrix1.rows;i++) {
for (int j = 0; j < matrix1.cols; j++) { for (int j = 0; j < matrix1.cols; j++) {
// how this should work in normal Matrix version: // how this should work in normal Matrix version:
@ -131,8 +125,7 @@ Matrix multiply(const Matrix matrix1, const Matrix matrix2)
{ {
//check, if the matrices can be multiplied //check, if the matrices can be multiplied
if (matrix1.rows == matrix2.cols) { if (matrix1.rows == matrix2.cols) {
// Matrix outputMatrix = createMatrix(matrix1.rows, matrix2.cols); Matrix outputMatrix = createMatrix(matrix1.rows, matrix2.cols);
Matrix outputMatrix = createMatrix(matrix2.cols, matrix1.rows);
for(int i = 0; i < matrix1.rows; i++) { for(int i = 0; i < matrix1.rows; i++) {
for (int j = 0; j < matrix2.cols; j++) { for (int j = 0; j < matrix2.cols; j++) {
for (int k = 0; k < matrix2.rows; k++) { for (int k = 0; k < matrix2.rows; k++) {