Mercurial > hg > silvet
comparison src/EM.cpp @ 121:dfb6e5ce3eb1 bqvec-openmp
Simplify normalisation
author | Chris Cannam |
---|---|
date | Wed, 07 May 2014 10:44:18 +0100 |
parents | 6890dea115c3 |
children | 7377032e0bf1 |
comparison
equal
deleted
inserted
replaced
120:ab1d8efbb7b5 | 121:dfb6e5ce3eb1 |
---|---|
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 | |
116 for (int i = 0; i < size1; ++i) { | 114 for (int i = 0; i < size1; ++i) { |
117 for (int j = 0; j < size2; ++j) { | 115 normaliseColumn(grid[i], size2); |
118 denominators[j] += grid[i][j]; | 116 } |
119 } | |
120 } | |
121 | |
122 for (int i = 0; i < size1; ++i) { | |
123 v_divide(grid[i], denominators, size2); | |
124 } | |
125 | |
126 deallocate(denominators); | |
127 } | 117 } |
128 | 118 |
129 void | 119 void |
130 EM::iterate(const double *column) | 120 EM::iterate(const double *column) |
131 { | 121 { |