comparison src/EM.cpp @ 42:c0c4a945577a

Sparsity parameters

 #include "EM.h"
 
 #include "data/include/templates.h"
 
 #include <cstdlib>
+#include <cmath>
 
 #include <iostream>
 
 #include <vector>
 

 static double epsilon = 1e-16;
 
 EM::EM() :
     m_notes(SILVET_TEMPLATE_NOTE_COUNT),
     m_bins(SILVET_TEMPLATE_HEIGHT),
-    m_instruments(SILVET_TEMPLATE_COUNT)
+    m_instruments(SILVET_TEMPLATE_COUNT),
+    m_pitchSparsity(1.1),
+    m_sourceSparsity(1.3)
 {
     m_lowest = 0;
     m_highest = m_notes - 1;
 
     for (int i = 0; i < m_instruments; ++i) {

                 for (int j = 0; j < m_bins; ++j) {
                     newPitches[n] += w[j] * m_q[j] * pitch * source;
                 }
             }
         }
+        if (m_pitchSparsity != 1.0) {
+            newPitches[n] = pow(newPitches[n], m_pitchSparsity);
+        }
     }
     normalise(newPitches);
 
     Grid newSources = m_sources;
 

                 double pitch = m_pitches[n];
                 double source = m_sources[i][n];
                 for (int j = 0; j < m_bins; ++j) {
                     newSources[i][n] += w[j] * m_q[j] * pitch * source;
                 }
+            }
+            if (m_sourceSparsity != 1.0) {
+                newSources[i][n] = pow(newSources[i][n], m_sourceSparsity);
             }
         }
         normalise(newSources[i]);
     }