Mercurial > hg > aimc
comparison branches/carfac_cpp/src/CAR.cpp @ 587:d59c0d65624b
some more refactor, and stubbed more unit test.
author | Ulf.Hammarqvist@gmail.com |
---|---|
date | Thu, 11 Oct 2012 21:28:34 +0000 |
parents | f3dde307f4b8 |
children |
comparison
equal
deleted
inserted
replaced
586:f3dde307f4b8 | 587:d59c0d65624b |
---|---|
1 #include "CAR.h" | 1 #include "CAR.h" |
2 #include "CARFAC_common.h" | 2 #include "CARFAC_common.h" |
3 #include "CARFAC.h" | 3 #include "CARFAC.h" |
4 #include <cmath> | 4 #include <cmath> |
5 #include "unit_conversion.h" | |
5 | 6 |
6 CAR_parameters::CAR_parameters(): | 7 CAR_parameters::CAR_parameters(): |
7 velocity_scale_(0.2), | 8 velocity_scale_(0.2), |
8 v_offset_(0.01), | 9 v_offset_(0.01), |
9 v2_corner_(0.2), | 10 v2_corner_(0.2), |
47 a0_coeffs_[i] = cos(theta[i]); | 48 a0_coeffs_[i] = cos(theta[i]); |
48 | 49 |
49 x = theta[i]/kPi; | 50 x = theta[i]/kPi; |
50 zr_coeffs_[i] = kPi * (x - ff * x*x*x); | 51 zr_coeffs_[i] = kPi * (x - ff * x*x*x); |
51 | 52 |
52 min_zeta_mod = (car_params_p->min_zeta_ + 0.25 * (CARFAC::ERB_Hz( | 53 min_zeta_mod = (car_params_p->min_zeta_ + 0.25 * (ERB_Hz( |
53 pole_freqs[i], car_params_p->erb_break_freq_, | 54 pole_freqs[i], car_params_p->erb_break_freq_, |
54 car_params_p->erb_q_) / pole_freqs[i] | 55 car_params_p->erb_q_) / pole_freqs[i] |
55 - car_params_p->min_zeta_)); | 56 - car_params_p->min_zeta_)); |
56 | 57 |
57 r1_coeffs_[i] = 1-zr_coeffs_[i]*min_zeta_mod; | 58 r1_coeffs_[i] = 1-zr_coeffs_[i]*min_zeta_mod; |