diff NNLSBase.cpp @ 100:d1398182a072 matthiasm-plugin

s parameter setting now has an effect

--- a/NNLSBase.cpp	Fri Dec 03 19:10:09 2010 +0900
+++ b/NNLSBase.cpp	Tue Dec 07 10:56:55 2010 +0900
@@ -57,8 +57,7 @@
     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;
-    dictionaryMatrix(m_dict, 0.7);
+    for (unsigned i = 0; i < nNote * 84; ++i) m_dict[i] = 0.0;    
 }
 
 
@@ -354,6 +353,8 @@
         cerr << "--> initialise";
     }
 	
+	dictionaryMatrix(m_dict, m_s);
+	
 	// make things for tuning estimation
 	for (int iBPS = 0; iBPS < nBPS; ++iBPS) {
         sinvalues.push_back(sin(2*M_PI*(iBPS*1.0/nBPS)));