From 8b9f4d51a86cb2e1a116f3fb2cd8a61e27c370eb Mon Sep 17 00:00:00 2001
From: James Goppert <jgoppert@w7.hsl.dynalias.com>
Date: Tue, 8 Mar 2011 09:56:36 -0500
Subject: [PATCH] Fixed max. iter. bug.
---
src/Trim.cpp | 2 +-
src/math/FGNelderMead.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/Trim.cpp b/src/Trim.cpp
index 8b2d544..733987f 100644
--- a/src/Trim.cpp
+++ b/src/Trim.cpp
@@ -195,7 +195,7 @@ int main (int argc, char const* argv[])
solver = new FGNelderMead(trimmer,initialGuess,
lowerBound, upperBound, initialStepSize,iterMax,rtol,
abstol,speed,showConvergeStatus,showSimplex,pause,&callback);
- while(solver->status()) solver->update();
+ while(solver->status()==1) solver->update();
}
catch (const std::runtime_error & e)
{
diff --git a/src/math/FGNelderMead.cpp b/src/math/FGNelderMead.cpp
index f48a209..f62a3a8 100644
--- a/src/math/FGNelderMead.cpp
+++ b/src/math/FGNelderMead.cpp
@@ -108,7 +108,7 @@ void FGNelderMead::update()
m_cost[m_iMin])/(std::abs(m_cost[m_iMax]+std::abs(m_cost[m_iMin])+
std::numeric_limits<double>::epsilon()));
- // check for max iteratin break condition
+ // check for max iteration break condition
if (iter > iterMax)
{
std::cout << "\nmax iterations exceeded" << std::endl;
--
GitLab