Mercurial > hg > nnls-chroma
changeset 140:8ff2aa01df4d darwintunes
Johan's changes:
* removing slash notation substitution in the case of Harte's syntax
* remove obsolete chorddict.cpp
| author | Matthias Mauch <matthias.mauch@eecs.qmul.ac.uk> |
|---|---|
| date | Tue, 19 Jun 2012 15:40:09 +0100 |
| parents | 75a46075bf4e |
| children | 73199c9b3319 |
| files | chorddict.cpp chromamethods.cpp nnls-chroma.n3 |
| diffstat | 3 files changed, 4 insertions(+), 306 deletions(-) [+] |
line wrap: on
line diff
--- a/chorddict.cpp Thu May 10 11:32:05 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,297 +0,0 @@ - -// #include <string> -const int nChorddict = 2904; -const char* chordtypes[] = {"", "", "", "", "", "", "", "", "", "", "", "", "/3", "/3", "/3", "/3", "/3", "/3", "/3", "/3", "/3", "/3", "/3", "/3", "/5", "/5", "/5", "/5", "/5", "/5", "/5", "/5", "/5", "/5", "/5", "/5", ":maj6", ":maj6", ":maj6", ":maj6", ":maj6", ":maj6", ":maj6", ":maj6", ":maj6", ":maj6", ":maj6", ":maj6", ":maj7", ":maj7", ":maj7", ":maj7", ":maj7", ":maj7", ":maj7", ":maj7", ":maj7", ":maj7", ":maj7", ":maj7", ":min", ":min", ":min", ":min", ":min", ":min", ":min", ":min", ":min", ":min", ":min", ":min", ":7", ":7", ":7", ":7", ":7", ":7", ":7", ":7", ":7", ":7", ":7", ":7", ":min7", ":min7", ":min7", ":min7", ":min7", ":min7", ":min7", ":min7", ":min7", ":min7", ":min7", ":min7", ":dim", ":dim", ":dim", ":dim", ":dim", ":dim", ":dim", ":dim", ":dim", ":dim", ":dim", ":dim", ":aug", ":aug", ":aug", ":aug", ":aug", ":aug", ":aug", ":aug", ":aug", ":aug", ":aug", ":aug", ""}; - -const float chorddict[] = - {0.471405, 0.000000, 0.000000, 0.000000, 0.235702, 0.000000, 0.000000, 0.235702, 0.000000, -0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, -0.471405, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, -0.235702, 0.000000, 0.000000, 0.235702, 0.000000, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, -0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.000000, -0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.235702, 0.000000, 0.000000, 0.235702, 0.000000, -0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, -0.471405, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, -0.235702, 0.000000, 0.000000, 0.235702, 0.000000, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, -0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.000000, -0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.235702, 0.000000, 0.000000, 0.235702, 0.000000, -0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, -0.471405, 0.235702, 0.000000, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, -0.235702, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, -0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.235702, 0.000000, 0.000000, 0.000000, -0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.235702, 0.000000, 0.000000, 0.471405, 0.000000, -0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, -0.000000, 0.235702, 0.000000, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, -0.235702, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, -0.000000, 0.000000, 0.471405, 0.235702, 0.000000, 0.000000, 0.235702, 0.000000, 0.000000, 0.000000, -0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.471405, 0.000000, -0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.000000, 0.235702, 0.000000, -0.000000, 0.235702, 0.000000, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, -0.471405, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, -0.000000, 0.000000, 0.000000, 0.235702, 0.000000, 0.000000, 0.235702, 0.000000, 0.000000, 0.000000, -0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.471405, 0.000000, -0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.000000, 0.235702, 0.000000, -0.000000, 0.235702, 0.000000, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, -0.471405, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.000000, 0.471405, 0.235702, -0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.235702, 0.000000, 0.000000, 0.000000, -0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.471405, 0.000000, -0.000000, 0.000000, 0.000000, 0.000000, 0.235702, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, -0.000000, 0.235702, 0.000000, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, -0.471405, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.235702, -0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.235702, 0.000000, 0.000000, 0.000000, -0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.471405, 0.000000, -0.000000, 0.000000, 0.000000, 0.000000, 0.235702, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, -0.000000, 0.235702, 0.000000, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, -0.471405, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.235702, -0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.235702, 0.000000, 0.000000, 0.000000, -0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.471405, 0.235702, -0.000000, 0.000000, 0.000000, 0.000000, 0.235702, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, -0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, -0.471405, 0.000000, 0.000000, 0.000000, 0.235702, 0.000000, 0.000000, 0.000000, 0.000000, 0.235702, -0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, -0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.235702, -0.000000, 0.000000, 0.000000, 0.000000, 0.235702, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, -0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, -0.471405, 0.471405, 0.000000, 0.000000, 0.235702, 0.000000, 0.000000, 0.000000, 0.000000, 0.235702, -0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, -0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.235702, -0.000000, 0.000000, 0.000000, 0.000000, 0.235702, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, -0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, -0.000000, 0.471405, 0.000000, 0.000000, 0.235702, 0.000000, 0.000000, 0.000000, 0.000000, 0.235702, -0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, -0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.235702, -0.000000, 0.000000, 0.000000, 0.000000, 0.235702, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, -0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.000000, 0.471405, 0.235702, 0.000000, 0.000000, -0.000000, 0.235702, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.000000, 0.471405, -0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000, 0.235702, 0.000000, 0.000000, 0.000000, 0.235702, 0.000000, 0.000000, 0.471405, -0.000000, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, -0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.235702, 0.000000, 0.000000, -0.000000, 0.235702, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.000000, 0.471405, -0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000, 0.235702, 0.000000, 0.000000, 0.000000, 0.235702, 0.000000, 0.000000, 0.471405, -0.000000, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, -0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.235702, 0.000000, 0.000000, -0.000000, 0.235702, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.000000, 0.471405, -0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.471405, 0.471405, 0.000000, 0.000000, -0.000000, 0.000000, 0.235702, 0.000000, 0.000000, 0.000000, 0.235702, 0.000000, 0.000000, 0.471405, -0.000000, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, -0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.000000, 0.235702, 0.000000, 0.000000, -0.000000, 0.235702, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.000000, 0.471405, -0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, -0.000000, 0.000000, 0.235702, 0.000000, 0.000000, 0.000000, 0.235702, 0.000000, 0.000000, 0.471405, -0.000000, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.471405, 0.235702, -0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.000000, 0.235702, 0.000000, 0.000000, -0.000000, 0.471405, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.000000, 0.471405, -0.000000, 0.000000, 0.000000, 0.000000, 0.235702, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, -0.000000, 0.000000, 0.235702, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.471405, -0.000000, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.000000, 0.235702, -0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.000000, 0.235702, 0.000000, 0.000000, -0.000000, 0.471405, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.000000, 0.471405, -0.000000, 0.000000, 0.000000, 0.000000, 0.235702, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, -0.000000, 0.000000, 0.235702, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.471405, -0.000000, 0.000000, 0.000000, 0.000000, 0.471405, 0.417029, 0.000000, 0.000000, 0.000000, 0.208514, -0.000000, 0.000000, 0.208514, 0.000000, 0.208514, 0.000000, 0.000000, 0.417029, 0.000000, 0.000000, -0.000000, 0.417029, 0.000000, 0.000000, 0.417029, 0.000000, 0.417029, 0.000000, 0.000000, 0.000000, -0.417029, 0.000000, 0.000000, 0.000000, 0.208514, 0.000000, 0.000000, 0.208514, 0.000000, 0.208514, -0.000000, 0.000000, 0.417029, 0.000000, 0.000000, 0.000000, 0.417029, 0.000000, 0.000000, 0.417029, -0.000000, 0.417029, 0.000000, 0.000000, 0.000000, 0.417029, 0.000000, 0.000000, 0.000000, 0.208514, -0.000000, 0.000000, 0.208514, 0.000000, 0.208514, 0.000000, 0.000000, 0.417029, 0.000000, 0.000000, -0.000000, 0.417029, 0.000000, 0.000000, 0.417029, 0.000000, 0.417029, 0.208514, 0.000000, 0.000000, -0.417029, 0.000000, 0.000000, 0.000000, 0.208514, 0.000000, 0.000000, 0.208514, 0.000000, 0.417029, -0.000000, 0.000000, 0.417029, 0.000000, 0.000000, 0.000000, 0.417029, 0.000000, 0.000000, 0.417029, -0.000000, 0.000000, 0.208514, 0.000000, 0.000000, 0.417029, 0.000000, 0.000000, 0.000000, 0.208514, -0.000000, 0.000000, 0.208514, 0.000000, 0.417029, 0.000000, 0.000000, 0.417029, 0.000000, 0.000000, -0.000000, 0.417029, 0.000000, 0.000000, 0.417029, 0.208514, 0.000000, 0.208514, 0.000000, 0.000000, -0.417029, 0.000000, 0.000000, 0.000000, 0.208514, 0.000000, 0.000000, 0.417029, 0.000000, 0.417029, -0.000000, 0.000000, 0.417029, 0.000000, 0.000000, 0.000000, 0.417029, 0.000000, 0.000000, 0.000000, -0.208514, 0.000000, 0.208514, 0.000000, 0.000000, 0.417029, 0.000000, 0.000000, 0.000000, 0.208514, -0.000000, 0.000000, 0.417029, 0.000000, 0.417029, 0.000000, 0.000000, 0.417029, 0.000000, 0.000000, -0.000000, 0.417029, 0.000000, 0.000000, 0.000000, 0.208514, 0.000000, 0.208514, 0.000000, 0.000000, -0.417029, 0.000000, 0.000000, 0.000000, 0.208514, 0.000000, 0.000000, 0.417029, 0.000000, 0.417029, -0.000000, 0.000000, 0.417029, 0.000000, 0.000000, 0.000000, 0.417029, 0.208514, 0.000000, 0.000000, -0.208514, 0.000000, 0.208514, 0.000000, 0.000000, 0.417029, 0.000000, 0.000000, 0.000000, 0.417029, -0.000000, 0.000000, 0.417029, 0.000000, 0.417029, 0.000000, 0.000000, 0.417029, 0.000000, 0.000000, -0.000000, 0.000000, 0.208514, 0.000000, 0.000000, 0.208514, 0.000000, 0.208514, 0.000000, 0.000000, -0.417029, 0.000000, 0.000000, 0.000000, 0.417029, 0.000000, 0.000000, 0.417029, 0.000000, 0.417029, -0.000000, 0.000000, 0.417029, 0.000000, 0.000000, 0.000000, 0.000000, 0.208514, 0.000000, 0.000000, -0.208514, 0.000000, 0.208514, 0.000000, 0.000000, 0.417029, 0.000000, 0.000000, 0.000000, 0.417029, -0.000000, 0.000000, 0.417029, 0.000000, 0.417029, 0.000000, 0.000000, 0.417029, 0.000000, 0.000000, -0.000000, 0.000000, 0.208514, 0.000000, 0.000000, 0.208514, 0.000000, 0.208514, 0.000000, 0.000000, -0.417029, 0.000000, 0.000000, 0.000000, 0.417029, 0.000000, 0.000000, 0.417029, 0.000000, 0.417029, -0.000000, 0.000000, 0.417029, 0.417029, 0.000000, 0.000000, 0.000000, 0.208514, 0.000000, 0.000000, -0.208514, 0.000000, 0.000000, 0.000000, 0.208514, 0.417029, 0.000000, 0.000000, 0.000000, 0.417029, -0.000000, 0.000000, 0.417029, 0.000000, 0.000000, 0.000000, 0.417029, 0.208514, 0.417029, 0.000000, -0.000000, 0.000000, 0.208514, 0.000000, 0.000000, 0.208514, 0.000000, 0.000000, 0.000000, 0.417029, -0.417029, 0.000000, 0.000000, 0.000000, 0.417029, 0.000000, 0.000000, 0.417029, 0.000000, 0.000000, -0.000000, 0.000000, 0.208514, 0.417029, 0.000000, 0.000000, 0.000000, 0.208514, 0.000000, 0.000000, -0.208514, 0.000000, 0.000000, 0.000000, 0.417029, 0.417029, 0.000000, 0.000000, 0.000000, 0.417029, -0.000000, 0.000000, 0.417029, 0.000000, 0.000000, 0.000000, 0.000000, 0.208514, 0.417029, 0.000000, -0.000000, 0.000000, 0.208514, 0.000000, 0.000000, 0.208514, 0.000000, 0.000000, 0.000000, 0.417029, -0.417029, 0.000000, 0.000000, 0.000000, 0.417029, 0.000000, 0.000000, 0.417029, 0.000000, 0.000000, -0.000000, 0.000000, 0.208514, 0.417029, 0.000000, 0.000000, 0.000000, 0.208514, 0.000000, 0.000000, -0.208514, 0.000000, 0.000000, 0.000000, 0.417029, 0.417029, 0.000000, 0.000000, 0.000000, 0.417029, -0.000000, 0.000000, 0.417029, 0.208514, 0.000000, 0.000000, 0.000000, 0.208514, 0.417029, 0.000000, -0.000000, 0.000000, 0.208514, 0.000000, 0.000000, 0.417029, 0.000000, 0.000000, 0.000000, 0.417029, -0.417029, 0.000000, 0.000000, 0.000000, 0.417029, 0.000000, 0.000000, 0.000000, 0.208514, 0.000000, -0.000000, 0.000000, 0.208514, 0.417029, 0.000000, 0.000000, 0.000000, 0.208514, 0.000000, 0.000000, -0.417029, 0.000000, 0.000000, 0.000000, 0.417029, 0.417029, 0.000000, 0.000000, 0.000000, 0.417029, -0.000000, 0.000000, 0.000000, 0.208514, 0.000000, 0.000000, 0.000000, 0.208514, 0.417029, 0.000000, -0.000000, 0.000000, 0.208514, 0.000000, 0.000000, 0.417029, 0.000000, 0.000000, 0.000000, 0.417029, -0.417029, 0.000000, 0.000000, 0.000000, 0.417029, 0.208514, 0.000000, 0.000000, 0.208514, 0.000000, -0.000000, 0.000000, 0.208514, 0.417029, 0.000000, 0.000000, 0.000000, 0.417029, 0.000000, 0.000000, -0.417029, 0.000000, 0.000000, 0.000000, 0.417029, 0.417029, 0.000000, 0.000000, 0.000000, 0.000000, -0.208514, 0.000000, 0.000000, 0.208514, 0.000000, 0.000000, 0.000000, 0.208514, 0.417029, 0.000000, -0.000000, 0.000000, 0.417029, 0.000000, 0.000000, 0.417029, 0.000000, 0.000000, 0.000000, 0.417029, -0.417029, 0.000000, 0.000000, 0.000000, 0.000000, 0.208514, 0.000000, 0.000000, 0.208514, 0.000000, -0.000000, 0.000000, 0.208514, 0.417029, 0.000000, 0.000000, 0.000000, 0.417029, 0.000000, 0.000000, -0.417029, 0.000000, 0.000000, 0.000000, 0.417029, 0.417029, 0.000000, 0.000000, 0.000000, 0.000000, -0.208514, 0.000000, 0.000000, 0.208514, 0.000000, 0.000000, 0.000000, 0.208514, 0.417029, 0.000000, -0.000000, 0.000000, 0.417029, 0.000000, 0.000000, 0.417029, 0.000000, 0.000000, 0.000000, 0.417029, -0.417029, 0.471405, 0.000000, 0.000000, 0.235702, 0.000000, 0.000000, 0.000000, 0.235702, 0.000000, -0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, -0.471405, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.235702, -0.000000, 0.000000, 0.000000, 0.235702, 0.000000, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, -0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.000000, -0.000000, 0.471405, 0.000000, 0.000000, 0.235702, 0.000000, 0.000000, 0.000000, 0.235702, 0.000000, -0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, -0.471405, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.235702, -0.000000, 0.000000, 0.000000, 0.235702, 0.000000, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, -0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.000000, -0.000000, 0.471405, 0.000000, 0.000000, 0.235702, 0.000000, 0.000000, 0.000000, 0.235702, 0.000000, -0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, -0.471405, 0.235702, 0.000000, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.235702, -0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, -0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.000000, 0.235702, 0.000000, 0.000000, 0.000000, -0.000000, 0.471405, 0.000000, 0.000000, 0.235702, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, -0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, -0.000000, 0.235702, 0.000000, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.235702, -0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, -0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.000000, 0.235702, 0.000000, 0.000000, 0.000000, -0.000000, 0.471405, 0.000000, 0.000000, 0.235702, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, -0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.471405, 0.235702, 0.000000, 0.000000, -0.000000, 0.235702, 0.000000, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.471405, -0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, -0.000000, 0.000000, 0.235702, 0.000000, 0.000000, 0.000000, 0.235702, 0.000000, 0.000000, 0.000000, -0.000000, 0.471405, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, -0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.235702, 0.000000, 0.000000, -0.000000, 0.235702, 0.000000, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.471405, -0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.000000, 0.471405, 0.417029, -0.000000, 0.000000, 0.000000, 0.208514, 0.000000, 0.000000, 0.208514, 0.000000, 0.000000, 0.208514, -0.000000, 0.417029, 0.000000, 0.000000, 0.000000, 0.417029, 0.000000, 0.000000, 0.417029, 0.000000, -0.000000, 0.417029, 0.000000, 0.000000, 0.417029, 0.000000, 0.000000, 0.000000, 0.208514, 0.000000, -0.000000, 0.208514, 0.000000, 0.000000, 0.208514, 0.000000, 0.417029, 0.000000, 0.000000, 0.000000, -0.417029, 0.000000, 0.000000, 0.417029, 0.000000, 0.000000, 0.417029, 0.208514, 0.000000, 0.417029, -0.000000, 0.000000, 0.000000, 0.208514, 0.000000, 0.000000, 0.208514, 0.000000, 0.000000, 0.417029, -0.000000, 0.417029, 0.000000, 0.000000, 0.000000, 0.417029, 0.000000, 0.000000, 0.417029, 0.000000, -0.000000, 0.000000, 0.208514, 0.000000, 0.417029, 0.000000, 0.000000, 0.000000, 0.208514, 0.000000, -0.000000, 0.208514, 0.000000, 0.000000, 0.417029, 0.000000, 0.417029, 0.000000, 0.000000, 0.000000, -0.417029, 0.000000, 0.000000, 0.417029, 0.000000, 0.000000, 0.000000, 0.208514, 0.000000, 0.417029, -0.000000, 0.000000, 0.000000, 0.208514, 0.000000, 0.000000, 0.208514, 0.000000, 0.000000, 0.417029, -0.000000, 0.417029, 0.000000, 0.000000, 0.000000, 0.417029, 0.000000, 0.000000, 0.417029, 0.208514, -0.000000, 0.000000, 0.208514, 0.000000, 0.417029, 0.000000, 0.000000, 0.000000, 0.208514, 0.000000, -0.000000, 0.417029, 0.000000, 0.000000, 0.417029, 0.000000, 0.417029, 0.000000, 0.000000, 0.000000, -0.417029, 0.000000, 0.000000, 0.000000, 0.208514, 0.000000, 0.000000, 0.208514, 0.000000, 0.417029, -0.000000, 0.000000, 0.000000, 0.208514, 0.000000, 0.000000, 0.417029, 0.000000, 0.000000, 0.417029, -0.000000, 0.417029, 0.000000, 0.000000, 0.000000, 0.417029, 0.000000, 0.000000, 0.000000, 0.208514, -0.000000, 0.000000, 0.208514, 0.000000, 0.417029, 0.000000, 0.000000, 0.000000, 0.208514, 0.000000, -0.000000, 0.417029, 0.000000, 0.000000, 0.417029, 0.000000, 0.417029, 0.000000, 0.000000, 0.000000, -0.417029, 0.208514, 0.000000, 0.000000, 0.208514, 0.000000, 0.000000, 0.208514, 0.000000, 0.417029, -0.000000, 0.000000, 0.000000, 0.417029, 0.000000, 0.000000, 0.417029, 0.000000, 0.000000, 0.417029, -0.000000, 0.417029, 0.000000, 0.000000, 0.000000, 0.000000, 0.208514, 0.000000, 0.000000, 0.208514, -0.000000, 0.000000, 0.208514, 0.000000, 0.417029, 0.000000, 0.000000, 0.000000, 0.417029, 0.000000, -0.000000, 0.417029, 0.000000, 0.000000, 0.417029, 0.000000, 0.417029, 0.000000, 0.000000, 0.000000, -0.000000, 0.208514, 0.000000, 0.000000, 0.208514, 0.000000, 0.000000, 0.208514, 0.000000, 0.417029, -0.000000, 0.000000, 0.000000, 0.417029, 0.000000, 0.000000, 0.417029, 0.000000, 0.000000, 0.417029, -0.000000, 0.417029, 0.000000, 0.000000, 0.000000, 0.000000, 0.208514, 0.000000, 0.000000, 0.208514, -0.000000, 0.000000, 0.208514, 0.000000, 0.417029, 0.000000, 0.000000, 0.000000, 0.417029, 0.000000, -0.000000, 0.417029, 0.000000, 0.000000, 0.417029, 0.000000, 0.417029, 0.417029, 0.000000, 0.000000, -0.208514, 0.000000, 0.000000, 0.000000, 0.208514, 0.000000, 0.000000, 0.208514, 0.000000, 0.417029, -0.000000, 0.000000, 0.417029, 0.000000, 0.000000, 0.000000, 0.417029, 0.000000, 0.000000, 0.417029, -0.000000, 0.000000, 0.417029, 0.000000, 0.000000, 0.208514, 0.000000, 0.000000, 0.000000, 0.208514, -0.000000, 0.000000, 0.208514, 0.000000, 0.417029, 0.000000, 0.000000, 0.417029, 0.000000, 0.000000, -0.000000, 0.417029, 0.000000, 0.000000, 0.417029, 0.208514, 0.000000, 0.417029, 0.000000, 0.000000, -0.208514, 0.000000, 0.000000, 0.000000, 0.208514, 0.000000, 0.000000, 0.417029, 0.000000, 0.417029, -0.000000, 0.000000, 0.417029, 0.000000, 0.000000, 0.000000, 0.417029, 0.000000, 0.000000, 0.000000, -0.208514, 0.000000, 0.417029, 0.000000, 0.000000, 0.208514, 0.000000, 0.000000, 0.000000, 0.208514, -0.000000, 0.000000, 0.417029, 0.000000, 0.417029, 0.000000, 0.000000, 0.417029, 0.000000, 0.000000, -0.000000, 0.417029, 0.000000, 0.000000, 0.000000, 0.208514, 0.000000, 0.417029, 0.000000, 0.000000, -0.208514, 0.000000, 0.000000, 0.000000, 0.208514, 0.000000, 0.000000, 0.417029, 0.000000, 0.417029, -0.000000, 0.000000, 0.417029, 0.000000, 0.000000, 0.000000, 0.417029, 0.208514, 0.000000, 0.000000, -0.208514, 0.000000, 0.417029, 0.000000, 0.000000, 0.208514, 0.000000, 0.000000, 0.000000, 0.417029, -0.000000, 0.000000, 0.417029, 0.000000, 0.417029, 0.000000, 0.000000, 0.417029, 0.000000, 0.000000, -0.000000, 0.000000, 0.208514, 0.000000, 0.000000, 0.208514, 0.000000, 0.417029, 0.000000, 0.000000, -0.208514, 0.000000, 0.000000, 0.000000, 0.417029, 0.000000, 0.000000, 0.417029, 0.000000, 0.417029, -0.000000, 0.000000, 0.417029, 0.000000, 0.000000, 0.000000, 0.000000, 0.208514, 0.000000, 0.000000, -0.208514, 0.000000, 0.417029, 0.000000, 0.000000, 0.208514, 0.000000, 0.000000, 0.000000, 0.417029, -0.000000, 0.000000, 0.417029, 0.000000, 0.417029, 0.000000, 0.000000, 0.417029, 0.000000, 0.000000, -0.000000, 0.000000, 0.208514, 0.000000, 0.000000, 0.208514, 0.000000, 0.417029, 0.000000, 0.000000, -0.208514, 0.000000, 0.000000, 0.000000, 0.417029, 0.000000, 0.000000, 0.417029, 0.000000, 0.417029, -0.000000, 0.000000, 0.417029, 0.208514, 0.000000, 0.000000, 0.000000, 0.208514, 0.000000, 0.000000, -0.208514, 0.000000, 0.417029, 0.000000, 0.000000, 0.417029, 0.000000, 0.000000, 0.000000, 0.417029, -0.000000, 0.000000, 0.417029, 0.000000, 0.417029, 0.000000, 0.000000, 0.000000, 0.208514, 0.000000, -0.000000, 0.000000, 0.208514, 0.000000, 0.000000, 0.208514, 0.000000, 0.417029, 0.000000, 0.000000, -0.417029, 0.000000, 0.000000, 0.000000, 0.417029, 0.000000, 0.000000, 0.417029, 0.000000, 0.417029, -0.000000, 0.000000, 0.000000, 0.208514, 0.000000, 0.000000, 0.000000, 0.208514, 0.000000, 0.000000, -0.208514, 0.000000, 0.417029, 0.000000, 0.000000, 0.417029, 0.000000, 0.000000, 0.000000, 0.417029, -0.000000, 0.000000, 0.417029, 0.000000, 0.417029, 0.471405, 0.000000, 0.000000, 0.235702, 0.000000, -0.000000, 0.235702, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, -0.471405, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, -0.471405, 0.000000, 0.000000, 0.235702, 0.000000, 0.000000, 0.235702, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.471405, 0.000000, -0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.235702, 0.000000, -0.000000, 0.235702, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, -0.471405, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, -0.471405, 0.000000, 0.000000, 0.235702, 0.000000, 0.000000, 0.235702, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.471405, 0.000000, -0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.235702, 0.000000, -0.000000, 0.235702, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, -0.471405, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, -0.471405, 0.000000, 0.000000, 0.235702, 0.000000, 0.000000, 0.235702, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.471405, 0.235702, -0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.235702, 0.000000, -0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, -0.471405, 0.000000, 0.000000, 0.000000, 0.235702, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, -0.471405, 0.000000, 0.000000, 0.235702, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.235702, -0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.235702, 0.000000, -0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, -0.471405, 0.235702, 0.000000, 0.000000, 0.235702, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, -0.471405, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.235702, 0.000000, 0.000000, 0.235702, -0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.471405, 0.000000, -0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, -0.000000, 0.235702, 0.000000, 0.000000, 0.235702, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, -0.471405, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000, 0.471405, 0.471405, 0.000000, 0.000000, 0.000000, 0.235702, 0.000000, 0.000000, -0.000000, 0.235702, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.471405, -0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, -0.000000, 0.000000, 0.235702, 0.000000, 0.000000, 0.000000, 0.235702, 0.000000, 0.000000, 0.000000, -0.471405, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, -0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.235702, 0.000000, 0.000000, -0.000000, 0.235702, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.471405, -0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, -0.000000, 0.000000, 0.235702, 0.000000, 0.000000, 0.000000, 0.235702, 0.000000, 0.000000, 0.000000, -0.471405, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.471405, 0.235702, -0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.235702, 0.000000, 0.000000, -0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.471405, -0.000000, 0.000000, 0.000000, 0.000000, 0.235702, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, -0.000000, 0.000000, 0.235702, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, -0.471405, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.000000, 0.235702, -0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.235702, 0.000000, 0.000000, -0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.471405, -0.000000, 0.000000, 0.000000, 0.000000, 0.235702, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, -0.000000, 0.000000, 0.235702, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, -0.471405, 0.000000, 0.000000, 0.000000, 0.471405, 0.235702, 0.000000, 0.000000, 0.000000, 0.235702, -0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, -0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.000000, -0.235702, 0.000000, 0.000000, 0.000000, 0.235702, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, -0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, -0.471405, 0.000000, 0.000000, 0.000000, 0.000000, 0.235702, 0.000000, 0.000000, 0.000000, 0.235702, -0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, -0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.000000, -0.235702, 0.000000, 0.000000, 0.000000, 0.235702, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, -0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, 0.471405, 0.000000, 0.000000, 0.000000, -0.471405, 0.129099, 0.129099, 0.129099, 0.129099, 0.129099, 0.129099, 0.129099, 0.129099, 0.129099, -0.129099, 0.129099, 0.129099, 0.258199, 0.258199, 0.258199, 0.258199, 0.258199, 0.258199, 0.258199, -0.258199, 0.258199, 0.258199, 0.258199, 0.258199}; \ No newline at end of file
--- a/chromamethods.cpp Thu May 10 11:32:05 2012 +0100 +++ b/chromamethods.cpp Tue Jun 19 15:40:09 2012 +0100 @@ -31,8 +31,6 @@ #include <boost/iostreams/stream.hpp> #include <boost/lexical_cast.hpp> -#include "chorddict.cpp" - using namespace std; using namespace boost; @@ -355,7 +353,7 @@ "A (bass)","Bb (bass)","B (bass)","C (bass)","C# (bass)","D (bass)","Eb (bass)","E (bass)","F (bass)","F# (bass)","G (bass)","Ab (bass)", "A","Bb","B","C","C#","D","Eb","E","F","F#","G","Ab"}; - const char* bassnames[13][12] ={ + const char* bassnames[12][12] ={ {"A","","B","C","C#","D","","E","","F#","G","G#"}, {"Bb","","C","Db","D","Eb","","F","","G","Ab","A"}, {"B","","C#","D","D#","E","","F#","","G#","A","A#"}, @@ -367,8 +365,7 @@ {"F","","G","Ab","A","Bb","","C","","D","Eb","E"}, {"F#","","G#","A","A#","B","","C#","","D#","E","E#"}, {"G","","A","Bb","B","C","","D","","E","F","F#"}, - {"Ab","","Bb","Cb","C","Db","","Eb","","F","Gb","G"}, - {"1","","2","b3","3","4","","5","","6","b7","7"} + {"Ab","","Bb","Cb","C","Db","","Eb","","F","Gb","G"} }; bool hasExternalDictinoary = true; @@ -408,7 +405,6 @@ vector<string> loadedChordNames; vector<float> loadedChordDict; if (hasExternalDictinoary && chordDictFile.is_open()) { - cerr << "-----------------> " << tempChordNames.size() << endl; tempChordDict.clear(); tempChordNames.clear(); while (std::getline(chordDictFile, line)) { // loop over lines in chord.dict file @@ -435,6 +431,7 @@ tempChordNames.push_back(chordType); } } + cerr << "-----------------> " << tempChordNames.size() << endl; } @@ -448,8 +445,6 @@ if (tempChordDict[24*iType+(kSemitone) % 12] > 0.99) { if (harte_syntax == 0.0) { slashNotation = bassnames[iSemitone][kSemitone]; - } else { - slashNotation = bassnames[12][kSemitone]; } } }
--- a/nnls-chroma.n3 Thu May 10 11:32:05 2012 +0100 +++ b/nnls-chroma.n3 Tue Jun 19 15:40:09 2012 +0100 @@ -1,7 +1,7 @@ @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> . @prefix xsd: <http://www.w3.org/2001/XMLSchema#> . @prefix vamp: <http://purl.org/ontology/vamp/> . -@prefix plugbase: <http://vamp-plugins.org/rdf/plugins/nnls-chromannls-chroma#> . +@prefix plugbase: <http://vamp-plugins.org/rdf/plugins/nnls-chroma#> . @prefix owl: <http://www.w3.org/2002/07/owl#> . @prefix dc: <http://purl.org/dc/elements/1.1/> . @prefix af: <http://purl.org/ontology/af/> .