MODWT branch added. Test for memory leaks

test/CMakeLists.txt

@@ -26,6 +26,10 @@ add_executable(denoisetest denoisetest.c)
 
 target_link_libraries(denoisetest wauxlib wavelib)
 
+add_executable(modwtdenoisetest modwtdenoisetest.c)
+
+target_link_libraries(modwtdenoisetest wauxlib wavelib)
+
 if(UNIX)
 	target_link_libraries(cwttest m)
 	target_link_libraries(dwttest m)
@@ -34,9 +38,10 @@ if(UNIX)
 	target_link_libraries(dwpttest m)
 	target_link_libraries(wtreetest m)
 	target_link_libraries(denoisetest m)
+	target_link_libraries(modwtdenoisetest m)
 endif()
 
-set_target_properties(cwttest dwttest swttest modwttest dwpttest wtreetest denoisetest
+set_target_properties(cwttest dwttest swttest modwttest dwpttest wtreetest denoisetest modwtdenoisetest
         PROPERTIES
         RUNTIME_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/test"
         )

test/denoisetest.c

@@ -56,10 +56,12 @@ int main() {
 	double temp[2400];
 
 	char *wname = "db5";
-	char *method = "dwt";
-	char *ext = "sym";
-	char *thresh = "soft";
-	char *level = "all";
+	char *method = "dwt";// Available - dwt, swt and modwt. modwt works only with modwtshrink. The other two methods work with
+	// visushrink and sureshrink
+	char *ext = "sym";// sym and per work with dwt. swt and modwt only use per extension when called through denoise.
+	// You can use sy extension if you directly call modwtshrink with cmethod set to fft. See modwtdenoisetest.c file 
+	char *thresh = "soft";// soft or hard
+	char *level = "all"; // noise estimation at "first" or "all" levels. modwt only has the option of "all" 
 
 	ifp = fopen("pieceregular1024.txt", "r");
 	i = 0;
@@ -104,19 +106,20 @@ int main() {
 		inp[i] = temp[i];
 	}
 	obj = denoise_init(N,J,wname);
-	setDenoiseMethod(obj,"visushrink");// sureshrink is also the default. The other option is visushrink
-	setDenoiseWTMethod(obj,method);// Default is dwt. the other option is swt
+	setDenoiseMethod(obj,"visushrink");// sureshrink is also the default. The other option with dwt and swt is visushrink.
+	// modwt works only with modwtshrink method
+	setDenoiseWTMethod(obj,method);// Default is dwt. the other options are swt and modwt
 	setDenoiseWTExtension(obj,ext);// Default is sym. the other option is per
 	setDenoiseParameters(obj,thresh,level);// Default for thresh is soft. Other option is hard
-	// Default for level is first. The other option is all
+	// Default for level is all. The other option is first
 
 	denoise(obj,inp,oup);
 
 	// Alternative to denoise_object
-	// Just use visushrink and sureshrink functions
+	// Just use visushrink, modwtshrink and sureshrink functions
 	//visushrink(inp,N,J,wname,method,ext,thresh,level,oup);
 	//sureshrink(inp,N,J,wname,method,ext,thresh,level,oup);
-
+	// modwtshrink(sig,N,J,wname,cmethod,ext,thresh,oup); See modwtdenoisetest.c
 	//ofp = fopen("denoiseds.txt", "w");
 
 

test/modwtdenoisetest.c

@@ -0,0 +1,123 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+
+#include "../header/wauxlib.h"
+
+static double rmse(int N,double *x,double *y) {
+	double rms;
+	int i;
+
+	rms = 0.0;
+
+	for(i = 0; i < N;++i) {
+		rms += (x[i] - y[i]) * (x[i] - y[i]);
+	}
+
+	rms = sqrt(rms/(double)N);
+
+	return rms;
+}
+
+static double corrcoef(int N,double *x,double *y) {
+	double cc,xm,ym,tx,ty,num,den1,den2;
+	int i;
+	xm = ym = 0.0;
+	for(i = 0; i < N;++i) {
+		xm += x[i];
+		ym += y[i];
+	}
+
+	xm = xm/N;
+	ym = ym / N;
+	num = den1 = den2 = 0.0;
+
+	for(i = 0; i < N;++i) {
+		tx = x[i] - xm;
+		ty = y[i] - ym;
+		num += (tx*ty);
+		den1 += (tx*tx);
+		den2 += (ty*ty);
+	}
+
+	cc = num / sqrt(den1*den2);
+
+	return cc;
+}
+
+int main() {
+	// gcc -Wall -I../header -L../Bin modwtdenoisetest.c -o modwtdenoise -lwauxlib -lwavelib -lm
+    /*
+    modwtshrink can also be called from the denoise object. See denoisetest.c for more information
+    */
+	double *sig,*inp,*oup;
+	int i,N,J;
+	FILE *ifp;
+
+	double temp[2400];
+
+	char *wname = "db5";
+	char *ext = "per";// The other option sym is only available with "fft" cmethod
+	char *thresh = "soft";
+	char *cmethod = "direct";// The other option is "fft"
+
+	ifp = fopen("pieceregular1024.txt", "r");
+	i = 0;
+	if (!ifp) {
+	    printf("Cannot Open File");
+	    exit(100);
+	}
+
+	while (!feof(ifp)) {
+	    fscanf(ifp, "%lf \n", &temp[i]);
+	    i++;
+	}
+
+	fclose(ifp);
+
+	N = i;
+	J = 4;
+
+	sig = (double*)malloc(sizeof(double)* N);
+	inp = (double*)malloc(sizeof(double)* N);
+	oup = (double*)malloc(sizeof(double)* N);
+
+	for(i = 0; i < N;++i) {
+		sig[i] = temp[i];
+	}
+
+	ifp = fopen("PieceRegular10.txt", "r");
+	i = 0;
+	if (!ifp) {
+		printf("Cannot Open File");
+		exit(100);
+	}
+
+	while (!feof(ifp)) {
+		fscanf(ifp, "%lf \n", &temp[i]);
+		i++;
+	}
+
+	fclose(ifp);
+
+	for(i = 0; i < N;++i) {
+		inp[i] = temp[i];
+	}
+	
+    modwtshrink(sig,N,J,wname,cmethod,ext,thresh,oup);
+
+
+	printf("Signal - Noisy Signal Stats \n");
+	printf("RMSE %g\n",rmse(N,sig,inp));
+	printf("Corr Coeff %g\n",corrcoef(N,sig,inp));
+
+	printf("Signal - DeNoised Signal Stats \n");
+	printf("RMSE %g\n",rmse(N,sig,oup));
+		printf("Corr Coeff %g\n",corrcoef(N,sig,oup));
+
+	free(sig);
+	free(inp);
+	free(oup);
+	return 0;
+}