comparison plugins/SimilarityPlugin.cpp @ 49:fc88b465548a

* Normalise type option for chromagram
* Minimum segment duration option for segmenter
* Bit more documentation

 #include "dsp/chromagram/Chromagram.h"
 #include "dsp/rateconversion/Decimator.h"
 #include "dsp/rhythm/BeatSpectrum.h"
 #include "maths/KLDivergence.h"
 #include "maths/CosineDistance.h"
+#include "maths/MathUtilities.h"
 
 using std::string;
 using std::vector;
 using std::cerr;
 using std::endl;

         config.FS = m_processRate;
         config.min = Pitch::getFrequencyForPitch(24, 0, 440);
         config.max = Pitch::getFrequencyForPitch(96, 0, 440);
         config.BPO = 12;
         config.CQThresh = 0.0054;
-        config.isNormalised = true;
+        // We don't normalise the chromagram's columns individually;
+        // we normalise the mean at the end instead
+        config.normalise = MathUtilities::NormaliseNone;
         m_chromagram = new Chromagram(config);
         m_fftSize = m_chromagram->getFrameSize();
 
         std::cerr << "fftsize = " << m_fftSize << std::endl;
 

         config.FS = m_processRate;
         config.min = Pitch::getFrequencyForPitch(24, 0, 440);
         config.max = Pitch::getFrequencyForPitch(96, 0, 440);
         config.BPO = 12;
         config.CQThresh = 0.0054;
-        config.isNormalised = false;
+        config.normalise = MathUtilities::NormaliseNone;
         Chromagram *c = new Chromagram(config);
         size_t sz = c->getFrameSize();
         delete c;
         m_blockSize = sz * decimationFactor;
     } else {

             }
         }
 
     } else {
 
-        // Chroma are histograms already
+        // We use the KL divergence for distributions of discrete
+        // variables, as chroma are histograms already.  Or at least,
+        // they will be when we've normalised them like this:
+        for (int i = 0; i < m_channels; ++i) {
+            MathUtilities::normalise(m[i], MathUtilities::NormaliseUnitSum);
+        }
 
         KLDivergence kld;
 
         for (int i = 0; i < m_channels; ++i) {
             for (int j = 0; j < m_channels; ++j) {