# HG changeset patch
# User tomwalters
# Date 1267807595 0
# Node ID 994b84cb59746ae4cda05ae4a5720ab4fe0f770a
# Parent  66a23c0545b6ca7cd299ff06b9f7944e46bd9f11
-Trying out the PZFC - it's broken at the moment

diff -r 66a23c0545b6 -r 994b84cb5974 trunk/SConstruct
--- a/trunk/SConstruct	Thu Mar 04 17:38:58 2010 +0000
+++ b/trunk/SConstruct	Fri Mar 05 16:46:35 2010 +0000
@@ -51,7 +51,7 @@
                   'Modules/Output/FileOutputHTK.cc']
 
 # File which contains main()
-sources = common_sources + ['Main/AIMCopy_SSI_Features_v3.cc']
+sources = common_sources + ['Main/AIMCopy_SSI_Features_v4_PZFC.cc']
 
 # Test sources
 test_sources = ['Modules/Profile/ModuleSlice_unittest.cc']
diff -r 66a23c0545b6 -r 994b84cb5974 trunk/src/Main/AIMCopy_SSI_Features_v4_PZFC.cc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/trunk/src/Main/AIMCopy_SSI_Features_v4_PZFC.cc	Fri Mar 05 16:46:35 2010 +0000
@@ -0,0 +1,284 @@
+// Copyright 2008-2010, Thomas Walters
+//
+// AIM-C: A C++ implementation of the Auditory Image Model
+// http://www.acousticscale.org/AIMC
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+/*!
+ * \file AIMCopy.cpp
+ * \brief AIM-C replacement for HTK's HCopy
+ *
+ * The following subset of the command-line flags
+ * should be implemented from HCopy:
+ *  -A      Print command line arguments         off
+ *  -C cf   Set config file to cf                default 
+ * (should be able to take multiple config files)
+ *  -S f    Set script file to f                 none
+ *  //! \todo -T N    Set trace flags to N                 0
+ *  -V      Print version information            off
+ *  -D of   Write configuration data to of       none
+ *
+ * \author Thomas Walters <tom@acousticscale.org>
+ * \date created 2008/05/08
+ * \version \$Id$
+ */
+
+#include <fstream>
+#include <iostream>
+#include <string>
+#include <utility>
+#include <vector>
+
+#include <stdlib.h>
+#include <time.h>
+
+#include "Modules/Input/ModuleFileInput.h"
+#include "Modules/BMM/ModuleGammatone.h"
+#include "Modules/BMM/ModulePZFC.h"
+#include "Modules/NAP/ModuleHCL.h"
+#include "Modules/Strobes/ModuleParabola.h"
+#include "Modules/Strobes/ModuleLocalMax.h"
+#include "Modules/SAI/ModuleSAI.h"
+#include "Modules/SSI/ModuleSSI.h"
+#include "Modules/SNR/ModuleNoise.h"
+#include "Modules/Profile/ModuleSlice.h"
+#include "Modules/Profile/ModuleScaler.h"
+#include "Modules/Features/ModuleGaussians.h"
+#include "Modules/Output/FileOutputHTK.h"
+#include "Support/Common.h"
+#include "Support/FileList.h"
+#include "Support/Parameters.h"
+
+using std::ofstream;
+using std::pair;
+using std::vector;
+using std::string;
+int main(int argc, char* argv[]) {
+  string sound_file;
+  string data_file;
+  string config_file;
+  string script_file;
+  bool write_data = false;
+  bool print_version = false;
+
+  string version_string(
+    " AIM-C AIMCopy\n"
+    "  (c) 2006-2010, Thomas Walters and Willem van Engen\n"
+    "  http://www.acoustiscale.org/AIMC/\n"
+    "\n");
+
+  if (argc < 2) {
+    printf("%s", version_string.c_str());
+    printf("AIMCopy is intended as a drop-in replacement for HTK's HCopy\n");
+    printf("command. It is used for making features from audio files for\n");
+    printf("use with HTK.\n");
+    printf("Usage: \n");
+    printf("  -A      Print command line arguments  off\n");
+    printf("  -C cf   Set config file to cf         none\n");
+    printf("  -S f    Set script file to f          none\n");
+    printf("  -V      Print version information     off\n");
+    printf("  -D g    Write configuration data to g none\n");
+    return -1;
+  }
+
+  // Parse command-line arguments
+  for (int i = 1; i < argc; i++) {
+    if (strcmp(argv[i],"-A") == 0) {
+      for (int j = 0; j < argc; j++)
+        printf("%s ",argv[j]);
+      printf("\n");
+      fflush(stdout);
+      continue;
+    }
+    if (strcmp(argv[i],"-C") == 0) {
+      if (++i >= argc) {
+        aimc::LOG_ERROR(_T("Configuration file name expected after -C"));
+        return(-1);
+      }
+      config_file = argv[i];
+      continue;
+    }
+    if (strcmp(argv[i],"-S") == 0) {
+      if (++i >= argc) {
+        aimc::LOG_ERROR(_T("Script file name expected after -S"));
+        return(-1);
+      }
+      script_file = argv[i];
+      continue;
+    }
+    if (strcmp(argv[i],"-D") == 0) {
+      if (++i >= argc) {
+        aimc::LOG_ERROR(_T("Data file name expected after -D"));
+        return(-1);
+      }
+      data_file = argv[i];
+      write_data = true;
+      continue;
+    }
+    if (strcmp(argv[i],"-V") == 0) {
+      print_version = true;
+      continue;
+    }
+    aimc::LOG_ERROR(_T("Unrecognized command-line argument: %s"), argv[i]);
+  }
+
+  if (print_version)
+    printf("%s", version_string.c_str());
+
+  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;
+  }
+
+  vector<pair<string, string> > file_list = aimc::FileList::Load(script_file);
+  if (file_list.size() == 0) {
+    aimc::LOG_ERROR("No data read from file %s", script_file.c_str());
+    return -1;
+  }
+
+  // Set up AIM-C processor here
+  aimc::ModuleFileInput input(&params);
+  //aimc::ModuleNoise noise_maker(&params);
+  aimc::ModulePZFC bmm(&params);
+  aimc::ModuleHCL nap(&params);
+  aimc::ModuleLocalMax strobes(&params);
+  aimc::ModuleSAI sai(&params);
+  params.SetBool("ssi.pitch_cutoff", false);
+  aimc::ModuleSSI ssi_no_cutoff(&params);
+
+  params.SetBool("ssi.pitch_cutoff", true);
+  params.SetFloat("ssi.pitch_search_start_ms", 4.6f);
+  aimc::ModuleSSI ssi_cutoff(&params);
+
+  params.SetBool("slice.all", false);
+  params.SetInt("slice.lower_index", 77);
+  params.SetInt("slice.upper_index", 150);
+  aimc::ModuleSlice slice_ssi_slice_1_no_cutoff(&params);
+  aimc::ModuleSlice slice_ssi_slice_1_cutoff(&params);
+
+  params.SetBool("slice.all", true);
+  aimc::ModuleSlice slice_ssi_all_no_cutoff(&params);
+  aimc::ModuleSlice slice_ssi_all_cutoff(&params);
+
+  params.SetFloat("nap.lowpass_cutoff", 100.0);
+  aimc::ModuleHCL smooth_nap(&params);
+  params.SetBool("slice.all", true);
+  aimc::ModuleSlice nap_profile(&params);
+  aimc::ModuleScaler nap_scaler(&params);
+
+  aimc::ModuleGaussians nap_features(&params);
+  aimc::ModuleGaussians features_ssi_slice1_no_cutoff(&params);
+  aimc::ModuleGaussians features_ssi_slice1_cutoff(&params);
+  aimc::ModuleGaussians features_ssi_all_no_cutoff(&params);
+  aimc::ModuleGaussians features_ssi_all_cutoff(&params);
+
+  aimc::FileOutputHTK nap_out(&params);
+  aimc::FileOutputHTK output_ssi_slice1_no_cutoff(&params);
+  aimc::FileOutputHTK output_ssi_slice1_cutoff(&params);
+  aimc::FileOutputHTK output_ssi_all_no_cutoff(&params);
+  aimc::FileOutputHTK output_ssi_all_cutoff(&params);
+
+  input.AddTarget(&bmm);
+  //noise_maker.AddTarget(&bmm);
+  bmm.AddTarget(&nap);
+  bmm.AddTarget(&smooth_nap);
+  smooth_nap.AddTarget(&nap_profile);
+  nap_profile.AddTarget(&nap_scaler);
+  nap_scaler.AddTarget(&nap_features);
+  nap_features.AddTarget(&nap_out);
+
+  nap.AddTarget(&strobes);
+  strobes.AddTarget(&sai);
+  sai.AddTarget(&ssi_no_cutoff);
+  sai.AddTarget(&ssi_cutoff);
+
+  ssi_no_cutoff.AddTarget(&slice_ssi_slice_1_no_cutoff);
+  ssi_no_cutoff.AddTarget(&slice_ssi_all_no_cutoff);
+  ssi_cutoff.AddTarget(&slice_ssi_slice_1_cutoff);
+  ssi_cutoff.AddTarget(&slice_ssi_all_cutoff);
+
+  slice_ssi_slice_1_no_cutoff.AddTarget(&features_ssi_slice1_no_cutoff);
+  slice_ssi_all_no_cutoff.AddTarget(&features_ssi_all_no_cutoff);
+  slice_ssi_slice_1_cutoff.AddTarget(&features_ssi_slice1_cutoff);
+  slice_ssi_all_cutoff.AddTarget(&features_ssi_all_cutoff);
+
+
+  features_ssi_slice1_no_cutoff.AddTarget(&output_ssi_slice1_no_cutoff);
+  features_ssi_all_no_cutoff.AddTarget(&output_ssi_all_no_cutoff);
+  features_ssi_slice1_cutoff.AddTarget(&output_ssi_slice1_cutoff);
+  features_ssi_all_cutoff.AddTarget(&output_ssi_all_cutoff);
+
+
+  if (write_data) {
+    ofstream outfile(data_file.c_str());
+    if (outfile.fail()) {
+      aimc::LOG_ERROR("Couldn't open data file %s for writing",
+                      data_file.c_str());
+      return -1;
+    }
+    time_t rawtime;
+    struct tm * timeinfo;
+    time(&rawtime);
+    timeinfo = localtime(&rawtime);
+
+
+    outfile << "# AIM-C AIMCopy\n";
+    outfile << "# Run on: " << asctime(timeinfo);
+    char * descr = getenv("USER");
+    if (descr) {
+      outfile << "# By user: " << descr <<"\n";
+    }
+    outfile << "#Module chain: ";
+    outfile << "# ";
+    outfile << "# Module versions:\n";
+    outfile << "# " << input.id() << " : " << input.version() << "\n";
+    outfile << "# " << bmm.id() << " : " << bmm.version() << "\n";
+    outfile << "# " << nap.id() << " : " << nap.version() << "\n";
+    outfile << "# " << strobes.id() << " : " << strobes.version() << "\n";
+    outfile << "# " << sai.id() << " : " << sai.version() << "\n";
+    outfile << "#\n";
+    outfile << "# Parameters:\n";
+    outfile << params.WriteString();
+    outfile.close();
+  }
+
+  for (unsigned int i = 0; i < file_list.size(); ++i) {
+    // 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";
+    output_ssi_slice1_no_cutoff.OpenFile(filename.c_str(), 10.0f);
+    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";
+    output_ssi_slice1_cutoff.OpenFile(filename.c_str(), 10.0f);
+    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";
+    nap_out.OpenFile(filename.c_str(), 10.0f);
+
+    if (input.LoadFile(file_list[i].first.c_str())) {
+      input.Process();
+    } else {
+      printf("LoadFile failed for file %s\n", file_list[i].first.c_str());
+    }
+    input.Reset();
+  }
+
+  return 0;
+}
diff -r 66a23c0545b6 -r 994b84cb5974 trunk/src/Modules/BMM/ModulePZFC.cc
--- a/trunk/src/Modules/BMM/ModulePZFC.cc	Thu Mar 04 17:38:58 2010 +0000
+++ b/trunk/src/Modules/BMM/ModulePZFC.cc	Fri Mar 05 16:46:35 2010 +0000
@@ -309,13 +309,9 @@
     // Set up now.
     /*! \todo Make a separate InitAGC function which does this.
      */
-    detect_.resize(channel_count_);
-    for (int c = 0; c < channel_count_; ++c)
-      detect_[c] = 1.0f;
-
-    float fDetectZero = DetectFun(0.0f);
-    for (int c = 0; c < channel_count_; c++)
-      detect_[c] *= fDetectZero;
+    detect_.clear();
+    float detect_zero = DetectFun(0.0f);
+    detect_.resize(channel_count_, detect_zero);
 
     for (int c = 0; c < channel_count_; c++)
       for (int st = 0; st < agc_stage_count_; st++)
@@ -360,7 +356,7 @@
     }
   }
 
-  float fOffset = 1.0f - agc_factor_ * DetectFun(0.0f);
+  float offset = 1.0f - agc_factor_ * DetectFun(0.0f);
 
   for (int i = 0; i < channel_count_; ++i) {
     float fAGCStateMean = 0.0f;
@@ -370,7 +366,7 @@
     fAGCStateMean /= static_cast<float>(agc_stage_count_);
 
     pole_damps_mod_[i] = pole_dampings_[i] *
-                           (fOffset + agc_factor_ * fAGCStateMean);
+                           (offset + agc_factor_ * fAGCStateMean);
   }
 }
 
@@ -393,14 +389,14 @@
   // Set the start time of the output buffer
   output_.set_start_time(input.start_time());
 
-  for (int iSample = 0; iSample < input.buffer_length(); ++iSample) {
-    float fInput = input[0][iSample];
+  for (int s = 0; s < input.buffer_length(); ++s) {
+    float input_sample = input.sample(0, s);
 
     // Lowpass filter the input with a zero at PI
-    fInput = 0.5f * fInput + 0.5f * last_input_;
-    last_input_ = input[0][iSample];
+    input_sample = 0.5f * input_sample + 0.5f * last_input_;
+    last_input_ = input.sample(0, s);
 
-    inputs_[channel_count_ - 1] = fInput;
+    inputs_[channel_count_ - 1] = input_sample;
     for (int c = 0; c < channel_count_ - 1; ++c)
       inputs_[c] = previous_out_[c + 1];
 
@@ -409,8 +405,7 @@
     float damp_rate = 1.0f / (maxdamp_ - mindamp_);
 
     for (int c = channel_count_ - 1; c > -1; --c) {
-      float interp_factor = (pole_damps_mod_[c]
-                             - mindamp_) * damp_rate;
+      float interp_factor = (pole_damps_mod_[c] - mindamp_) * damp_rate;
 
       float x = xmin_[c] + (xmax_[c] - xmin_[c]) * interp_factor;
       float r = rmin_[c] + (rmax_[c] - rmin_[c]) * interp_factor;
@@ -434,9 +429,9 @@
                                          + za2_[c] * state_2_[c];
 
       // cubic compression nonlinearity
-      output = output - 0.0001f * pow(output, 3);
+      output -= 0.0001f * pow(output, 3);
 
-      output_.set_sample(c, iSample, output);
+      output_.set_sample(c, s, output);
       detect_[c] = DetectFun(output);
       state_2_[c] = state_1_[c];
       state_1_[c] = new_state;
@@ -446,7 +441,7 @@
       AGCDampStep();
 
     for (int c = 0; c < channel_count_; ++c)
-      previous_out_[c] = output_[c][iSample];
+      previous_out_[c] = output_[c][s];
   }
   PushOutput();
 }