freudenreichan/info2Praktikum-NeuronalesNetz
Template
1
1
Fork 14
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hilfsfunktionen und matrix fix

Browse Source
This commit is contained in:
Giorgi Kesidis 2025-11-16 22:06:41 +01:00
parent 3f539cbe1d
commit 59cdcafa94
5 changed files with 105 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
imageInput.c
View File

@ -8,6 +8,48 @@
// TODO Implementieren Sie geeignete Hilfsfunktionen für das Lesen der Bildserie aus einer Datei
static int read_header(FILE *file, unsigned short *count, unsigned short *width, unsigned short *height)
{
size_t headerLEN = strlen(FILE_HEADER_STRING);
char buffer[BUFFER_SIZE];
if (headerLEN >= BUFFER_SIZE)
{
return 0;
}
if (fread(buffer, 1, headerLEN, file) != headerLEN)
{
return 0;
}
buffer[headerLEN] = '\0';
if (strcmp(buffer, FILE_HEADER_STRING) != 0)
{
return 0;
}
if (fread(count, sizeof(unsigned short), 1, file) != 1 || fread(width, sizeof(unsigned short), 1, file) != 1 ||
fread(height, sizeof(unsigned short), 1, file) != 1)
{
return 0;
}
return 1;
}
static int read_single_image(FILE *file, GrayScaleImage *image)
{
unsigned int number_of_pixel = image->width * image->height;
if (fread(image->buffer, sizeof(GrayScalePixelType), number_of_pixel, file) != number_of_pixel) // fehler beim lesen
{
return 0;
}
return 1;
}
// TODO Vervollständigen Sie die Funktion readImages unter Benutzung Ihrer Hilfsfunktionen
GrayScaleImageSeries *readImages(const char *path)
{
@ -17,26 +59,9 @@ GrayScaleImageSeries *readImages(const char *path)
return 0;
}
const size_t headerLEN = strlen(FILE_HEADER_STRING);
char buffer[BUFFER_SIZE];
unsigned short count, width, height;
if (fread(buffer, 1, headerLEN, file) != headerLEN)
{
fclose(file);
return 0;
}
buffer[headerLEN] = '\0';
if (strcmp(buffer, FILE_HEADER_STRING) != 0)
{
fclose(file);
return 0;
}
unsigned short count, height, width;
if (fread(&count, sizeof(unsigned short), 1, file) != 1 || fread(&height, sizeof(unsigned short), 1, file) != 1 ||
fread(&width, sizeof(unsigned short), 1, file) != 1)
if (!read_header(file, &count, &width, &height))
{
fclose(file);
return 0;
@ -65,7 +90,7 @@ GrayScaleImageSeries *readImages(const char *path)
{
series->images[i].width = width;
series->images[i].height = height;
series->images[i].buffer = malloc(width * height);
series->images[i].buffer = malloc(width * height * sizeof(GrayScalePixelType));
if (!series->images[i].buffer)
{
@ -73,13 +98,8 @@ GrayScaleImageSeries *readImages(const char *path)
fclose(file);
return 0;
}
}
for (int i = 0; i < count; i++)
{
size_t pixel_count = width * height;
if (fread(series->images[i].buffer, 1, pixel_count, file) != pixel_count)
if (!read_single_image(file, &series->images[i]))
{
clearSeries(series);
fclose(file);
@ -101,17 +121,14 @@ GrayScaleImageSeries *readImages(const char *path)
// TODO Vervollständigen Sie die Funktion clearSeries, welche eine Bildserie vollständig aus dem Speicher freigibt
void clearSeries(GrayScaleImageSeries *series)
{
if (series == 0)
return;
if (series->images)
if (series)
{
for (int i = 0; i < series->count; i++)
{
free(series->images[i].buffer);
}
free(series->images);
}
free(series->labels);
free(series);
}
}

11
imageInputTests.c
View File

@ -54,7 +54,7 @@ void test_readImagesReturnsCorrectImageWidth(void)
GrayScaleImageSeries *series = NULL;
const unsigned short expectedWidth = 10;
const char *path = "testFile.info2";
prepareImageFile(path, 8, expectedWidth, 2, 1);
prepareImageFile(path, expectedWidth, 8, 2, 1);
series = readImages(path);
TEST_ASSERT_NOT_NULL(series);
TEST_ASSERT_NOT_NULL(series->images);
@ -70,7 +70,7 @@ void test_readImagesReturnsCorrectImageHeight(void)
GrayScaleImageSeries *series = NULL;
const unsigned short expectedHeight = 10;
const char *path = "testFile.info2";
prepareImageFile(path, expectedHeight, 8, 2, 1);
prepareImageFile(path, 8, expectedHeight, 2, 1);
series = readImages(path);
TEST_ASSERT_NOT_NULL(series);
TEST_ASSERT_NOT_NULL(series->images);
@ -119,6 +119,13 @@ void test_readImagesFailsOnWrongFileTag(void)
remove(path);
}
// Tests der Hilfsfunktionen
void test_read_header(void)
{
}
void setUp(void) {
// Falls notwendig, kann hier Vorbereitungsarbeit gemacht werden
}

4
matrix.c
View File

@ -138,7 +138,7 @@ Matrix add(const Matrix matrix1, const Matrix matrix2)
fprintf(stderr, "Fehler: Matrizen haben unterschiedliche Größen (%u x %u) und (%u x %u)\n",
matrix1.rows, matrix1.cols, matrix2.rows, matrix2.cols);
Matrix empty = {0, 0, NULL};
Matrix empty = {NULL, 0, 0};
return empty;
}
@ -149,7 +149,7 @@ Matrix multiply(const Matrix matrix1, const Matrix matrix2)
fprintf(stderr, "Fehler: Matrizen der Dimension (%u x %u) und (%u x %u) koennen nicht multipliziert werden\n",
matrix1.rows, matrix1.cols, matrix2.rows, matrix2.cols);
Matrix empty = {0, 0, NULL};
Matrix empty = {NULL, 0, 0};
return empty;
}

2
matrix.h
View File

@ -8,9 +8,9 @@ typedef float MatrixType;
// TODO Matrixtyp definieren
typedef struct Matrix {
MatrixType *buffer;
unsigned int rows;
unsigned int cols;
MatrixType *buffer;
} Matrix;

13
neuralNetworkTests.c
View File

@ -5,10 +5,9 @@
#include "unity.h"
#include "neuralNetwork.h"
static void prepareNeuralNetworkFile(const char *path, const NeuralNetwork nn)
{
// TODO
}
void test_loadModelReturnsCorrectNumberOfLayers(void)
@ -205,8 +204,8 @@ void test_predictReturnsCorrectLabels(void)
Matrix biases1 = {.buffer = biasBuffer1, .rows = 2, .cols = 1};
Matrix biases2 = {.buffer = biasBuffer2, .rows = 3, .cols = 1};
Matrix biases3 = {.buffer = biasBuffer3, .rows = 5, .cols = 1};
Layer layers[] = {{.weights=weights1, .biases=biases1, .activation=someActivation}, \
{.weights=weights2, .biases=biases2, .activation=someActivation}, \
Layer layers[] = {{.weights = weights1, .biases = biases1, .activation = someActivation},
{.weights = weights2, .biases = biases2, .activation = someActivation},
{.weights = weights3, .biases = biases3, .activation = someActivation}};
NeuralNetwork netUnderTest = {.layers = layers, .numberOfLayers = 3};
unsigned char *predictedLabels = predict(netUnderTest, inputImages, 2);
@ -216,11 +215,13 @@ void test_predictReturnsCorrectLabels(void)
free(predictedLabels);
}
void setUp(void) {
void setUp(void)
{
// Falls notwendig, kann hier Vorbereitungsarbeit gemacht werden
}
void tearDown(void) {
void tearDown(void)
{
// Hier kann Bereinigungsarbeit nach jedem Test durchgeführt werden
}