Commit : Zeropad removed. Periodic Extension debugged.

This commit is contained in:
Rafat Hussain 2015-12-13 12:52:16 +05:30
parent fcf4914f05
commit 23d5075329

View File

@ -159,10 +159,20 @@ static void dwt_per(wt_object wt, double *inp, int N, double *cA, int len_cA, do
cA[i] += wt->wave->lpd[l] * inp[t - l]; cA[i] += wt->wave->lpd[l] * inp[t - l];
cD[i] += wt->wave->hpd[l] * inp[t - l]; cD[i] += wt->wave->hpd[l] * inp[t - l];
} }
else if ((t - l) < 0) { else if ((t - l) < 0 && isodd == 0) {
cA[i] += wt->wave->lpd[l] * inp[t - l + N]; cA[i] += wt->wave->lpd[l] * inp[t - l + N];
cD[i] += wt->wave->hpd[l] * inp[t - l + N]; cD[i] += wt->wave->hpd[l] * inp[t - l + N];
} }
else if ((t - l) < 0 && isodd == 1) {
if ((t - l) != -1) {
cA[i] += wt->wave->lpd[l] * inp[t - l + N + 1];
cD[i] += wt->wave->hpd[l] * inp[t - l + N + 1];
}
else {
cA[i] += wt->wave->lpd[l] * inp[N - 1];
cD[i] += wt->wave->hpd[l] * inp[N - 1];
}
}
else if ((t - l) >= N && isodd == 0) { else if ((t - l) >= N && isodd == 0) {
cA[i] += wt->wave->lpd[l] * inp[t - l - N]; cA[i] += wt->wave->lpd[l] * inp[t - l - N];
cD[i] += wt->wave->hpd[l] * inp[t - l - N]; cD[i] += wt->wave->hpd[l] * inp[t - l - N];
@ -297,6 +307,10 @@ void dwt(wt_object wt,double *inp) {
J = wt->J; J = wt->J;
wt->length[J + 1] = temp_len; wt->length[J + 1] = temp_len;
wt->outlength = 0; wt->outlength = 0;
wt->zpad = 0;
orig = (double*)malloc(sizeof(double)* temp_len);
orig2 = (double*)malloc(sizeof(double)* temp_len);
/*
if ((temp_len % 2) == 0) { if ((temp_len % 2) == 0) {
wt->zpad = 0; wt->zpad = 0;
orig = (double*)malloc(sizeof(double)* temp_len); orig = (double*)malloc(sizeof(double)* temp_len);
@ -308,6 +322,7 @@ void dwt(wt_object wt,double *inp) {
orig = (double*)malloc(sizeof(double)* temp_len); orig = (double*)malloc(sizeof(double)* temp_len);
orig2 = (double*)malloc(sizeof(double)* temp_len); orig2 = (double*)malloc(sizeof(double)* temp_len);
} }
*/
for (i = 0; i < wt->siglength; ++i) { for (i = 0; i < wt->siglength; ++i) {
orig[i] = inp[i]; orig[i] = inp[i];