Minor correction do update data order

diff --git a/src/daComposant/daAlgorithms/DerivativeFreeOptimization.py b/src/daComposant/daAlgorithms/DerivativeFreeOptimization.py
index e46d9c4b74674ba4c5f0622c6a05ffc74a956b63..f3230d64fdfe98e5a8f72b762d938f85a6c96c00 100644 (file)
--- 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 e4a978db924ad3ab573a09b2eb11ee2bf06df48d..381d4134e021e72d31287a333b937e7c15b41131 100644 (file)
--- 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 7aa7ca9db1522df2df7f4665abb5c7f29a647b31..78f2c3210e76c4dd20f17e9a149b7344338d2369 100644 (file)
--- 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",