# HG changeset patch
# User Chris Cannam
# Date 1399383462 -3600
# Node ID 853b2d7506886bd7d0578faef987a6672609a535
# Parent  891cbcf1e4d2996ddd38c8b07e355f2e496ec55a
Fix silly bug

diff -r 891cbcf1e4d2 -r 853b2d750688 src/EM.cpp
--- 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);
diff -r 891cbcf1e4d2 -r 853b2d750688 testdata/timing/results.txt
--- 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
+