diff carfac/carfac_output.cc @ 643:8b70f4cf00c7

Additional changes to C++ CARFAC on the basis of ronw's comments on r289. Moved CARFAC::Design to CARFAC::CARFAC and CARFAC::Reset(), moved carfac_common.h to common.h, CARFACDetect to carfac_util.h/cc, FloatArray and Float2dArray to ArrayX and ArrayXX, improved variable naming, made a start on improved commenting documentation.

--- a/carfac/carfac_output.cc	Fri May 31 21:46:48 2013 +0000
+++ b/carfac/carfac_output.cc	Tue Jun 04 18:30:22 2013 +0000
@@ -24,10 +24,9 @@
 
 using std::vector;
 
-void CARFACOutput::Init(const int n_ears, const bool store_nap,
-                        const bool store_nap_decim, const bool store_bm,
-                        const bool store_ohc, const bool store_agc) {
-  n_ears_ = n_ears;
+CARFACOutput::CARFACOutput(const bool store_nap, const bool store_nap_decim,
+                        const bool store_bm, const bool store_ohc,
+                        const bool store_agc) {
   store_nap_ = store_nap;
   store_nap_decim_ = store_nap_decim;
   store_bm_ = store_bm;
@@ -36,27 +35,27 @@
 
 }
 
-void CARFACOutput::StoreOutput(const vector<Ear>& ears) {
+void CARFACOutput::AppendOutput(const vector<Ear>& ears) {
   if (store_nap_) {
-    nap_.push_back(vector<FloatArray>());
+    nap_.push_back(vector<ArrayX>());
     for (auto ear : ears) {
       nap_.back().push_back(ear.ihc_out());
     }
   }
   if (store_ohc_) {
-    ohc_.push_back(vector<FloatArray>());
+    ohc_.push_back(vector<ArrayX>());
     for (auto ear : ears) {
       ohc_.back().push_back(ear.za_memory());
     }
   }
   if (store_agc_) {
-    agc_.push_back(vector<FloatArray>());
+    agc_.push_back(vector<ArrayX>());
     for (auto ear : ears) {
       agc_.back().push_back(ear.zb_memory());
     }
   }
   if (store_bm_) {
-    bm_.push_back(vector<FloatArray>());
+    bm_.push_back(vector<ArrayX>());
     for (auto ear : ears) {
       bm_.back().push_back(ear.zy_memory());
     }