Mercurial > hg > aimc

changeset 485:181df875bf84 carfac_cpp

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(none)
author Ulf.Hammarqvist@gmail.com
date Sat, 31 Mar 2012 17:36:22 +0000
parents 715fc47a965e
children c6bd1d58e72e
files src/CAR.h src/CARFAC.cpp
diffstat 2 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/CAR.h	Sat Mar 31 17:24:08 2012 +0000
+++ b/src/CAR.h	Sat Mar 31 17:36:22 2012 +0000
@@ -16,8 +16,7 @@
     zero_ratio_(sqrt(2)),
     high_f_damping_compression_(0.5),
     erb_per_step_(0.5),
-    min_pole_hz_(30)
-  {
+    min_pole_hz_(30){
     // do nothing more
   }
 
--- a/src/CARFAC.cpp	Sat Mar 31 17:24:08 2012 +0000
+++ b/src/CARFAC.cpp	Sat Mar 31 17:36:22 2012 +0000
@@ -1,3 +1,5 @@
+#include <cmath>
+
 #include "CARFAC.h"
 #include "CAR.h"
 #include "IHC.h"
@@ -25,6 +27,8 @@
   }
   n_ch_ = pole_freqs_.size(); // STL specific
 
+  max_channels_per_octave_ = log(2) / log(pole_freqs_[0]/pole_freqs_[1]);
+
   // 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_);