comparison Matcher.cpp @ 16:4c8526c5bf58

Implement features outputs

 #include "Matcher.h"
 
 #include <iostream>
 
 #include <cstdlib>
+#include <cassert>
 
 bool Matcher::silent = true;
 
 //#define DEBUG_MATCHER 1
 

 Matcher::init()
 {
     if (initialised) return;
 
     initialised = true;
+
+    freqMapSize = getFeatureSize(params);
 
     makeFreqMap();
 
     initVector<double>(prevFrame, freqMapSize);
     initVector<double>(newFrame, freqMapSize);

 #endif
         makeStandardFrequencyMap();
     }
 } // makeFreqMap()
 
+int
+Matcher::getFeatureSize(Parameters params)
+{
+    if (params.useChromaFrequencyMap) {
+        return 13;
+    } else {
+        return 84;
+    }
+}
+
 void
 Matcher::makeStandardFrequencyMap()
 {
     double binWidth = params.sampleRate / params.fftSize;
     int crossoverBin = (int)(2 / (pow(2, 1/12.0) - 1));

         freqMap[i] = i;
         ++i;
     }
     while (i <= params.fftSize/2) {
         double midi = log(i*binWidth/440.0) / log(2.0) * 12 + 69;
-        if (midi > 127)
-            midi = 127;
+        if (midi > 127) midi = 127;
         freqMap[i++] = crossoverBin + lrint(midi) - crossoverMidi;
     }
-    freqMapSize = freqMap[i-1] + 1;
+    assert(freqMapSize == freqMap[i-1] + 1);
     if (!silent) {
         cerr << "Standard map size: " << freqMapSize 
              << ";  Crossover at: " << crossoverBin << endl;
             for (i = 0; i < params.fftSize / 2; i++)
                 cerr << "freqMap[" << i << "] = " << freqMap[i] << endl;

         freqMap[i++] = 0;
     while (i <= params.fftSize/2) {
         double midi = log(i*binWidth/440.0) / log(2.0) * 12 + 69;
         freqMap[i++] = (lrint(midi)) % 12 + 1;
     }
-    freqMapSize = 13;
     if (!silent) {
         cerr << "Chroma map size: " << freqMapSize 
              << ";  Crossover at: " << crossoverBin << endl;
         for (i = 0; i < params.fftSize / 2; i++)
             cerr << "freqMap[" << i << "] = " << freqMap[i] << endl;