comparison branches/carfac_cpp/src/CAR.cpp @ 586:f3dde307f4b8

some refactoring
author Ulf.Hammarqvist@gmail.com
date Thu, 11 Oct 2012 20:55:03 +0000
parents 9c4c3675c3f8
children d59c0d65624b
comparison
equal deleted inserted replaced
585:b8a961149499 586:f3dde307f4b8
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 5
6 CAR_parameters::CAR_parameters():
7 velocity_scale_(0.2),
8 v_offset_(0.01),
9 v2_corner_(0.2),
10 v_damp_max_(0.01),
11 min_zeta_(0.10),
12 first_pole_theta_(0.085*kPi),
13 zero_ratio_(sqrt(2)),
14 high_f_damping_compression_(0.5),
15 erb_per_step_(0.5),
16 min_pole_hz_(30),
17 erb_break_freq_(kDefaultErbBreakFreq),
18 erb_q_(kDefaultErbQ)
19 {
20 // do nothing more!
21 }
22
6 CAR_coefficients::CAR_coefficients(CAR_parameters* car_params_p, float fs, 23 CAR_coefficients::CAR_coefficients(CAR_parameters* car_params_p, float fs,
7 FloatArray pole_freqs){ 24 FloatArray pole_freqs)
25 {
8 26
9 float f = pow(car_params_p->zero_ratio_, 2) + 1; 27 float f = pow(car_params_p->zero_ratio_, 2) + 1;
10 28
11 // TODO: dirty FloatArray initialization. 29 // TODO: dirty FloatArray initialization.
12 r1_coeffs_= pole_freqs; 30 r1_coeffs_= pole_freqs;
46 float tmp = 1 - 2*r1_coeffs_[i]*a0_coeffs_[i] + r1_coeffs_[i]*r1_coeffs_[i]; 64 float tmp = 1 - 2*r1_coeffs_[i]*a0_coeffs_[i] + r1_coeffs_[i]*r1_coeffs_[i];
47 g0_coeffs_[i] = tmp / ( tmp + h_coeffs_[i]*r1_coeffs_[i]*c0_coeffs_[i]); 65 g0_coeffs_[i] = tmp / ( tmp + h_coeffs_[i]*r1_coeffs_[i]*c0_coeffs_[i]);
48 } 66 }
49 67
50 } 68 }
51
52 CAR_coefficients::~CAR_coefficients(){
53 // TODO Auto-generated destructor stub
54 }