Mercurial > hg > aimc
diff carfac/carfac_output.cc @ 610:01986636257a
Second check-in of Alex Brandmeyer's C++ implementation of CARFAC. Addressed style issues and completed implementation of remaining functions. Still needs proper testing of the output stages against the MATLAB version, and runtime functions need improvements in efficiency.
author | alexbrandmeyer |
---|---|
date | Thu, 16 May 2013 17:33:23 +0000 |
parents | aefe2ca0674f |
children | 0fbaf443ec82 |
line wrap: on
line diff
--- a/carfac/carfac_output.cc Mon May 13 22:51:15 2013 +0000 +++ b/carfac/carfac_output.cc Thu May 16 17:33:23 2013 +0000 @@ -22,15 +22,15 @@ #include "carfac_output.h" -void CARFACOutput::InitOutput(int n_ears, int n_ch, long n_tp){ +void CARFACOutput::InitOutput(int n_ears, int n_ch, long n_tp) { n_ears_ = n_ears; ears_ = new EarOutput[n_ears_]; - for (int i = 0; i < n_ears_; i++){ - ears_[i].InitOutput(n_ch,n_tp); + for (int i = 0; i < n_ears_; i++) { + ears_[i].InitOutput(n_ch, n_tp); } } -void CARFACOutput::MergeOutput(CARFACOutput output, long start, long length){ +void CARFACOutput::MergeOutput(CARFACOutput output, long start, long length) { for (int i = 0; i < n_ears_; i++){ ears_[i].MergeOutput(output.ears_[i], start, length); }