Mercurial > hg > nnls-chroma
comparison NNLSBase.cpp @ 50:b6cddb109482 matthiasm-plugin
added chord change value, some other tweaks
author | matthiasm |
---|---|
date | Mon, 25 Oct 2010 18:34:44 +0900 |
parents | 6e76c7710fa1 |
children | 01bc078f5f61 |
comparison
equal
deleted
inserted
replaced
48:6e76c7710fa1 | 50:b6cddb109482 |
---|---|
53 m_chorddict(0), | 53 m_chorddict(0), |
54 m_chordnames(0), | 54 m_chordnames(0), |
55 m_doNormalizeChroma(0), | 55 m_doNormalizeChroma(0), |
56 m_rollon(0.0), | 56 m_rollon(0.0), |
57 m_s(0.7), | 57 m_s(0.7), |
58 m_useNNLS(1) | 58 m_useNNLS(1), |
59 m_useHMM(1) | |
59 { | 60 { |
60 if (debug_on) cerr << "--> NNLSBase" << endl; | 61 if (debug_on) cerr << "--> NNLSBase" << endl; |
61 | 62 |
62 // make the *note* dictionary matrix | 63 // make the *note* dictionary matrix |
63 m_dict = new float[nNote * 84]; | 64 m_dict = new float[nNote * 84]; |
257 return m_preset; | 258 return m_preset; |
258 } | 259 } |
259 if (identifier == "chromanormalize") { | 260 if (identifier == "chromanormalize") { |
260 return m_doNormalizeChroma; | 261 return m_doNormalizeChroma; |
261 } | 262 } |
263 | |
264 if (identifier == "useHMM") { | |
265 return m_useHMM; | |
266 } | |
267 | |
262 return 0; | 268 return 0; |
263 | 269 |
264 } | 270 } |
265 | 271 |
266 void | 272 void |
277 | 283 |
278 if (identifier == "s") { | 284 if (identifier == "s") { |
279 m_s = value; | 285 m_s = value; |
280 } | 286 } |
281 | 287 |
288 if (identifier == "useHMM") { | |
289 m_useHMM = value; | |
290 } | |
291 | |
282 if (identifier == "tuningmode") { | 292 if (identifier == "tuningmode") { |
283 m_tuneLocal = (value > 0) ? true : false; | 293 m_tuneLocal = (value > 0) ? true : false; |
284 // cerr << "m_tuneLocal :" << m_tuneLocal << endl; | 294 // cerr << "m_tuneLocal :" << m_tuneLocal << endl; |
285 } | 295 } |
286 // if (identifier == "preset") { | 296 // if (identifier == "preset") { |