comparison branches/carfac_cpp/src/CARFAC.cpp @ 544:c666e8e0696a

style

 #include "IHC.h"
 #include "AGC.h"
 
 #include "CARFAC_common_typedefs.h"
 
-CARFAC::CARFAC(int fs = DEFAULT_FS,
-		CAR_parameters* _CAR_params = new CAR_parameters(),
-		IHC_parameters* _IHC_params = new IHC_parameters(),
-		AGC_parameters* _AGC_params = new AGC_parameters(),
-		float ERB_break_freq = DEFAULT_ERB_break_freq,
-		float ERB_Q = DEFAULT_ERB_Q){
+CARFAC::CARFAC(int fs = kDefaultFs,
+              CAR_parameters* car_params = new CAR_parameters(),
+              IHC_parameters* ihc_params = new IHC_parameters(),
+              AGC_parameters* agc_params = new AGC_parameters(),
+              float erb_break_freq = kDefaultErbBreakFreq,
+              float erb_q = kDefaultErbQ){
 
-	// for now, design is to take ownership. Preferences? Make copies, call by value, etc?
-	CAR_params = _CAR_params;
-	IHC_params = _IHC_params;
-	AGC_params = _AGC_params;
+  // for now, design is to take ownership. Preferences? Make copies, call by value, etc?
+  car_params_ = car_params;
+  ihc_params_ = ihc_params;
+  agc_params_ = agc_params;
 
-	FloatArray pole_freqs; //TODO: do it
-	CAR_coeffs = new CAR_coefficients(CAR_params, fs, pole_freqs);
+  FloatArray pole_freqs; //TODO: do it
+  car_coeffs_ = new CAR_coefficients(car_params_, fs, pole_freqs);
 
-	int n_ch = 10; // TODO: do the design loops
-	AGC_coeffs = new AGC_coefficients(AGC_params, fs, n_ch);
+  int n_ch = 10; // TODO: do the design loops
+  agc_coeffs_ = new AGC_coefficients(agc_params_, fs, n_ch);
 
-	IHC_coeffs = new IHC_coefficients(IHC_params, fs, n_ch);
+  ihc_coeffs_ = new IHC_coefficients(ihc_params_, fs, n_ch);
 }
 
 CARFAC::~CARFAC() {
-	delete CAR_coeffs;
-	//delete CAR_params;
+  delete car_coeffs_;
+  delete ihc_coeffs_;
+  delete agc_coeffs_;
 
-	delete IHC_coeffs;
-	//delete IHC_params;
-
-	delete AGC_coeffs;
-	//delete AGC_params;
+  //delete car_params_;
+  //delete ihc_params_;
+  //delete agc_params_;
 }