First reasonably finished version of the testing script.

4 files changed, 17 insertions, 13 deletions

diff --git a/sampling_alg_lac2020/.gitignore b/sampling_alg_lac2020/.gitignore
index 8020af2..0eb5693 100644
--- a/sampling_alg_lac2020/.gitignore
+++ b/sampling_alg_lac2020/.gitignore
@@ -8,7 +8,5 @@ midi_tests/*.pdf
 midi_tests/*.txt
 midi_tests/new_wav/
 midi_tests/old_wav/
-midi_tests/drumgizmo_new
-midi_tests/drumgizmo_old
 midi_tests/*.wav
 midi_tests/drumgizmo_new.bkp
diff --git a/sampling_alg_lac2020/midi_tests/drumgizmo_new b/sampling_alg_lac2020/midi_tests/drumgizmo_new
new file mode 100755
index 0000000..60f8c23
--- /dev/null
+++ b/sampling_alg_lac2020/midi_tests/drumgizmo_new
diff --git a/sampling_alg_lac2020/midi_tests/drumgizmo_old b/sampling_alg_lac2020/midi_tests/drumgizmo_old
new file mode 100755
index 0000000..f2df4dd
--- /dev/null
+++ b/sampling_alg_lac2020/midi_tests/drumgizmo_old
diff --git a/sampling_alg_lac2020/midi_tests/run_tests.sh b/sampling_alg_lac2020/midi_tests/run_tests.sh
index ea89838..556a3ac 100755
--- a/sampling_alg_lac2020/midi_tests/run_tests.sh
+++ b/sampling_alg_lac2020/midi_tests/run_tests.sh
@@ -1,25 +1,31 @@
 #!/bin/bash
-if [ "$#" != "3" ]; then
+if [[ "$#" != "3" && "$#" != "5" ]]; then
 	echo "Wrong number of parameters!"
-	echo "USAGE: ./run_tests.sh <midifile> <alg_type> <out_file>"
+	echo "USAGE: ./run_tests.sh <midifile> <alg_type> <out_file> <midimap> <kit>"
 	exit
 fi
 
 midifile="$1"
 alg="$2"
 output="$3"
-
-new_parameters1="-I speed=1 -o dummy -p stddev=0"
-new_parameters2="-I speed=1" # -p close=1,diverse=0,random=0"
+if [ "$#" == "5" ]; then
+	midimap="$4"
+	kit="$5"
+else
+	# Use Crocell as default
+	midimap="/home/chaot/Data/Drumkits/CrocellKit/Midimap_full.xml"
+	kit="/home/chaot/Data/Drumkits/CrocellKit/CrocellKit_full.xml"
+fi
 
 if [ "$alg" = "old" ]; then
 	echo "test with old selection..."
-	./drumgizmo_old -i midifile -I file=$midifile -I midimap=~/Data/Drumkits/CrocellKit/Midimap_full.xml -o dummy ~/Data/Drumkits/CrocellKit/CrocellKit_full.xml | grep "index: " | awk '{print $8}' | sed 's/.$//' > "$output"
-	# ./drumgizmo_old -i midifile -I file=/home/chaot/Data/midi_tests/$midifile -I midimap=~/Data/Drumkits/CrocellKit/Midimap_full.xml -I speed=4 -o wavfile -O file="$3" ~/Data/Drumkits/CrocellKit/CrocellKit_full.xml
-	sort -n "$output" | uniq -c | awk '{print $2 " " $1}'
+	bin="./drumgizmo_old"
+	parameters="-I speed=4 -p close=.8,diverse=0.05,random=0.02 -x -X attack=0,release=0,stddev=1.5"
 elif [ "$alg" = "new" ]; then
 	echo "test with new selection..."
-	# ./drumgizmo_new -i midifile -I file=$midifile -I midimap=~/Data/Drumkits/CrocellKit/Midimap_full.xml "$new_parameters" ~/Data/Drumkits/CrocellKit/CrocellKit_full.xml | grep "index: " | awk '{print $8}' | sed 's/.$//' > "$output"
-	./drumgizmo_new -i midifile -I file=$midifile -I midimap=~/Data/Drumkits/CrocellKit/Midimap_full.xml $new_parameters2 -o wavfile -O file="$3" ~/Data/Drumkits/CrocellKit/CrocellKit_full.xml | grep "index: " | awk '{print $8}' | sed 's/.$//' > "$output"
-	sort -n "$output" | uniq -c | awk '{print $2 " " $1}'
+	bin="./drumgizmo_new"
+	parameters="-I speed=4 -p close=.9,diverse=0.04,random=0.01 -x -X attack=0,release=0,stddev=0"
 fi
+
+$bin -i midifile -I file=$midifile -I midimap=$midimap $parameters -o wavfile -O file="$output" $kit | grep "index: " | awk '{print $8}' | sed 's/.$//' > "$output"
+	sort -n "$output" | uniq -c | awk '{print $2 " " $1}'