The following commit has been merged in the master branch:
commit 43fb2f0976cf09824c1791b064e735861637f17d
Author: Andrei Zavada <[email protected]>
Date: Sat Nov 17 23:23:36 2012 +0200
make some enum ids like Erlang atoms
diff --git a/src/metrics/mc.cc b/src/metrics/mc.cc
index cabf020..ce37278 100644
--- a/src/metrics/mc.cc
+++ b/src/metrics/mc.cc
@@ -191,11 +191,11 @@ do_sssu_reduction( const valarray<TFloat>& signal,
double bandwidth)
{
sigproc::CFilterDUE
- due_filter (samplerate,
sigproc::CFilterIIR::TFilterDirection::Forward,
+ due_filter (samplerate,
sigproc::CFilterIIR::TFilterDirection::forward,
mc_gain, iir_backpolate,
fc);
sigproc::CFilterSE
- se_filter (samplerate,
sigproc::CFilterIIR::TFilterDirection::Forward,
+ se_filter (samplerate,
sigproc::CFilterIIR::TFilterDirection::forward,
mc_gain, iir_backpolate,
f0, fc,
bandwidth);
diff --git a/src/sigproc/ext-filters.cc b/src/sigproc/ext-filters.cc
index edbaae8..78e4d37 100644
--- a/src/sigproc/ext-filters.cc
+++ b/src/sigproc/ext-filters.cc
@@ -107,12 +107,12 @@ apply( const valarray<TFloat>& in, bool
use_first_sample_to_reset)
int d;
switch ( direction ) {
- case Forward:
+ case forward:
i = 0;
l = in.size();
d = 1;
break;
- case Back:
+ case back:
i = in.size()-1;
l = 0-1;
d = -1;
diff --git a/src/sigproc/ext-filters.hh b/src/sigproc/ext-filters.hh
index 166f623..f17b80f 100644
--- a/src/sigproc/ext-filters.hh
+++ b/src/sigproc/ext-filters.hh
@@ -28,15 +28,16 @@ class CFilter_base {
CFilter_base() = delete;
public:
- enum TFilterDirection { Forward, Back };
+ enum TFilterDirection { forward, back };
+
protected:
size_t samplerate;
TFilterDirection direction;
- CFilter_base( size_t samplerate_,
- TFilterDirection direction_ = Forward)
- : samplerate (samplerate_),
- direction (direction_)
+ CFilter_base (size_t samplerate_,
+ TFilterDirection direction_ = forward)
+ : samplerate (samplerate_),
+ direction (direction_)
{
if ( samplerate_ == 0 )
throw invalid_argument ("CFilter_base():
samplerate is 0");
--
Sleep experiment manager
_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
