Mercurial > hg > nnls-chroma
comparison NNLSChroma.cpp @ 82:e8ceb7d3bd4f matthiasm-plugin
merge
| author | Matthias Mauch <mail@matthiasmauch.net> |
|---|---|
| date | Mon, 15 Nov 2010 11:01:56 +0900 |
| parents | 026a5c0ee2c2 f50f701df33e |
| children | 3277f6cef3fe |
comparison
equal
deleted
inserted
replaced
| 81:4270f3039ab0 | 82:e8ceb7d3bd4f |
|---|---|
| 397 // cerr << mode << endl; | 397 // cerr << mode << endl; |
| 398 chroma[signifIndex[iNote] % 12] += x[iNote] * treblewindow[signifIndex[iNote]]; | 398 chroma[signifIndex[iNote] % 12] += x[iNote] * treblewindow[signifIndex[iNote]]; |
| 399 basschroma[signifIndex[iNote] % 12] += x[iNote] * basswindow[signifIndex[iNote]]; | 399 basschroma[signifIndex[iNote] % 12] += x[iNote] * basswindow[signifIndex[iNote]]; |
| 400 } | 400 } |
| 401 } | 401 } |
| 402 } else { | |
| 403 for (int i = 0; i < 84; ++i) f3.values.push_back(0); | |
| 402 } | 404 } |
| 403 | 405 |
| 404 f4.values = chroma; | 406 f4.values = chroma; |
| 405 f5.values = basschroma; | 407 f5.values = basschroma; |
| 406 chroma.insert(chroma.begin(), basschroma.begin(), basschroma.end()); // just stack the both chromas | 408 chroma.insert(chroma.begin(), basschroma.begin(), basschroma.end()); // just stack the both chromas |