Mercurial > hg > silvet

changeset 122:7377032e0bf1 bqvec-openmp

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Backed out changeset dfb6e5ce3eb1 -- it was arithmetically quite wrong!
author Chris Cannam
date Wed, 07 May 2014 10:48:58 +0100
parents dfb6e5ce3eb1
children 230920148ee5
files src/EM.cpp
diffstat 1 files changed, 11 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/EM.cpp	Wed May 07 10:44:18 2014 +0100
+++ b/src/EM.cpp	Wed May 07 10:48:58 2014 +0100
@@ -111,9 +111,19 @@
 void
 EM::normaliseGrid(double **grid, int size1, int size2)
 {
+    double *denominators = allocate_and_zero<double>(size2);
+
     for (int i = 0; i < size1; ++i) {
-        normaliseColumn(grid[i], size2);
+        for (int j = 0; j < size2; ++j) {
+            denominators[j] += grid[i][j];
+        }
     }
+
+    for (int i = 0; i < size1; ++i) {
+        v_divide(grid[i], denominators, size2);
+    }
+
+    deallocate(denominators);
 }
 
 void