Mercurial > hg > silvet

changeset 95:853b2d750688 bqvec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix silly bug
author Chris Cannam
date Tue, 06 May 2014 14:37:42 +0100
parents 891cbcf1e4d2
children c2996b9bedbe
files src/EM.cpp testdata/timing/results.txt
diffstat 2 files changed, 9 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/EM.cpp	Tue May 06 14:29:07 2014 +0100
+++ b/src/EM.cpp	Tue May 06 14:37:42 2014 +0100
@@ -123,6 +123,7 @@
     normaliseColumn(norm, m_binCount);
     expectation(norm);
     maximisation(norm);
+    deallocate(norm);
 }
 
 const double *
@@ -193,7 +194,7 @@
                 const double *w = templateFor(i, n, f);
 
                 v_copy(contributions, w, m_binCount);
-                v_add(contributions, m_q, m_binCount);
+                v_multiply(contributions, m_q, m_binCount);
                 v_scale(contributions, factor, m_binCount);
 
                 double total = v_sum(contributions, m_binCount);
--- a/testdata/timing/results.txt	Tue May 06 14:29:07 2014 +0100
+++ b/testdata/timing/results.txt	Tue May 06 14:37:42 2014 +0100
@@ -142,3 +142,10 @@
 user	1m36.863s
 sys	0m0.240s
 
+commit:891cbcf1e4d2, as commit:81eaba98985b but with some calculations
+vectorised
+
+real	1m24.961s
+user	1m24.663s
+sys	0m0.177s
+