comparison dsp/chromagram/ConstantQ.cpp @ 73:dcb555b90924

* Key detector: when returning key strengths, use the peak value of the
  three underlying chromagram correlations (from 36-bin chromagram)
  corresponding to each key, instead of the mean.
  Rationale: This is the same method as used when returning the key value,
  and it's nice to have the same results in both returned value and plot.
  The peak performed better than the sum with a simple test set of triads,
  so it seems reasonable to change the plot to match the key output rather
  than the other way around.

* FFT: kiss_fftr returns only the non-conjugate bins, synthesise the rest
  rather than leaving them (perhaps dangerously) undefined.  Fixes an
  uninitialised data error in chromagram that could cause garbage results
  from key detector.

* Constant Q: remove precalculated values again, I reckon they're not
  proving such a good tradeoff.

 
 #include "ConstantQ.h"
 #include "dsp/transforms/FFT.h"
 
 #include <iostream>
+
+#ifdef NOT_DEFINED
+// see note in CQprecalc
 
 #include "CQprecalc.cpp"
 
 static bool push_precalculated(int uk, int fftlength,
                                std::vector<unsigned> &is,

         push_84_65536(is, js, real, imag);
         return true;
     }
     return false;
 }
+#endif
 
 //---------------------------------------------------------------------------
 // nextpow2 returns the smallest integer n such that 2^n >= x.
 static double nextpow2(double x) {
     double y = ceil(log(x)/log(2.0));

 {
 //    std::cerr << "ConstantQ: initialising sparse kernel, uK = " << m_uK << ", FFTLength = " << m_FFTLength << "...";
 
     SparseKernel *sk = new SparseKernel();
 
+#ifdef NOT_DEFINED
     if (push_precalculated(m_uK, m_FFTLength,
                            sk->is, sk->js, sk->real, sk->imag)) {
+//        std::cerr << "using precalculated kernel" << std::endl;
         m_sparseKernel = sk;
         return;
     }
-    
+#endif
+
     //generates spectral kernel matrix (upside down?)
     // initialise temporal kernel with zeros, twice length to deal w. complex numbers
 
     double* hammingWindowRe = new double [ m_FFTLength ];
     double* hammingWindowIm = new double [ m_FFTLength ];