diff carfac/car_params.h @ 626:586b0677aae8

Fourth revision of Alex Brandmeyer's C++ implementation. Fixed more style issues, changed AGC structures to vectors, replaced FloatArray2d with vector<FloatArray>, implemented first tests using GTest to verify coefficients and monaural output against Matlab values (stored in aimc/carfac/test_data/). To run tests, change the path stored in carfac_test.h in TEST_SRC_DIR. Added CARFAC_GenerateTestData to the Matlab branch, fixed stage indexing in CARFAC_Cross_Couple.m to reflect changes in AGCCoeffs and AGCState structs.

--- a/carfac/car_params.h	Tue May 21 21:48:34 2013 +0000
+++ b/carfac/car_params.h	Wed May 22 21:30:02 2013 +0000
@@ -27,11 +27,6 @@
 
 struct CARParams {
   CARParams();  // The constructor initializes using default parameter values.
-  // This is a method to set non-default params.
-  CARParams(FPType velocity_scale, FPType v_offset, FPType min_zeta,
-            FPType max_zeta, FPType first_pole_theta, FPType zero_ratio,
-            FPType high_f_damping_compression, FPType erb_per_step,
-            FPType min_pole_hz_, FPType erb_break_freq, FPType erb_q_);
   FPType velocity_scale_; // This is used for the velocity nonlinearity.
   FPType v_offset_;  // The offset gives us quadratic part.
   FPType min_zeta_;  // This is the minimum damping factor in mid-freq channels.
@@ -39,10 +34,10 @@
   FPType first_pole_theta_;
   FPType zero_ratio_;  // This is how far zero is above the pole.
   FPType high_f_damping_compression_;  // A range from 0 to 1 to compress theta.
-  FPType erb_per_step_;  // Here we assume G&M's ERB formula.
+  FPType erb_per_step_;
   FPType min_pole_hz_;
-  FPType erb_break_freq_;  // This is the Greenwood map's break frequency.
-  FPType erb_q_;  // This represents Glassberg and Moore's high-cf ratio.
+  FPType erb_break_freq_;
+  FPType erb_q_;
 };
 
 #endif
\ No newline at end of file