hofmannjo99187/Neuronalesnetz
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: hofmannjo99187:master
Branches Tags
hofmannjo99187:master
hofmannjo99187:branchjonas
hofmannjo99187:branchflorian
hofmannjo99187:branchjens
..
compare: hofmannjo99187:branchjens
Branches Tags
hofmannjo99187:branchjonas
hofmannjo99187:master
hofmannjo99187:branchflorian
hofmannjo99187:branchjens

No commits in common. "master" and "branchjens" have entirely different histories.
master ... branchjens

7 changed files with 19 additions and 192 deletions
Show Stats Expand all files Collapse all files

146
imageInput.c
View File

@ -6,153 +6,17 @@
#define BUFFER_SIZE 100
#define FILE_HEADER_STRING "__info2_image_file_format__"
// TODO Implementieren Sie geeignete Hilfsfunktionen für das Lesen der Bildserie aus einer Datei
// DONE Implementieren Sie geeignete Hilfsfunktionen für das Lesen der Bildserie aus einer Datei
unsigned int readStatusInfo (FILE *const source, GrayScaleImageSeries *const series, char *const headerString, int const sizeToRead, int const amountToRead);
void readImagedata (FILE *const source, GrayScaleImageSeries *const series, int const amountToRead);
unsigned int checkHeaderString (const char *const header);
// DONE Vervollständigen Sie die Funktion readImages unter Benutzung Ihrer Hilfsfunktionen
// TODO Vervollständigen Sie die Funktion readImages unter Benutzung Ihrer Hilfsfunktionen
GrayScaleImageSeries *readImages(const char *path)
{
GrayScaleImageSeries *series = NULL;
FILE *readSource = 0;
const unsigned int sizeOfStausInfoElementsInBytes = sizeof(unsigned short);
const unsigned int amountOfStatusInfoToRead = 1;
unsigned int numberOfBytesToRead = 0;
unsigned int expectedHeader = 0;
char headerString[sizeof(FILE_HEADER_STRING)] = "";
readSource = fopen(path, "rb");
if (readSource != NULL)
{
series = calloc (amountOfStatusInfoToRead, sizeof(GrayScaleImageSeries));
series->images = calloc (amountOfStatusInfoToRead, sizeof(GrayScaleImage));
numberOfBytesToRead = readStatusInfo (readSource, series, headerString, sizeOfStausInfoElementsInBytes, amountOfStatusInfoToRead);
expectedHeader = checkHeaderString (headerString);
series->images = realloc (series->images, series->count * sizeof(GrayScaleImage));
series->labels = calloc (series->count, sizeof(&(series->labels)));
if (expectedHeader)
{
for (int i = 0; i < series->count; i++)
{
series->images[i].buffer = calloc(numberOfBytesToRead, sizeof(unsigned char));
}
for (int i = 0; i < series->count; i++)
{
series->images[i].width = series->images->width;
series->images[i].height = series->images->height;
}
readImagedata(readSource, series, numberOfBytesToRead);
}
else
{
fclose(readSource);
return NULL;
}
fclose(readSource);
}
GrayScaleImageSeries *series = NULL;
return series;
}
// DONE Vervollständigen Sie die Funktion clearSeries, welche eine Bildserie vollständig aus dem Speicher freigibt
void clearSeries(GrayScaleImageSeries * series)
// TODO Vervollständigen Sie die Funktion clearSeries, welche eine Bildserie vollständig aus dem Speicher freigibt
void clearSeries(GrayScaleImageSeries *series)
{
int i = 0;
int j = 0;
for (i = 0; i < series->count; i++)
{
if (i >= 0)
{
for (j = 0; j < series->images[i].width * series->images[i].height; j++)
{
series->images[i].buffer[j] = 0;
}
}
series->labels[i] = 0;
series->images[i].width = 0;
series->images[i].height = 0;
}
for (i = 0; i < series->count; i++)
{
free(series->images[i].buffer);
series->images[i].buffer = NULL;
}
free(series->labels);
series->labels = NULL;
free(series->images);
series->images = NULL;
free(series);
series = NULL;
}
// reads headerString, pictureCount, pictureWidth, pictureHight
unsigned int readStatusInfo(FILE *const source, GrayScaleImageSeries *const series, char *const headerString, int const sizeToRead, int const amountToRead)
{
unsigned int bytesToRead = 0;
fread(headerString, sizeof(FILE_HEADER_STRING) - 1, amountToRead, source);
fread(&(series->count), sizeToRead, amountToRead, source);
fread(&(series->images->width), sizeToRead, amountToRead, source);
fread(&(series->images->height), sizeToRead, amountToRead, source);
bytesToRead = (series->images->width) * (series->images->height);
return bytesToRead;
}
// reads the imagebytes and the label of all images
void readImagedata(FILE *const source, GrayScaleImageSeries *const series, int const amountToRead)
{
int i = 0;
for (i = 0; i < series->count ; i++)
{
fread(&series->images[i].buffer[0], sizeof(*series->images->buffer), amountToRead, source);
fread(&series->labels[i], sizeof(*series->images->buffer), sizeof(*series->labels), source);
}
}
// checks if the read headerString matches the expected headerString
unsigned int checkHeaderString(const char *const header)
{
int i = 0;
int notIdenticall = 0;
char expectedHeader[sizeof(FILE_HEADER_STRING)] = FILE_HEADER_STRING;
for (i = 0; i < sizeof(FILE_HEADER_STRING); i++)
{
if (header[i] != expectedHeader[i])
{
notIdenticall = 1;
}
}
return !notIdenticall;
}

7
imageInputTests.c
View File

@ -9,18 +9,19 @@
static void prepareImageFile(const char *path, unsigned short int width, unsigned short int height, unsigned int short numberOfImages, unsigned char label)
{
FILE *file = fopen(path, "wb");
if(file != NULL)
{
const char *fileTag = "__info2_image_file_format__";
GrayScalePixelType *zeroBuffer = (GrayScalePixelType *)calloc(numberOfImages * width * height, sizeof(GrayScalePixelType));
if(zeroBuffer != NULL)
{
fwrite(fileTag, sizeof(fileTag[0]), strlen(fileTag), file);
fwrite(&numberOfImages, sizeof(numberOfImages), 1, file);
fwrite(&width, sizeof(width), 1, file);
fwrite(&height, sizeof(height), 1, file);
for(int i = 0; i < numberOfImages; i++)
{
fwrite(zeroBuffer, sizeof(GrayScalePixelType), width * height, file);
@ -29,7 +30,7 @@ static void prepareImageFile(const char *path, unsigned short int width, unsigne
free(zeroBuffer);
}
fclose(file);
}
}

2
main.c
View File

@ -23,7 +23,7 @@ int main(int argc, char *argv[])
printf("Loaded %u images ... \n", series->count);
model = loadModel(pathToModel);
if(model.numberOfLayers > 0)
{
unsigned char *predictions = NULL;

4
makefile
View File

@ -18,8 +18,8 @@ unityfolder = ./unity
# --------------------------
# Initiales Programm bauen (zum ausprobieren)
# --------------------------
#mnist_initial: $(BINARIES)/libmnist_complete.a
# $(CC) -o mnist $(BINARIES)/libmnist_complete.a $(BINARIES)/libraylib.a ${LDFLAGS}
mnist_initial: $(BINARIES)/libmnist_complete.a
$(CC) -o mnist $(BINARIES)/libmnist_complete.a $(BINARIES)/libraylib.a ${LDFLAGS}
# --------------------------
# Selbst implementiertes Programm bauen

10
matrix.c
View File

@ -41,21 +41,19 @@ void clearMatrix(Matrix *matrix)
void setMatrixAt(MatrixType value, Matrix matrix, unsigned int rowIdx, unsigned int colIdx)
{
// printf("hier0\n");
if(matrix.buffer == NULL)
{
// printf("Fehler beim Setzen! Matrix nicht initialisiert");
//printf("Fehler beim Setzen! Matrix nicht initialisiert");
return;
}
if(rowIdx >= matrix.rows || colIdx >= matrix.cols)
{
// printf("Ungueltige Indizes beim Setzen!\n");
//printf("Ungueltige Indizes beim Setzen!\n");
return;
}
// printf("hier1\n");
matrix.buffer[rowIdx * matrix.cols + colIdx] = value;
// printf("hier2\n");
}
MatrixType getMatrixAt(const Matrix matrix, unsigned int rowIdx, unsigned int colIdx)

7
neuralNetwork.c
View File

@ -170,19 +170,18 @@ NeuralNetwork loadModel(const char *path)
static Matrix imageBatchToMatrixOfImageVectors(const GrayScaleImage images[], unsigned int count)
{
Matrix matrix = {/*NULL,*/ 0, 0, NULL};
Matrix matrix = {NULL, 0, 0};
if(count > 0 && images != NULL)
{
matrix = createMatrix(images[0].height * images[0].width, count);
if(matrix.buffer != NULL)
{
{
for(int i = 0; i < count; i++)
{
for(int j = 0; j < images[i].width * images[i].height; j++)
{
// printf("i %d, j %d \n", i,j);
setMatrixAt((MatrixType)images[i].buffer[j], matrix, j, i);
}
}
@ -249,7 +248,7 @@ unsigned char *predict(const NeuralNetwork model, const GrayScaleImage images[],
Matrix outputBatch = forward(model, inputBatch);
unsigned char *result = argmax(outputBatch);
clearMatrix(&outputBatch);
return result;

35
neuralNetworkTests.c
View File

@ -5,45 +5,10 @@
#include "unity.h"
#include "neuralNetwork.h"
#define FILE_HEADER_STRING "__info2_neural_network_file_format__"
static void prepareNeuralNetworkFile(const char *path, const NeuralNetwork nn)
{
// TODO
FILE *f = fopen(path, "wb");
if (!f) return;
fwrite(FILE_HEADER_STRING, sizeof(char), strlen(FILE_HEADER_STRING), f);
int inputDim = nn.layers[0].weights.cols;
int outputDim = nn.layers[0].weights.rows;
fwrite(&inputDim, sizeof(int), 1, f);
fwrite(&outputDim, sizeof(int), 1, f);
for (int i = 0; i < nn.numberOfLayers; i++)
{
Matrix weights = nn.layers[i].weights;
Matrix biases = nn.layers[i].biases;
int numWeightValues = weights.rows * weights.cols;
int numBiasValues = biases.rows * biases.cols;
fwrite(weights.buffer, sizeof(MatrixType), numWeightValues, f);
fwrite(biases.buffer, sizeof(MatrixType), numBiasValues, f);
if (i < nn.numberOfLayers - 1)
{
int nextOutputDim = nn.layers[i + 1].weights.rows;
fwrite(&nextOutputDim, sizeof(int), 1, f);
}
}
int endMarker = 0;
fwrite(&endMarker, sizeof(int), 1, f);
fclose(f);
}
void test_loadModelReturnsCorrectNumberOfLayers(void)