# HG changeset patch # User Chris Cannam # Date 1399455858 -3600 # Node ID dfb6e5ce3eb183b05c18c64a987f3a5c7aef4fe4 # Parent ab1d8efbb7b501e599c9da6169d18baed74882ef Simplify normalisation diff -r ab1d8efbb7b5 -r dfb6e5ce3eb1 src/EM.cpp --- 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(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