kachelto100370/info2Praktikum-NeuronalesNetz
2
0
Fork 0
forked from freudenreichan/info2Praktikum-NeuronalesNetz
Code Pull Requests Activity

Compare commits

base: kachelto100370:0886489d4942d994fe8d0aa0f7b700090a5aa48a
Branches Tags
kachelto100370:main
kachelto100370:Krisp2
kachelto100370:RMax
kachelto100370:KTobi2
freudenreichan:main
..
compare: kachelto100370:5fcc3cd042ad6cb28b2781f832a034604d40e2a2
Branches Tags
kachelto100370:Krisp2
kachelto100370:RMax
kachelto100370:KTobi2
kachelto100370:main
freudenreichan:main

No commits in common. "0886489d4942d994fe8d0aa0f7b700090a5aa48a" and "5fcc3cd042ad6cb28b2781f832a034604d40e2a2" have entirely different histories.
0886489d49 ... 5fcc3cd042

3 changed files with 46 additions and 93 deletions
Show Stats Expand all files Collapse all files

14
makefile
View File

@ -57,12 +57,10 @@ imageInputTests: imageInput.o imageInputTests.c $(unityfolder)/unity.c
# -------------------------- # --------------------------
# Clean # Clean
# -------------------------- # --------------------------
#clean:
#ifeq ($(OS),Windows_NT)
# del /f *.o *.exe
#else
# rm -f *.o mnist runMatrixTests runNeuralNetworkTests runImageInputTests
#endif
# clean für windows
clean: clean:
rm -f *.o *.exe ifeq ($(OS),Windows_NT)
del /f *.o *.exe
else
rm -f *.o mnist runMatrixTests runNeuralNetworkTests runImageInputTests
endif

107
matrix.c
View File

@ -1,87 +1,42 @@
#include "matrix.h"
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "matrix.h"
// TODO Matrix-Funktionen implementieren // TODO Matrix-Funktionen implementieren
/*typedef struct {
unsigned int rows; //Zeilen Matrix createMatrix(unsigned int rows, unsigned int cols)
unsigned int cols; //Spalten {
MatrixType *buffer; //Zeiger auf Speicherbereich Reihen*Spalten MatrixType*data= malloc(rows*cols*sizeof(MatrixType)); //Speicher reservieren
} Matrix;*/ Matrix newMatrix = {rows,cols,data};
Matrix createMatrix(unsigned int rows, unsigned int cols) { return newMatrix;
MatrixType *buffer =
malloc(rows * cols * sizeof(MatrixType)); // Speicher reservieren, malloc
// liefert Zeiger auf Speicher
Matrix newMatrix = {rows, cols, buffer}; // neue Matrix nach struct
return newMatrix;
} }
void clearMatrix(Matrix *matrix) {
matrix->buffer = UNDEFINED_MATRIX_VALUE; void clearMatrix(Matrix *matrix)
matrix->rows = UNDEFINED_MATRIX_VALUE; {
matrix->cols = UNDEFINED_MATRIX_VALUE; matrix->data = UNDEFINED_MATRIX_VALUE; //Auf 0 setzen
free((*matrix).buffer); // Speicher freigeben matrix->rows = UNDEFINED_MATRIX_VALUE;
matrix->cols = UNDEFINED_MATRIX_VALUE;
free((*matrix).data); //Speicher freigeben
} }
void setMatrixAt(const MatrixType value, Matrix matrix,
const unsigned int rowIdx, // Kopie der Matrix wird übergeben
const unsigned int colIdx) {
matrix.buffer[rowIdx * matrix.cols + colIdx] = void setMatrixAt(MatrixType value, Matrix matrix, unsigned int rowIdx, unsigned int colIdx)
value; // rowIdx * matrix.cols -> Beginn der Zeile colIdx ->Spalte {
// innerhalb der Zeile
} }
MatrixType getMatrixAt(const Matrix matrix,
unsigned int rowIdx, // Kopie der Matrix wird übergeben
unsigned int colIdx) {
if (rowIdx >= matrix.rows ||
colIdx >= matrix.cols) { // Speichergröße nicht überschreiten
return 0;
}
MatrixType value = matrix.buffer[rowIdx * matrix.cols + colIdx]; MatrixType getMatrixAt(const Matrix matrix, unsigned int rowIdx, unsigned int colIdx)
{
return value;
} }
Matrix add(const Matrix matrix1, const Matrix matrix2) {
// Ergebnismatrix Matrix add(const Matrix matrix1, const Matrix matrix2)
Matrix result; {
const int cols1 = matrix1.cols;
const int rows1 = matrix1.rows;
const int cols2 = matrix2.cols;
const int rows2 = matrix2.rows;
const int rowsEqual = (matrix1.rows==matrix2.rows) ? 1: 0;
const int colsEqual = (matrix1.cols==matrix2.cols) ? 1: 0;
// Broadcasting nur bei Vektor und Matrix, Fehlermeldung bei zwei unpassender
// Matrix
if (rowsEqual == 1 && colsEqual == 1){
Matrix result = createMatrix(matrix1.rows, matrix1.cols);
for (int i = 0; i< rows1; i++) {
for (int j= 0; j< cols1; j++){
int valueM1= getMatrixAt(matrix1, i, j);
int valueM2= getMatrixAt(matrix2, i, j);
int sum = valueM1 + valueM2;
setMatrixAt(sum, result, i, j);
}
}
return result;
}
else if (rowsEqual ==1 && colsEqual == 0){
}
else if (rowsEqual == 0 && colsEqual == 1){
}
else {
}
// Speicher reservieren
// Matrix addieren
return result;
} }
Matrix multiply(const Matrix matrix1, const Matrix matrix2) { return matrix1; }
Matrix multiply(const Matrix matrix1, const Matrix matrix2)
{
}

18
matrix.h
View File

@ -6,20 +6,20 @@
typedef float MatrixType; typedef float MatrixType;
// TODO Matrixtyp definieren // TODO Matrixtyp definieren
typedef struct { typedef struct
unsigned int rows; {
unsigned int cols; unsigned int rows;
MatrixType *buffer; unsigned int cols;
MatrixType *data;
} Matrix; } 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, void setMatrixAt(MatrixType value, Matrix matrix, unsigned int rowIdx, unsigned int colIdx);
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);
#endif #endif