# HG changeset patch
# User Chris Cannam
# Date 1399456138 -3600
# Node ID 7377032e0bf1856cd3bdc5e35f95fa6175ec3e96
# Parent  dfb6e5ce3eb183b05c18c64a987f3a5c7aef4fe4
Backed out changeset dfb6e5ce3eb1 -- it was arithmetically quite wrong!

diff -r dfb6e5ce3eb1 -r 7377032e0bf1 src/EM.cpp
--- 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