comparison src/EM.cpp @ 174:237d41a0f69d

Introduce shift sparsity

     m_noteCount(pack->templateNoteCount),
     m_shiftCount(useShifts ? pack->templateMaxShift * 2 + 1 : 1),
     m_binCount(pack->templateHeight),
     m_sourceCount(pack->templates.size()),
     m_pitchSparsity(1.1),
-    //!!! note: slightly less source sparsity might help; also
-    //!!! consider a modest shift sparsity e.g. 1.1
-    m_sourceSparsity(1.3),
+    m_shiftSparsity(1.1),
+    m_sourceSparsity(1.2),
     m_lowestPitch(pack->lowestNote),
     m_highestPitch(pack->highestNote)
 {
     m_pitches = allocate<float>(m_noteCount);
     m_updatePitches = allocate<float>(m_noteCount);

     }
 
     if (m_pitchSparsity != 1.0) {
         for (int n = 0; n < m_noteCount; ++n) {
             m_updatePitches[n] = 
-                pow(m_updatePitches[n], m_pitchSparsity);
+                powf(m_updatePitches[n], m_pitchSparsity);
+        }
+    }
+
+    if (m_shifts && m_shiftSparsity != 1.0) {
+        for (int i = 0; i < m_shiftCount; ++i) {
+            for (int n = 0; n < m_noteCount; ++n) {
+                m_updateShifts[i][n] =
+                    powf(m_updateShifts[i][n], m_shiftSparsity);
+            }
         }
     }
 
     if (m_sourceSparsity != 1.0) {
         for (int i = 0; i < m_sourceCount; ++i) {
             for (int n = 0; n < m_noteCount; ++n) {
                 m_updateSources[i][n] =
-                    pow(m_updateSources[i][n], m_sourceSparsity);
+                    powf(m_updateSources[i][n], m_sourceSparsity);
             }
         }
     }
 
     normaliseColumn(m_updatePitches, m_noteCount);