Mercurial > hg > silvet

changeset 266:c9d2809cb86d norm

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Adjust some polyphony levels. Doesn't seem to make much difference in tests, but seems reasonable in principle
author Chris Cannam
date Wed, 23 Jul 2014 15:52:44 +0100
parents 8788fe838c49
children a8c05709e486
files src/Instruments.cpp testdata/evaluation/run-piano.sh
diffstat 2 files changed, 6 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/Instruments.cpp	Wed Jul 23 15:44:13 2014 +0100
+++ b/src/Instruments.cpp	Wed Jul 23 15:52:44 2014 +0100
@@ -133,9 +133,7 @@
 			 silvet_templates_highest_note,
 			 "Piano",
 			 pianoTemplates);
-//    piano.maxPolyphony = 8;
-//    piano.levelThreshold = 4;
-    piano.maxPolyphony = 5;
+    piano.maxPolyphony = 6;
     piano.levelThreshold = 6;
     piano.pitchSparsity = 1.0;
     piano.sourceSparsity = 1.0;
@@ -158,16 +156,17 @@
 			     t.highestNote,
 			     simpleInstruments[i],
 			     tt);
-//        instr.pitchSparsity = 1.5;
+
         instr.maxPolyphony = 5;
         instr.levelThreshold = 6;
+
 	if (isBowedString(i)) {
-//            instr.maxPolyphony = 2;
+            instr.maxPolyphony = 2;
 //            instr.levelThreshold = 3;
 	    stringTemplates.push_back(t);
 	}
 	if (isWind(i)) {
-//            instr.maxPolyphony = 1;
+            instr.maxPolyphony = 2;
 //            instr.levelThreshold = 5;
 	    windTemplates.push_back(t);
 	}
--- a/testdata/evaluation/run-piano.sh	Wed Jul 23 15:44:13 2014 +0100
+++ b/testdata/evaluation/run-piano.sh	Wed Jul 23 15:52:44 2014 +0100
@@ -67,7 +67,7 @@
 
     for instrument in $intended_instrument ; do
 
-	for norm in no yes; do
+	for norm in no; do
 
 	    echo
 	    echo "For file $filename, instrument $instrument, norm $norm..."