Mercurial > hg > silvet

changeset 200:4840c6306b4f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use same polyphony/threshold settings for all single instruments as for unknown/multiple instruments (for comparative evaluation)
author Chris Cannam
date Wed, 04 Jun 2014 12:00:55 +0100
parents ad706e771398
children 607c3c92822f
files src/Instruments.cpp
diffstat 1 files changed, 11 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/Instruments.cpp	Wed Jun 04 11:45:42 2014 +0100
+++ b/src/Instruments.cpp	Wed Jun 04 12:00:55 2014 +0100
@@ -131,8 +131,10 @@
 			 silvet_templates_highest_note,
 			 "Piano",
 			 pianoTemplates);
-    piano.maxPolyphony = 8;
-    piano.levelThreshold = 3;
+//    piano.maxPolyphony = 8;
+//    piano.levelThreshold = 3;
+    piano.maxPolyphony = 5;
+    piano.levelThreshold = 6;
     if (isOK(piano)) {
 	ii.push_back(piano);
     }
@@ -151,15 +153,17 @@
 			     t.highestNote,
 			     simpleInstruments[i],
 			     tt);
-        instr.pitchSparsity = 1.5;
+//        instr.pitchSparsity = 1.5;
+        instr.maxPolyphony = 5;
+        instr.levelThreshold = 6;
 	if (isString(i)) {
-            instr.maxPolyphony = 2;
-            instr.levelThreshold = 3;
+//            instr.maxPolyphony = 2;
+//            instr.levelThreshold = 3;
 	    stringTemplates.push_back(t);
 	}
 	if (isWind(i)) {
-            instr.maxPolyphony = 1;
-            instr.levelThreshold = 5;
+//            instr.maxPolyphony = 1;
+//            instr.levelThreshold = 5;
 	    windTemplates.push_back(t);
 	}
 	if (isOK(instr)) {