comparison Yin.cpp @ 117:1b75e5fd4b99 tony

sorted out precise timing, chose parameters

 #include <cmath>
 #include <complex>
 
 using std::vector;
 
-Yin::Yin(size_t frameSize, size_t inputSampleRate, double thresh) : 
+Yin::Yin(size_t frameSize, size_t inputSampleRate, double thresh, bool fast) : 
     m_frameSize(frameSize),
     m_inputSampleRate(inputSampleRate),
     m_thresh(thresh),
     m_threshDistr(2),
-    m_yinBufferSize(frameSize/2)
+    m_yinBufferSize(frameSize/2),
+    m_fast(fast)
 {
     if (frameSize & (frameSize-1)) {
       //  throw "N must be a power of two";
     }
 }

 Yin::process(const double *in) const {
     
     double* yinBuffer = new double[m_yinBufferSize];
 
     // calculate aperiodicity function for all periods
-    YinUtil::fastDifference(in, yinBuffer, m_yinBufferSize);    
+    if (m_fast) YinUtil::fastDifference(in, yinBuffer, m_yinBufferSize);
+    else YinUtil::slowDifference(in, yinBuffer, m_yinBufferSize);
+
     YinUtil::cumulativeDifference(yinBuffer, m_yinBufferSize);
 
     int tau = 0;
     tau = YinUtil::absoluteThreshold(yinBuffer, m_yinBufferSize, m_thresh);
         

 Yin::processProbabilisticYin(const double *in) const {
     
     double* yinBuffer = new double[m_yinBufferSize];
 
     // calculate aperiodicity function for all periods
-    YinUtil::fastDifference(in, yinBuffer, m_yinBufferSize);    
+    if (m_fast) YinUtil::fastDifference(in, yinBuffer, m_yinBufferSize);
+    else YinUtil::slowDifference(in, yinBuffer, m_yinBufferSize);
+
     YinUtil::cumulativeDifference(yinBuffer, m_yinBufferSize);
 
     vector<double> peakProbability = YinUtil::yinProb(yinBuffer, m_threshDistr, m_yinBufferSize);
     
     // calculate overall "probability" from peak probability

     m_frameSize = parameter;
     m_yinBufferSize = m_frameSize/2;
     return 0;
 }
 
-// int
-// Yin::setRemoveUnvoiced(bool parameter)
-// {
-//     m_removeUnvoiced = parameter;
-//     return 0;
-// }
+int
+Yin::setFast(bool parameter)
+{
+    m_fast = parameter;
+    return 0;
+}