Skip to content
Snippets Groups Projects
Commit ea378671 authored by James Goppert's avatar James Goppert
Browse files

Fixed bug in nelder mead.

parent 5bbc67da
No related branches found
No related tags found
No related merge requests found
...@@ -30,7 +30,7 @@ namespace JSBSim ...@@ -30,7 +30,7 @@ namespace JSBSim
FGNelderMead::FGNelderMead(Function & f, const std::vector<double> & initialGuess, FGNelderMead::FGNelderMead(Function & f, const std::vector<double> & initialGuess,
const std::vector<double> & lowerBound, const std::vector<double> & lowerBound,
const std::vector<double> & upperBound, 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, double rtol, double abstol, double speed, bool showConvergeStatus,
bool showSimplex, bool pause, Callback * callback) : bool showSimplex, bool pause, Callback * callback) :
m_f(f), m_lowerBound(lowerBound), m_upperBound(upperBound), m_f(f), m_lowerBound(lowerBound), m_upperBound(upperBound),
......
...@@ -44,7 +44,7 @@ public: ...@@ -44,7 +44,7 @@ public:
FGNelderMead(Function & f, const std::vector<double> & initialGuess, FGNelderMead(Function & f, const std::vector<double> & initialGuess,
const std::vector<double> & lowerBound, const std::vector<double> & lowerBound,
const std::vector<double> & upperBound, 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 rtol=std::numeric_limits<float>::epsilon(),
double abstol=std::numeric_limits<float>::epsilon(), double abstol=std::numeric_limits<float>::epsilon(),
double speed = 2.0, double speed = 2.0,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment