]> git.mxchange.org Git - flightgear.git/blobdiff - src/Autopilot/digitalfilter.cxx
Cleanup, no functional change
[flightgear.git] / src / Autopilot / digitalfilter.cxx
index 26377e13141b289635ca871e4103579e0b5c66fb..e44ce4cf287ee6d9fdcd7ad0d0a448e1488f151e 100644 (file)
@@ -6,6 +6,10 @@
 // Copyright (C) 2004  Curtis L. Olson  - http://www.flightgear.org/~curt
 // Copyright (C) 2010  Torsten Dreyer - Torsten (at) t3r (dot) de
 //
+// Washout/high-pass filter, lead-lag filter and integrator added.
+// low-pass and lag aliases added to Exponential filter, 
+// rate-limit added.   A J Teeder 2013
+//
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License as
 // published by the Free Software Foundation; either version 2 of the
 //
 
 #include "digitalfilter.hxx"
-#include "functor.hxx"
 #include <deque>
 
-using std::map;
-using std::string;
-using std::endl;
-using std::cout;
-
-namespace FGXMLAutopilot {
+namespace FGXMLAutopilot
+{
 
 /**
  *
  *
  */
-class DigitalFilterImplementation : public SGReferenced {
-protected:
-  virtual bool configure( const std::string & nodeName, SGPropertyNode_ptr configNode) = 0;
-public:
-  virtual ~DigitalFilterImplementation() {}
-  DigitalFilterImplementation();
-  virtual void   initialize( double output ) {}
-  virtual double compute( double dt, double input ) = 0;
-  bool configure( SGPropertyNode_ptr configNode );
-
-  void setDigitalFilter( DigitalFilter * digitalFilter ) { _digitalFilter = digitalFilter; }
-
-protected:
-  DigitalFilter * _digitalFilter;
+class DigitalFilterImplementation:
+  public SGReferenced
+{
+  public:
+    virtual ~DigitalFilterImplementation() {}
+    DigitalFilterImplementation();
+    virtual void   initialize( double initvalue ) {}
+    virtual double compute( double dt, double input ) = 0;
+    virtual bool configure( SGPropertyNode& cfg_node,
+                            const std::string& cfg_name,
+                            SGPropertyNode& prop_root ) = 0;
+
+    void setDigitalFilter( DigitalFilter * digitalFilter ) { _digitalFilter = digitalFilter; }
+
+  protected:
+    DigitalFilter * _digitalFilter;
 };
 
 /* --------------------------------------------------------------------------------- */
@@ -57,7 +58,9 @@ protected:
 class GainFilterImplementation : public DigitalFilterImplementation {
 protected:
   InputValueList _gainInput;
-  bool configure( const std::string & nodeName, SGPropertyNode_ptr configNode );
+  bool configure( SGPropertyNode& cfg_node,
+                  const std::string& cfg_name,
+                  SGPropertyNode& prop_root );
 public:
   GainFilterImplementation() : _gainInput(1.0) {}
   double compute(  double dt, double input );
@@ -71,22 +74,27 @@ public:
 class DerivativeFilterImplementation : public GainFilterImplementation {
   InputValueList _TfInput;
   double _input_1;
-  bool configure( const std::string & nodeName, SGPropertyNode_ptr configNode );
+  bool configure( SGPropertyNode& cfg_node,
+                  const std::string& cfg_name,
+                  SGPropertyNode& prop_root );
 public:
   DerivativeFilterImplementation();
   double compute(  double dt, double input );
+  virtual void initialize( double initvalue );
 };
 
 class ExponentialFilterImplementation : public GainFilterImplementation {
 protected:
   InputValueList _TfInput;
-  bool configure( const std::string & nodeName, SGPropertyNode_ptr configNode );
+  bool configure( SGPropertyNode& cfg_node,
+                  const std::string& cfg_name,
+                  SGPropertyNode& prop_root );
   bool _isSecondOrder;
-  double output_1, output_2;
+  double _output_1, _output_2;
 public:
   ExponentialFilterImplementation();
   double compute(  double dt, double input );
-  virtual void initialize( double output );
+  virtual void initialize( double initvalue );
 };
 
 class MovingAverageFilterImplementation : public DigitalFilterImplementation {
@@ -94,24 +102,85 @@ protected:
   InputValueList _samplesInput;
   double _output_1;
   std::deque <double> _inputQueue;
-  bool configure( const std::string & nodeName, SGPropertyNode_ptr configNode );
+  bool configure( SGPropertyNode& cfg_node,
+                  const std::string& cfg_name,
+                  SGPropertyNode& prop_root );
 public:
   MovingAverageFilterImplementation();
   double compute(  double dt, double input );
-  virtual void initialize( double output );
+  virtual void initialize( double initvalue );
 };
 
 class NoiseSpikeFilterImplementation : public DigitalFilterImplementation {
 protected:
   double _output_1;
   InputValueList _rateOfChangeInput;
-  bool configure( const std::string & nodeName, SGPropertyNode_ptr configNode );
+  bool configure( SGPropertyNode& cfg_node,
+                  const std::string& cfg_name,
+                  SGPropertyNode& prop_root );
 public:
   NoiseSpikeFilterImplementation();
   double compute(  double dt, double input );
-  virtual void initialize( double output );
+  virtual void initialize( double initvalue );
+};
+
+class RateLimitFilterImplementation : public DigitalFilterImplementation {
+protected:
+  double _output_1;
+  InputValueList _rateOfChangeMax;
+  InputValueList _rateOfChangeMin ;
+  bool configure( SGPropertyNode& cfg_node,
+                  const std::string& cfg_name,
+                  SGPropertyNode& prop_root );
+public:
+  RateLimitFilterImplementation();
+  double compute(  double dt, double input );
+  virtual void initialize( double initvalue );
+};
+
+class IntegratorFilterImplementation : public GainFilterImplementation {
+protected:
+  InputValueList _TfInput;
+  InputValueList _minInput;
+  InputValueList _maxInput;
+  double _input_1;
+  double _output_1;
+  bool configure( SGPropertyNode& cfg_node,
+                  const std::string& cfg_name,
+                  SGPropertyNode& prop_root );
+public:
+  IntegratorFilterImplementation();
+  double compute(  double dt, double input );
+  virtual void initialize( double initvalue );
 };
 
+class HighPassFilterImplementation : public GainFilterImplementation {
+protected:
+  InputValueList _TfInput;
+  double _input_1;
+  double _output_1;
+  bool configure( SGPropertyNode& cfg_node,
+                  const std::string& cfg_name,
+                  SGPropertyNode& prop_root );
+public:
+  HighPassFilterImplementation();
+  double compute(  double dt, double input );
+  virtual void initialize( double initvalue );
+};
+class LeadLagFilterImplementation : public GainFilterImplementation {
+protected:
+  InputValueList _TfaInput;
+  InputValueList _TfbInput;
+  double _input_1;
+  double _output_1;
+  bool configure( SGPropertyNode& cfg_node,
+                  const std::string& cfg_name,
+                  SGPropertyNode& prop_root );
+public:
+  LeadLagFilterImplementation();
+  double compute(  double dt, double input );
+  virtual void initialize( double initvalue );
+};
 /* --------------------------------------------------------------------------------- */
 /* --------------------------------------------------------------------------------- */
 
@@ -119,41 +188,25 @@ public:
 
 using namespace FGXMLAutopilot;
 
-/* --------------------------------------------------------------------------------- */
-/* --------------------------------------------------------------------------------- */
+//------------------------------------------------------------------------------
 DigitalFilterImplementation::DigitalFilterImplementation() :
   _digitalFilter(NULL)
 {
-}
-
-bool DigitalFilterImplementation::configure( SGPropertyNode_ptr configNode )
-{
-  for (int i = 0; i < configNode->nChildren(); ++i ) {
-    SGPropertyNode_ptr prop;
 
-    SGPropertyNode_ptr child = configNode->getChild(i);
-    string cname(child->getName());
-
-    if( configure( cname, child ) )
-      continue;
-
-  } // for configNode->nChildren()
-
-  return true;
 }
 
-/* --------------------------------------------------------------------------------- */
-/* --------------------------------------------------------------------------------- */
-
+//------------------------------------------------------------------------------
 double GainFilterImplementation::compute(  double dt, double input )
 {
   return _gainInput.get_value() * input;
 }
 
-bool GainFilterImplementation::configure( const std::string & nodeName, SGPropertyNode_ptr configNode )
+bool GainFilterImplementation::configure( SGPropertyNode& cfg_node,
+                                          const std::string& cfg_name,
+                                          SGPropertyNode& prop_root )
 {
-  if (nodeName == "gain" ) {
-    _gainInput.push_back( new InputValue( configNode, 1 ) );
+  if (cfg_name == "gain" ) {
+    _gainInput.push_back( new InputValue(prop_root, cfg_node, 1) );
     return true;
   }
 
@@ -180,13 +233,21 @@ DerivativeFilterImplementation::DerivativeFilterImplementation() :
 {
 }
 
-bool DerivativeFilterImplementation::configure( const std::string & nodeName, SGPropertyNode_ptr configNode )
+void DerivativeFilterImplementation::initialize( double initvalue )
+{
+  _input_1 = initvalue;
+}
+
+//------------------------------------------------------------------------------
+bool DerivativeFilterImplementation::configure( SGPropertyNode& cfg_node,
+                                                const std::string& cfg_name,
+                                                SGPropertyNode& prop_root )
 {
-  if( GainFilterImplementation::configure( nodeName, configNode ) )
+  if( GainFilterImplementation::configure(cfg_node, cfg_name, prop_root) )
     return true;
 
-  if (nodeName == "filter-time" ) {
-    _TfInput.push_back( new InputValue( configNode, 1 ) );
+  if (cfg_name == "filter-time" ) {
+    _TfInput.push_back( new InputValue(prop_root, cfg_node, 1) );
     return true;
   }
 
@@ -209,27 +270,42 @@ MovingAverageFilterImplementation::MovingAverageFilterImplementation() :
 {
 }
 
-void MovingAverageFilterImplementation::initialize( double output )
+void MovingAverageFilterImplementation::initialize( double initvalue )
 {
-  _output_1 = output;
+  _output_1 = initvalue;
 }
 
 double MovingAverageFilterImplementation::compute(  double dt, double input )
 {
-  std::deque<double>::size_type samples = _samplesInput.get_value();
-  _inputQueue.resize(samples+1, 0.0);
+  typedef std::deque<double>::size_type size_type;
+  size_type samples = _samplesInput.get_value();
+
+  if (_inputQueue.size() != samples) {
+    // For constant size filters, this code executed once.
+    bool shrunk = _inputQueue.size() > samples;
+    _inputQueue.resize(samples, _output_1);
+    if (shrunk) {
+      _output_1 = 0.0;
+      for (size_type ii = 0; ii < samples; ii++)
+      _output_1 += _inputQueue[ii];
+      _output_1 /= samples;
+    }
+  }
 
   double output_0 = _output_1 + (input - _inputQueue.back()) / samples;
 
   _output_1 = output_0;
+  _inputQueue.pop_back();
   _inputQueue.push_front(input);
   return output_0;
 }
 
-bool MovingAverageFilterImplementation::configure( const std::string & nodeName, SGPropertyNode_ptr configNode )
+bool MovingAverageFilterImplementation::configure( SGPropertyNode& cfg_node,
+                                                   const std::string& cfg_name,
+                                                   SGPropertyNode& prop_root )
 {
-  if (nodeName == "samples" ) {
-    _samplesInput.push_back( new InputValue( configNode, 1 ) );
+  if (cfg_name == "samples" ) {
+    _samplesInput.push_back( new InputValue(prop_root, cfg_node, 1) );
     return true;
   }
 
@@ -244,9 +320,9 @@ NoiseSpikeFilterImplementation::NoiseSpikeFilterImplementation() :
 {
 }
 
-void NoiseSpikeFilterImplementation::initialize( double output )
+void NoiseSpikeFilterImplementation::initialize( double initvalue )
 {
-  _output_1 = output;
+  _output_1 = initvalue;
 }
 
 double NoiseSpikeFilterImplementation::compute(  double dt, double input )
@@ -264,10 +340,62 @@ double NoiseSpikeFilterImplementation::compute(  double dt, double input )
     return (_output_1 = _output_1 + copysign( maxChange, delta ));
 }
 
-bool NoiseSpikeFilterImplementation::configure( const std::string & nodeName, SGPropertyNode_ptr configNode )
+//------------------------------------------------------------------------------
+bool NoiseSpikeFilterImplementation::configure( SGPropertyNode& cfg_node,
+                                                const std::string& cfg_name,
+                                                SGPropertyNode& prop_root )
+{
+  if (cfg_name == "max-rate-of-change" ) {
+    _rateOfChangeInput.push_back( new InputValue(prop_root, cfg_node, 1) );
+    return true;
+  }
+
+  return false;
+}
+
+/* --------------------------------------------------------------------------------- */
+
+RateLimitFilterImplementation::RateLimitFilterImplementation() :
+  _output_1(0.0)
+{
+}
+
+void RateLimitFilterImplementation::initialize( double initvalue )
+{
+  _output_1 = initvalue;
+}
+
+double RateLimitFilterImplementation::compute(  double dt, double input )
+{
+  double delta = input - _output_1;
+  double output;
+
+  if( fabs(delta) <= SGLimitsd::min() ) return input; // trivial
+
+  double maxChange = _rateOfChangeMax.get_value() * dt;
+  double minChange = _rateOfChangeMin.get_value() * dt;
+//  const PeriodicalValue * periodical = _digitalFilter->getPeriodicalValue();
+//  if( periodical ) delta = periodical->normalizeSymmetric( delta );
+
+  output = input;
+  if(delta >= maxChange ) output = _output_1 + maxChange;
+  if(delta <= minChange ) output = _output_1 + minChange;
+  _output_1 = output;
+
+  return (output);
+}
+
+bool RateLimitFilterImplementation::configure( SGPropertyNode& cfg_node,
+                                               const std::string& cfg_name,
+                                               SGPropertyNode& prop_root )
 {
-  if (nodeName == "max-rate-of-change" ) {
-    _rateOfChangeInput.push_back( new InputValue( configNode, 1 ) );
+  std::cout << "RateLimitFilterImplementation " << cfg_name << std::endl;
+  if (cfg_name == "max-rate-of-change" ) {
+    _rateOfChangeMax.push_back( new InputValue(prop_root, cfg_node, 1) );
+    return true;
+  }
+  if (cfg_name == "min-rate-of-change" ) {
+    _rateOfChangeMin.push_back( new InputValue(prop_root, cfg_node, 1) );
     return true;
   }
 
@@ -279,14 +407,14 @@ bool NoiseSpikeFilterImplementation::configure( const std::string & nodeName, SG
 
 ExponentialFilterImplementation::ExponentialFilterImplementation()
   : _isSecondOrder(false),
-    output_1(0.0),
-    output_2(0.0)
+    _output_1(0.0),
+    _output_2(0.0)
 {
 }
 
-void ExponentialFilterImplementation::initialize( double output )
+void ExponentialFilterImplementation::initialize( double initvalue )
 {
-  output_1 = output_2 = output;
+  _output_1 = _output_2 = initvalue;
 }
 
 double ExponentialFilterImplementation::compute(  double dt, double input )
@@ -303,27 +431,30 @@ double ExponentialFilterImplementation::compute(  double dt, double input )
  
   if(_isSecondOrder) {
     output_0 = alpha * alpha * input + 
-               2 * (1 - alpha) * output_1 -
-              (1 - alpha) * (1 - alpha) * output_2;
+               2 * (1 - alpha) * _output_1 -
+              (1 - alpha) * (1 - alpha) * _output_2;
   } else {
-    output_0 = alpha * input + (1 - alpha) * output_1;
+    output_0 = alpha * input + (1 - alpha) * _output_1;
   }
-  output_2 = output_1;
-  return (output_1 = output_0);
+  _output_2 = _output_1;
+  return (_output_1 = output_0);
 }
 
-bool ExponentialFilterImplementation::configure( const std::string & nodeName, SGPropertyNode_ptr configNode )
+//------------------------------------------------------------------------------
+bool ExponentialFilterImplementation::configure( SGPropertyNode& cfg_node,
+                                                 const std::string& cfg_name,
+                                                 SGPropertyNode& prop_root )
 {
-  if( GainFilterImplementation::configure( nodeName, configNode ) )
+  if( GainFilterImplementation::configure(cfg_node, cfg_name, prop_root) )
     return true;
 
-  if (nodeName == "filter-time" ) {
-    _TfInput.push_back( new InputValue( configNode, 1 ) );
+  if (cfg_name == "filter-time" ) {
+    _TfInput.push_back( new InputValue(prop_root, cfg_node, 1) );
     return true;
   }
 
-  if (nodeName == "type" ) {
-    string type(configNode->getStringValue());
+  if (cfg_name == "type" ) {
+    std::string type(cfg_node.getStringValue());
     _isSecondOrder = type == "double-exponential";
   }
 
@@ -331,9 +462,154 @@ bool ExponentialFilterImplementation::configure( const std::string & nodeName, S
 }
 
 /* --------------------------------------------------------------------------------- */
-/* Digital Filter Component Implementation                                           */
+
+IntegratorFilterImplementation::IntegratorFilterImplementation() :
+  _input_1(0.0),
+  _output_1(0.0)
+{
+}
+
+void IntegratorFilterImplementation::initialize( double initvalue )
+{
+  _input_1 = _output_1 = initvalue;
+}
+
+//------------------------------------------------------------------------------
+bool IntegratorFilterImplementation::configure( SGPropertyNode& cfg_node,
+                                                const std::string& cfg_name,
+                                                SGPropertyNode& prop_root )
+{
+  if( GainFilterImplementation::configure(cfg_node, cfg_name, prop_root) )
+    return true;
+
+  if (cfg_name == "u_min" ) {
+    _minInput.push_back( new InputValue(prop_root, cfg_node, 1) );
+    return true;
+  }
+  if (cfg_name == "u_max" ) {
+    _maxInput.push_back( new InputValue(prop_root, cfg_node, 1) );
+    return true;
+  }
+  return false;
+}
+
+double IntegratorFilterImplementation::compute(  double dt, double input )
+{
+  double output = _output_1 + input *  _gainInput.get_value() * dt;
+  double u_min = _minInput.get_value();
+  double u_max = _maxInput.get_value();
+  if (output >= u_max) output = u_max; // clamping inside "::compute" prevents integrator wind-up
+  if (output <= u_min) output = u_min;
+  _input_1 = input;
+  _output_1 = output;
+  return output;
+
+}
+
 /* --------------------------------------------------------------------------------- */
 
+HighPassFilterImplementation::HighPassFilterImplementation() :
+  _input_1(0.0),
+  _output_1(0.0)
+
+{
+}
+
+void HighPassFilterImplementation::initialize( double initvalue )
+{
+  _input_1 = initvalue;
+  _output_1 = initvalue;
+}
+
+double HighPassFilterImplementation::compute(  double dt, double input )
+{
+  input = GainFilterImplementation::compute( dt, input );
+  double tf = _TfInput.get_value();
+
+  double output;
+
+  // avoid negative filter times 
+  // and div by zero if -tf == dt
+
+  double alpha = tf > 0.0 ? 1 / ((tf/dt) + 1) : 1.0;
+  output = (1 - alpha) * (input - _input_1 +  _output_1);
+  _input_1 = input;
+  _output_1 = output;
+  return output;
+}
+
+//------------------------------------------------------------------------------
+bool HighPassFilterImplementation::configure( SGPropertyNode& cfg_node,
+                                              const std::string& cfg_name,
+                                              SGPropertyNode& prop_root )
+{
+  if( GainFilterImplementation::configure(cfg_node, cfg_name, prop_root) )
+    return true;
+
+  if (cfg_name == "filter-time" ) {
+    _TfInput.push_back( new InputValue(prop_root, cfg_node, 1) );
+    return true;
+  }
+  return false;
+}
+
+/* --------------------------------------------------------------------------------- */
+
+LeadLagFilterImplementation::LeadLagFilterImplementation() :
+  _input_1(0.0),
+  _output_1(0.0)
+
+{
+}
+
+void LeadLagFilterImplementation::initialize( double initvalue )
+{
+  _input_1 = initvalue;
+  _output_1 = initvalue;
+}
+
+double LeadLagFilterImplementation::compute(  double dt, double input )
+{
+  input = GainFilterImplementation::compute( dt, input );
+  double tfa = _TfaInput.get_value();
+  double tfb = _TfbInput.get_value();
+
+  double output;
+
+  // avoid negative filter times 
+  // and div by zero if -tf == dt
+
+  double alpha = tfa > 0.0 ? 1 / ((tfa/dt) + 1) : 1.0;
+  double beta = tfb > 0.0 ? 1 / ((tfb/dt) + 1) : 1.0;
+  output = (1 - beta) * (input / (1 - alpha) - _input_1 + _output_1);
+  _input_1 = input;
+  _output_1 = output;
+  return output;
+}
+
+//------------------------------------------------------------------------------
+bool LeadLagFilterImplementation::configure( SGPropertyNode& cfg_node,
+                                             const std::string& cfg_name,
+                                             SGPropertyNode& prop_root )
+{
+  if( GainFilterImplementation::configure(cfg_node, cfg_name, prop_root) )
+    return true;
+
+  if (cfg_name == "filter-time-a" ) {
+    _TfaInput.push_back( new InputValue(prop_root, cfg_node, 1) );
+    return true;
+  }
+  if (cfg_name == "filter-time-b" ) {
+    _TfbInput.push_back( new InputValue(prop_root, cfg_node, 1) );
+    return true;
+  }
+  return false;
+}
+/* -------------------------------------------------------------------------- */
+/* Digital Filter Component Implementation                                    */
+/* -------------------------------------------------------------------------- */
+
 DigitalFilter::DigitalFilter() :
     AnalogComponent(),
     _initializeTo(INITIALIZE_INPUT)
@@ -344,54 +620,96 @@ DigitalFilter::~DigitalFilter()
 {
 }
 
+//------------------------------------------------------------------------------
+template<class DigitalFilterType>
+DigitalFilterImplementation* digitalFilterFactory()
+{
+  return new DigitalFilterType();
+}
 
-static map<string,FunctorBase<DigitalFilterImplementation> *> componentForge;
+typedef std::map<std::string, DigitalFilterImplementation*(*)()>
+DigitalFilterMap;
+static DigitalFilterMap componentForge;
 
-bool DigitalFilter::configure(const string& nodeName, SGPropertyNode_ptr configNode)
+//------------------------------------------------------------------------------
+bool DigitalFilter::configure( SGPropertyNode& prop_root,
+                               SGPropertyNode& cfg )
 {
-  if( componentForge.empty() ) {
-    componentForge["gain"] = new CreateAndConfigureFunctor<GainFilterImplementation,DigitalFilterImplementation>();
-    componentForge["exponential"] = new CreateAndConfigureFunctor<ExponentialFilterImplementation,DigitalFilterImplementation>();
-    componentForge["double-exponential"] = new CreateAndConfigureFunctor<ExponentialFilterImplementation,DigitalFilterImplementation>();
-    componentForge["moving-average"] = new CreateAndConfigureFunctor<MovingAverageFilterImplementation,DigitalFilterImplementation>();
-    componentForge["noise-spike"] = new CreateAndConfigureFunctor<NoiseSpikeFilterImplementation,DigitalFilterImplementation>();
-    componentForge["reciprocal"] = new CreateAndConfigureFunctor<ReciprocalFilterImplementation,DigitalFilterImplementation>();
-    componentForge["derivative"] = new CreateAndConfigureFunctor<DerivativeFilterImplementation,DigitalFilterImplementation>();
+  if( componentForge.empty() )
+  {
+    componentForge["gain"               ] = digitalFilterFactory<GainFilterImplementation>;
+    componentForge["exponential"        ] = digitalFilterFactory<ExponentialFilterImplementation>;
+    componentForge["double-exponential" ] = digitalFilterFactory<ExponentialFilterImplementation>;
+    componentForge["moving-average"     ] = digitalFilterFactory<MovingAverageFilterImplementation>;
+    componentForge["noise-spike"        ] = digitalFilterFactory<NoiseSpikeFilterImplementation>;
+    componentForge["rate-limit"         ] = digitalFilterFactory<RateLimitFilterImplementation>;
+    componentForge["reciprocal"         ] = digitalFilterFactory<ReciprocalFilterImplementation>;
+    componentForge["derivative"         ] = digitalFilterFactory<DerivativeFilterImplementation>;
+    componentForge["high-pass"          ] = digitalFilterFactory<HighPassFilterImplementation>;
+    componentForge["lead-lag"           ] = digitalFilterFactory<LeadLagFilterImplementation>;
+    componentForge["integrator"         ] = digitalFilterFactory<IntegratorFilterImplementation>;
   }
 
-  SG_LOG( SG_AUTOPILOT, SG_BULK, "DigitalFilter::configure(" << nodeName << ")" << endl );
-  if( AnalogComponent::configure( nodeName, configNode ) )
-    return true;
+  const std::string type = cfg.getStringValue("type");
+  DigitalFilterMap::iterator component_factory = componentForge.find(type);
+  if( component_factory == componentForge.end() )
+  {
+    SG_LOG(SG_AUTOPILOT, SG_WARN, "unhandled filter type '" << type << "'");
+    return false;
+  }
 
-  if (nodeName == "type" ) {
-    string type( configNode->getStringValue() );
-    if( componentForge.count(type) == 0 ) {
-      SG_LOG( SG_AUTOPILOT, SG_BULK, "unhandled filter type <" << type << ">" << endl );
-      return true;
-    }
-    _implementation = (*componentForge[type])( configNode->getParent() );
-    _implementation->setDigitalFilter( this );
-    return true;
+  _implementation = (*component_factory->second)();
+  _implementation->setDigitalFilter( this );
+
+  for( int i = 0; i < cfg.nChildren(); ++i )
+  {
+    SGPropertyNode_ptr child = cfg.getChild(i);
+    std::string cname(child->getName());
+
+    if(    !_implementation->configure(*child, cname, prop_root)
+        && !configure(*child, cname, prop_root)
+        && cname != "type"
+        && cname != "params" ) // 'params' is usually used to specify parameters
+                               // in PropertList files.
+      SG_LOG
+      (
+        SG_AUTOPILOT,
+        SG_WARN,
+        "DigitalFilter: unknown config node: " << cname
+      );
   }
 
-  if( nodeName == "initialize-to" ) {
-    string s( configNode->getStringValue() );
-    if( s == "input" ) {
+  return true;
+}
+
+//------------------------------------------------------------------------------
+bool DigitalFilter::configure( SGPropertyNode& cfg_node,
+                               const std::string& cfg_name,
+                               SGPropertyNode& prop_root )
+{
+  if( cfg_name == "initialize-to" )
+  {
+    std::string s( cfg_node.getStringValue() );
+    if( s == "input" )
       _initializeTo = INITIALIZE_INPUT;
-    } else if( s == "output" ) {
+    else if( s == "output" )
       _initializeTo = INITIALIZE_OUTPUT;
-    } else if( s == "none" ) {
+    else if( s == "none" )
       _initializeTo = INITIALIZE_NONE;
-    } else {
-      SG_LOG( SG_AUTOPILOT, SG_WARN, "unhandled initialize-to value '" << s << "' ignored" );
-    }
+    else
+      SG_LOG
+      (
+        SG_AUTOPILOT,
+        SG_WARN, "DigitalFilter: initialize-to (" << s << ") ignored"
+      );
+
     return true;
   }
 
-  SG_LOG( SG_AUTOPILOT, SG_BULK, "DigitalFilter::configure(" << nodeName << ") [unhandled]" << endl );
-  return false; // not handled by us, let the base class try
+  return AnalogComponent::configure(cfg_node, cfg_name, prop_root);
 }
 
+//------------------------------------------------------------------------------
 void DigitalFilter::update( bool firstTime, double dt)
 {
   if( _implementation == NULL ) return;
@@ -421,7 +739,7 @@ void DigitalFilter::update( bool firstTime, double dt)
   set_output_value( output );
 
   if(_debug) {
-    cout << "input:" << input
-         << "\toutput:" << output << endl;
+    std::cout << "input:" << input
+              << "\toutput:" << output << std::endl;
   }
 }