# HG changeset patch
# User tomwalters
# Date 1281696500 0
# Node ID b7c1c5e4061a8c685cee913b6162db33bee08f10
# Parent  cbe78255b12c7f508a57145de99957bf493bcb29
- AWS

diff -r cbe78255b12c -r b7c1c5e4061a experiments/scripts/cnbh-syllables/run_training_and_testing/run_test_instance.sh
--- a/experiments/scripts/cnbh-syllables/run_training_and_testing/run_test_instance.sh	Fri Aug 13 10:28:14 2010 +0000
+++ b/experiments/scripts/cnbh-syllables/run_training_and_testing/run_test_instance.sh	Fri Aug 13 10:48:20 2010 +0000
@@ -20,10 +20,10 @@
 MISCLASSIFIED=misclassified_syllables
 
 # Filenames used here
-TRAIN_SCRIPT=training_script
-TEST_SCRIPT=testing_script
+#TRAIN_SCRIPT=training_script
+#TEST_SCRIPT=testing_script
 SYLLIST_COMPLETE=syllable_list_with_silence
-TEST_MLF=testing_master_label_file
+#TEST_MLF=testing_master_label_file
 
 DICT=dictionary
 WDNET=word_network
@@ -52,7 +52,7 @@
 echo "Training HMM..."
 echo "Setting up prototype HMM..."
 mkdir -p $WORKING_DIRECTORY/$hmm_type/hmm0
-HCompV -C $WORKING_DIRECTORY/$HMMCONFIG -f 0.01 -m -S $WORKING_DIRECTORY/$TRAIN_SCRIPT -M $WORKING_DIRECTORY/$hmm_type/hmm0 $WORKING_DIRECTORY/$hmm_type/$HMMPROTO
+HCompV -C $WORKING_DIRECTORY/$HMMCONFIG -f 0.01 -m -S $TRAIN_SCRIPT -M $WORKING_DIRECTORY/$hmm_type/hmm0 $WORKING_DIRECTORY/$hmm_type/$HMMPROTO
 
 echo "Generating HMM definitions..."
 # Now take the prototype file from hmm0, and create the other HMM definitions
@@ -74,7 +74,7 @@
   let "nextiter=$iter+1"
   mkdir $WORKING_DIRECTORY/$hmm_type/hmm$nextiter
   HERest -C $WORKING_DIRECTORY/$HMMCONFIG -I $TRAIN_MLF \
-    -t 250.0 150.0 1000.0 -S $WORKING_DIRECTORY/$TRAIN_SCRIPT \
+    -t 250.0 150.0 1000.0 -S $TRAIN_SCRIPT \
     -H $WORKING_DIRECTORY/$hmm_type/hmm$iter/macros -H $WORKING_DIRECTORY/$hmm_type/hmm$iter/hmmdefs \
     -M $WORKING_DIRECTORY/$hmm_type/hmm$nextiter $WORKING_DIRECTORY/$SYLLIST_COMPLETE
 done
@@ -82,7 +82,7 @@
 for iter in $TESTING_ITERATIONS_LIST; do
   echo "Testing iteration ${iter}..."
   HVite -H $WORKING_DIRECTORY/$hmm_type/hmm$iter/macros -H $WORKING_DIRECTORY/$hmm_type/hmm$iter/hmmdefs \
-    -C $WORKING_DIRECTORY/$HMMCONFIG -S $WORKING_DIRECTORY/$TEST_SCRIPT -i $WORKING_DIRECTORY/$hmm_type/$RECOUT \
+    -C $WORKING_DIRECTORY/$HMMCONFIG -S $TEST_SCRIPT -i $WORKING_DIRECTORY/$hmm_type/$RECOUT \
     -w $WORKING_DIRECTORY/$WDNET -p 0.0 -s 5.0 $WORKING_DIRECTORY/$DICT $WORKING_DIRECTORY/$SYLLIST_COMPLETE
   echo "Results from testing on iteration ${iter}..."
   HResults -e "???" ${SILENCE} -I $WORKING_DIRECTORY/$TEST_MLF $WORKING_DIRECTORY/$SYLLIST_COMPLETE $WORKING_DIRECTORY/$hmm_type/$RECOUT
diff -r cbe78255b12c -r b7c1c5e4061a experiments/scripts/cnbh-syllables/run_training_and_testing/test_features.sh
--- a/experiments/scripts/cnbh-syllables/run_training_and_testing/test_features.sh	Fri Aug 13 10:28:14 2010 +0000
+++ b/experiments/scripts/cnbh-syllables/run_training_and_testing/test_features.sh	Fri Aug 13 10:48:20 2010 +0000
@@ -20,10 +20,10 @@
 TESTING_ITERATIONS_LIST=$7
 input_vector_size=$8
 feature_code=$9
-TRAIN_SPEAKERS=${10}
-TEST_SPEAKERS=${11}
+TRAIN_SCRIPT=${10}
+TEST_SCRIPT=${11}
 TRAIN_MLF=${12}
-
+TEST_MLF=${13}
 
 HMMCONFIG=hmm_configuration
 
diff -r cbe78255b12c -r b7c1c5e4061a experiments/scripts/master.sh
--- a/experiments/scripts/master.sh	Fri Aug 13 10:28:14 2010 +0000
+++ b/experiments/scripts/master.sh	Fri Aug 13 10:48:20 2010 +0000
@@ -13,7 +13,6 @@
 # HTK_USERNAME and HTK_PASSWORD - username and password for the site at 
 # http://htk.eng.cam.ac.uk/
 
-
 # Set these to be the location of your input database, and desired output
 # locations.
 SYLLABLES_DATABASE_TAR=/mnt/sounds/cnbh-syllables.tar
@@ -142,6 +141,7 @@
     $FEATURE_SUFFIX
 
 TESTING_SCRIPT=$WORK/testing_script
+TESTING_MASTER_LABEL_FILE=$HMMS_ROOT/$FEATURE_CLASS/$FEATURE_SUFFIX/$SOURCE_SNR/$TALKERS/testing_master_label_file
 
 ./cnbh-syllables/run_training_and_testing/gen_htk_base_files.sh $WORK
 
@@ -157,7 +157,8 @@
     "$FEATURE_TYPE" \
     "$TRAINING_SCRIPT" \
     "$TESTING_SCRIPT" \
-    "$TRAINING_MASTER_LABEL_FILE"
+    "$TRAINING_MASTER_LABEL_FILE" \
+    "$TESTING_MASTER_LABEL_FILE"
 done
 }