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

refractor and cleanup matrix.c

Browse Source
This commit is contained in:
D2A62006 2025-11-27 13:20:06 +01:00
parent e0ded7b738
commit 0c85fb19bc
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
matrix.c
View File

@ -1,9 +1,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "matrix.h" #include "matrix.h"
#include <stdbool.h>
// TODO Matrix-Funktionen implementieren
Matrix createMatrix(size_t rows, size_t cols) Matrix createMatrix(size_t rows, size_t cols)
{ {
@ -17,7 +14,7 @@ Matrix createMatrix(size_t rows, size_t cols)
return m; return m;
} }
// Single allocation for entire matrix //Allocate Matrix buffer
m.buffer = malloc(rows * cols * sizeof(MatrixType)); m.buffer = malloc(rows * cols * sizeof(MatrixType));
if(!m.buffer){ if(!m.buffer){
@ -25,7 +22,7 @@ Matrix createMatrix(size_t rows, size_t cols)
return m; return m;
} }
// Initialize (optional) //Initialize matrix with default value
for(unsigned int i = 0; i < rows * cols; i++){ for(unsigned int i = 0; i < rows * cols; i++){
m.buffer[i] = UNDEFINED_MATRIX_VALUE; m.buffer[i] = UNDEFINED_MATRIX_VALUE;
} }
@ -75,7 +72,7 @@ MatrixType getMatrixAt(const Matrix matrix, unsigned int rowIdx, unsigned int co
Matrix add(const Matrix matrix1, const Matrix matrix2) Matrix add(const Matrix matrix1, const Matrix matrix2)
{ {
bool doBroadcast = false; unsigned int doBroadcast = 0;
Matrix larger, smaller; Matrix larger, smaller;
if(matrix1.rows == matrix2.rows && matrix1.cols == matrix2.cols){ if(matrix1.rows == matrix2.rows && matrix1.cols == matrix2.cols){
@ -86,13 +83,13 @@ Matrix add(const Matrix matrix1, const Matrix matrix2)
{ {
larger = matrix1; larger = matrix1;
smaller = matrix2; smaller = matrix2;
doBroadcast = true; doBroadcast = 1;
} }
else if (matrix1.rows == matrix2.rows && matrix1.cols == 1) else if (matrix1.rows == matrix2.rows && matrix1.cols == 1)
{ {
larger = matrix2; larger = matrix2;
smaller = matrix1; smaller = matrix1;
doBroadcast = true; doBroadcast = 1;
} }
else{ else{
Matrix m = {NULL, 0, 0}; Matrix m = {NULL, 0, 0};
@ -101,6 +98,7 @@ Matrix add(const Matrix matrix1, const Matrix matrix2)
Matrix outputMatrix = createMatrix(larger.rows, larger.cols); Matrix outputMatrix = createMatrix(larger.rows, larger.cols);
if(doBroadcast){ if(doBroadcast){
//Broadcasting
for(int i = 0; i < outputMatrix.rows; i++){ for(int i = 0; i < outputMatrix.rows; i++){
MatrixType broadcastValue = smaller.buffer[i]; MatrixType broadcastValue = smaller.buffer[i];
for(int j = 0; j < outputMatrix.cols; j++){ for(int j = 0; j < outputMatrix.cols; j++){
@ -108,6 +106,7 @@ Matrix add(const Matrix matrix1, const Matrix matrix2)
} }
} }
} else{ } else{
//Classic execution
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: