diff src/Main/aimc.cc @ 16:2a5354042241

-Updated the Slaney IIR gammatone to use a cascase of four second-order filters as per the implementtion in Slaney's auditory toolbox. This is more numerically stable at high sample rates and low centre frequencies.

--- a/src/Main/aimc.cc	Fri Feb 19 15:19:27 2010 +0000
+++ b/src/Main/aimc.cc	Sat Feb 20 17:56:40 2010 +0000
@@ -26,21 +26,21 @@
 #include "Modules/NAP/ModuleHCL.h"
 #include "Modules/Strobes/ModuleParabola.h"
 #include "Modules/SAI/ModuleSAI.h"
-// #include "Modules/SSI/ModuleSSI.h"
-// #include "Modules/Profile/ModuleProfile.h"
+#include "Modules/SSI/ModuleSSI.h"
+#include "Modules/Profile/ModuleSlice.h"
 #include "Modules/Features/ModuleGaussians.h"
 #include "Modules/Output/FileOutputHTK.h"
 
 int main(int argc, char* argv[]) {
   aimc::Parameters params;
   aimc::ModuleFileInput input(&params);
-  // aimc::ModuleGammatone bmm(&params);
-  aimc::ModulePZFC bmm(&params);
+  aimc::ModuleGammatone bmm(&params);
+  //aimc::ModulePZFC bmm(&params);
   aimc::ModuleHCL nap(&params);
   aimc::ModuleParabola strobes(&params);
   aimc::ModuleSAI sai(&params);
-  // aimc::ModuleSSI ssi(&params);
-  // aimc::ModuleProfile profile(&params);
+  aimc::ModuleSSI ssi(&params);
+  aimc::ModuleSlice profile(&params);
   aimc::ModuleGaussians features(&params);
   aimc::FileOutputHTK output(&params);
 
@@ -51,9 +51,9 @@
   bmm.AddTarget(&nap);
   nap.AddTarget(&strobes);
   strobes.AddTarget(&sai);
-  sai.AddTarget(&features);
-  // ssi.AddTarget(&profile);
-  // profile.AddTarget(&features);
+  sai.AddTarget(&ssi);
+  ssi.AddTarget(&profile);
+  profile.AddTarget(&features);
   features.AddTarget(&output);
 
   output.OpenFile("test_output.htk", params.GetFloat("sai.frame_period_ms"));