comparison src/EM.cpp @ 354:63609ec70811

Remove unused arg
author Chris Cannam
date Mon, 07 Sep 2015 12:00:22 +0100
parents 8a2166088b94
children b1dc04c74671
comparison
equal deleted inserted replaced
353:169775c036b3 354:63609ec70811
126 { 126 {
127 float *norm = allocate<float>(m_binCount); 127 float *norm = allocate<float>(m_binCount);
128 v_convert(norm, column, m_binCount); 128 v_convert(norm, column, m_binCount);
129 normaliseColumn(norm, m_binCount); 129 normaliseColumn(norm, m_binCount);
130 expectation(norm); 130 expectation(norm);
131 maximisation(norm); 131 maximisation();
132 deallocate(norm); 132 deallocate(norm);
133 } 133 }
134 134
135 const float * 135 const float *
136 EM::templateFor(int instrument, int note, int shift) 136 EM::templateFor(int instrument, int note, int shift)
190 cerr << "l2norm = " << l2norm << endl; 190 cerr << "l2norm = " << l2norm << endl;
191 */ 191 */
192 } 192 }
193 193
194 void 194 void
195 EM::maximisation(const float *column) 195 EM::maximisation()
196 { 196 {
197 v_set(m_updatePitches, epsilon, m_noteCount); 197 v_set(m_updatePitches, epsilon, m_noteCount);
198 198
199 for (int i = 0; i < m_sourceCount; ++i) { 199 for (int i = 0; i < m_sourceCount; ++i) {
200 v_set(m_updateSources[i], epsilon, m_noteCount); 200 v_set(m_updateSources[i], epsilon, m_noteCount);