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

removed not needed code and old comments, also updated readImagedata() so that labels are now read correctly

Browse Source
This commit is contained in:
Jonas Hofmann 2025-11-22 16:31:44 +01:00
parent d7fb02e6b4
commit e9d3ddb999
1 changed files with 18 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
imageInput.c
View File

@ -13,20 +13,13 @@
// merge with others to test in entirity
// Funktionen müssen noch auf Teilfunktionen
// übersichtlich aufgeteilt werden!
// TODO Implementieren Sie geeignete Hilfsfunktionen für das Lesen der Bildserie aus einer Datei
//void setupMemory();
// DONE Implementieren Sie geeignete Hilfsfunktionen für das Lesen der Bildserie aus einer Datei
unsigned int readStatusInfo(FILE *source, char *const headerString, unsigned int *const imageCount, unsigned int *const imageWidth, unsigned int *const imageHeight, int const amountToRead);
void readImagedata(FILE *source, GrayScaleImageSeries *series, int const amountToRead);
unsigned int checkHeaderString(char header[]);
// TODO Vervollständigen Sie die Funktion readImages unter Benutzung Ihrer Hilfsfunktionen
// DONE Vervollständigen Sie die Funktion readImages unter Benutzung Ihrer Hilfsfunktionen
GrayScaleImageSeries *readImages(const char *path)
{
GrayScaleImageSeries *series = NULL;
@ -37,31 +30,12 @@ GrayScaleImageSeries *readImages(const char *path)
const unsigned int amountOfStatusInfoToRead = 1;
unsigned int expectedHeader = 0;
char headerString[sizeof(FILE_HEADER_STRING)] = "";
/*
char curChar = 0;
int i = 0;
*/
readSource = fopen(path, "rb");
if (readSource != NULL)
{
/*
// print entire source char by char
do
{
curChar = fgetc(readSource);
printf("%x ", curChar);
if (i >= 9)
{
printf("\n");
i = 0;
}
i++;
} while (curChar != EOF);
*/
series = calloc(sizeof(unsigned int) + 3* sizeof(headerString), amountOfStatusInfoToRead);
series->images = calloc(2*sizeof(unsigned int) + sizeof(headerString), amountOfStatusInfoToRead);
@ -74,8 +48,7 @@ GrayScaleImageSeries *readImages(const char *path)
if (expectedHeader)
{
// reallocate memory so that each image width can be
// saved seperately ???
// reallocate memory so that each image width can be saved seperately
series->images = realloc(series->images, series->count * 2 * sizeof(unsigned int) + sizeof(headerString));
for (int i = 0; i < series->count; i++)
@ -84,20 +57,11 @@ GrayScaleImageSeries *readImages(const char *path)
series->images[i].height = series->images->height;
}
// printf("%d\n", series->images[0].width);
// series->images[1].width is not being set
// implement setting several amoundt of status info
// for when several images are bing read
// also adjust amoung of memory allocated for
// staus info based on the number of images to be read
// printf("%d\n", series->images[1].width);
readImagedata(readSource, series, numberOfBytesToRead);
}
else
{
fclose(readSource);
return NULL;
series = NULL;
}
fclose(readSource);
@ -106,18 +70,12 @@ GrayScaleImageSeries *readImages(const char *path)
return series;
}
// TODO Vervollständigen Sie die Funktion clearSeries, welche eine Bildserie vollständig aus dem Speicher freigibt
// DONE Vervollständigen Sie die Funktion clearSeries, welche eine Bildserie vollständig aus dem Speicher freigibt
void clearSeries(GrayScaleImageSeries *series)
{
int i = 0;
/*
printf("count: %d ", series->count);
printf("width: %d ", series->images->width);
printf("height: %d ", series->images->height);
printf("sum: %d ", ((series->count) * (series->images->width) * (series->images->height)));
printf("sum in int: %d\n",((series->count) * (series->images->width) * (series->images->height)/4));
*/
// Write NULL into all memory spaces
for (i = 0; i < ((series->count) * (series->images->width) * (series->images->height) / 4); i++)
@ -133,6 +91,7 @@ void clearSeries(GrayScaleImageSeries *series)
series->count = 0;
series->images->width = 0;
series->images->height = 0;
// Closse all allocated memory
// AND write NULL into every pointer
// so they can't be accessed
@ -152,36 +111,20 @@ void clearSeries(GrayScaleImageSeries *series)
unsigned int readStatusInfo(FILE *source, char *const headerString, unsigned int *const imageCount, unsigned int *const imageWidth, unsigned int *const imageHeight, int const amountToRead)
{
unsigned int bytesToRead = 0;
/*
int numred = 0;
int numred2 = 0;
int numred3 = 0;
int numred4 = 0;
*/
//unsigned int imageCountBuffer = 0;
/*numred =*/ fread(headerString, 27, 1, source);
/*numred2 =*/ fread(imageCount, 2, 1, source);
/*numred3 =*/ fread(imageWidth, 2, 1, source);
/*numred4 =*/ fread(imageHeight, 2, 1, source);
fread(headerString, 27, 1, source);
fread(imageCount, 2, 1, source);
fread(imageWidth, 2, 1, source);
fread(imageHeight, 2, 1, source);
bytesToRead = (*imageWidth) * (*imageHeight);
/*
printf("numred: %d\n", numred);
printf("stringsize: %lld\n", sizeof("__info2_image_file_format__"));
printf("string: %send\n", headerString);
printf("numred2: %d\n", numred2);
printf("count: %u\n", *imageCount);
printf("numred3: %d\n", numred3);
printf("width: %u\n", *imageWidth);
printf("numred4: %d\n", numred4);
printf("height %u\n", *imageHeight);
printf("bytes to read = %u\n", bytesToRead);
*/
return bytesToRead;
}
// reads the imagebytes and the label of all images
void readImagedata(FILE *source, GrayScaleImageSeries *series, int const amountOfBytes)
{
@ -190,19 +133,12 @@ void readImagedata(FILE *source, GrayScaleImageSeries *series, int const amount
for (i = 0; i < series->count ; i++)
{
fread(&(series->images->buffer[i]), 1, amountOfBytes, source);
fread(&(series->labels[i]), 2, 1, source);
fread(&(series->labels[i]), 1, 1, source);
printf("label: %x\n", series->labels[i]);
}
// No lable in images after the first one,
// so expectation is that they must all be set
// to the same lable
for (int i = 0; i < series->count; i++)
{
series->labels[i] = *series->labels;
}
}
unsigned int checkHeaderString(char header[])
{
int i = 0;