Documentation and source observer improvements for checking algorithms

[modules/adao.git] / src / daComposant / daAlgorithms / SamplingTest.py

diff --git a/src/daComposant/daAlgorithms/SamplingTest.py b/src/daComposant/daAlgorithms/SamplingTest.py
index b4cbeb7ad8b54c617c91520c84ef72a93d7a4d4d..26a040186dca04bcd9d1eafc78c359b9860c9466 100644 (file)
--- a/src/daComposant/daAlgorithms/SamplingTest.py
+++ b/src/daComposant/daAlgorithms/SamplingTest.py
@@ -74,7 +74,7 @@ class ElementaryAlgorithm(BasicObjects.Algorithm):
             default  = [],
             typecast = tuple,
             message  = "Liste de calculs supplémentaires à stocker et/ou effectuer",
-            listval  = ["CostFunctionJ","CurrentState","Innovation","SimulatedObservationAtCurrentState"]
+            listval  = ["CostFunctionJ","CurrentState","InnovationAtCurrentState","SimulatedObservationAtCurrentState"]
             )
         self.defineRequiredParameter(
             name     = "SetSeed",
@@ -155,8 +155,8 @@ class ElementaryAlgorithm(BasicObjects.Algorithm):
                 J   = float( Jb ) + float( Jo )
             if "CurrentState" in self._parameters["StoreSupplementaryCalculations"]:
                 self.StoredVariables["CurrentState"].store( _X )
-            if "Innovation" in self._parameters["StoreSupplementaryCalculations"]:
-                self.StoredVariables["Innovation"].store( Y - _HX )
+            if "InnovationAtCurrentState" in self._parameters["StoreSupplementaryCalculations"]:
+                self.StoredVariables["InnovationAtCurrentState"].store( Y - _HX )
             if "SimulatedObservationAtCurrentState" in self._parameters["StoreSupplementaryCalculations"]:
                 self.StoredVariables["SimulatedObservationAtCurrentState"].store( _HX )
             self.StoredVariables["CostFunctionJb"].store( Jb )