From: Jean-Philippe ARGAUD <jean-philippe.argaud@edf.fr>
Date: Sat, 25 Aug 2018 19:18:38 +0000 (+0200)
Subject: Adding DE to standard GUI, and minor Python 3 correction
X-Git-Tag: V9_2_0b_ok_ADAO~11
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=cf8a8e9a9a0a5477aeb973e032d841f274092e1d;p=modules%2Fadao.git

Adding DE to standard GUI, and minor Python 3 correction
---

diff --git a/resources/ADAOSchemaCatalog.xml b/resources/ADAOSchemaCatalog.xml
index 8906525..f531643 100644
--- a/resources/ADAOSchemaCatalog.xml
+++ b/resources/ADAOSchemaCatalog.xml
@@ -61,9 +61,9 @@
 <![CDATA[
 import numpy, logging
 logging.debug("CREATE YI Entering in CreateAssimilationStudy")
-print "Entering in the assimilation study"
-print "Name is set to........:", Name
-print "Algorithm is set to...:", Algorithm
+print("Entering in the assimilation study")
+print("Name is set to........:", Name)
+print("Algorithm is set to...:", Algorithm)
 
 try:
     # Create Assimilation study
@@ -590,7 +590,7 @@ output["errorMessage"]        = ""
 
   <inline name="SetObserversNode">
     <script><code><![CDATA[
-#print "Setting observers"
+#print("Setting observers")
 ]]></code></script>
     <outport name="has_observers" type="bool"/>
     <outport name="observers" type="pyobj"/>
diff --git a/src/daSalome/daYacsSchemaCreator/infos_daComposant.py b/src/daSalome/daYacsSchemaCreator/infos_daComposant.py
index 6a18350..b9c4067 100644
--- a/src/daSalome/daYacsSchemaCreator/infos_daComposant.py
+++ b/src/daSalome/daYacsSchemaCreator/infos_daComposant.py
@@ -75,6 +75,7 @@ AssimAlgos = [
     "NonLinearLeastSquares",
     "QuantileRegression",
     "ParticleSwarmOptimization",
+    "DifferentialEvolution",
     ]
 CheckAlgos = [
     "FunctionTest",
@@ -151,6 +152,11 @@ AlgoDataRequirements["ParticleSwarmOptimization"] = [
     "Observation", "ObservationError",
     "ObservationOperator",
     ]
+AlgoDataRequirements["DifferentialEvolution"] = [
+    "Background", "BackgroundError",
+    "Observation", "ObservationError",
+    "ObservationOperator",
+    ]
 AlgoDataRequirements["QuantileRegression"] = [
     "Background",
     "Observation",
@@ -200,6 +206,7 @@ AlgoType["UnscentedKalmanFilter"] = "Optim"
 AlgoType["LinearLeastSquares"] = "Optim"
 AlgoType["NonLinearLeastSquares"] = "Optim"
 AlgoType["ParticleSwarmOptimization"] = "Optim"
+AlgoType["DifferentialEvolution"] = "Optim"
 AlgoType["QuantileRegression"] = "Optim"
 
 # Variables qui sont partages avec le generateur de