Minor corrections

diff --git a/src/daComposant/daAlgorithms/DerivativeFreeOptimization.py b/src/daComposant/daAlgorithms/DerivativeFreeOptimization.py
index b3649ba9afe2e18e1dfa0b247c5c748bb74434b7..2ae938dfd4d60f8651554d2b3f5ee218cfd5058d 100644 (file)
--- 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 aca70e6ce76e5df52d0ee7366c0c4082820ede9b..3e81578e84ea9afba571922052725ab2d9dec086 100644 (file)
--- 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)"