Compare commits
17
Commits
master
..
6a2767fa71
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6a2767fa71 | ||
|
|
dd542429c9 | ||
|
|
fa26fbfb39 | ||
|
|
4658bbafea | ||
|
|
98d18ae6ba | ||
|
|
66a9212093 | ||
|
|
d096780389 | ||
|
|
3581f434c4 | ||
|
|
7b4cac83c5 | ||
|
|
f2dc978764 | ||
|
|
c04202725b | ||
|
|
c9fa2ed07d | ||
|
|
ae761afb00 | ||
|
|
b8510c82da | ||
|
|
7b9a1d8f07 | ||
|
|
4486fbd82e | ||
|
|
2f30c2d030 |
Vendored
+5
@@ -0,0 +1,5 @@
|
|||||||
|
{
|
||||||
|
"files.associations": {
|
||||||
|
"unity.h": "c"
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -33,7 +33,6 @@ GrayScaleImageSeries *readImages(const char *path)
|
|||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
//liest die Anzahl der Bilder aus
|
//liest die Anzahl der Bilder aus
|
||||||
series->count = 0;
|
|
||||||
fread(&series->count, sizeof(unsigned short),1, data);
|
fread(&series->count, sizeof(unsigned short),1, data);
|
||||||
series->images = malloc(series->count * sizeof(GrayScaleImage));
|
series->images = malloc(series->count * sizeof(GrayScaleImage));
|
||||||
if (series->images == NULL){
|
if (series->images == NULL){
|
||||||
|
|||||||
+1
-2
@@ -123,8 +123,7 @@ void setUp(void) {
|
|||||||
// Falls notwendig, kann hier Vorbereitungsarbeit gemacht werden
|
// Falls notwendig, kann hier Vorbereitungsarbeit gemacht werden
|
||||||
}
|
}
|
||||||
|
|
||||||
void tearDown(void)
|
void tearDown(void) {
|
||||||
{
|
|
||||||
// Hier kann Bereinigungsarbeit nach jedem Test durchgeführt werden
|
// Hier kann Bereinigungsarbeit nach jedem Test durchgeführt werden
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+20
-11
@@ -5,18 +5,20 @@
|
|||||||
#include "unity.h"
|
#include "unity.h"
|
||||||
#include "neuralNetwork.h"
|
#include "neuralNetwork.h"
|
||||||
|
|
||||||
|
|
||||||
static void prepareNeuralNetworkFile(const char *path, const NeuralNetwork nn)
|
static void prepareNeuralNetworkFile(const char *path, const NeuralNetwork nn)
|
||||||
{
|
{
|
||||||
|
// TODO : Fehlerbehandlung
|
||||||
|
// Öffne die Datei zum Schreiben im Binärmodus
|
||||||
FILE *file = fopen(path, "wb");
|
FILE *file = fopen(path, "wb");
|
||||||
if (!file)
|
if (!file) return;
|
||||||
return;
|
|
||||||
|
|
||||||
|
// Schreibe den Datei-Tag
|
||||||
const char *tag = "__info2_neural_network_file_format__";
|
const char *tag = "__info2_neural_network_file_format__";
|
||||||
fwrite(tag, 1, strlen(tag), file);
|
fwrite(tag, 1, strlen(tag), file);
|
||||||
|
|
||||||
// Überprüfung, ob es Layer gibt
|
// Schreibe die Anzahl der Layer
|
||||||
if (nn.numberOfLayers == 0)
|
if (nn.numberOfLayers == 0) {
|
||||||
{
|
|
||||||
fclose(file);
|
fclose(file);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -37,6 +39,7 @@ static void prepareNeuralNetworkFile(const char *path, const NeuralNetwork nn)
|
|||||||
|
|
||||||
fwrite(layer->weights.buffer, sizeof(MatrixType), out * in, file);
|
fwrite(layer->weights.buffer, sizeof(MatrixType), out * in, file);
|
||||||
|
|
||||||
|
|
||||||
fwrite(layer->biases.buffer, sizeof(MatrixType), out * 1, file);
|
fwrite(layer->biases.buffer, sizeof(MatrixType), out * 1, file);
|
||||||
|
|
||||||
if (i + 1 < nn.numberOfLayers)
|
if (i + 1 < nn.numberOfLayers)
|
||||||
@@ -45,8 +48,16 @@ static void prepareNeuralNetworkFile(const char *path, const NeuralNetwork nn)
|
|||||||
fwrite(&nextOut, sizeof(int), 1, file);
|
fwrite(&nextOut, sizeof(int), 1, file);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fclose(file);
|
fclose(file);
|
||||||
|
|
||||||
|
// Debuging-Ausgabe
|
||||||
|
printf("prepareNeuralNetworkFile: Datei '%s' erstellt mit %u Layer(n)\n", path, nn.numberOfLayers);
|
||||||
|
for (unsigned int i = 0; i < nn.numberOfLayers; i++) {
|
||||||
|
Layer layer = nn.layers[i];
|
||||||
|
printf("Layer %u: weights (%u x %u), biases (%u x %u)\n",
|
||||||
|
i, layer.weights.rows, layer.weights.cols, layer.biases.rows, layer.biases.cols);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -244,8 +255,8 @@ 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=weights1, .biases=biases1, .activation=someActivation}, \
|
||||||
{.weights = weights2, .biases = biases2, .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);
|
||||||
@@ -255,13 +266,11 @@ void test_predictReturnsCorrectLabels(void)
|
|||||||
free(predictedLabels);
|
free(predictedLabels);
|
||||||
}
|
}
|
||||||
|
|
||||||
void setUp(void)
|
void setUp(void) {
|
||||||
{
|
|
||||||
// Falls notwendig, kann hier Vorbereitungsarbeit gemacht werden
|
// Falls notwendig, kann hier Vorbereitungsarbeit gemacht werden
|
||||||
}
|
}
|
||||||
|
|
||||||
void tearDown(void)
|
void tearDown(void) {
|
||||||
{
|
|
||||||
// Hier kann Bereinigungsarbeit nach jedem Test durchgeführt werden
|
// Hier kann Bereinigungsarbeit nach jedem Test durchgeführt werden
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user