comparison trunk/carfac/carfac_output.h @ 682:10dc41e4d2f2

More small style revisions to C++ CARFAC, adjusted struct member variable naming, header guards and #include structure.
author alexbrandmeyer
date Wed, 29 May 2013 15:37:28 +0000
parents 7def70bdd6b6
children d0612798f6de
comparison
equal deleted inserted replaced
681:7def70bdd6b6 682:10dc41e4d2f2
32 // 32 //
33 // The 'InitOutput' method is used to initialize the arrays in each of the 33 // The 'InitOutput' method is used to initialize the arrays in each of the
34 // EarOutput sub-objects once the target data dimensions ears (n_ears), channels 34 // EarOutput sub-objects once the target data dimensions ears (n_ears), channels
35 // (n_ch) and timepoints (n_tp) are known. 35 // (n_ch) and timepoints (n_tp) are known.
36 36
37 #ifndef CARFAC_Open_Source_C__Library_carfac_output_h 37 #ifndef CARFAC_CARFAC_OUTPUT_H
38 #define CARFAC_Open_Source_C__Library_carfac_output_h 38 #define CARFAC_CARFAC_OUTPUT_H
39 39
40 #include <deque> 40 #include <deque>
41 #include <vector>
42 #include "carfac_common.h"
41 #include "ear.h" 43 #include "ear.h"
42 44
43 class CARFACOutput { 45 class CARFACOutput {
44 public: 46 public:
45 void Init(const int n_ears, const bool store_nap, const bool store_nap_decim, 47 void Init(const int n_ears, const bool store_nap, const bool store_nap_decim,
64 std::deque<std::vector<FloatArray>> bm_; 66 std::deque<std::vector<FloatArray>> bm_;
65 std::deque<std::vector<FloatArray>> ohc_; 67 std::deque<std::vector<FloatArray>> ohc_;
66 std::deque<std::vector<FloatArray>> agc_; 68 std::deque<std::vector<FloatArray>> agc_;
67 }; 69 };
68 70
69 #endif 71 #endif // CARFAC_CARFAC_OUTPUT_H