stefan
/
NLMSvariants
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updated

This commit is contained in:
gurkenhabicht 2018-05-22 16:22:12 +02:00
parent 5cb57b106b
commit 71bd11c6e9
3 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ansi_c_implementation/nlms_types.h
View File

@ -24,7 +24,7 @@ typedef struct { // Storage for image data
}imagePixel_t; }imagePixel_t;
/** file handling* */ /** file handling* */
enum fileSuffix_t{ // Used in conjunction with mkFileName() enum fileSuffix_t{ // Used in conjunction with MkFileName()
PURE_WEIGHTS, PURE_WEIGHTS,
USED_WEIGHTS, USED_WEIGHTS,
DIRECT_PREDECESSOR, DIRECT_PREDECESSOR,
@ -34,7 +34,7 @@ enum fileSuffix_t{ // Used in conjunction with mkFileName()
DIFFERENTIAL_PREDECESSOR DIFFERENTIAL_PREDECESSOR
}; };
enum fileHeader{ enum fileHeader{ // Used in conjunction with MkFilename()
LOCAL_MEAN_HEADER, LOCAL_MEAN_HEADER,
DIRECT_PREDECESSOR_HEADER, DIRECT_PREDECESSOR_HEADER,
DIFFERENTIAL_PREDECESSOR_HEADER DIFFERENTIAL_PREDECESSOR_HEADER

13
src/cpp_implementation/NLMSvariants.cpp
View File

@ -11,7 +11,6 @@ Created by Stefan Friese on 26.04.2018
#include <time.h> #include <time.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
//#include <float.h> // DBL_MAX
#include "nlms_types.h" // added types #include "nlms_types.h" // added types
#define RGB_COLOR 255 #define RGB_COLOR 255
@ -247,11 +246,7 @@ void localMean ( mldata_t *mlData, point_t points[] ) {
deviation /= xErrorLength; // Deviation deviation /= xErrorLength; // Deviation
printf("mean:%lf, devitation:%lf\t\tlocal Mean\n", mean, deviation); printf("mean:%lf, devitation:%lf\t\tlocal Mean\n", mean, deviation);
// write in file
//mkFileName(fileName, sizeof(fileName), RESULTS);
//FILE *fp2 = fopen(fileName, "w");
fprintf(fp4, "\nQuadratische Varianz(x_error): %f\nMittelwert:(x_error): %f\n\n", deviation, mean); // Write to logfile fprintf(fp4, "\nQuadratische Varianz(x_error): %f\nMittelwert:(x_error): %f\n\n", deviation, mean); // Write to logfile
//fclose(fp2);
free(localWeights); free(localWeights);
fclose(fp4); fclose(fp4);
@ -333,12 +328,8 @@ void directPredecessor( mldata_t *mlData, point_t points[]) {
} }
deviation /= xErrorLength; // Deviation deviation /= xErrorLength; // Deviation
printf("mean:%lf, devitation:%lf\t\tdirect Predecessor\n", mean, deviation); printf("mean:%lf, devitation:%lf\t\tdirect Predecessor\n", mean, deviation);
// write in file
//mkFileName(fileName, sizeof(fileName), RESULTS);
//FILE *fp2 = fopen(fileName, "wa");
fprintf(fp3, "\nQuadratische Varianz(x_error): %f\nMittelwert:(x_error): %f\n\n", deviation, mean); fprintf(fp3, "\nQuadratische Varianz(x_error): %f\nMittelwert:(x_error): %f\n\n", deviation, mean);
fclose(fp3); fclose(fp3);
//fclose(fp2);
free(localWeights); free(localWeights);
} }
@ -414,11 +405,7 @@ void differentialPredecessor ( mldata_t *mlData, point_t points[] ) {
deviation /= xErrorLength; deviation /= xErrorLength;
printf("mean:%lf, devitation:%lf\t\tdifferential Predecessor\n", mean, deviation); printf("mean:%lf, devitation:%lf\t\tdifferential Predecessor\n", mean, deviation);
// write in file
//mkFileName(fileName, sizeof(fileName), RESULTS);
//FILE *fp2 = fopen(fileName, "wa");
fprintf(fp6, "\nQuadratische Varianz(x_error): %f\nMittelwert:(x_error): %f\n\n", deviation, mean); fprintf(fp6, "\nQuadratische Varianz(x_error): %f\nMittelwert:(x_error): %f\n\n", deviation, mean);
//fclose(fp2);
fclose(fp6); fclose(fp6);
free(localWeights); free(localWeights);

4
src/cpp_implementation/nlms_types.h
View File

@ -24,7 +24,7 @@ typedef struct { // Storage for image data
}imagePixel_t; }imagePixel_t;
/** file handling* */ /** file handling* */
enum fileSuffix_t{ // Used in conjunction with mkFileName() enum fileSuffix_t{ // Used in conjunction with MkFileName()
PURE_WEIGHTS, PURE_WEIGHTS,
USED_WEIGHTS, USED_WEIGHTS,
DIRECT_PREDECESSOR, DIRECT_PREDECESSOR,
@ -34,7 +34,7 @@ enum fileSuffix_t{ // Used in conjunction with mkFileName()
DIFFERENTIAL_PREDECESSOR DIFFERENTIAL_PREDECESSOR
}; };
enum fileHeader{ enum fileHeader{ // Used in conjunction with MkFilename()
LOCAL_MEAN_HEADER, LOCAL_MEAN_HEADER,
DIRECT_PREDECESSOR_HEADER, DIRECT_PREDECESSOR_HEADER,
DIFFERENTIAL_PREDECESSOR_HEADER DIFFERENTIAL_PREDECESSOR_HEADER