comparison branches/carfac_cpp/src/CARFAC.cpp @ 545:e63fbe19b255

stubbed some more, and tidying

 #include "CARFAC.h"
 #include "CAR.h"
 #include "IHC.h"
 #include "AGC.h"
 
-#include "CARFAC_common_typedefs.h"
+#include "CARFAC_common.h"
 
 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){
+              float erb_q = kDefaultErbQ) : n_ears_(0) {
 
-  // for now, design is to take ownership. Preferences? Make copies, call by value, etc?
+  // 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);
+  float pole_hz = car_params->first_pole_theta_* fs / (2*kPi);
+  while (pole_hz > car_params->min_pole_hz_){
+      pole_freqs_.push_back(pole_hz); // STL specific
+      pole_hz = pole_hz - car_params->erb_per_step_ *
+                ERB_Hz(pole_hz, erb_break_freq, erb_q);
+  }
+  n_ch_ = pole_freqs_.size(); // STL specific
 
-  int n_ch = 10; // TODO: do the design loops
-  agc_coeffs_ = new AGC_coefficients(agc_params_, fs, n_ch);
+  // 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_);
+  agc_coeffs_ = new AGC_coefficients(agc_params_, fs_, n_ch_);
 
-  ihc_coeffs_ = new IHC_coefficients(ihc_params_, fs, n_ch);
+  // move this into AGC_coefficients constructor instead
+  agc_coeffs_->detect_scale_ = agc_params_->detect_scale_ /
+                               (ihc_coeffs_->saturation_output_ *
+                               agc_coeffs_->agc_gain_);
+}
+
+//move this somewhere else?
+float CARFAC::ERB_Hz(float cf_hz, float erb_break_freq, float erb_q){
+  return (erb_break_freq + cf_hz) / erb_q;
 }
 
 CARFAC::~CARFAC() {
   delete car_coeffs_;
   delete ihc_coeffs_;