# HG changeset patch
# User tomwalters
# Date 1284426041 0
# Node ID 3a63349623575b6361b8aac59aa93c26809a0033
# Parent  717e0227e4547c6f0097679044d5224e149e4991
- Pass spoke pattern
- More bugfixen

diff -r 717e0227e454 -r 3a6334962357 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	Tue Sep 14 00:46:47 2010 +0000
+++ b/experiments/scripts/cnbh-syllables/run_training_and_testing/run_test_instance.sh	Tue Sep 14 01:00:41 2010 +0000
@@ -97,7 +97,7 @@
   fi
   # Count the number of instances of each talker appearing in the list of errors.
   grep Aligned $WORKING_DIRECTORY/$hmm_type/${RESULTS_FILE}_iteration_$iter| sed -E "s/.*\/..\/([a-z]{2})([0-9]{2,3}\.[0-9])p([0-9]{2,3}\.[0-9])s.*/\2 \3/" | sort | uniq -c > $WORKING_DIRECTORY/$hmm_type/${MISCLASSIFIED}_iteration_$iter
-  python ./cnbh-syllables/results_plotting/gen_results.py --input_file=$WORKING_DIRECTORY/$hmm_type/${MISCLASSIFIED}_iteration_$iter --train_talkers=$WORKING_DIRECTORY/training_talkers --test_talkers=$WORKING_DIRECTORY/testing_talkers --output_filename=$WORKING_DIRECTORY/$hmm_type/results_iteration_${iter}.txt --spoke_pattern=cnbh-syllables/run_training_and_testing/train_test_sets/gen_spoke_points/spoke_pattern.txt
+  python ./cnbh-syllables/results_plotting/gen_results.py --input_file=$WORKING_DIRECTORY/$hmm_type/${MISCLASSIFIED}_iteration_$iter --train_talkers=$WORKING_DIRECTORY/training_talkers --test_talkers=$WORKING_DIRECTORY/testing_talkers --output_filename=$WORKING_DIRECTORY/$hmm_type/results_iteration_${iter}.txt --spoke_pattern=$SPOKE_PATTERN_FILE
   python ./cnbh-syllbles/results_plotting/spider_plot.py --input_file=$WORKING_DIRECTORY/$hmm_type/results_iteration_${iter}.txt --output_file=$WORKING_DIRECTORY/$hmm_type/results_iteration_${iter}.png
 done
 touch $WORKING_DIRECTORY/$hmm_type/.hmm_success
diff -r 717e0227e454 -r 3a6334962357 experiments/scripts/cnbh-syllables/run_training_and_testing/test_features.sh
--- a/experiments/scripts/cnbh-syllables/run_training_and_testing/test_features.sh	Tue Sep 14 00:46:47 2010 +0000
+++ b/experiments/scripts/cnbh-syllables/run_training_and_testing/test_features.sh	Tue Sep 14 01:00:41 2010 +0000
@@ -24,6 +24,7 @@
 TEST_SCRIPT=${11}
 TRAIN_MLF=${12}
 TEST_MLF=${13}
+SPOKE_PATTERN_FILE=${14}
 
 HMMCONFIG=hmm_configuration
 
@@ -49,7 +50,7 @@
 for total_hmm_states in $HMM_STATES_LIST; do
   for mixture_components in $MIXTURE_COMPONENTS_LIST; do
     #. $THIS_DIR/run_test_instance.sh &
-    $THIS_DIR/run_test_instance.sh
+    . $THIS_DIR/run_test_instance.sh
   done
 done
 echo "Waiting..."
diff -r 717e0227e454 -r 3a6334962357 experiments/scripts/master.sh
--- a/experiments/scripts/master.sh	Tue Sep 14 00:46:47 2010 +0000
+++ b/experiments/scripts/master.sh	Tue Sep 14 01:00:41 2010 +0000
@@ -137,6 +137,7 @@
 WORK=$HMMS_ROOT/$FEATURE_CLASS/$FEATURE_SUFFIX/$SOURCE_SNR/$TALKERS/
 mkdir -p $WORK
 FEATURES_DIR=$FEATURES_ROOT/$FEATURE_CLASS/$SOURCE_SNR/
+SPOKE_PATTERN_FILE=`pwd`/cnbh-syllables/run_training_and_testing/train_test_sets/gen_spoke_points/spoke_pattern.txt
 
 ./cnbh-syllables/run_training_and_testing/train_test_sets/generate_train_test_lists.sh \
     $TALKERS \
@@ -165,7 +166,8 @@
     "$TRAINING_SCRIPT" \
     "$TESTING_SCRIPT" \
     "$TRAINING_MASTER_LABEL_FILE" \
-    "$TESTING_MASTER_LABEL_FILE"
+    "$TESTING_MASTER_LABEL_FILE" \
+    "$SPOKE_PATTERN_FILE"
 done
 }