Mercurial > hg > aimc
diff carfac/ihc_params.cc @ 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.
author | alexbrandmeyer |
---|---|
date | Wed, 22 May 2013 21:30:02 +0000 |
parents | 0fbaf443ec82 |
children | 27f2d9b76075 |
line wrap: on
line diff
--- a/carfac/ihc_params.cc Tue May 21 21:48:34 2013 +0000 +++ b/carfac/ihc_params.cc Wed May 22 21:30:02 2013 +0000 @@ -32,20 +32,5 @@ tau1_in_ = 0.010; tau2_out_ = 0.0025; tau2_in_ = 0.005; - ac_corner_hz_ = 20; -} - -// The overloaded constructor allows for use of different inner hair cell -// parameters. -IHCParams::IHCParams(bool just_hwr, bool one_cap, FPType tau_lpf, - FPType tau1_out, FPType tau1_in, FPType tau2_out, - FPType tau2_in, FPType ac_corner_hz) { - just_hwr_ = just_hwr; - one_cap_ = one_cap; - tau_lpf_ = tau_lpf; - tau1_out_ = tau1_out; - tau1_in_ = tau1_in; - tau2_out_ = tau2_out; - tau2_in_ = tau2_in; - ac_corner_hz_ = ac_corner_hz; + ac_corner_hz_ = 20.0; } \ No newline at end of file