Mercurial > hg > silvet

changeset 103:e6b4235fa2ea bqvec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update results, tidy a bit
author Chris Cannam
date Tue, 06 May 2014 16:05:05 +0100
parents 19f6832fdc8a
children ac750e222ad3 13eea203c58c
files src/EM.cpp testdata/timing/results.txt
diffstat 2 files changed, 19 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/EM.cpp	Tue May 06 15:12:45 2014 +0100
+++ b/src/EM.cpp	Tue May 06 16:05:05 2014 +0100
@@ -210,13 +210,18 @@
         }
     }
 
-    for (int n = 0; n < m_noteCount; ++n) {
-        if (m_pitchSparsity != 1.0) {
-            m_updatePitches[n] = pow(m_updatePitches[n], m_pitchSparsity);
+    if (m_pitchSparsity != 1.0) {
+        for (int n = 0; n < m_noteCount; ++n) {
+            m_updatePitches[n] = 
+                pow(m_updatePitches[n], m_pitchSparsity);
         }
-        if (m_sourceSparsity != 1.0) {
+    }
+
+    if (m_sourceSparsity != 1.0) {
+        for (int n = 0; n < m_noteCount; ++n) {
             for (int i = 0; i < m_sourceCount; ++i) {
-                m_updateSources[i][n] = pow(m_updateSources[i][n], m_sourceSparsity);
+                m_updateSources[i][n] =
+                    pow(m_updateSources[i][n], m_sourceSparsity);
             }
         }
     }
--- a/testdata/timing/results.txt	Tue May 06 15:12:45 2014 +0100
+++ b/testdata/timing/results.txt	Tue May 06 16:05:05 2014 +0100
@@ -171,3 +171,12 @@
 user	1m10.327s
 sys	0m0.180s
 
+(still broken?)
+
+commit:19f6832fdc8a, as commit:9ecad4c9c2a2 but with the arguments to
+v_add_with_gain supplied in the right order (that's what I'd broken!)
+
+real	1m28.957s
+user	1m28.437s
+sys	0m0.213s
+