Merge branch 'Krisp2'

This commit is contained in:
Kristin 2025-11-25 10:49:32 +01:00
commit f1af6c1e4a
6 changed files with 715 additions and 453 deletions

View File

@ -1,29 +1,134 @@
#include "imageInput.h"
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "imageInput.h"
#define BUFFER_SIZE 100
#define FILE_HEADER_STRING "__info2_image_file_format__" #define FILE_HEADER_STRING "__info2_image_file_format__"
// TODO Implementieren Sie geeignete Hilfsfunktionen für das Lesen der Bildserie aus einer Datei /* ----------------------------------------------------------
GrayScaleImage readImage() 1. Header prüfen
{ ---------------------------------------------------------- */
static int readHeader(FILE *file) {
char header[sizeof(FILE_HEADER_STRING)];
if (fread(header, 1, sizeof(FILE_HEADER_STRING) - 1, file) !=
sizeof(FILE_HEADER_STRING) - 1)
return 0;
header[sizeof(FILE_HEADER_STRING) - 1] = '\0';
return strcmp(header, FILE_HEADER_STRING) == 0;
} }
// TODO Vervollständigen Sie die Funktion readImages unter Benutzung Ihrer Hilfsfunktionen /* ----------------------------------------------------------
GrayScaleImageSeries *readImages(const char *path) 2. Meta-Daten lesen (unsigned short)
{ ---------------------------------------------------------- */
GrayScaleImageSeries *series = NULL; static int readMeta(FILE *file, unsigned short *count, unsigned short *width,
FILE *file = fopen("mnist_test.info2","rb"); unsigned short *height) {
char headOfFile; if (fread(count, sizeof(unsigned short), 1, file) != 1)
series = malloc(); return 0;
if (fread(width, sizeof(unsigned short), 1, file) != 1)
return 0;
if (fread(height, sizeof(unsigned short), 1, file) != 1)
return 0;
return 1;
}
/* ----------------------------------------------------------
3. Einzelbild lesen
---------------------------------------------------------- */
static int readSingleImage(FILE *file, GrayScaleImage *img,
unsigned short width, unsigned short height) {
img->width = width;
img->height = height;
size_t numPixels = (size_t)width * (size_t)height;
img->buffer = malloc(numPixels);
if (!img->buffer)
return 0;
if (fread(img->buffer, 1, numPixels, file) != numPixels) {
free(img->buffer);
img->buffer = NULL;
return 0;
}
return 1;
}
/* ----------------------------------------------------------
4. Label lesen
---------------------------------------------------------- */
static int readLabel(FILE *file, unsigned char *label) {
return fread(label, 1, 1, file) == 1;
}
/* ----------------------------------------------------------
5. Komplette Bildserie lesen
---------------------------------------------------------- */
GrayScaleImageSeries *readImages(const char *path) {
FILE *file = fopen(path, "rb");
if (!file)
return NULL;
if (!readHeader(file)) {
fclose(file);
return NULL;
}
unsigned short count, width, height;
if (!readMeta(file, &count, &width, &height)) {
fclose(file);
return NULL;
}
// printf("%d, %d, %d", count, width, height);
GrayScaleImageSeries *series = malloc(sizeof(GrayScaleImageSeries));
if (!series) {
fclose(file);
return NULL;
}
series->count = count;
series->images = malloc(count * sizeof(GrayScaleImage));
series->labels = malloc(count * sizeof(unsigned char));
if (!series->images || !series->labels) {
free(series->images);
free(series->labels);
free(series);
fclose(file);
return NULL;
}
for (unsigned int i = 0; i < count; i++) {
if (!readSingleImage(file, &series->images[i], width, height) ||
!readLabel(file, &series->labels[i])) {
// Aufräumen bei Fehler
for (unsigned int j = 0; j < i; j++) {
free(series->images[j].buffer);
}
free(series->images);
free(series->labels);
free(series);
fclose(file);
return NULL;
}
}
fclose(file);
return series; return series;
} }
// TODO Vervollständigen Sie die Funktion clearSeries, welche eine Bildserie vollständig aus dem Speicher freigibt /* ----------------------------------------------------------
void clearSeries(GrayScaleImageSeries *series) 6. Speicher komplett freigeben
{ ---------------------------------------------------------- */
void clearSeries(GrayScaleImageSeries *series) {
if (!series)
return;
for (unsigned int i = 0; i < series->count; i++) {
free(series->images[i].buffer);
}
free(series->images);
free(series->labels);
free(series);
} }

View File

@ -1,88 +1,98 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include "unity.h"
#include "imageInput.h" #include "imageInput.h"
#include "unity.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
/* ---------------------------------------------------------
static void prepareImageFile(const char *path, unsigned short int width, unsigned short int height, unsigned int short numberOfImages, unsigned char label) Hilfsfunktion: Testdatei vorbereiten
{ --------------------------------------------------------- */
static void prepareImageFile(const char *path, unsigned int width,
unsigned int height, unsigned int numberOfImages,
unsigned char label) {
FILE *file = fopen(path, "wb"); FILE *file = fopen(path, "wb");
if (!file)
return;
if(file != NULL) // Header
{
const char *fileTag = "__info2_image_file_format__"; const char *fileTag = "__info2_image_file_format__";
GrayScalePixelType *zeroBuffer = (GrayScalePixelType *)calloc(numberOfImages * width * height, sizeof(GrayScalePixelType)); fwrite(fileTag, 1, strlen(fileTag), file);
if(zeroBuffer != NULL) // Meta-Daten als unsigned short
{ unsigned short n = (unsigned short)numberOfImages;
fwrite(fileTag, sizeof(fileTag[0]), strlen(fileTag), file); unsigned short w = (unsigned short)width;
fwrite(&numberOfImages, sizeof(numberOfImages), 1, file); unsigned short h = (unsigned short)height;
fwrite(&width, sizeof(width), 1, file); fwrite(&n, sizeof(unsigned short), 1, file);
fwrite(&height, sizeof(height), 1, file); fwrite(&w, sizeof(unsigned short), 1, file);
fwrite(&h, sizeof(unsigned short), 1, file);
for(int i = 0; i < numberOfImages; i++) // Pixelbuffer
{ GrayScalePixelType *buffer =
fwrite(zeroBuffer, sizeof(GrayScalePixelType), width * height, file); calloc(width * height, sizeof(GrayScalePixelType));
if (!buffer) {
fclose(file);
return;
}
for (unsigned int i = 0; i < width * height; i++)
buffer[i] = (GrayScalePixelType)i;
// Jedes Bild schreiben: Pixel + Label
for (unsigned int img = 0; img < numberOfImages; img++) {
fwrite(buffer, sizeof(GrayScalePixelType), width * height, file);
fwrite(&label, sizeof(unsigned char), 1, file); fwrite(&label, sizeof(unsigned char), 1, file);
} }
free(zeroBuffer); free(buffer);
}
fclose(file); fclose(file);
} }
}
/* ---------------------------------------------------------
Unit Tests
--------------------------------------------------------- */
void test_readImagesReturnsCorrectNumberOfImages(void) void test_readImagesReturnsCorrectNumberOfImages(void) {
{
GrayScaleImageSeries *series = NULL; GrayScaleImageSeries *series = NULL;
const unsigned short expectedNumberOfImages = 2; const unsigned int expectedNumberOfImages = 2;
const char *path = "testFile.info2"; const char *path = "testFile.info2";
prepareImageFile(path, 8, 8, expectedNumberOfImages, 1); prepareImageFile(path, 8, 8, expectedNumberOfImages, 1);
series = readImages(path); series = readImages(path);
TEST_ASSERT_NOT_NULL(series); TEST_ASSERT_NOT_NULL(series);
TEST_ASSERT_EQUAL_UINT16(expectedNumberOfImages, series->count); TEST_ASSERT_EQUAL_UINT(expectedNumberOfImages, series->count);
clearSeries(series); clearSeries(series);
remove(path); remove(path);
} }
void test_readImagesReturnsCorrectImageWidth(void) void test_readImagesReturnsCorrectImageWidth(void) {
{
GrayScaleImageSeries *series = NULL; GrayScaleImageSeries *series = NULL;
const unsigned short expectedWidth = 10; const unsigned int expectedWidth = 10;
const char *path = "testFile.info2"; const char *path = "testFile.info2";
prepareImageFile(path, expectedWidth, 8, 2, 1); prepareImageFile(path, expectedWidth, 8, 2, 1);
series = readImages(path); series = readImages(path);
TEST_ASSERT_NOT_NULL(series); TEST_ASSERT_NOT_NULL(series);
TEST_ASSERT_NOT_NULL(series->images); TEST_ASSERT_NOT_NULL(series->images);
TEST_ASSERT_EQUAL_UINT16(2, series->count); TEST_ASSERT_EQUAL_UINT(2, series->count);
TEST_ASSERT_EQUAL_UINT16(expectedWidth, series->images[0].width); TEST_ASSERT_EQUAL_UINT(expectedWidth, series->images[0].width);
TEST_ASSERT_EQUAL_UINT16(expectedWidth, series->images[1].width); TEST_ASSERT_EQUAL_UINT(expectedWidth, series->images[1].width);
clearSeries(series); clearSeries(series);
remove(path); remove(path);
} }
void test_readImagesReturnsCorrectImageHeight(void) void test_readImagesReturnsCorrectImageHeight(void) {
{
GrayScaleImageSeries *series = NULL; GrayScaleImageSeries *series = NULL;
const unsigned short expectedHeight = 10; const unsigned int expectedHeight = 10;
const char *path = "testFile.info2"; const char *path = "testFile.info2";
prepareImageFile(path, 8, expectedHeight, 2, 1); prepareImageFile(path, 8, expectedHeight, 2, 1);
series = readImages(path); series = readImages(path);
TEST_ASSERT_NOT_NULL(series); TEST_ASSERT_NOT_NULL(series);
TEST_ASSERT_NOT_NULL(series->images); TEST_ASSERT_NOT_NULL(series->images);
TEST_ASSERT_EQUAL_UINT16(2, series->count); TEST_ASSERT_EQUAL_UINT(2, series->count);
TEST_ASSERT_EQUAL_UINT16(expectedHeight, series->images[0].height); TEST_ASSERT_EQUAL_UINT(expectedHeight, series->images[0].height);
TEST_ASSERT_EQUAL_UINT16(expectedHeight, series->images[1].height); TEST_ASSERT_EQUAL_UINT(expectedHeight, series->images[1].height);
clearSeries(series); clearSeries(series);
remove(path); remove(path);
} }
void test_readImagesReturnsCorrectLabels(void) void test_readImagesReturnsCorrectLabels(void) {
{
const unsigned char expectedLabel = 15; const unsigned char expectedLabel = 15;
GrayScaleImageSeries *series = NULL; GrayScaleImageSeries *series = NULL;
@ -91,7 +101,7 @@ void test_readImagesReturnsCorrectLabels(void)
series = readImages(path); series = readImages(path);
TEST_ASSERT_NOT_NULL(series); TEST_ASSERT_NOT_NULL(series);
TEST_ASSERT_NOT_NULL(series->labels); TEST_ASSERT_NOT_NULL(series->labels);
TEST_ASSERT_EQUAL_UINT16(2, series->count); TEST_ASSERT_EQUAL_UINT(2, series->count);
for (int i = 0; i < 2; i++) { for (int i = 0; i < 2; i++) {
TEST_ASSERT_EQUAL_UINT8(expectedLabel, series->labels[i]); TEST_ASSERT_EQUAL_UINT8(expectedLabel, series->labels[i]);
} }
@ -99,19 +109,16 @@ void test_readImagesReturnsCorrectLabels(void)
remove(path); remove(path);
} }
void test_readImagesReturnsNullOnNotExistingPath(void) void test_readImagesReturnsNullOnNotExistingPath(void) {
{
const char *path = "testFile.txt"; const char *path = "testFile.txt";
remove(path); remove(path);
TEST_ASSERT_NULL(readImages(path)); TEST_ASSERT_NULL(readImages(path));
} }
void test_readImagesFailsOnWrongFileTag(void) void test_readImagesFailsOnWrongFileTag(void) {
{
const char *path = "testFile.info2"; const char *path = "testFile.info2";
FILE *file = fopen(path, "w"); FILE *file = fopen(path, "w");
if(file != NULL) if (file != NULL) {
{
fprintf(file, "some_tag "); fprintf(file, "some_tag ");
fclose(file); fclose(file);
TEST_ASSERT_NULL(readImages(path)); TEST_ASSERT_NULL(readImages(path));
@ -119,25 +126,79 @@ void test_readImagesFailsOnWrongFileTag(void)
remove(path); remove(path);
} }
void setUp(void) { void test_read_GrayScale_Pixel(void) {
// Falls notwendig, kann hier Vorbereitungsarbeit gemacht werden GrayScaleImageSeries *series = NULL;
const char *path = "testFile.info2";
prepareImageFile(path, 8, 8, 1, 1);
series = readImages(path);
TEST_ASSERT_NOT_NULL(series);
TEST_ASSERT_NOT_NULL(series->images);
TEST_ASSERT_EQUAL_UINT(1, series->count);
for (int i = 0; i < (8 * 8); i++) {
TEST_ASSERT_EQUAL_UINT8((GrayScalePixelType)i, series->images[0].buffer[i]);
} }
void tearDown(void) { clearSeries(series);
// Hier kann Bereinigungsarbeit nach jedem Test durchgeführt werden remove(path);
} }
int main() /* ---------------------------------------------------------
{ Optional: Mehrere Bilder gleichzeitig testen
--------------------------------------------------------- */
void test_readImagesMultipleImagesContent(void) {
GrayScaleImageSeries *series = NULL;
const char *path = "testFile.info2";
const unsigned int numberOfImages = 3;
const unsigned int width = 4;
const unsigned int height = 4;
const unsigned char label = 7;
prepareImageFile(path, width, height, numberOfImages, label);
series = readImages(path);
TEST_ASSERT_NOT_NULL(series);
TEST_ASSERT_NOT_NULL(series->images);
TEST_ASSERT_NOT_NULL(series->labels);
TEST_ASSERT_EQUAL_UINT(numberOfImages, series->count);
for (unsigned int img = 0; img < numberOfImages; img++) {
for (unsigned int i = 0; i < width * height; i++)
TEST_ASSERT_EQUAL_UINT8((GrayScalePixelType)i,
series->images[img].buffer[i]);
TEST_ASSERT_EQUAL_UINT8(label, series->labels[img]);
}
clearSeries(series);
remove(path);
}
/* ---------------------------------------------------------
Setup / Teardown
--------------------------------------------------------- */
void setUp(void) {}
void tearDown(void) {}
/* ---------------------------------------------------------
main()
--------------------------------------------------------- */
int main(void) {
UNITY_BEGIN(); UNITY_BEGIN();
printf("\n============================\nImage input tests\n============================\n"); printf("\n============================\nImage input "
"tests\n============================\n");
RUN_TEST(test_readImagesReturnsCorrectNumberOfImages); RUN_TEST(test_readImagesReturnsCorrectNumberOfImages);
RUN_TEST(test_readImagesReturnsCorrectImageWidth); RUN_TEST(test_readImagesReturnsCorrectImageWidth);
RUN_TEST(test_readImagesReturnsCorrectImageHeight); RUN_TEST(test_readImagesReturnsCorrectImageHeight);
RUN_TEST(test_readImagesReturnsCorrectLabels); RUN_TEST(test_readImagesReturnsCorrectLabels);
RUN_TEST(test_readImagesReturnsNullOnNotExistingPath); RUN_TEST(test_readImagesReturnsNullOnNotExistingPath);
RUN_TEST(test_readImagesFailsOnWrongFileTag); RUN_TEST(test_readImagesFailsOnWrongFileTag);
RUN_TEST(test_read_GrayScale_Pixel);
RUN_TEST(test_readImagesMultipleImagesContent);
return UNITY_END(); return UNITY_END();
} }

View File

@ -1,12 +1,14 @@
#include "matrix.h" #include "matrix.h"
#include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
// TODO Matrix-Funktionen implementieren
/*typedef struct { /*typedef struct {
unsigned int rows; //Zeilen unsigned int rows; //Zeilen
unsigned int cols; //Spalten unsigned int cols; //Spalten
MatrixType *buffer; //Zeiger auf Speicherbereich Reihen*Spalten MatrixType *buffer; //Zeiger auf Speicherbereich Reihen*Spalten
} Matrix;*/ } Matrix;*/
Matrix createMatrix(unsigned int rows, unsigned int cols) { Matrix createMatrix(unsigned int rows, unsigned int cols) {
if (cols == 0 || rows == 0) { if (cols == 0 || rows == 0) {
Matrix errorMatrix = {0, 0, NULL}; Matrix errorMatrix = {0, 0, NULL};
@ -19,11 +21,15 @@ Matrix createMatrix(unsigned int rows, unsigned int cols) {
return newMatrix; return newMatrix;
} }
void clearMatrix(Matrix *matrix) { void clearMatrix(Matrix *matrix) {
matrix->buffer = UNDEFINED_MATRIX_VALUE;
matrix->rows = UNDEFINED_MATRIX_VALUE; if (matrix->buffer != NULL) {
matrix->cols = UNDEFINED_MATRIX_VALUE; free((*matrix).buffer);
free((*matrix).buffer); // Speicher freigeben matrix->buffer = NULL;
} }
matrix->rows = 0;
matrix->cols = 0;
}
void setMatrixAt(const MatrixType value, Matrix matrix, void setMatrixAt(const MatrixType value, Matrix matrix,
const unsigned int rowIdx, // Kopie der Matrix wird übergeben const unsigned int rowIdx, // Kopie der Matrix wird übergeben
const unsigned int colIdx) { const unsigned int colIdx) {
@ -39,9 +45,9 @@ void setMatrixAt(const MatrixType value, Matrix matrix,
MatrixType getMatrixAt(const Matrix matrix, MatrixType getMatrixAt(const Matrix matrix,
unsigned int rowIdx, // Kopie der Matrix wird übergeben unsigned int rowIdx, // Kopie der Matrix wird übergeben
unsigned int colIdx) { unsigned int colIdx) {
if (rowIdx >= matrix.rows || if (rowIdx >= matrix.rows || colIdx >= matrix.cols ||
colIdx >= matrix.cols) { // Speichergröße nicht überschreiten matrix.buffer == NULL) { // Speichergröße nicht überschreiten
return 0; return UNDEFINED_MATRIX_VALUE;
} }
MatrixType value = matrix.buffer[rowIdx * matrix.cols + colIdx]; MatrixType value = matrix.buffer[rowIdx * matrix.cols + colIdx];
@ -67,7 +73,6 @@ Matrix broadcastingRows(const Matrix matrix, const unsigned int rows){
} }
} }
return copy1; return copy1;
} }
Matrix add(const Matrix matrix1, const Matrix matrix2) { Matrix add(const Matrix matrix1, const Matrix matrix2) {
@ -78,7 +83,6 @@ Matrix add(const Matrix matrix1, const Matrix matrix2) {
const int cols2 = matrix2.cols; const int cols2 = matrix2.cols;
const int rows2 = matrix2.rows; const int rows2 = matrix2.rows;
const int rowsEqual = (matrix1.rows == matrix2.rows) ? 1 : 0; const int rowsEqual = (matrix1.rows == matrix2.rows) ? 1 : 0;
const int colsEqual = (matrix1.cols == matrix2.cols) ? 1 : 0; const int colsEqual = (matrix1.cols == matrix2.cols) ? 1 : 0;
@ -98,8 +102,7 @@ Matrix add(const Matrix matrix1, const Matrix matrix2) {
} }
} }
return result; return result;
} } else if (rowsEqual == 1 && (cols1 == 1 || cols2 == 1)) {
else if (rowsEqual ==1 && (cols1 ==1 || cols2 ==1)){
if (cols1 == 1) { // broadcasting von vektor 1 zu matrix 1, add if (cols1 == 1) { // broadcasting von vektor 1 zu matrix 1, add
Matrix newMatrix = broadcastingCols(matrix1, cols2); Matrix newMatrix = broadcastingCols(matrix1, cols2);
// add // add
@ -116,8 +119,7 @@ Matrix add(const Matrix matrix1, const Matrix matrix2) {
} }
} }
return result; return result;
} } else {
else{
Matrix newMatrix2 = broadcastingCols(matrix2, cols1); Matrix newMatrix2 = broadcastingCols(matrix2, cols1);
// add // add
Matrix result = createMatrix(newMatrix2.rows, newMatrix2.cols); Matrix result = createMatrix(newMatrix2.rows, newMatrix2.cols);
@ -153,8 +155,7 @@ Matrix add(const Matrix matrix1, const Matrix matrix2) {
} }
} }
return result; return result;
} } else {
else{
Matrix newMatrix2 = broadcastingRows(matrix2, rows1); Matrix newMatrix2 = broadcastingRows(matrix2, rows1);
// add // add
Matrix result = createMatrix(newMatrix2.rows, newMatrix2.cols); Matrix result = createMatrix(newMatrix2.rows, newMatrix2.cols);
@ -171,8 +172,7 @@ Matrix add(const Matrix matrix1, const Matrix matrix2) {
} }
return result; return result;
} }
} } else {
else {
// kein add möglich // kein add möglich
Matrix errorMatrix = {0, 0, NULL}; Matrix errorMatrix = {0, 0, NULL};
return errorMatrix; return errorMatrix;
@ -187,9 +187,11 @@ Matrix multiply(const Matrix matrix1, const Matrix matrix2) {
for (int r = 0; r < matrix1.rows; r++) { for (int r = 0; r < matrix1.rows; r++) {
for (int c = 0; c < matrix2.cols; c++) { for (int c = 0; c < matrix2.cols; c++) {
MatrixType sum = 0.0; MatrixType sum = 0.0;
//skalarprodukte berechnen, k damit die ganze zeile mal die ganze spalte genommen wird quasi // skalarprodukte berechnen, k damit die ganze zeile mal die ganze
// spalte genommen wird quasi
for (int k = 0; k < matrix1.cols; k++) { for (int k = 0; k < matrix1.cols; k++) {
//sum+= matrix1.buffer[r*matrix1.cols+k]*matrix2.buffer[k*matrix2.cols+c]; // sum+=
// matrix1.buffer[r*matrix1.cols+k]*matrix2.buffer[k*matrix2.cols+c];
sum += getMatrixAt(matrix1, r, k) * getMatrixAt(matrix2, k, c); sum += getMatrixAt(matrix1, r, k) * getMatrixAt(matrix2, k, c);
} }
// Ergebnisse in neue matrix speichern // Ergebnisse in neue matrix speichern

View File

@ -19,6 +19,11 @@ void setMatrixAt(MatrixType value, Matrix matrix, unsigned int rowIdx,
unsigned int colIdx); unsigned int colIdx);
MatrixType getMatrixAt(const Matrix matrix, unsigned int rowIdx, MatrixType getMatrixAt(const Matrix matrix, unsigned int rowIdx,
unsigned int colIdx); unsigned int colIdx);
Matrix broadCastCols(const Matrix matrix, const unsigned int rows,
const unsigned int cols);
Matrix broadCastRows(const Matrix matrix, const unsigned int rows,
const unsigned int cols);
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);

View File

@ -151,7 +151,7 @@ NeuralNetwork loadModel(const char *path) {
static Matrix imageBatchToMatrixOfImageVectors(const GrayScaleImage images[], static Matrix imageBatchToMatrixOfImageVectors(const GrayScaleImage images[],
unsigned int count) { unsigned int count) {
Matrix matrix = {0, 0, NULL}; Matrix matrix = {0, 0, NULL}; // falsch herum
if (count > 0 && images != NULL) { if (count > 0 && images != NULL) {
matrix = createMatrix(images[0].height * images[0].width, count); matrix = createMatrix(images[0].height * images[0].width, count);

View File

@ -1,18 +1,99 @@
#include "neuralNetwork.h"
#include "unity.h"
#include <math.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <math.h>
#include "unity.h"
#include "neuralNetwork.h"
/*typedef struct
static void prepareNeuralNetworkFile(const char *path, const NeuralNetwork nn)
{ {
// TODO Matrix weights;
Matrix biases;
ActivationFunctionType activation;
} Layer;
typedef struct
{
Layer *layers;
unsigned int numberOfLayers;
} NeuralNetwork;*/
/*Layer: Ebene im neuronalen Netzwerk, besteht aus mehreren Neuronen
Input-Layer: Eingabedatei
Hidden-Layer: verarbeiten die Daten
Output-Layer: Ergebnis
Gewichte: bestimmen, wie stark ein Eingangssignal auf ein Neuron wirkt
Dimension: Form der Matrizen für einen Layer*/
// speichert NeuralNetwork nn in binäre Datei->erzeugt Dateiformat
static void prepareNeuralNetworkFile(const char *path, const NeuralNetwork nn) {
FILE *fptr = fopen(path, "wb"); // Binärdatei zum Schreiben öffnen
if (fptr == NULL)
return; // file konnte nicht geöffnet werden
// Header ist Erkennungsstring am Anfang der Datei, loadmodel erkennt
// Dateiformat
const char header[] =
"__info2_neural_network_file_format__"; // header vor jedem Layer
fwrite(header, sizeof(char), strlen(header), fptr);
// Wenn es keine Layer gibt, 0 eintragen, LoadModel gibt 0 zurück
if (nn.numberOfLayers == 0) {
int zero = 0;
fwrite(&zero, sizeof(int), 1, fptr);
fclose(fptr);
return;
} }
void test_loadModelReturnsCorrectNumberOfLayers(void) // Layer 0, inputDimension: Anzahl Input-Neuronen, outputDimension: Anzahl
{ // Output-Neuronen
int inputDim = (int)nn.layers[0].weights.cols;
int outputDim = (int)nn.layers[0].weights.rows;
fwrite(&inputDim, sizeof(int), 1, fptr);
fwrite(&outputDim, sizeof(int), 1, fptr);
/* 3) Für jede Layer in Reihenfolge: Gewichte (output x input), Biases (output
x 1). Zwischen Layern wird nur die nächste outputDimension (int)
geschrieben. */
for (int i = 0; i < nn.numberOfLayers; i++) {
Layer layer = nn.layers[i];
int wrows = (int)layer.weights.rows;
int wcols = (int)layer.weights.cols;
int wcount = wrows * wcols;
int bcount =
layer.biases.rows * layer.biases.cols; /* normalerweise rows * 1 */
/* Gewichte (MatrixType binär) */
if (wcount > 0 && layer.weights.buffer != NULL) {
fwrite(layer.weights.buffer, sizeof(MatrixType), (size_t)wcount, fptr);
}
/* Biases (MatrixType binär) */
if (bcount > 0 && layer.biases.buffer != NULL) {
fwrite(layer.biases.buffer, sizeof(MatrixType), (size_t)bcount, fptr);
}
/* Für die nächste Layer: falls vorhanden, schreibe deren outputDimension */
if (i + 1 < nn.numberOfLayers) {
int nextOutput = (int)nn.layers[i + 1].weights.rows;
fwrite(&nextOutput, sizeof(int), 1, fptr);
} else {
/* Letzte Layer: wir können das Ende signalisieren, indem wir ein 0
schreiben. loadModel liest dann outputDimension = 0 und beendet die
Schleife. */
int zero = 0;
fwrite(&zero, sizeof(int), 1, fptr);
}
}
fclose(fptr);
}
void test_loadModelReturnsCorrectNumberOfLayers(void) {
const char *path = "some__nn_test_file.info2"; const char *path = "some__nn_test_file.info2";
MatrixType buffer1[] = {1, 2, 3, 4, 5, 6}; MatrixType buffer1[] = {1, 2, 3, 4, 5, 6};
MatrixType buffer2[] = {1, 2, 3, 4, 5, 6}; MatrixType buffer2[] = {1, 2, 3, 4, 5, 6};
@ -22,7 +103,8 @@ void test_loadModelReturnsCorrectNumberOfLayers(void)
MatrixType buffer4[] = {1, 2}; MatrixType buffer4[] = {1, 2};
Matrix biases1 = {.buffer = buffer3, .rows = 3, .cols = 1}; Matrix biases1 = {.buffer = buffer3, .rows = 3, .cols = 1};
Matrix biases2 = {.buffer = buffer4, .rows = 2, .cols = 1}; Matrix biases2 = {.buffer = buffer4, .rows = 2, .cols = 1};
Layer layers[] = {{.weights=weights1, .biases=biases1}, {.weights=weights2, .biases=biases2}}; Layer layers[] = {{.weights = weights1, .biases = biases1},
{.weights = weights2, .biases = biases2}};
NeuralNetwork expectedNet = {.layers = layers, .numberOfLayers = 2}; NeuralNetwork expectedNet = {.layers = layers, .numberOfLayers = 2};
NeuralNetwork netUnderTest; NeuralNetwork netUnderTest;
@ -32,12 +114,12 @@ void test_loadModelReturnsCorrectNumberOfLayers(void)
netUnderTest = loadModel(path); netUnderTest = loadModel(path);
remove(path); remove(path);
TEST_ASSERT_EQUAL_INT(expectedNet.numberOfLayers, netUnderTest.numberOfLayers); TEST_ASSERT_EQUAL_INT(expectedNet.numberOfLayers,
netUnderTest.numberOfLayers);
clearModel(&netUnderTest); clearModel(&netUnderTest);
} }
void test_loadModelReturnsCorrectWeightDimensions(void) void test_loadModelReturnsCorrectWeightDimensions(void) {
{
const char *path = "some__nn_test_file.info2"; const char *path = "some__nn_test_file.info2";
MatrixType weightBuffer[] = {1, 2, 3, 4, 5, 6}; MatrixType weightBuffer[] = {1, 2, 3, 4, 5, 6};
Matrix weights = {.buffer = weightBuffer, .rows = 3, .cols = 2}; Matrix weights = {.buffer = weightBuffer, .rows = 3, .cols = 2};
@ -54,13 +136,14 @@ void test_loadModelReturnsCorrectWeightDimensions(void)
remove(path); remove(path);
TEST_ASSERT_TRUE(netUnderTest.numberOfLayers > 0); TEST_ASSERT_TRUE(netUnderTest.numberOfLayers > 0);
TEST_ASSERT_EQUAL_INT(expectedNet.layers[0].weights.rows, netUnderTest.layers[0].weights.rows); TEST_ASSERT_EQUAL_INT(expectedNet.layers[0].weights.rows,
TEST_ASSERT_EQUAL_INT(expectedNet.layers[0].weights.cols, netUnderTest.layers[0].weights.cols); netUnderTest.layers[0].weights.rows);
TEST_ASSERT_EQUAL_INT(expectedNet.layers[0].weights.cols,
netUnderTest.layers[0].weights.cols);
clearModel(&netUnderTest); clearModel(&netUnderTest);
} }
void test_loadModelReturnsCorrectBiasDimensions(void) void test_loadModelReturnsCorrectBiasDimensions(void) {
{
const char *path = "some__nn_test_file.info2"; const char *path = "some__nn_test_file.info2";
MatrixType weightBuffer[] = {1, 2, 3, 4, 5, 6}; MatrixType weightBuffer[] = {1, 2, 3, 4, 5, 6};
Matrix weights = {.buffer = weightBuffer, .rows = 3, .cols = 2}; Matrix weights = {.buffer = weightBuffer, .rows = 3, .cols = 2};
@ -77,13 +160,14 @@ void test_loadModelReturnsCorrectBiasDimensions(void)
remove(path); remove(path);
TEST_ASSERT_TRUE(netUnderTest.numberOfLayers > 0); TEST_ASSERT_TRUE(netUnderTest.numberOfLayers > 0);
TEST_ASSERT_EQUAL_INT(expectedNet.layers[0].biases.rows, netUnderTest.layers[0].biases.rows); TEST_ASSERT_EQUAL_INT(expectedNet.layers[0].biases.rows,
TEST_ASSERT_EQUAL_INT(expectedNet.layers[0].biases.cols, netUnderTest.layers[0].biases.cols); netUnderTest.layers[0].biases.rows);
TEST_ASSERT_EQUAL_INT(expectedNet.layers[0].biases.cols,
netUnderTest.layers[0].biases.cols);
clearModel(&netUnderTest); clearModel(&netUnderTest);
} }
void test_loadModelReturnsCorrectWeights(void) void test_loadModelReturnsCorrectWeights(void) {
{
const char *path = "some__nn_test_file.info2"; const char *path = "some__nn_test_file.info2";
MatrixType weightBuffer[] = {1, 2, 3, 4, 5, 6}; MatrixType weightBuffer[] = {1, 2, 3, 4, 5, 6};
Matrix weights = {.buffer = weightBuffer, .rows = 3, .cols = 2}; Matrix weights = {.buffer = weightBuffer, .rows = 3, .cols = 2};
@ -100,15 +184,18 @@ void test_loadModelReturnsCorrectWeights(void)
remove(path); remove(path);
TEST_ASSERT_TRUE(netUnderTest.numberOfLayers > 0); TEST_ASSERT_TRUE(netUnderTest.numberOfLayers > 0);
TEST_ASSERT_EQUAL_INT(expectedNet.layers[0].weights.rows, netUnderTest.layers[0].weights.rows); TEST_ASSERT_EQUAL_INT(expectedNet.layers[0].weights.rows,
TEST_ASSERT_EQUAL_INT(expectedNet.layers[0].weights.cols, netUnderTest.layers[0].weights.cols); netUnderTest.layers[0].weights.rows);
int n = netUnderTest.layers[0].weights.rows * netUnderTest.layers[0].weights.cols; TEST_ASSERT_EQUAL_INT(expectedNet.layers[0].weights.cols,
TEST_ASSERT_EQUAL_INT_ARRAY(expectedNet.layers[0].weights.buffer, netUnderTest.layers[0].weights.buffer, n); netUnderTest.layers[0].weights.cols);
int n =
netUnderTest.layers[0].weights.rows * netUnderTest.layers[0].weights.cols;
TEST_ASSERT_EQUAL_INT_ARRAY(expectedNet.layers[0].weights.buffer,
netUnderTest.layers[0].weights.buffer, n);
clearModel(&netUnderTest); clearModel(&netUnderTest);
} }
void test_loadModelReturnsCorrectBiases(void) void test_loadModelReturnsCorrectBiases(void) {
{
const char *path = "some__nn_test_file.info2"; const char *path = "some__nn_test_file.info2";
MatrixType weightBuffer[] = {1, 2, 3, 4, 5, 6}; MatrixType weightBuffer[] = {1, 2, 3, 4, 5, 6};
Matrix weights = {.buffer = weightBuffer, .rows = 3, .cols = 2}; Matrix weights = {.buffer = weightBuffer, .rows = 3, .cols = 2};
@ -125,21 +212,23 @@ void test_loadModelReturnsCorrectBiases(void)
remove(path); remove(path);
TEST_ASSERT_TRUE(netUnderTest.numberOfLayers > 0); TEST_ASSERT_TRUE(netUnderTest.numberOfLayers > 0);
TEST_ASSERT_EQUAL_INT(expectedNet.layers[0].weights.rows, netUnderTest.layers[0].weights.rows); TEST_ASSERT_EQUAL_INT(expectedNet.layers[0].weights.rows,
TEST_ASSERT_EQUAL_INT(expectedNet.layers[0].weights.cols, netUnderTest.layers[0].weights.cols); netUnderTest.layers[0].weights.rows);
int n = netUnderTest.layers[0].biases.rows * netUnderTest.layers[0].biases.cols; TEST_ASSERT_EQUAL_INT(expectedNet.layers[0].weights.cols,
TEST_ASSERT_EQUAL_INT_ARRAY(expectedNet.layers[0].biases.buffer, netUnderTest.layers[0].biases.buffer, n); netUnderTest.layers[0].weights.cols);
int n =
netUnderTest.layers[0].biases.rows * netUnderTest.layers[0].biases.cols;
TEST_ASSERT_EQUAL_INT_ARRAY(expectedNet.layers[0].biases.buffer,
netUnderTest.layers[0].biases.buffer, n);
clearModel(&netUnderTest); clearModel(&netUnderTest);
} }
void test_loadModelFailsOnWrongFileTag(void) void test_loadModelFailsOnWrongFileTag(void) {
{
const char *path = "some_nn_test_file.info2"; const char *path = "some_nn_test_file.info2";
NeuralNetwork netUnderTest; NeuralNetwork netUnderTest;
FILE *file = fopen(path, "wb"); FILE *file = fopen(path, "wb");
if(file != NULL) if (file != NULL) {
{
const char *fileTag = "info2_neural_network_file_format"; const char *fileTag = "info2_neural_network_file_format";
fwrite(fileTag, sizeof(char), strlen(fileTag), file); fwrite(fileTag, sizeof(char), strlen(fileTag), file);
@ -155,8 +244,7 @@ void test_loadModelFailsOnWrongFileTag(void)
TEST_ASSERT_EQUAL_INT(0, netUnderTest.numberOfLayers); TEST_ASSERT_EQUAL_INT(0, netUnderTest.numberOfLayers);
} }
void test_clearModelSetsMembersToNull(void) void test_clearModelSetsMembersToNull(void) {
{
const char *path = "some__nn_test_file.info2"; const char *path = "some__nn_test_file.info2";
MatrixType weightBuffer[] = {1, 2, 3, 4, 5, 6}; MatrixType weightBuffer[] = {1, 2, 3, 4, 5, 6};
Matrix weights = {.buffer = weightBuffer, .rows = 3, .cols = 2}; Matrix weights = {.buffer = weightBuffer, .rows = 3, .cols = 2};
@ -179,23 +267,23 @@ void test_clearModelSetsMembersToNull(void)
TEST_ASSERT_EQUAL_INT(0, netUnderTest.numberOfLayers); TEST_ASSERT_EQUAL_INT(0, netUnderTest.numberOfLayers);
} }
static void someActivation(Matrix *matrix) static void someActivation(Matrix *matrix) {
{ for (int i = 0; i < matrix->rows * matrix->cols; i++) {
for(int i = 0; i < matrix->rows * matrix->cols; i++)
{
matrix->buffer[i] = fabs(matrix->buffer[i]); matrix->buffer[i] = fabs(matrix->buffer[i]);
} }
} }
void test_predictReturnsCorrectLabels(void) void test_predictReturnsCorrectLabels(void) {
{
const unsigned char expectedLabels[] = {4, 2}; const unsigned char expectedLabels[] = {4, 2};
GrayScalePixelType imageBuffer1[] = {10, 30, 25, 17}; GrayScalePixelType imageBuffer1[] = {10, 30, 25, 17};
GrayScalePixelType imageBuffer2[] = {20, 40, 10, 128}; GrayScalePixelType imageBuffer2[] = {20, 40, 10, 128};
GrayScaleImage inputImages[] = {{.buffer=imageBuffer1, .width=2, .height=2}, {.buffer=imageBuffer2, .width=2, .height=2}}; GrayScaleImage inputImages[] = {
{.buffer = imageBuffer1, .width = 2, .height = 2},
{.buffer = imageBuffer2, .width = 2, .height = 2}};
MatrixType weightsBuffer1[] = {1, -2, 3, -4, 5, -6, 7, -8}; MatrixType weightsBuffer1[] = {1, -2, 3, -4, 5, -6, 7, -8};
MatrixType weightsBuffer2[] = {-9, 10, 11, 12, 13, 14}; MatrixType weightsBuffer2[] = {-9, 10, 11, 12, 13, 14};
MatrixType weightsBuffer3[] = {-15, 16, 17, 18, -19, 20, 21, 22, 23, -24, 25, 26, 27, -28, -29}; MatrixType weightsBuffer3[] = {-15, 16, 17, 18, -19, 20, 21, 22,
23, -24, 25, 26, 27, -28, -29};
Matrix weights1 = {.buffer = weightsBuffer1, .rows = 2, .cols = 4}; Matrix weights1 = {.buffer = weightsBuffer1, .rows = 2, .cols = 4};
Matrix weights2 = {.buffer = weightsBuffer2, .rows = 3, .cols = 2}; Matrix weights2 = {.buffer = weightsBuffer2, .rows = 3, .cols = 2};
Matrix weights3 = {.buffer = weightsBuffer3, .rows = 5, .cols = 3}; Matrix weights3 = {.buffer = weightsBuffer3, .rows = 5, .cols = 3};
@ -205,8 +293,9 @@ void test_predictReturnsCorrectLabels(void)
Matrix biases1 = {.buffer = biasBuffer1, .rows = 2, .cols = 1}; Matrix biases1 = {.buffer = biasBuffer1, .rows = 2, .cols = 1};
Matrix biases2 = {.buffer = biasBuffer2, .rows = 3, .cols = 1}; Matrix biases2 = {.buffer = biasBuffer2, .rows = 3, .cols = 1};
Matrix biases3 = {.buffer = biasBuffer3, .rows = 5, .cols = 1}; Matrix biases3 = {.buffer = biasBuffer3, .rows = 5, .cols = 1};
Layer layers[] = {{.weights=weights1, .biases=biases1, .activation=someActivation}, \ Layer layers[] = {
{.weights=weights2, .biases=biases2, .activation=someActivation}, \ {.weights = weights1, .biases = biases1, .activation = someActivation},
{.weights = weights2, .biases = biases2, .activation = someActivation},
{.weights = weights3, .biases = biases3, .activation = someActivation}}; {.weights = weights3, .biases = biases3, .activation = someActivation}};
NeuralNetwork netUnderTest = {.layers = layers, .numberOfLayers = 3}; NeuralNetwork netUnderTest = {.layers = layers, .numberOfLayers = 3};
unsigned char *predictedLabels = predict(netUnderTest, inputImages, 2); unsigned char *predictedLabels = predict(netUnderTest, inputImages, 2);
@ -224,11 +313,11 @@ void tearDown(void) {
// Hier kann Bereinigungsarbeit nach jedem Test durchgeführt werden // Hier kann Bereinigungsarbeit nach jedem Test durchgeführt werden
} }
int main() int main() {
{
UNITY_BEGIN(); UNITY_BEGIN();
printf("\n============================\nNeural network tests\n============================\n"); printf("\n============================\nNeural network "
"tests\n============================\n");
RUN_TEST(test_loadModelReturnsCorrectNumberOfLayers); RUN_TEST(test_loadModelReturnsCorrectNumberOfLayers);
RUN_TEST(test_loadModelReturnsCorrectWeightDimensions); RUN_TEST(test_loadModelReturnsCorrectWeightDimensions);
RUN_TEST(test_loadModelReturnsCorrectBiasDimensions); RUN_TEST(test_loadModelReturnsCorrectBiasDimensions);