From: Jean-Philippe ARGAUD <jean-philippe.argaud@edf.fr>
Date: Sat, 4 Aug 2018 07:43:27 +0000 (+0200)
Subject: Minor correction do update data order
X-Git-Tag: V9_2_0b_ok_ADAO~16
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=c2d577745cba62e16eb49532f861609751ff1409;p=modules%2Fadao.git

Minor correction do update data order
---

diff --git a/src/daComposant/daAlgorithms/DerivativeFreeOptimization.py b/src/daComposant/daAlgorithms/DerivativeFreeOptimization.py
index e46d9c4..f3230d6 100644
--- a/src/daComposant/daAlgorithms/DerivativeFreeOptimization.py
+++ b/src/daComposant/daAlgorithms/DerivativeFreeOptimization.py
@@ -84,7 +84,7 @@ class ElementaryAlgorithm(BasicObjects.Algorithm):
             typecast = tuple,
             message  = "Liste de calculs supplémentaires à stocker et/ou effectuer",
             listval  = [
-                "CurrentState",
+                "BMA",
                 "CostFunctionJ",
                 "CostFunctionJb",
                 "CostFunctionJo",
@@ -92,9 +92,10 @@ class ElementaryAlgorithm(BasicObjects.Algorithm):
                 "CostFunctionJbAtCurrentOptimum",
                 "CostFunctionJoAtCurrentOptimum",
                 "CurrentOptimum",
+                "CurrentState",
                 "IndexOfOptimum",
+                "Innovation",
                 "InnovationAtCurrentState",
-                "BMA",
                 "OMA",
                 "OMB",
                 "SimulatedObservationAtBackground",
diff --git a/src/daComposant/daAlgorithms/DifferentialEvolution.py b/src/daComposant/daAlgorithms/DifferentialEvolution.py
index e4a978d..381d413 100644
--- a/src/daComposant/daAlgorithms/DifferentialEvolution.py
+++ b/src/daComposant/daAlgorithms/DifferentialEvolution.py
@@ -108,7 +108,7 @@ class ElementaryAlgorithm(BasicObjects.Algorithm):
             typecast = tuple,
             message  = "Liste de calculs supplémentaires à stocker et/ou effectuer",
             listval  = [
-                "CurrentState",
+                "BMA",
                 "CostFunctionJ",
                 "CostFunctionJb",
                 "CostFunctionJo",
@@ -116,9 +116,10 @@ class ElementaryAlgorithm(BasicObjects.Algorithm):
                 "CostFunctionJbAtCurrentOptimum",
                 "CostFunctionJoAtCurrentOptimum",
                 "CurrentOptimum",
+                "CurrentState",
                 "IndexOfOptimum",
+                "Innovation",
                 "InnovationAtCurrentState",
-                "BMA",
                 "OMA",
                 "OMB",
                 "SimulatedObservationAtBackground",
diff --git a/src/daComposant/daAlgorithms/ParticleSwarmOptimization.py b/src/daComposant/daAlgorithms/ParticleSwarmOptimization.py
index 7aa7ca9..78f2c32 100644
--- a/src/daComposant/daAlgorithms/ParticleSwarmOptimization.py
+++ b/src/daComposant/daAlgorithms/ParticleSwarmOptimization.py
@@ -93,13 +93,13 @@ class ElementaryAlgorithm(BasicObjects.Algorithm):
             message  = "Liste de calculs supplémentaires à stocker et/ou effectuer",
             listval  = [
                 "BMA",
-                "OMA",
-                "OMB",
                 "CurrentState",
                 "CostFunctionJ",
                 "CostFunctionJb",
                 "CostFunctionJo",
                 "Innovation",
+                "OMA",
+                "OMB",
                 "SimulatedObservationAtBackground",
                 "SimulatedObservationAtCurrentState",
                 "SimulatedObservationAtOptimum",