fly/flightgear
1
0
Fork 0
Code Activity

renamed to DampedOscillation

Browse source
This commit is contained in:
Thomas Albrecht 2015-04-07 21:29:00 +10:00
parent 92e6e25d33
commit c8115f516c
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/Autopilot/digitalfilter.cxx
View file

@ -155,7 +155,7 @@ public:
}; };
// integrates x" + ax' + bx + c = 0 // integrates x" + ax' + bx + c = 0
class DampedOsciFilterImplementation : public GainFilterImplementation { class DampedOscillationFilterImplementation : public GainFilterImplementation {
protected: protected:
InputValueList _aInput; InputValueList _aInput;
InputValueList _bInput; InputValueList _bInput;
@ -167,7 +167,7 @@ protected:
const std::string& cfg_name, const std::string& cfg_name,
SGPropertyNode& prop_root ); SGPropertyNode& prop_root );
public: public:
DampedOsciFilterImplementation(); DampedOscillationFilterImplementation();
double compute( double dt, double input ); double compute( double dt, double input );
virtual void initialize( double initvalue ); virtual void initialize( double initvalue );
}; };
@ -525,17 +525,17 @@ double IntegratorFilterImplementation::compute( double dt, double input )
} }
/* --------------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------------- */
DampedOsciFilterImplementation::DampedOsciFilterImplementation() : DampedOscillationFilterImplementation::DampedOscillationFilterImplementation() :
_x0(0.0) _x0(0.0)
{ {
} }
void DampedOsciFilterImplementation::initialize( double initvalue ) void DampedOscillationFilterImplementation::initialize( double initvalue )
{ {
_x2 = _x1 = _x0 = initvalue; _x2 = _x1 = _x0 = initvalue;
} }
bool DampedOsciFilterImplementation::configure( SGPropertyNode& cfg_node, bool DampedOscillationFilterImplementation::configure( SGPropertyNode& cfg_node,
const std::string& cfg_name, const std::string& cfg_name,
SGPropertyNode& prop_root ) SGPropertyNode& prop_root )
{ {
@ -557,7 +557,7 @@ bool DampedOsciFilterImplementation::configure( SGPropertyNode& cfg_node,
return false; return false;
} }
double DampedOsciFilterImplementation::compute( double dt, double input ) double DampedOscillationFilterImplementation::compute( double dt, double input )
{ {
if (fabs(input) > 1e-15) { if (fabs(input) > 1e-15) {
double dz = dt * input; double dz = dt * input;
@ -716,7 +716,7 @@ bool DigitalFilter::configure( SGPropertyNode& prop_root,
componentForge["high-pass" ] = digitalFilterFactory<HighPassFilterImplementation>; componentForge["high-pass" ] = digitalFilterFactory<HighPassFilterImplementation>;
componentForge["lead-lag" ] = digitalFilterFactory<LeadLagFilterImplementation>; componentForge["lead-lag" ] = digitalFilterFactory<LeadLagFilterImplementation>;
componentForge["integrator" ] = digitalFilterFactory<IntegratorFilterImplementation>; componentForge["integrator" ] = digitalFilterFactory<IntegratorFilterImplementation>;
componentForge["damped-osci" ] = digitalFilterFactory<DampedOsciFilterImplementation>; componentForge["damped-oscillation" ] = digitalFilterFactory<DampedOscillationFilterImplementation>;
} }
const std::string type = cfg.getStringValue("type"); const std::string type = cfg.getStringValue("type");