Compare commits

2 Commits
4 changed files with 28 additions and 24 deletions

No files matched your search

+13
View File
@@ -131,4 +131,17 @@ Matrix multiply(const Matrix matrix1, const Matrix matrix2)
}
}
return result;
}
void writeMatrix(Matrix matrix, FILE *file)//Added for neuralNetworkTests
{
//fprintf(file, "%d%d", matrix.rows, matrix.cols);
for(int i = 0; i < matrix.rows; i++)
{
for(int j = 0; j < matrix.cols; j++)
{
putw(*(matrix.buffer + (j+i)*sizeof(MatrixType)), file);
//fprintf(file, "%f", *(matrix.buffer + (j+i)*sizeof(MatrixType)));
printf("%f", *(matrix.buffer + (j+i)*sizeof(MatrixType)));
}
}
}
+1
View File
@@ -21,6 +21,7 @@ void setMatrixAt(MatrixType value, Matrix matrix, unsigned int rowIdx, unsigned
MatrixType getMatrixAt(const Matrix matrix, unsigned int rowIdx, unsigned int colIdx);
Matrix add(const Matrix matrix1, const Matrix matrix2);
Matrix multiply(const Matrix matrix1, const Matrix matrix2);
void writeMatrix(Matrix matrix, FILE *file);//Added for neuralNetworkTests
#endif
+1 -1
View File
@@ -170,7 +170,7 @@ NeuralNetwork loadModel(const char *path)
static Matrix imageBatchToMatrixOfImageVectors(const GrayScaleImage images[], unsigned int count)
{
Matrix matrix = {0, 0, NULL}; // TODO changed this line to fit our functionality
Matrix matrix = {NULL, 0, 0};
if(count > 0 && images != NULL)
{
+13 -23
View File
@@ -4,33 +4,23 @@
#include <math.h>
#include "unity.h"
#include "neuralNetwork.h"
#include "matrix.h"
static void prepareNeuralNetworkFile(const char *path, const NeuralNetwork nn)
{
// TODO
FILE* file = fopen(path, "wb");
if(file == NULL) {
printf("Failed to open file");
return;
FILE *testDatei = fopen(path, "w");
fprintf(testDatei, "__info2_neural_network_file_format__");
fprintf(testDatei, "%d%d", nn.layers->weights.rows, nn.layers->weights.cols);
// fprintf(testDatei, (char*) nn.numberOfLayers);
for(int i = 0; i < nn.numberOfLayers; i++)
{
//fprintf(testDatei, "\n");
//putw((nn.layers + sizeof(Layer) * i), testDatei);
writeMatrix(nn.layers[i].weights, testDatei);
writeMatrix(nn.layers[i].biases, testDatei);
}
const char* header = "__info2_neural_network_file_format__";
fwrite(header, sizeof(const char), strlen(header), file);
fwrite(&(nn.numberOfLayers), sizeof(unsigned int), 1, file);
fwrite(&(nn.numberOfLayers), sizeof(unsigned int), 1, file);
for(int i = 0; i < nn.numberOfLayers; i++) {
//write everything to do with weights
fwrite(&(nn.layers[i].weights.rows), sizeof(unsigned int), 1, file);
fwrite(&(nn.layers[i].weights.cols), sizeof(unsigned int), 1, file);
fwrite(nn.layers[i].weights.buffer, sizeof(MatrixType), nn.layers[i].weights.rows * nn.layers[i].weights.cols, file);
//write everything to do with biases
fwrite(&(nn.layers[i].biases.rows), sizeof(unsigned int), 1, file);
fwrite(&(nn.layers[i].biases.cols), sizeof(unsigned int), 1, file);
fwrite(nn.layers[i].biases.buffer, sizeof(MatrixType), nn.layers[i].biases.rows * nn.layers[i].biases.cols, file);
}
fclose(file);
fclose(testDatei);
}
void test_loadModelReturnsCorrectNumberOfLayers(void)
@@ -53,7 +43,7 @@ void test_loadModelReturnsCorrectNumberOfLayers(void)
netUnderTest = loadModel(path);
remove(path);
printf("\n%d\n%d\n", netUnderTest.numberOfLayers, expectedNet.numberOfLayers);
TEST_ASSERT_EQUAL_INT(expectedNet.numberOfLayers, netUnderTest.numberOfLayers);
clearModel(&netUnderTest);
}