Mercurial > hg > aimc

changeset 359:7074795fd2eb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
- AWS
author tomwalters
date Wed, 11 Aug 2010 23:54:37 +0000
parents 74c185b2b918
children b5cc3b21f8db
files trunk/experiments/scripts/cnbh-syllables/feature_generation/gen_hcopy_aimcopy_script.sh trunk/experiments/scripts/master.sh trunk/src/Main/AIMCopy_SSI_Features_v3.cc
diffstat 3 files changed, 22 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/trunk/experiments/scripts/cnbh-syllables/feature_generation/gen_hcopy_aimcopy_script.sh	Wed Aug 11 23:11:27 2010 +0000
+++ b/trunk/experiments/scripts/cnbh-syllables/feature_generation/gen_hcopy_aimcopy_script.sh	Wed Aug 11 23:54:37 2010 +0000
@@ -13,6 +13,7 @@
 
 FEATURES_DIR=$1
 SOUND_SOURCE=$2
+SUFFIX=$3
 
 FULL_LIST=feature_generation_script
 
@@ -111,7 +112,7 @@
 for syllable in $(cat $FEATURES_DIR/${SYLLIST}.tmp); do
   for speaker in $(cat $FEATURES_DIR/${TALKERS}.tmp); do
     SOURCE_FILENAME=$SOUND_SOURCE/$syllable/${syllable}${speaker}.wav
-    DEST_FILENAME=$FEATURES_DIR/$syllable/${syllable}${speaker}.htk
+    DEST_FILENAME=$FEATURES_DIR/$syllable/${syllable}${speaker}.$SUFFIX
     echo "$SOURCE_FILENAME  ${DEST_FILENAME}" >&3
   done
 done
--- a/trunk/experiments/scripts/master.sh	Wed Aug 11 23:11:27 2010 +0000
+++ b/trunk/experiments/scripts/master.sh	Wed Aug 11 23:54:37 2010 +0000
@@ -86,7 +86,7 @@
   if [ ! -e $FEATURES_ROOT/mfcc/$SOURCE_SNR/.make_mfcc_features_success ]; then
     mkdir -p $FEATURES_ROOT/mfcc/$SOURCE_SNR/
     # Generate the list of files to convert
-    ./cnbh-syllables/feature_generation/gen_hcopy_aimcopy_script.sh $FEATURES_ROOT/mfcc/$SOURCE_SNR/ $SOUNDS_ROOT/$SOURCE_SNR/
+    ./cnbh-syllables/feature_generation/gen_hcopy_aimcopy_script.sh $FEATURES_ROOT/mfcc/$SOURCE_SNR/ $SOUNDS_ROOT/$SOURCE_SNR/ htk
     # Run the conversion
     ./cnbh-syllables/feature_generation/run_hcopy.sh $FEATURES_ROOT/mfcc/$SOURCE_SNR/ $NUMBER_OF_CORES
     touch $FEATURES_ROOT/mfcc/$SOURCE_SNR/.make_mfcc_features_success
@@ -102,7 +102,7 @@
 
   if [ ! -e $FEATURES_ROOT/aim/$SOURCE_SNR/.make_aim_features_success ]; then
     mkdir -p $FEATURES_ROOT/aim/$SOURCE_SNR/ 
-    ./cnbh-syllables/feature_generation/gen_hcopy_aimcopy_script.sh $FEATURES_ROOT/aim/$SOURCE_SNR/ $SOUNDS_ROOT/$SOURCE_SNR/
+    ./cnbh-syllables/feature_generation/gen_hcopy_aimcopy_script.sh $FEATURES_ROOT/aim/$SOURCE_SNR/ $SOUNDS_ROOT/$SOURCE_SNR/ ""
     # Run the conversion
     ./cnbh-syllables/feature_generation/run_aimcopy.sh $FEATURES_ROOT/aim/$SOURCE_SNR/ $NUMBER_OF_CORES
     touch $FEATURES_ROOT/aim/$SOURCE_SNR/.make_aim_features_success
@@ -122,6 +122,11 @@
 FEATURE_SIZE=39
 FEATURE_TYPE=MFCC_0_D_A
 
+TALKERS=inner_talkers
+WORK=$HMMS_ROOT/$FEATURE_CLASS/$FEATURE_SUFFIX/$SOURCE_SNR/$TALKERS/
+mkdir -p $WORK
+FEATURES_DIR=$FEATURES_ROOT/$FEATURE_CLASS/$SOURCE_SNR/
+
 ./run_training_and_testing/train_test_sets/generate_train_test_lists.sh \
     $TALKERS \
     $WORK \
--- a/trunk/src/Main/AIMCopy_SSI_Features_v3.cc	Wed Aug 11 23:11:27 2010 +0000
+++ b/trunk/src/Main/AIMCopy_SSI_Features_v3.cc	Wed Aug 11 23:54:37 2010 +0000
@@ -71,6 +71,7 @@
   string script_file;
   bool write_data = false;
   bool print_version = false;
+  bool load_params = false;
 
   string version_string(
     " AIM-C AIMCopy\n"
@@ -107,6 +108,7 @@
         return(-1);
       }
       config_file = argv[i];
+      load_params = true;
       continue;
     }
     if (strcmp(argv[i],"-S") == 0) {
@@ -138,10 +140,12 @@
 
   aimc::Parameters params;
 
-  if (!params.Load(config_file.c_str())) {
-    aimc::LOG_ERROR(_T("Couldn't load parameters from file %s"),
-                    config_file.c_str());
-    return -1;
+  if (load_params) {
+    if (!params.Load(config_file.c_str())) {
+      aimc::LOG_ERROR(_T("Couldn't load parameters from file %s"),
+                      config_file.c_str());
+      return -1;
+    }
   }
 
   vector<pair<string, string> > file_list = aimc::FileList::Load(script_file);
@@ -259,15 +263,15 @@
     // aimc::LOG_INFO(_T("In:  %s"), file_list[i].first.c_str());
     aimc::LOG_INFO(_T("Out: %s"), file_list[i].second.c_str());
 
-    string filename = file_list[i].second + ".slice_1_no_cutoff";
+    string filename = file_list[i].second + "slice_1_no_cutoff";
     output_ssi_slice1_no_cutoff.OpenFile(filename.c_str(), 10.0f);
-    filename = file_list[i].second + ".ssi_profile_no_cutoff";
+    filename = file_list[i].second + "ssi_profile_no_cutoff";
     output_ssi_all_no_cutoff.OpenFile(filename.c_str(), 10.0f);
-    filename = file_list[i].second + ".slice_1_cutoff";
+    filename = file_list[i].second + "slice_1_cutoff";
     output_ssi_slice1_cutoff.OpenFile(filename.c_str(), 10.0f);
-    filename = file_list[i].second + ".ssi_profile_cutoff";
+    filename = file_list[i].second + "ssi_profile_cutoff";
     output_ssi_all_cutoff.OpenFile(filename.c_str(), 10.0f);
-    filename = file_list[i].second + ".smooth_nap_profile";
+    filename = file_list[i].second + "smooth_nap_profile";
     nap_out.OpenFile(filename.c_str(), 10.0f);
 
     if (input.LoadFile(file_list[i].first.c_str())) {