comparison src/EM.cpp @ 53:9e2d1f6cd43a

Fix incorrect normalisation of source activation matrix

     for (int n = 0; n < m_notes; ++n) {
         m_pitches[n] = drand48();
     }
     
     m_sources = Grid(m_instruments);
-    
     for (int i = 0; i < m_instruments; ++i) {
         m_sources[i] = V(m_notes);
         for (int n = 0; n < m_notes; ++n) {
             m_sources[i][n] = (inRange(i, n) ? 1.0 : 0.0);
         }

     for (int i = 0; i < (int)column.size(); ++i) {
         sum += column[i];
     }
     for (int i = 0; i < (int)column.size(); ++i) {
         column[i] /= sum;
+    }
+}
+
+void
+EM::normaliseSources(Grid &sources)
+{
+    V denominators(sources[0].size());
+
+    for (int i = 0; i < (int)sources.size(); ++i) {
+        for (int j = 0; j < (int)sources[i].size(); ++j) {
+            denominators[j] += sources[i][j];
+        }
+    }
+
+    for (int i = 0; i < (int)sources.size(); ++i) {
+        for (int j = 0; j < (int)sources[i].size(); ++j) {
+            sources[i][j] /= denominators[j];
+        }
     }
 }
 
 void
 EM::iterate(V column)

             }
             if (m_sourceSparsity != 1.0) {
                 newSources[i][n] = pow(newSources[i][n], m_sourceSparsity);
             }
         }
-        normalise(newSources[i]);
-    }
+    }
+    normaliseSources(newSources);
 
     m_pitches = newPitches;
     m_sources = newSources;
 }