# HG changeset patch
# User Chris Cannam
# Date 1406127164 -3600
# Node ID c9d2809cb86d61ef7d2a3534b433dc06579ef82a
# Parent  8788fe838c4965022392ec28ca0fea84069eb061
Adjust some polyphony levels. Doesn't seem to make much difference in tests, but seems reasonable in principle

diff -r 8788fe838c49 -r c9d2809cb86d src/Instruments.cpp
--- 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);
 	}
diff -r 8788fe838c49 -r c9d2809cb86d testdata/evaluation/run-piano.sh
--- 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..."