From ea3786714ed868c383310b478c5fcb96c0324b2c Mon Sep 17 00:00:00 2001 From: James Goppert <jgoppert@w7.hsl.dynalias.com> Date: Tue, 8 Mar 2011 09:34:23 -0500 Subject: [PATCH] Fixed bug in nelder mead. --- src/math/FGNelderMead.cpp | 2 +- src/math/FGNelderMead.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/math/FGNelderMead.cpp b/src/math/FGNelderMead.cpp index 637f2f2..f48a209 100644 --- a/src/math/FGNelderMead.cpp +++ b/src/math/FGNelderMead.cpp @@ -30,7 +30,7 @@ namespace JSBSim FGNelderMead::FGNelderMead(Function & f, const std::vector<double> & initialGuess, const std::vector<double> & lowerBound, const std::vector<double> & upperBound, - const std::vector<double> initialStepSize, int iterMax, + const std::vector<double> & initialStepSize, int iterMax, double rtol, double abstol, double speed, bool showConvergeStatus, bool showSimplex, bool pause, Callback * callback) : m_f(f), m_lowerBound(lowerBound), m_upperBound(upperBound), diff --git a/src/math/FGNelderMead.h b/src/math/FGNelderMead.h index 4dee0bf..ca6188c 100644 --- a/src/math/FGNelderMead.h +++ b/src/math/FGNelderMead.h @@ -44,7 +44,7 @@ public: FGNelderMead(Function & f, const std::vector<double> & initialGuess, const std::vector<double> & lowerBound, const std::vector<double> & upperBound, - const std::vector<double> initialStepSize, int iterMax=2000, + const std::vector<double> & initialStepSize, int iterMax=2000, double rtol=std::numeric_limits<float>::epsilon(), double abstol=std::numeric_limits<float>::epsilon(), double speed = 2.0, -- GitLab