Mercurial > hg > aimc
changeset 546:e5ae2ed4249c
(none)
| author | Ulf.Hammarqvist@gmail.com |
|---|---|
| date | Sat, 31 Mar 2012 17:36:22 +0000 |
| parents | e63fbe19b255 |
| children | cffa9e98eb45 |
| files | branches/carfac_cpp/src/CAR.h branches/carfac_cpp/src/CARFAC.cpp |
| diffstat | 2 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/branches/carfac_cpp/src/CAR.h Sat Mar 31 17:24:08 2012 +0000 +++ b/branches/carfac_cpp/src/CAR.h Sat Mar 31 17:36:22 2012 +0000 @@ -16,8 +16,7 @@ zero_ratio_(sqrt(2)), high_f_damping_compression_(0.5), erb_per_step_(0.5), - min_pole_hz_(30) - { + min_pole_hz_(30){ // do nothing more }
--- a/branches/carfac_cpp/src/CARFAC.cpp Sat Mar 31 17:24:08 2012 +0000 +++ b/branches/carfac_cpp/src/CARFAC.cpp Sat Mar 31 17:36:22 2012 +0000 @@ -1,3 +1,5 @@ +#include <cmath> + #include "CARFAC.h" #include "CAR.h" #include "IHC.h" @@ -25,6 +27,8 @@ } n_ch_ = pole_freqs_.size(); // STL specific + max_channels_per_octave_ = log(2) / log(pole_freqs_[0]/pole_freqs_[1]); + // replace with feeding this (as const ref) instead? Saves storing doubly car_coeffs_ = new CAR_coefficients(car_params_, fs_, pole_freqs_); ihc_coeffs_ = new IHC_coefficients(ihc_params_, fs_, n_ch_);