Mercurial > hg > nnls-chroma
changeset 92:a76598852303 matthiasm-plugin
resolved
author | matthiasm |
---|---|
date | Thu, 02 Dec 2010 22:24:20 +0900 |
parents | b56dde3417d4 |
children | 12cdf228c47d |
files | Chordino.cpp NNLSBase.cpp |
diffstat | 2 files changed, 8 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/Chordino.cpp Thu Dec 02 13:05:23 2010 +0000 +++ b/Chordino.cpp Thu Dec 02 22:24:20 2010 +0900 @@ -103,7 +103,7 @@ d0.unit = "%"; d0.minValue = 0; d0.maxValue = 5; - d0.defaultValue = 0; + d0.defaultValue = 0.0; d0.isQuantized = true; d0.quantizeStep = 0.5; list.push_back(d0); @@ -115,7 +115,7 @@ d1.unit = ""; d1.minValue = 0; d1.maxValue = 1; - d1.defaultValue = 0; + d1.defaultValue = 0.0; d1.isQuantized = true; d1.valueNames.push_back("global tuning"); d1.valueNames.push_back("local tuning"); @@ -152,7 +152,7 @@ boostn.unit = ""; boostn.minValue = 1.0; boostn.maxValue = 2.0; - boostn.defaultValue = 1.0; + boostn.defaultValue = 1.1; boostn.isQuantized = false; list.push_back(boostn);
--- a/NNLSBase.cpp Thu Dec 02 13:05:23 2010 +0000 +++ b/NNLSBase.cpp Thu Dec 02 22:24:20 2010 +0900 @@ -39,23 +39,22 @@ m_localTunings(0), m_whitening(1.0), m_preset(0.0), - m_useNNLS(1), - m_useHMM(1), - m_localTuning(0), + m_useNNLS(1.0), + m_useHMM(1.0), + m_localTuning(0.0), m_kernelValue(0), m_kernelFftIndex(0), m_kernelNoteIndex(0), m_dict(0), - m_tuneLocal(0), + m_tuneLocal(0.0), m_doNormalizeChroma(0), - m_rollon(0), + m_rollon(0.0), m_boostN(1.1), m_s(0.7), sinvalues(0), cosvalues(0) { if (debug_on) cerr << "--> NNLSBase" << endl; - // make the *note* dictionary matrix m_dict = new float[nNote * 84]; for (unsigned i = 0; i < nNote * 84; ++i) m_dict[i] = 0.0;