Mercurial > hg > nnls-chroma
comparison NNLSBase.cpp @ 86:e5c16976513d consonance
implemented note output for estimated chords
author | matthiasm |
---|---|
date | Sun, 28 Nov 2010 23:10:57 +0900 |
parents | 4270f3039ab0 |
children | 7af5312e66f8 |
comparison
equal
deleted
inserted
replaced
85:ccc0d4b3f867 | 86:e5c16976513d |
---|---|
42 m_kernelValue(0), | 42 m_kernelValue(0), |
43 m_kernelFftIndex(0), | 43 m_kernelFftIndex(0), |
44 m_kernelNoteIndex(0), | 44 m_kernelNoteIndex(0), |
45 m_dict(0), | 45 m_dict(0), |
46 m_tuneLocal(0), | 46 m_tuneLocal(0), |
47 m_chorddict(0), | |
48 m_chordnames(0), | |
49 m_doNormalizeChroma(0), | 47 m_doNormalizeChroma(0), |
50 m_rollon(0), | 48 m_rollon(0), |
51 m_s(0.7), | 49 m_s(0.7), |
52 m_useNNLS(1), | 50 m_useNNLS(1), |
53 m_useHMM(1), | 51 m_useHMM(1), |
58 | 56 |
59 // make the *note* dictionary matrix | 57 // make the *note* dictionary matrix |
60 m_dict = new float[nNote * 84]; | 58 m_dict = new float[nNote * 84]; |
61 for (unsigned i = 0; i < nNote * 84; ++i) m_dict[i] = 0.0; | 59 for (unsigned i = 0; i < nNote * 84; ++i) m_dict[i] = 0.0; |
62 dictionaryMatrix(m_dict, 0.7); | 60 dictionaryMatrix(m_dict, 0.7); |
63 | |
64 // get the *chord* dictionary from file (if the file exists) | |
65 m_chordnames = chordDictionary(&m_chorddict); | |
66 } | 61 } |
67 | 62 |
68 | 63 |
69 NNLSBase::~NNLSBase() | 64 NNLSBase::~NNLSBase() |
70 { | 65 { |