Compare commits

..
Author SHA1 Message Date
kelleral99467 fa26fbfb39 Vollständige Version 2025-11-24 12:07:46 +01:00
kelleral99467 4658bbafea Test 2025-11-24 12:06:02 +01:00
kelleral99467 98d18ae6ba test 3 2025-11-24 12:05:22 +01:00
kelleral99467 66a9212093 Test 3 2025-11-24 12:04:45 +01:00
kelleral99467 d096780389 Test 2 2025-11-24 12:02:29 +01:00
kelleral99467 3581f434c4 test 2 2025-11-24 12:01:53 +01:00
kelleral99467 7b4cac83c5 Test 1 2025-11-24 12:01:11 +01:00
kelleral99467 f2dc978764 fixed some typos 2025-11-24 12:00:25 +01:00
kelleral99467 c04202725b Version 2, Variable ausgeklammert 2025-11-24 11:53:27 +01:00
kelleral99467 c9fa2ed07d Vollständige Versionen 2025-11-24 11:51:45 +01:00
kelleral99467 ae761afb00 Version 1; prepare Funktion geschrieben 2025-11-23 19:00:55 +01:00
kelleral99467 b8510c82da Base code 2025-11-20 14:10:56 +01:00
kelleral99467 7b9a1d8f07 Hilfsfunktion und Clearseries erstellt 2025-11-19 16:53:36 +01:00
kelleral99467 4486fbd82e Hilfsfunktion und clearSeries geschrieben 2025-11-19 16:49:05 +01:00
kelleral99467 2f30c2d030 Test 2025-11-12 09:23:41 +01:00
5 changed files with 81 additions and 31 deletions
+5
View File
@@ -0,0 +1,5 @@
{
"files.associations": {
"unity.h": "c"
}
}
+1 -1
View File
@@ -12,7 +12,7 @@ typedef struct
typedef struct typedef struct
{ {
GrayScaleImage *images; //in sich verschachtelte Struktur GrayScaleImage *images;
unsigned char *labels; unsigned char *labels;
unsigned int count; unsigned int count;
} GrayScaleImageSeries; } GrayScaleImageSeries;
+24 -24
View File
@@ -2,20 +2,22 @@
#include <string.h> #include <string.h>
#include "matrix.h" #include "matrix.h"
// TODO Matrix-Funktionen implementieren
Matrix createMatrix(unsigned int rows, unsigned int cols) Matrix createMatrix(unsigned int rows, unsigned int cols)
{ {
Matrix m = {NULL, 0, 0}; Matrix matrix = {NULL, 0, 0};
if (rows == 0 || cols == 0) if (rows == 0 || cols == 0)
return m; return matrix; //gibt leere Matrix zurück
m.buffer = (MatrixType *)calloc(rows * cols, sizeof(MatrixType)); matrix.buffer = (MatrixType *)calloc(rows * cols, sizeof(MatrixType));
if (m.buffer == NULL) if (matrix.buffer == NULL) //auf verfügbaren Speicherplatz prüfen
return m; return matrix;
m.rows = rows; matrix.rows = rows;
m.cols = cols; matrix.cols = cols;
return m; return matrix; //Matrix zurückgeben
} }
void clearMatrix(Matrix *matrix) void clearMatrix(Matrix *matrix)
@@ -23,18 +25,18 @@ void clearMatrix(Matrix *matrix)
if (matrix != NULL) if (matrix != NULL)
{ {
free(matrix->buffer); free(matrix->buffer); //Speicherplatz bereinigen
matrix->buffer = NULL; matrix->buffer = NULL; //Werte auf 0 setzen
matrix->rows = 0; matrix->rows = 0;
matrix->cols = 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)
// Matrix matrix zu Matrix *matrix, empfehlung
{ {
if (rowIdx < matrix.rows && colIdx < matrix.cols && matrix.buffer != NULL) if (rowIdx < matrix.rows && colIdx < matrix.cols && matrix.buffer != NULL) //Prüft ob Zugriff möglich
matrix.buffer[rowIdx * matrix.cols + colIdx] = value; matrix.buffer[rowIdx * matrix.cols + colIdx] = value;
//schreibt 2D element in 1D Liste: Element_Reihe*Matrix_Spalten + Element_Spalte
} }
MatrixType getMatrixAt(const Matrix matrix, unsigned int rowIdx, unsigned int colIdx) MatrixType getMatrixAt(const Matrix matrix, unsigned int rowIdx, unsigned int colIdx)
@@ -45,11 +47,10 @@ MatrixType getMatrixAt(const Matrix matrix, unsigned int rowIdx, unsigned int co
} }
// TODO: Funktionen implementieren // TODO: Funktionen implementieren
Matrix add(const Matrix matrix1, const Matrix matrix2) Matrix add(const Matrix matrix1, const Matrix matrix2)
{ {
// check, equal rows // immer Probe, gleiche Zeilen der Matrizen
// "Elementweise Addition": test, if two matrix has exact size // "Elementweise Addition": Probe, ob matrix gleiche größe hat
if (matrix1.rows == matrix2.rows && matrix1.cols == matrix2.cols) if (matrix1.rows == matrix2.rows && matrix1.cols == matrix2.cols)
{ {
Matrix result_add = createMatrix(matrix1.rows, matrix1.cols); Matrix result_add = createMatrix(matrix1.rows, matrix1.cols);
@@ -64,7 +65,7 @@ Matrix add(const Matrix matrix1, const Matrix matrix2)
} }
return result_add; return result_add;
} }
// "Broadcasting": matrix1 has 1 collum // "Broadcasting": matrix1 hat 1 Spalte
if (matrix1.rows == matrix2.rows && matrix1.cols == 1) if (matrix1.rows == matrix2.rows && matrix1.cols == 1)
{ {
Matrix result_add = createMatrix(matrix1.rows, matrix2.cols); Matrix result_add = createMatrix(matrix1.rows, matrix2.cols);
@@ -78,7 +79,7 @@ Matrix add(const Matrix matrix1, const Matrix matrix2)
} }
return result_add; return result_add;
} }
// "Broadcasting": matrix2 has 1 collum // "Broadcasting": matrix2 hat 1 Spalte
if (matrix1.rows == matrix2.rows && matrix2.cols == 1) if (matrix1.rows == matrix2.rows && matrix2.cols == 1)
{ {
Matrix result_add = createMatrix(matrix1.rows, matrix1.cols); Matrix result_add = createMatrix(matrix1.rows, matrix1.cols);
@@ -98,13 +99,14 @@ Matrix add(const Matrix matrix1, const Matrix matrix2)
Matrix multiply(const Matrix matrix1, const Matrix matrix2) Matrix multiply(const Matrix matrix1, const Matrix matrix2)
{ {
// Needed: rows/Zeilen, collums/Spalten
MatrixType buffer_add; MatrixType buffer_add;
// Probe ob Spalten1 = Zeilen2
if (matrix1.cols != matrix2.rows) if (!matrix1.buffer || !matrix2.buffer) // Probe ob leere Matrize vorliegt
return createMatrix(0, 0);
if (matrix1.cols != matrix2.rows) // Probe ob Spalten1 = Zeilen2
return createMatrix(0, 0); return createMatrix(0, 0);
Matrix result_mul = createMatrix(matrix1.rows, matrix2.cols); // "" Matrix result_mul = createMatrix(matrix1.rows, matrix2.cols);
for (unsigned int index = 0; index < matrix1.rows; index++) for (unsigned int index = 0; index < matrix1.rows; index++)
{ {
@@ -113,11 +115,9 @@ Matrix multiply(const Matrix matrix1, const Matrix matrix2)
buffer_add = 0; buffer_add = 0;
for (unsigned int skalar = 0; skalar < matrix1.cols; skalar++) for (unsigned int skalar = 0; skalar < matrix1.cols; skalar++)
{ {
// buffer_add += matrix1[index][skalar]*matrix2[skalar][shift];
buffer_add += getMatrixAt(matrix1, index, skalar) * getMatrixAt(matrix2, skalar, shift); buffer_add += getMatrixAt(matrix1, index, skalar) * getMatrixAt(matrix2, skalar, shift);
} }
// matrix_mul[index][shift] = buffer_add; setMatrixAt(buffer_add, result_mul, index, shift);
setMatrixAt(buffer_add, result_mul, index, shift); // result als Pointer, also mit &result
} }
} }
return result_mul; return result_mul;
+1 -1
View File
@@ -7,7 +7,7 @@ typedef float MatrixType;
// TODO Matrixtyp definieren // TODO Matrixtyp definieren
typedef struct { typedef struct {
MatrixType *matrix; MatrixType *buffer;
unsigned int rows; unsigned int rows;
unsigned int cols; unsigned int cols;
} Matrix; } Matrix;
+46 -1
View File
@@ -8,7 +8,52 @@
static void prepareNeuralNetworkFile(const char *path, const NeuralNetwork nn) static void prepareNeuralNetworkFile(const char *path, const NeuralNetwork nn)
{ {
// TODO FILE *file = fopen(path, "wb");
if (!file)
{
return;
}
// Schreibe den Datei-Tag
const char *tag = "info2_neural_network_file_format";
fwrite(tag, 1, strlen(tag), file);
// Überprüfe, ob es Layer gibt
if (nn.numberOfLayers == 0)
{
fclose(file);
return;
}
// Schreibe die Eingabe- und Ausgabegrößen des Netzwerks
int input = nn.layers[0].weights.cols;
int output = nn.layers[0].weights.rows;
fwrite(&input, sizeof(int), 1, file);
fwrite(&output, sizeof(int), 1, file);
// Schreibe die Layer-Daten
for (int i = 0; i < nn.numberOfLayers; i++)
{
const Layer *layer = &nn.layers[i];
int out = layer->weights.rows;
int in = layer->weights.cols;
fwrite(layer->weights.buffer, sizeof(MatrixType), out * in, file);
fwrite(layer->biases.buffer, sizeof(MatrixType), out * 1, file);
if (i + 1 < nn.numberOfLayers)
{
int nextOut = nn.layers[i + 1].weights.rows;
fwrite(&nextOut, sizeof(int), 1, file);
}
}
fclose(file);
} }
void test_loadModelReturnsCorrectNumberOfLayers(void) void test_loadModelReturnsCorrectNumberOfLayers(void)