Mercurial > hg > silvet

changeset 121:dfb6e5ce3eb1 bqvec-openmp

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