From: Jean-Philippe ARGAUD <D18530@dsp0721113.postes.calibre.edf.fr>
Date: Mon, 12 Dec 2016 06:33:11 +0000 (+0100)
Subject: Minor corrections
X-Git-Tag: V8_2_0~1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=690c0682f92ee1deb7a4ed5fa0a9aa8c596ce2ad;p=modules%2Fadao.git

Minor corrections
---

diff --git a/src/daComposant/daAlgorithms/DerivativeFreeOptimization.py b/src/daComposant/daAlgorithms/DerivativeFreeOptimization.py
index b3649ba..2ae938d 100644
--- a/src/daComposant/daAlgorithms/DerivativeFreeOptimization.py
+++ b/src/daComposant/daAlgorithms/DerivativeFreeOptimization.py
@@ -186,7 +186,7 @@ class ElementaryAlgorithm(BasicObjects.Algorithm):
                 x0          = Xini,
                 args        = (self._parameters["QualityCriterion"],),
                 maxiter     = self._parameters["MaximumNumberOfSteps"]-1,
-                maxfun      = self._parameters["MaximumNumberOfFunctionEvaluations"]-1,
+                maxfun      = self._parameters["MaximumNumberOfFunctionEvaluations"],
                 xtol        = self._parameters["StateVariationTolerance"],
                 ftol        = self._parameters["CostDecrementTolerance"],
                 full_output = True,
@@ -198,7 +198,7 @@ class ElementaryAlgorithm(BasicObjects.Algorithm):
                 x0          = Xini,
                 args        = (self._parameters["QualityCriterion"],),
                 maxiter     = self._parameters["MaximumNumberOfSteps"]-1,
-                maxfun      = self._parameters["MaximumNumberOfFunctionEvaluations"]-1,
+                maxfun      = self._parameters["MaximumNumberOfFunctionEvaluations"],
                 xtol        = self._parameters["StateVariationTolerance"],
                 ftol        = self._parameters["CostDecrementTolerance"],
                 full_output = True,
@@ -218,8 +218,9 @@ class ElementaryAlgorithm(BasicObjects.Algorithm):
                 func        = CostFunction,
                 x0          = Xini,
                 cons        = make_constraints( Bounds ),
+                args        = (self._parameters["QualityCriterion"],),
                 consargs    = (), # To avoid extra-args
-                maxfun      = self._parameters["MaximumNumberOfFunctionEvaluations"]-1,
+                maxfun      = self._parameters["MaximumNumberOfFunctionEvaluations"],
                 rhobeg      = 1.0,
                 rhoend      = self._parameters["StateVariationTolerance"],
                 catol       = 2.*self._parameters["StateVariationTolerance"],
diff --git a/src/daComposant/daCore/version.py b/src/daComposant/daCore/version.py
index aca70e6..3e81578 100644
--- a/src/daComposant/daCore/version.py
+++ b/src/daComposant/daCore/version.py
@@ -27,5 +27,5 @@ __author__ = "Jean-Philippe ARGAUD"
 __all__ = []
 
 name    = "Data Assimilation Package"
-version = "0.13.0"
-date    = "jeudi 31 mars 2016, 12:12:12 (UTC+0100)"
+version = "16.12.08"
+date    = "jeudi 8 décembre 2016, 12:12:12 (UTC+0100)"