changeset 12:fc8f351d2cd6 perf

Remove further unused

--- a/FChTransformF0gram.cpp	Tue Oct 02 13:33:29 2018 +0100
+++ b/FChTransformF0gram.cpp	Tue Oct 02 13:49:23 2018 +0100
@@ -33,7 +33,7 @@
     // max frequency of interest (Hz)
     m_fmax = 10000.f;
     // warping parameters
-    m_warp_params.nsamps_twarp   = 2048;
+    m_warp_params.nsamps_twarp = 2048;
     //m_warp_params.nsamps_twarp = 8;
     m_warp_params.alpha_max = 4;
     m_warp_params.num_warps = 21;
@@ -531,11 +531,8 @@
     design_GLogS();
 
     /* design of FChT */
-    // design_fcht(m_warps, m_accums, m_f0s)
     design_FChT();
 
-    design_FFT();
-
     design_LPF();
 
     design_time_window();
@@ -639,18 +636,6 @@
 }
 
 void
-FChTransformF0gram::design_FFT() {
-    in = (fftw_complex*) fftw_malloc(sizeof (fftw_complex) * m_nfft);
-    out = (fftw_complex*) fftw_malloc(sizeof (fftw_complex) * m_nfft);
-    //TODO verificar que el tipo de datos de in_window es del tipo double, era float.
-    in_window = (double*) fftw_malloc(sizeof (double) * m_nfft);
-    planFFT = fftw_plan_dft_1d(m_nfft, in, out, FFTW_FORWARD, FFTW_ESTIMATE);
-
-    //TODO hacer diseño del FFT para el filtrado pasabajos.
-
-}
-
-void
 FChTransformF0gram::design_FChT() {
 
     /*
@@ -941,10 +926,6 @@
     delete [] m_warpings.pos_int;
     delete [] m_warpings.pos_frac;
 
-    fftw_destroy_plan(planFFT);
-    fftw_free(in); 
-    fftw_free(out);
-
     clean_LPF();
 
     delete [] m_timeWindow;
@@ -1029,31 +1010,6 @@
     Feature feature;
     feature.hasTimestamp = false;
 
-
-    /* Solo a modo de prueba, voy a poner la salida del filtrado en «in» y
-       voy a mostrar la FFT de eso, para ver el efecto del filtrado. */
-//    for (int i = 0; i < m_nfft; i++) {
-//        in[i][0] = tbuf[i];
-//        in[i][1] = 0;
-//    }
-//	fftw_execute(planFFT);
-//	double real, imag;
-//	for (int i=0; i<n; ++i) {		// preincremento?? ver version de nacho
-//		real = out[i][0];
-//		imag = out[i][1];
-//		feature.values.push_back(real*real + imag*imag);
-//	}
-//	fs[0].push_back(feature);
-
-//	float real; 
-//	float imag;
-//	for (int i=0; i<m_blockSize/2+1; i++) {
-//		real = (float)(LPF_frequency[i][0]);
-//		imag = (float)(LPF_frequency[i][1]);
-//		feature.values.push_back(real*real+imag*imag);
-//		//feature.values.push_back((float)(mp_LPFWindow[i]));
-//	}
-
 // ----------------------------------------------------------------------------------------------
 // 		Hanning window & FFT for all warp directions
 

--- a/FChTransformF0gram.h	Tue Oct 02 13:33:29 2018 +0100
+++ b/FChTransformF0gram.h	Tue Oct 02 13:49:23 2018 +0100
@@ -16,8 +16,8 @@
 */
 
 // Remember to use a different guard symbol in each header!
-#ifndef _FCHTRANSFORMF0GRAM_H_
-#define _FCHTRANSFORMF0GRAM_H_
+#ifndef FCHTRANSFORMF0GRAM_H
+#define FCHTRANSFORMF0GRAM_H
 
 #define _USE_MATH_DEFINES
 #include <cmath>
@@ -179,14 +179,7 @@
     void design_LPF();
     void clean_LPF();
     void apply_LPF();
-    void design_FFT();
     void design_time_window();
-
-    // FFT variables
-    fftw_complex *in, *out;
-    //TODO verificar que el tipo de datos de in_window es del tipo double, era del tipo float.
-    double *in_window;
-    fftw_plan planFFT;
 };