comparison src/EM.cpp @ 122:7377032e0bf1 bqvec-openmp

Backed out changeset dfb6e5ce3eb1 -- it was arithmetically quite wrong!
author Chris Cannam
date Wed, 07 May 2014 10:48:58 +0100
parents dfb6e5ce3eb1
children f25b8e7de0ed
comparison
equal deleted inserted replaced
121:dfb6e5ce3eb1 122:7377032e0bf1
109 } 109 }
110 110
111 void 111 void
112 EM::normaliseGrid(double **grid, int size1, int size2) 112 EM::normaliseGrid(double **grid, int size1, int size2)
113 { 113 {
114 double *denominators = allocate_and_zero<double>(size2);
115
114 for (int i = 0; i < size1; ++i) { 116 for (int i = 0; i < size1; ++i) {
115 normaliseColumn(grid[i], size2); 117 for (int j = 0; j < size2; ++j) {
116 } 118 denominators[j] += grid[i][j];
119 }
120 }
121
122 for (int i = 0; i < size1; ++i) {
123 v_divide(grid[i], denominators, size2);
124 }
125
126 deallocate(denominators);
117 } 127 }
118 128
119 void 129 void
120 EM::iterate(const double *column) 130 EM::iterate(const double *column)
121 { 131 {