diff --git a/src/fcwt.cpp b/src/fcwt.cpp index 61c1045..7543590 100644 --- a/src/fcwt.cpp +++ b/src/fcwt.cpp @@ -68,6 +68,8 @@ void Morlet::generate(int size) { mother[w] = (norm*exp(tmp1)); } } + +/* void Morlet::generate(float* real, float* imag, int size, float scale) { //Time domain because we know size from scale float tmp1, tmp2; @@ -106,6 +108,7 @@ void Morlet::getWavelet(float scale, complex* pwav, int pn) { free(real); free(imag); }; +*/ //==============================================================// //================== Scales =====================================// @@ -120,13 +123,14 @@ Scales::Scales(Wavelet *wav, SCALETYPE st, int afs, float af0, float af1, int af if(st==SCALETYPE::FCWT_LOGSCALES) calculate_logscale_array(2.0f, wav->four_wavelen, afs, af0, af1, afn); - else if(st==SCALETYPE::FCWT_LINSCALES) - calculate_linscale_array(wav->four_wavelen, afs, af0, af1, afn); + // else if(st==SCALETYPE::FCWT_LINSCALES) + // calculate_linscale_array(wav->four_wavelen, afs, af0, af1, afn); else calculate_linfreq_array(wav->four_wavelen, afs, af0, af1, afn); } +/* void Scales::getScales(float *pfreqs, int pnf) { for(int i=0;i* pwav, int pn); + // void getWavelet(float scale, complex* pwav, int pn); float fb; private: @@ -120,8 +120,8 @@ class Scales { public: FCWT_LIBRARY_API Scales(Wavelet *pwav, SCALETYPE st, int fs, float f0, float f1, int fn); - void FCWT_LIBRARY_API getScales(float *pfreqs, int pnf); - void FCWT_LIBRARY_API getFrequencies(float *pfreqs, int pnf); + // void FCWT_LIBRARY_API getScales(float *pfreqs, int pnf); + // void FCWT_LIBRARY_API getFrequencies(float *pfreqs, int pnf); float* scales; int fs; @@ -130,7 +130,7 @@ class Scales { private: void calculate_logscale_array(float base, float four_wavl, int fs, float f0, float f1, int fn); - void calculate_linscale_array(float four_wavl, int fs, float f0, float f1, int fn); + // void calculate_linscale_array(float four_wavl, int fs, float f0, float f1, int fn); void calculate_linfreq_array(float four_wavl, int fs, float f0, float f1, int fn); };