Mercurial > hg > silvet

diff src/EM.cpp @ 38:5164bccf3064

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Return pitch activation matrix
author Chris Cannam
date Fri, 04 Apr 2014 19:05:47 +0100
parents 947996aac974
children b49597c93132
line wrap: on
line diff
--- a/src/EM.cpp	Fri Apr 04 18:18:18 2014 +0100
+++ b/src/EM.cpp	Fri Apr 04 19:05:47 2014 +0100
@@ -152,9 +152,10 @@
             newSources[i][n] = epsilon;
             if (inRange(i, n)) {
                 float *w = silvet_templates[i].data[n];
+                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] * m_pitches[n] * m_sources[i][n];
+                    newSources[i][n] += w[j] * m_q[j] * pitch * source;
                 }
             }
         }