diff --git a/denoise/denoise.c b/denoise/denoise.c index d4bc27d..e9db053 100644 --- a/denoise/denoise.c +++ b/denoise/denoise.c @@ -101,8 +101,8 @@ void getDWTDetail(wt_object wt, double *detail, int N, int level) { } } -void visushrink(double *signal,int N,char *wname,char *method,char *ext,char *thresh,double *denoised) { - int J,filt_len,iter,i,dlen,dwt_len,sgn; +void visushrink(double *signal,int N,int J,char *wname,char *method,char *ext,char *thresh,double *denoised) { + int filt_len,iter,i,dlen,dwt_len,sgn, MaxIter; double sigma,td,tmp; wave_object wave; wt_object wt; @@ -112,10 +112,11 @@ void visushrink(double *signal,int N,char *wname,char *method,char *ext,char *th filt_len = wave->filtlength; - J = (int) (log((double)N / ((double)filt_len - 1.0)) / log(2.0)); + MaxIter = (int) (log((double)N / ((double)filt_len - 1.0)) / log(2.0)); - if (J > 50) { - J = 50; + if (J > MaxIter) { + printf("\n Error - The Signal Can only be iterated %d times using this wavelet. Exiting\n",MaxIter); + exit(-1); } wt = wt_init(wave,method,N,J); @@ -168,8 +169,8 @@ void visushrink(double *signal,int N,char *wname,char *method,char *ext,char *th wt_free(wt); } -void sureshrink(double *signal,int N,char *wname,char *method,char *ext,char *thresh,double *denoised) { - int J, filt_len,i,it,len,dlen,dwt_len,min_index,sgn; +void sureshrink(double *signal,int N,int J,char *wname,char *method,char *ext,char *thresh,double *denoised) { + int filt_len,i,it,len,dlen,dwt_len,min_index,sgn, MaxIter; double sigma,norm,td,tv,te,ct,thr,temp,x_sum; wave_object wave; wt_object wt; @@ -179,10 +180,11 @@ void sureshrink(double *signal,int N,char *wname,char *method,char *ext,char *th filt_len = wave->filtlength; - J = (int) (log((double)N / ((double)filt_len - 1.0)) / log(2.0)); + MaxIter = (int) (log((double)N / ((double)filt_len - 1.0)) / log(2.0)); - if (J > 50) { - J = 50; + if (J > MaxIter) { + printf("\n Error - The Signal Can only be iterated %d times using this wavelet. Exiting\n",MaxIter); + exit(-1); } wt = wt_init(wave,method,N,J); @@ -248,17 +250,17 @@ void sureshrink(double *signal,int N,char *wname,char *method,char *ext,char *th if(!strcmp(thresh,"hard")) { for(i = 0; i < dwt_len;++i) { if (fabs(wt->output[len+i]) < td) { - wt->output[i] = 0; + wt->output[len+i] = 0; } } } else if(!strcmp(thresh,"soft")) { for(i = 0; i < dwt_len;++i) { if (fabs(wt->output[len + i]) < td) { - wt->output[i] = 0; + wt->output[len+i] = 0; } else { sgn = wt->output[len+i] >= 0 ? 1 : -1; temp = sgn * (fabs(wt->output[len+i]) - td); - wt->output[i] = temp; + wt->output[len+i] = temp; } } } diff --git a/denoise/denoise.h b/denoise/denoise.h index 2d1809e..270964c 100644 --- a/denoise/denoise.h +++ b/denoise/denoise.h @@ -16,9 +16,9 @@ extern "C" { #endif -void visushrink(double *signal,int N,char *wname,char *method,char *ext,char *thresh,double *denoised); +void visushrink(double *signal,int N,int J,char *wname,char *method,char *ext,char *thresh,double *denoised); -void sureshrink(double *signal,int N,char *wname,char *method,char *ext,char *thresh,double *denoised); +void sureshrink(double *signal,int N,int J,char *wname,char *method,char *ext,char *thresh,double *denoised); double mad(double *x, int N); diff --git a/header/denoise.h b/header/denoise.h index 34b5e12..30ee9af 100644 --- a/header/denoise.h +++ b/header/denoise.h @@ -11,7 +11,9 @@ extern "C" { #endif -void visushrink(double *signal,int N,char *wname,char *method,char *ext,char *thresh,double *denoised); +void visushrink(double *signal,int N,int J,char *wname,char *method,char *ext,char *thresh,double *denoised); + +void sureshrink(double *signal,int N,int J,char *wname,char *method,char *ext,char *thresh,double *denoised); double mad(double *x, int N); diff --git a/test/denoisetest.c b/test/denoisetest.c index 2d12046..39047e4 100644 --- a/test/denoisetest.c +++ b/test/denoisetest.c @@ -7,7 +7,7 @@ int main() { // gcc -Wall -I../header -L../Bin denoisetest.c -o denoise -ldenoiselib -lwavelib -lm double *inp,*oup; - int i,N; + int i,N,J; FILE *ifp,*ofp; double temp[2400]; @@ -31,6 +31,7 @@ int main() { fclose(ifp); N = i; + J = 5; inp = (double*)malloc(sizeof(double)* N); oup = (double*)malloc(sizeof(double)* N); @@ -39,9 +40,10 @@ int main() { inp[i] = temp[i]; } - visushrink(inp,N,wname,method,ext,thresh,oup); + //visushrink(inp,N,wname,method,ext,thresh,oup); + sureshrink(inp,N,J,wname,method,ext,thresh,oup); - ofp = fopen("denoised.txt", "w"); + ofp = fopen("denoiseds.txt", "w"); for(i = 0; i < N;++i) { fprintf(ofp,"%g \n",oup[i]);