diff --git a/I2_NeuronalerAbsturz/Start_Mac/imageInputTests.c b/I2_NeuronalerAbsturz/Start_Mac/imageInputTests.c index 268910f..851cb89 100644 --- a/I2_NeuronalerAbsturz/Start_Mac/imageInputTests.c +++ b/I2_NeuronalerAbsturz/Start_Mac/imageInputTests.c @@ -6,23 +6,20 @@ #include "imageInput.h" -static void prepareImageFile(const char *path, unsigned short int width, unsigned short int height, unsigned int short numberOfImages, unsigned char label, unsigned short greyScaleTest) +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)); + GrayScalePixelType *Buffer = (GrayScalePixelType *)calloc(numberOfImages * width * height, sizeof(GrayScalePixelType)); - if(zeroBuffer != NULL) + if(Buffer != NULL) { - if(greyScaleTest) + for(unsigned int i = 0; i < (numberOfImages * width * height); i++) { - for(unsigned int i = 0; i < (numberOfImages * width * height); i++) - { - zeroBuffer[i] = (GrayScalePixelType)i; - } + Buffer[i] = (GrayScalePixelType)i; } fwrite(fileTag, sizeof(fileTag[0]), strlen(fileTag), file); @@ -32,11 +29,11 @@ static void prepareImageFile(const char *path, unsigned short int width, unsigne for(int i = 0; i < numberOfImages; i++) { - fwrite(zeroBuffer, sizeof(GrayScalePixelType), width * height, file); + fwrite(Buffer, sizeof(GrayScalePixelType), width * height, file); fwrite(&label, sizeof(unsigned char), 1, file); } - free(zeroBuffer); + free(Buffer); } fclose(file); @@ -49,7 +46,7 @@ void test_readImagesReturnsCorrectNumberOfImages(void) GrayScaleImageSeries *series = NULL; const unsigned short expectedNumberOfImages = 2; const char *path = "testFile.info2"; - prepareImageFile(path, 8, 8, expectedNumberOfImages, 1, 0); + prepareImageFile(path, 8, 8, expectedNumberOfImages, 1); series = readImages(path); TEST_ASSERT_NOT_NULL(series); TEST_ASSERT_EQUAL_UINT16(expectedNumberOfImages, series->count); @@ -62,7 +59,7 @@ void test_readImagesReturnsCorrectImageWidth(void) GrayScaleImageSeries *series = NULL; const unsigned short expectedWidth = 10; const char *path = "testFile.info2"; - prepareImageFile(path, expectedWidth, 8, 2, 1, 0); + prepareImageFile(path, expectedWidth, 8, 2, 1); series = readImages(path); TEST_ASSERT_NOT_NULL(series); TEST_ASSERT_NOT_NULL(series->images); @@ -78,7 +75,7 @@ void test_readImagesReturnsCorrectImageHeight(void) GrayScaleImageSeries *series = NULL; const unsigned short expectedHeight = 10; const char *path = "testFile.info2"; - prepareImageFile(path, 8, expectedHeight, 2, 1, 0); + prepareImageFile(path, 8, expectedHeight, 2, 1); series = readImages(path); TEST_ASSERT_NOT_NULL(series); TEST_ASSERT_NOT_NULL(series->images); @@ -95,7 +92,7 @@ void test_readImagesReturnsCorrectLabels(void) GrayScaleImageSeries *series = NULL; const char *path = "testFile.info2"; - prepareImageFile(path, 8, 8, 2, expectedLabel, 0); + prepareImageFile(path, 8, 8, 2, expectedLabel); series = readImages(path); TEST_ASSERT_NOT_NULL(series); TEST_ASSERT_NOT_NULL(series->labels); @@ -132,7 +129,7 @@ void test_readImagesReadsCorrectGrayScales(void) GrayScaleImageSeries *series = NULL; const char *path = "testFile.info2"; - prepareImageFile(path, 8, 8, 1, 1, 1); + prepareImageFile(path, 8, 8, 1, 1); series = readImages(path); TEST_ASSERT_NOT_NULL(series);