From: Jean-Philippe ARGAUD <jean-philippe.argaud@edf.fr>
Date: Thu, 24 Nov 2011 13:37:08 +0000 (+0100)
Subject: Correst warning when using default Minimizer
X-Git-Tag: V6_4_0rc2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=ebc2b935476d7d80ab1b530f2523bb55acbb8535;p=modules%2Fadao.git

Correst warning when using default Minimizer
---

diff --git a/src/daComposant/daAlgorithms/3DVAR.py b/src/daComposant/daAlgorithms/3DVAR.py
index a884154..bc17491 100644
--- a/src/daComposant/daAlgorithms/3DVAR.py
+++ b/src/daComposant/daAlgorithms/3DVAR.py
@@ -64,10 +64,6 @@ class ElementaryAlgorithm(BasicObjects.Algorithm):
             HXb = Hm( Xb )
         HXb = numpy.asmatrix(HXb).flatten().T
         #
-        # Calcul du préconditionnement
-        # ----------------------------
-	# Bdemi = numpy.linalg.cholesky(B)
-        #
         # Calcul de l'innovation
         # ----------------------
         d  = Y - HXb
@@ -129,8 +125,8 @@ class ElementaryAlgorithm(BasicObjects.Algorithm):
         if Parameters.has_key("Minimizer") and (Parameters["Minimizer"] in MinimizerList):
             Minimizer = str( Parameters["Minimizer"] )
         else:
-            logging.warning("%s Minimiseur inconnu ou non fourni, remplacé par la valeur par défaut"%self._name)
             Minimizer = "LBFGSB"
+            logging.warning("%s Unknown or undefined minimizer, replaced by the default one \"%s\""%(self._name,Minimizer))
         logging.debug("%s Minimiseur utilisé = %s"%(self._name, Minimizer))
         if Parameters.has_key("MaximumNumberOfSteps") and (Parameters["MaximumNumberOfSteps"] > -1):
             maxiter = int( Parameters["MaximumNumberOfSteps"] )