Adding DE to standard GUI, and minor Python 3 correction

diff --git a/resources/ADAOSchemaCatalog.xml b/resources/ADAOSchemaCatalog.xml
index 8906525979909ba14e5c65a8debad8e7ceb4bc83..f531643309442cf1b97446351928c719a2da4ec9 100644 (file)
--- 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 6a183509bcddcf7a55c7d1c796358bf5288fc70e..b9c4067328e0f8a02f223b32abd460eeab3228a8 100644 (file)
--- 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