Adding CurrentIterationNumber to user information and documentation

diff --git a/doc/en/ref_algorithm_3DVAR.rst b/doc/en/ref_algorithm_3DVAR.rst
index 186766fee738ea47ecb2e037e1af244a71f3a01f..730c9c0c1710c78e6ca3cde550ff95034084778b 100644 (file)
--- a/doc/en/ref_algorithm_3DVAR.rst
+++ b/doc/en/ref_algorithm_3DVAR.rst
@@ -106,6 +106,7 @@ StoreSupplementaryCalculations
   "CostFunctionJbAtCurrentOptimum",
   "CostFunctionJo",
   "CostFunctionJoAtCurrentOptimum",
+  "CurrentIterationNumber",
   "CurrentOptimum",
   "CurrentState",
   "IndexOfOptimum",
@@ -166,6 +167,8 @@ StoreSupplementaryCalculations
 
 .. include:: snippets/CostFunctionJoAtCurrentOptimum.rst
 
+.. include:: snippets/CurrentIterationNumber.rst
+
 .. include:: snippets/CurrentOptimum.rst
 
 .. include:: snippets/CurrentState.rst

diff --git a/doc/en/ref_algorithm_4DVAR.rst b/doc/en/ref_algorithm_4DVAR.rst
index e335338d26be882dfcf27e9d3f8f7da943a634dc..80b5d68c7baf0158ba104a8c2280135550bdc6c1 100644 (file)
--- a/doc/en/ref_algorithm_4DVAR.rst
+++ b/doc/en/ref_algorithm_4DVAR.rst
@@ -109,6 +109,7 @@ StoreSupplementaryCalculations
   "CostFunctionJbAtCurrentOptimum",
   "CostFunctionJo",
   "CostFunctionJoAtCurrentOptimum",
+  "CurrentIterationNumber",
   "CurrentOptimum",
   "CurrentState",
   "IndexOfOptimum",
@@ -147,6 +148,8 @@ StoreSupplementaryCalculations
 
 .. include:: snippets/CostFunctionJoAtCurrentOptimum.rst
 
+.. include:: snippets/CurrentIterationNumber.rst
+
 .. include:: snippets/CurrentOptimum.rst
 
 .. include:: snippets/CurrentState.rst

diff --git a/doc/en/ref_algorithm_DerivativeFreeOptimization.rst b/doc/en/ref_algorithm_DerivativeFreeOptimization.rst
index 59834539cea1201465c5528b87f3cdda1e5a52a4..961dbef83ec0ebf7cccce1026c990f3e281f8c06 100644 (file)
--- a/doc/en/ref_algorithm_DerivativeFreeOptimization.rst
+++ b/doc/en/ref_algorithm_DerivativeFreeOptimization.rst
@@ -89,6 +89,7 @@ StoreSupplementaryCalculations
   "CostFunctionJAtCurrentOptimum",
   "CostFunctionJbAtCurrentOptimum",
   "CostFunctionJoAtCurrentOptimum",
+  "CurrentIterationNumber",
   "CurrentOptimum",
   "CurrentState",
   "IndexOfOptimum",
@@ -137,6 +138,8 @@ StoreSupplementaryCalculations
 
 .. include:: snippets/CostFunctionJoAtCurrentOptimum.rst
 
+.. include:: snippets/CurrentIterationNumber.rst
+
 .. include:: snippets/CurrentOptimum.rst
 
 .. include:: snippets/CurrentState.rst

diff --git a/doc/en/ref_algorithm_DifferentialEvolution.rst b/doc/en/ref_algorithm_DifferentialEvolution.rst
index 09af20b22bfe46ebe72e5f1849aa0d2f7c6014a8..04c51efa05040fbb04fdad154b9cf9edf2097838 100644 (file)
--- a/doc/en/ref_algorithm_DifferentialEvolution.rst
+++ b/doc/en/ref_algorithm_DifferentialEvolution.rst
@@ -97,6 +97,7 @@ StoreSupplementaryCalculations
   "CostFunctionJAtCurrentOptimum",
   "CostFunctionJbAtCurrentOptimum",
   "CostFunctionJoAtCurrentOptimum",
+  "CurrentIterationNumber",
   "CurrentOptimum",
   "CurrentState",
   "IndexOfOptimum",
@@ -145,6 +146,8 @@ StoreSupplementaryCalculations
 
 .. include:: snippets/CostFunctionJoAtCurrentOptimum.rst
 
+.. include:: snippets/CurrentIterationNumber.rst
+
 .. include:: snippets/CurrentOptimum.rst
 
 .. include:: snippets/CurrentState.rst

diff --git a/doc/en/ref_algorithm_EnsembleKalmanFilter.rst b/doc/en/ref_algorithm_EnsembleKalmanFilter.rst
index 8d9b951150eff90aa74cf61ada305f3119694ee6..5a48eee8774e8d046bcf402a73ae1e6055ddbdd3 100644 (file)
--- a/doc/en/ref_algorithm_EnsembleKalmanFilter.rst
+++ b/doc/en/ref_algorithm_EnsembleKalmanFilter.rst
@@ -99,6 +99,7 @@ StoreSupplementaryCalculations
   "CostFunctionJbAtCurrentOptimum",
   "CostFunctionJo",
   "CostFunctionJoAtCurrentOptimum",
+  "CurrentIterationNumber",
   "CurrentOptimum",
   "CurrentState",
   "ForecastState",
@@ -145,6 +146,8 @@ StoreSupplementaryCalculations
 
 .. include:: snippets/CostFunctionJoAtCurrentOptimum.rst
 
+.. include:: snippets/CurrentIterationNumber.rst
+
 .. include:: snippets/CurrentOptimum.rst
 
 .. include:: snippets/CurrentState.rst

diff --git a/doc/en/ref_algorithm_ExtendedKalmanFilter.rst b/doc/en/ref_algorithm_ExtendedKalmanFilter.rst
index 57d4f2054dc7304a3ee5cbc9eb9df563cd11370d..6860d466a13763fe07af6e801a6ee009458e93d9 100644 (file)
--- a/doc/en/ref_algorithm_ExtendedKalmanFilter.rst
+++ b/doc/en/ref_algorithm_ExtendedKalmanFilter.rst
@@ -105,6 +105,7 @@ StoreSupplementaryCalculations
   "CostFunctionJbAtCurrentOptimum",
   "CostFunctionJo",
   "CostFunctionJoAtCurrentOptimum",
+  "CurrentIterationNumber",
   "CurrentOptimum",
   "CurrentState",
   "ForecastState",
@@ -151,6 +152,8 @@ StoreSupplementaryCalculations
 
 .. include:: snippets/CostFunctionJoAtCurrentOptimum.rst
 
+.. include:: snippets/CurrentIterationNumber.rst
+
 .. include:: snippets/CurrentOptimum.rst
 
 .. include:: snippets/CurrentState.rst

diff --git a/doc/en/ref_algorithm_KalmanFilter.rst b/doc/en/ref_algorithm_KalmanFilter.rst
index baa281fe49f4abfd9bfeebc4067a0453df18a9b0..02e01a74691dda7bb7fa00f8b942362ccb225a63 100644 (file)
--- a/doc/en/ref_algorithm_KalmanFilter.rst
+++ b/doc/en/ref_algorithm_KalmanFilter.rst
@@ -106,6 +106,7 @@ StoreSupplementaryCalculations
   "CostFunctionJbAtCurrentOptimum",
   "CostFunctionJo",
   "CostFunctionJoAtCurrentOptimum",
+  "CurrentIterationNumber",
   "CurrentOptimum",
   "CurrentState",
   "ForecastState",
@@ -152,6 +153,8 @@ StoreSupplementaryCalculations
 
 .. include:: snippets/CostFunctionJoAtCurrentOptimum.rst
 
+.. include:: snippets/CurrentIterationNumber.rst
+
 .. include:: snippets/CurrentOptimum.rst
 
 .. include:: snippets/CurrentState.rst

diff --git a/doc/en/ref_algorithm_NonLinearLeastSquares.rst b/doc/en/ref_algorithm_NonLinearLeastSquares.rst
index d039be537a9b4b33cf1c4f848339e8201cdc35c3..6fc563ad17283c2add8a40e6af386f2dd70dc20c 100644 (file)
--- a/doc/en/ref_algorithm_NonLinearLeastSquares.rst
+++ b/doc/en/ref_algorithm_NonLinearLeastSquares.rst
@@ -96,6 +96,7 @@ StoreSupplementaryCalculations
   "CostFunctionJbAtCurrentOptimum",
   "CostFunctionJo",
   "CostFunctionJoAtCurrentOptimum",
+  "CurrentIterationNumber",
   "CurrentOptimum",
   "CurrentState",
   "IndexOfOptimum",
@@ -149,6 +150,8 @@ StoreSupplementaryCalculations
 
 .. include:: snippets/CostFunctionJoAtCurrentOptimum.rst
 
+.. include:: snippets/CurrentIterationNumber.rst
+
 .. include:: snippets/CurrentOptimum.rst
 
 .. include:: snippets/CurrentState.rst

diff --git a/doc/en/ref_algorithm_ParticleSwarmOptimization.rst b/doc/en/ref_algorithm_ParticleSwarmOptimization.rst
index e9a4e4f5d8d2a6517dea8af73395e30ae6453045..ea37af78c516a31cde1641520075a5299f33474d 100644 (file)
--- a/doc/en/ref_algorithm_ParticleSwarmOptimization.rst
+++ b/doc/en/ref_algorithm_ParticleSwarmOptimization.rst
@@ -116,10 +116,11 @@ StoreSupplementaryCalculations
   the following list: [
   "Analysis",
   "BMA",
-  "CurrentState",
   "CostFunctionJ",
   "CostFunctionJb",
   "CostFunctionJo",
+  "CurrentIterationNumber",
+  "CurrentState",
   "Innovation",
   "OMA",
   "OMB",
@@ -149,14 +150,16 @@ StoreSupplementaryCalculations
 
 .. include:: snippets/BMA.rst
 
-.. include:: snippets/CurrentState.rst
-
 .. include:: snippets/CostFunctionJ.rst
 
 .. include:: snippets/CostFunctionJb.rst
 
 .. include:: snippets/CostFunctionJo.rst
 
+.. include:: snippets/CurrentIterationNumber.rst
+
+.. include:: snippets/CurrentState.rst
+
 .. include:: snippets/Innovation.rst
 
 .. include:: snippets/OMA.rst

diff --git a/doc/en/ref_algorithm_QuantileRegression.rst b/doc/en/ref_algorithm_QuantileRegression.rst
index e671b6c46ab09f90df2674dbe7981816abc97b0a..08769e79b1b32fb172b1f973f063dad687ebe669 100644 (file)
--- a/doc/en/ref_algorithm_QuantileRegression.rst
+++ b/doc/en/ref_algorithm_QuantileRegression.rst
@@ -69,6 +69,7 @@ StoreSupplementaryCalculations
   "CostFunctionJ",
   "CostFunctionJb",
   "CostFunctionJo",
+  "CurrentIterationNumber",
   "CurrentState",
   "Innovation",
   "OMA",
@@ -99,6 +100,8 @@ StoreSupplementaryCalculations
 
 .. include:: snippets/CostFunctionJo.rst
 
+.. include:: snippets/CurrentIterationNumber.rst
+
 .. ------------------------------------ ..
 .. include:: snippets/Header2Algo05.rst
 
@@ -112,6 +115,8 @@ StoreSupplementaryCalculations
 
 .. include:: snippets/CostFunctionJo.rst
 
+.. include:: snippets/CurrentIterationNumber.rst
+
 .. include:: snippets/CurrentState.rst
 
 .. include:: snippets/Innovation.rst

diff --git a/doc/en/ref_algorithm_TabuSearch.rst b/doc/en/ref_algorithm_TabuSearch.rst
index 10af47e1ff931fcff042daf799b540bd98d2f672..a1245d129672cded03aa2a29548e5b7702311ed6 100644 (file)
--- a/doc/en/ref_algorithm_TabuSearch.rst
+++ b/doc/en/ref_algorithm_TabuSearch.rst
@@ -93,10 +93,11 @@ StoreSupplementaryCalculations
   the following list: [
   "Analysis",
   "BMA",
-  "CurrentState",
   "CostFunctionJ",
   "CostFunctionJb",
   "CostFunctionJo",
+  "CurrentIterationNumber",
+  "CurrentState",
   "Innovation",
   "OMA",
   "OMB",
@@ -126,14 +127,16 @@ StoreSupplementaryCalculations
 
 .. include:: snippets/BMA.rst
 
-.. include:: snippets/CurrentState.rst
-
 .. include:: snippets/CostFunctionJ.rst
 
 .. include:: snippets/CostFunctionJb.rst
 
 .. include:: snippets/CostFunctionJo.rst
 
+.. include:: snippets/CurrentIterationNumber.rst
+
+.. include:: snippets/CurrentState.rst
+
 .. include:: snippets/Innovation.rst
 
 .. include:: snippets/OMA.rst

diff --git a/doc/en/ref_algorithm_UnscentedKalmanFilter.rst b/doc/en/ref_algorithm_UnscentedKalmanFilter.rst
index 7d386c638757ff802f1720adf80d3fea524c00a0..9f882ae7a0bae6c1bab784e50479f36b4a89a3f1 100644 (file)
--- a/doc/en/ref_algorithm_UnscentedKalmanFilter.rst
+++ b/doc/en/ref_algorithm_UnscentedKalmanFilter.rst
@@ -98,6 +98,7 @@ StoreSupplementaryCalculations
   "CostFunctionJ",
   "CostFunctionJb",
   "CostFunctionJo",
+  "CurrentIterationNumber",
   "CurrentState",
   "InnovationAtCurrentState",
   ].
@@ -131,6 +132,8 @@ StoreSupplementaryCalculations
 
 .. include:: snippets/CostFunctionJo.rst
 
+.. include:: snippets/CurrentIterationNumber.rst
+
 .. include:: snippets/CurrentState.rst
 
 .. include:: snippets/InnovationAtCurrentState.rst

diff --git a/doc/en/snippets/CurrentIterationNumber.rst b/doc/en/snippets/CurrentIterationNumber.rst
new file mode 100644 (file)
index 0000000..d1eea00
--- /dev/null
+++ b/doc/en/snippets/CurrentIterationNumber.rst
@@ -0,0 +1,8 @@
+.. index:: single: CurrentIterationNumber
+
+CurrentIterationNumber
+  *List of integers*. Each element is the iteration index at the current step during the
+  iterative algorithm procedure.
+
+  Example:
+  ``i = ADD.get("CurrentIterationNumber")[-1]``

diff --git a/doc/fr/ref_algorithm_3DVAR.rst b/doc/fr/ref_algorithm_3DVAR.rst
index 10023d3dc3a99caa3a0fec2b1c4758861f03edd7..dd0416311cde4c3d197f69ff139eeb15a8ae6d35 100644 (file)
--- a/doc/fr/ref_algorithm_3DVAR.rst
+++ b/doc/fr/ref_algorithm_3DVAR.rst
@@ -108,6 +108,7 @@ StoreSupplementaryCalculations
   "CostFunctionJbAtCurrentOptimum",
   "CostFunctionJo",
   "CostFunctionJoAtCurrentOptimum",
+  "CurrentIterationNumber",
   "CurrentOptimum",
   "CurrentState",
   "IndexOfOptimum",
@@ -168,6 +169,8 @@ StoreSupplementaryCalculations
 
 .. include:: snippets/CostFunctionJoAtCurrentOptimum.rst
 
+.. include:: snippets/CurrentIterationNumber.rst
+
 .. include:: snippets/CurrentOptimum.rst
 
 .. include:: snippets/CurrentState.rst

diff --git a/doc/fr/ref_algorithm_4DVAR.rst b/doc/fr/ref_algorithm_4DVAR.rst
index 4a104642a74091af226bd882bd1d6af83c292583..a0470727455ac9df284abc3cea8261aace7e4fab 100644 (file)
--- a/doc/fr/ref_algorithm_4DVAR.rst
+++ b/doc/fr/ref_algorithm_4DVAR.rst
@@ -111,6 +111,7 @@ StoreSupplementaryCalculations
   "CostFunctionJbAtCurrentOptimum",
   "CostFunctionJo",
   "CostFunctionJoAtCurrentOptimum",
+  "CurrentIterationNumber",
   "CurrentOptimum",
   "CurrentState",
   "IndexOfOptimum",
@@ -149,6 +150,7 @@ StoreSupplementaryCalculations
 
 .. include:: snippets/CostFunctionJoAtCurrentOptimum.rst
 
+.. include:: snippets/CurrentIterationNumber.rst
 .. include:: snippets/CurrentOptimum.rst
 
 .. include:: snippets/CurrentState.rst

diff --git a/doc/fr/ref_algorithm_DerivativeFreeOptimization.rst b/doc/fr/ref_algorithm_DerivativeFreeOptimization.rst
index c560d58cce730927ee4ad85e6fa5924bd508f853..be78c6dea8aaa15213b8aa2ed0a49d90bd8ec14b 100644 (file)
--- a/doc/fr/ref_algorithm_DerivativeFreeOptimization.rst
+++ b/doc/fr/ref_algorithm_DerivativeFreeOptimization.rst
@@ -91,6 +91,7 @@ StoreSupplementaryCalculations
   "CostFunctionJAtCurrentOptimum",
   "CostFunctionJbAtCurrentOptimum",
   "CostFunctionJoAtCurrentOptimum",
+  "CurrentIterationNumber",
   "CurrentOptimum",
   "CurrentState",
   "IndexOfOptimum",
@@ -139,6 +140,8 @@ StoreSupplementaryCalculations
 
 .. include:: snippets/CostFunctionJoAtCurrentOptimum.rst
 
+.. include:: snippets/CurrentIterationNumber.rst
+
 .. include:: snippets/CurrentOptimum.rst
 
 .. include:: snippets/CurrentState.rst

diff --git a/doc/fr/ref_algorithm_DifferentialEvolution.rst b/doc/fr/ref_algorithm_DifferentialEvolution.rst
index c21a609aeb4095c4352e2e42653d0fadadc7c51a..3a79289d9016f3a4285a80d5b637ba9b41ff0520 100644 (file)
--- a/doc/fr/ref_algorithm_DifferentialEvolution.rst
+++ b/doc/fr/ref_algorithm_DifferentialEvolution.rst
@@ -98,6 +98,7 @@ StoreSupplementaryCalculations
   "CostFunctionJAtCurrentOptimum",
   "CostFunctionJbAtCurrentOptimum",
   "CostFunctionJoAtCurrentOptimum",
+  "CurrentIterationNumber",
   "CurrentOptimum",
   "CurrentState",
   "IndexOfOptimum",
@@ -146,6 +147,8 @@ StoreSupplementaryCalculations
 
 .. include:: snippets/CostFunctionJoAtCurrentOptimum.rst
 
+.. include:: snippets/CurrentIterationNumber.rst
+
 .. include:: snippets/CurrentOptimum.rst
 
 .. include:: snippets/CurrentState.rst

diff --git a/doc/fr/ref_algorithm_EnsembleKalmanFilter.rst b/doc/fr/ref_algorithm_EnsembleKalmanFilter.rst
index 61cd540163473a2a0c0ee1880026fb0f52838ddc..5081d4b27c6c4513ce79a792d8e45e5f25530444 100644 (file)
--- a/doc/fr/ref_algorithm_EnsembleKalmanFilter.rst
+++ b/doc/fr/ref_algorithm_EnsembleKalmanFilter.rst
@@ -100,6 +100,7 @@ StoreSupplementaryCalculations
   "CostFunctionJbAtCurrentOptimum",
   "CostFunctionJo",
   "CostFunctionJoAtCurrentOptimum",
+  "CurrentIterationNumber",
   "CurrentOptimum",
   "CurrentState",
   "ForecastState",
@@ -146,6 +147,8 @@ StoreSupplementaryCalculations
 
 .. include:: snippets/CostFunctionJoAtCurrentOptimum.rst
 
+.. include:: snippets/CurrentIterationNumber.rst
+
 .. include:: snippets/CurrentOptimum.rst
 
 .. include:: snippets/CurrentState.rst

diff --git a/doc/fr/ref_algorithm_ExtendedKalmanFilter.rst b/doc/fr/ref_algorithm_ExtendedKalmanFilter.rst
index 38accd44874ad23ea2e157036711709197f7ed3a..4b37004ae5ae51c83ebd73ed1ad40c2c72ebdcb3 100644 (file)
--- a/doc/fr/ref_algorithm_ExtendedKalmanFilter.rst
+++ b/doc/fr/ref_algorithm_ExtendedKalmanFilter.rst
@@ -106,6 +106,7 @@ StoreSupplementaryCalculations
   "CostFunctionJbAtCurrentOptimum",
   "CostFunctionJo",
   "CostFunctionJoAtCurrentOptimum",
+  "CurrentIterationNumber",
   "CurrentOptimum",
   "CurrentState",
   "ForecastState",
@@ -152,6 +153,8 @@ StoreSupplementaryCalculations
 
 .. include:: snippets/CostFunctionJoAtCurrentOptimum.rst
 
+.. include:: snippets/CurrentIterationNumber.rst
+
 .. include:: snippets/CurrentOptimum.rst
 
 .. include:: snippets/CurrentState.rst

diff --git a/doc/fr/ref_algorithm_KalmanFilter.rst b/doc/fr/ref_algorithm_KalmanFilter.rst
index 55e48e678c7750dbf42573a195cbcd0ab5bb016d..a9079e230ad8257a791e58729f9718c32d0548f1 100644 (file)
--- a/doc/fr/ref_algorithm_KalmanFilter.rst
+++ b/doc/fr/ref_algorithm_KalmanFilter.rst
@@ -106,6 +106,7 @@ StoreSupplementaryCalculations
   "CostFunctionJbAtCurrentOptimum",
   "CostFunctionJo",
   "CostFunctionJoAtCurrentOptimum",
+  "CurrentIterationNumber",
   "CurrentOptimum",
   "CurrentState",
   "ForecastState",
@@ -152,6 +153,8 @@ StoreSupplementaryCalculations
 
 .. include:: snippets/CostFunctionJoAtCurrentOptimum.rst
 
+.. include:: snippets/CurrentIterationNumber.rst
+
 .. include:: snippets/CurrentOptimum.rst
 
 .. include:: snippets/CurrentState.rst

diff --git a/doc/fr/ref_algorithm_NonLinearLeastSquares.rst b/doc/fr/ref_algorithm_NonLinearLeastSquares.rst
index 1b5d56a713e85d817ef8c86d8ecac56d99cb089b..97f47e56aaf0e3044815fd77134e7336b9548186 100644 (file)
--- a/doc/fr/ref_algorithm_NonLinearLeastSquares.rst
+++ b/doc/fr/ref_algorithm_NonLinearLeastSquares.rst
@@ -99,6 +99,7 @@ StoreSupplementaryCalculations
   "CostFunctionJbAtCurrentOptimum",
   "CostFunctionJo",
   "CostFunctionJoAtCurrentOptimum",
+  "CurrentIterationNumber",
   "CurrentOptimum",
   "CurrentState",
   "IndexOfOptimum",
@@ -153,6 +154,8 @@ StoreSupplementaryCalculations
 
 .. include:: snippets/CostFunctionJoAtCurrentOptimum.rst
 
+.. include:: snippets/CurrentIterationNumber.rst
+
 .. include:: snippets/CurrentOptimum.rst
 
 .. include:: snippets/CurrentState.rst

diff --git a/doc/fr/ref_algorithm_ParticleSwarmOptimization.rst b/doc/fr/ref_algorithm_ParticleSwarmOptimization.rst
index c91d3c659b9ecd80f39971556389b6acf433fd88..c7d2390b3b0c78ed512be2ef80e7dd9227d0d62d 100644 (file)
--- a/doc/fr/ref_algorithm_ParticleSwarmOptimization.rst
+++ b/doc/fr/ref_algorithm_ParticleSwarmOptimization.rst
@@ -119,10 +119,11 @@ StoreSupplementaryCalculations
   Les noms possibles sont dans la liste suivante : [
   "Analysis",
   "BMA",
-  "CurrentState",
   "CostFunctionJ",
   "CostFunctionJb",
   "CostFunctionJo",
+  "CurrentIterationNumber",
+  "CurrentState",
   "Innovation",
   "OMA",
   "OMB",
@@ -152,14 +153,16 @@ StoreSupplementaryCalculations
 
 .. include:: snippets/BMA.rst
 
-.. include:: snippets/CurrentState.rst
-
 .. include:: snippets/CostFunctionJ.rst
 
 .. include:: snippets/CostFunctionJb.rst
 
 .. include:: snippets/CostFunctionJo.rst
 
+.. include:: snippets/CurrentIterationNumber.rst
+
+.. include:: snippets/CurrentState.rst
+
 .. include:: snippets/Innovation.rst
 
 .. include:: snippets/OMA.rst

diff --git a/doc/fr/ref_algorithm_QuantileRegression.rst b/doc/fr/ref_algorithm_QuantileRegression.rst
index f164a3f215ff1cf822a4d390beb9faa49fb55cb9..6dbaec6d26ce67d5f16329521af8cae542ec584a 100644 (file)
--- a/doc/fr/ref_algorithm_QuantileRegression.rst
+++ b/doc/fr/ref_algorithm_QuantileRegression.rst
@@ -69,6 +69,7 @@ StoreSupplementaryCalculations
   "CostFunctionJ",
   "CostFunctionJb",
   "CostFunctionJo",
+  "CurrentIterationNumber",
   "CurrentState",
   "Innovation",
   "OMA",
@@ -100,6 +101,8 @@ StoreSupplementaryCalculations
 
 .. include:: snippets/CostFunctionJo.rst
 
+.. include:: snippets/CurrentIterationNumber.rst
+
 .. ------------------------------------ ..
 .. include:: snippets/Header2Algo05.rst
 
@@ -113,6 +116,8 @@ StoreSupplementaryCalculations
 
 .. include:: snippets/CostFunctionJo.rst
 
+.. include:: snippets/CurrentIterationNumber.rst
+
 .. include:: snippets/CurrentState.rst
 
 .. include:: snippets/Innovation.rst

diff --git a/doc/fr/ref_algorithm_TabuSearch.rst b/doc/fr/ref_algorithm_TabuSearch.rst
index def5e4642d13f120e9ab16e307c49ca6ab6448a0..7080cbc2af1b16a18d6f583eb976f6034e50fd99 100644 (file)
--- a/doc/fr/ref_algorithm_TabuSearch.rst
+++ b/doc/fr/ref_algorithm_TabuSearch.rst
@@ -95,10 +95,11 @@ StoreSupplementaryCalculations
   Les noms possibles sont dans la liste suivante : [
   "Analysis",
   "BMA",
-  "CurrentState",
   "CostFunctionJ",
   "CostFunctionJb",
   "CostFunctionJo",
+  "CurrentIterationNumber",
+  "CurrentState",
   "Innovation",
   "OMA",
   "OMB",
@@ -128,14 +129,16 @@ StoreSupplementaryCalculations
 
 .. include:: snippets/BMA.rst
 
-.. include:: snippets/CurrentState.rst
-
 .. include:: snippets/CostFunctionJ.rst
 
 .. include:: snippets/CostFunctionJb.rst
 
 .. include:: snippets/CostFunctionJo.rst
 
+.. include:: snippets/CurrentIterationNumber.rst
+
+.. include:: snippets/CurrentState.rst
+
 .. include:: snippets/Innovation.rst
 
 .. include:: snippets/OMA.rst

diff --git a/doc/fr/ref_algorithm_UnscentedKalmanFilter.rst b/doc/fr/ref_algorithm_UnscentedKalmanFilter.rst
index bf87d6d52cf59ca843a103ab1bc7d2c080923be5..a7f8ad101b3e5b1b19162574cdbad9a1d428210d 100644 (file)
--- a/doc/fr/ref_algorithm_UnscentedKalmanFilter.rst
+++ b/doc/fr/ref_algorithm_UnscentedKalmanFilter.rst
@@ -99,6 +99,7 @@ StoreSupplementaryCalculations
   "CostFunctionJ",
   "CostFunctionJb",
   "CostFunctionJo",
+  "CurrentIterationNumber",
   "CurrentState",
   "InnovationAtCurrentState",
   ].
@@ -132,6 +133,8 @@ StoreSupplementaryCalculations
 
 .. include:: snippets/CostFunctionJo.rst
 
+.. include:: snippets/CurrentIterationNumber.rst
+
 .. include:: snippets/CurrentState.rst
 
 .. include:: snippets/InnovationAtCurrentState.rst

diff --git a/doc/fr/snippets/CurrentIterationNumber.rst b/doc/fr/snippets/CurrentIterationNumber.rst
new file mode 100644 (file)
index 0000000..63d285d
--- /dev/null
+++ b/doc/fr/snippets/CurrentIterationNumber.rst
@@ -0,0 +1,8 @@
+.. index:: single: CurrentIterationNumber
+
+CurrentIterationNumber
+  *Liste d'entiers*. Chaque élément est l'index d'itération courant au cours du
+  déroulement itératif de l'algorithme utilisé.
+
+  Exemple :
+  ``i = ADD.get("CurrentIterationNumber")[-1]``

diff --git a/src/daComposant/daAlgorithms/3DVAR.py b/src/daComposant/daAlgorithms/3DVAR.py
index 0a0f31f43bf0b1d22df7e7f7e8467c8b684413d4..2a967ce404e8f1237274a3382f7b03b54b729a36 100644 (file)
--- a/src/daComposant/daAlgorithms/3DVAR.py
+++ b/src/daComposant/daAlgorithms/3DVAR.py
@@ -87,6 +87,7 @@ class ElementaryAlgorithm(BasicObjects.Algorithm):
                 "CostFunctionJbAtCurrentOptimum",
                 "CostFunctionJo",
                 "CostFunctionJoAtCurrentOptimum",
+                "CurrentIterationNumber",
                 "CurrentOptimum",
                 "CurrentState",
                 "IndexOfOptimum",
@@ -201,6 +202,7 @@ class ElementaryAlgorithm(BasicObjects.Algorithm):
             Jo  = float( 0.5 * _Innovation.T * RI * _Innovation )
             J   = Jb + Jo
             #
+            self.StoredVariables["CurrentIterationNumber"].store( len(self.StoredVariables["CostFunctionJ"]) )
             self.StoredVariables["CostFunctionJb"].store( Jb )
             self.StoredVariables["CostFunctionJo"].store( Jo )
             self.StoredVariables["CostFunctionJ" ].store( J )

diff --git a/src/daComposant/daAlgorithms/4DVAR.py b/src/daComposant/daAlgorithms/4DVAR.py
index 0b191c6bb1dfdb94ff650f5d0fea48f807ecaf5e..a7e8f2e28dae1857264fabcf2e930411d5e5c5c7 100644 (file)
--- a/src/daComposant/daAlgorithms/4DVAR.py
+++ b/src/daComposant/daAlgorithms/4DVAR.py
@@ -97,6 +97,7 @@ class ElementaryAlgorithm(BasicObjects.Algorithm):
                 "CostFunctionJbAtCurrentOptimum",
                 "CostFunctionJo",
                 "CostFunctionJoAtCurrentOptimum",
+                "CurrentIterationNumber",
                 "CurrentOptimum",
                 "CurrentState",
                 "IndexOfOptimum",
@@ -214,6 +215,8 @@ class ElementaryAlgorithm(BasicObjects.Algorithm):
                 Jo = Jo + _YmHMX.T * RI * _YmHMX
             Jo  = 0.5 * Jo
             J   = float( Jb ) + float( Jo )
+            #
+            self.StoredVariables["CurrentIterationNumber"].store( len(self.StoredVariables["CostFunctionJ"]) )
             self.StoredVariables["CostFunctionJb"].store( Jb )
             self.StoredVariables["CostFunctionJo"].store( Jo )
             self.StoredVariables["CostFunctionJ" ].store( J )

diff --git a/src/daComposant/daAlgorithms/DerivativeFreeOptimization.py b/src/daComposant/daAlgorithms/DerivativeFreeOptimization.py
index cac169d234394c2185b92fb7e52d8e5944ac62de..93eea8821e58d2922a108c3b7fc64ea4771aca0e 100644 (file)
--- a/src/daComposant/daAlgorithms/DerivativeFreeOptimization.py
+++ b/src/daComposant/daAlgorithms/DerivativeFreeOptimization.py
@@ -92,6 +92,7 @@ class ElementaryAlgorithm(BasicObjects.Algorithm):
                 "CostFunctionJAtCurrentOptimum",
                 "CostFunctionJbAtCurrentOptimum",
                 "CostFunctionJoAtCurrentOptimum",
+                "CurrentIterationNumber",
                 "CurrentOptimum",
                 "CurrentState",
                 "IndexOfOptimum",
@@ -170,6 +171,7 @@ class ElementaryAlgorithm(BasicObjects.Algorithm):
             #
             J   = float( Jb ) + float( Jo )
             #
+            self.StoredVariables["CurrentIterationNumber"].store( len(self.StoredVariables["CostFunctionJ"]) )
             self.StoredVariables["CostFunctionJb"].store( Jb )
             self.StoredVariables["CostFunctionJo"].store( Jo )
             self.StoredVariables["CostFunctionJ" ].store( J )

diff --git a/src/daComposant/daAlgorithms/DifferentialEvolution.py b/src/daComposant/daAlgorithms/DifferentialEvolution.py
index 4db00f76940e976d8dac662c287d7a038081d16f..87b32286d46b761836b81a401a10c08b1bc6810c 100644 (file)
--- a/src/daComposant/daAlgorithms/DifferentialEvolution.py
+++ b/src/daComposant/daAlgorithms/DifferentialEvolution.py
@@ -116,6 +116,7 @@ class ElementaryAlgorithm(BasicObjects.Algorithm):
                 "CostFunctionJAtCurrentOptimum",
                 "CostFunctionJbAtCurrentOptimum",
                 "CostFunctionJoAtCurrentOptimum",
+                "CurrentIterationNumber",
                 "CurrentOptimum",
                 "CurrentState",
                 "IndexOfOptimum",
@@ -201,6 +202,7 @@ class ElementaryAlgorithm(BasicObjects.Algorithm):
             #
             J   = float( Jb ) + float( Jo )
             #
+            self.StoredVariables["CurrentIterationNumber"].store( len(self.StoredVariables["CostFunctionJ"]) )
             self.StoredVariables["CostFunctionJb"].store( Jb )
             self.StoredVariables["CostFunctionJo"].store( Jo )
             self.StoredVariables["CostFunctionJ" ].store( J )

diff --git a/src/daComposant/daAlgorithms/EnsembleKalmanFilter.py b/src/daComposant/daAlgorithms/EnsembleKalmanFilter.py
index 1660d0641a17efded67276fd2b59dbb1df1c2fe7..d2358285fd26dd12f83525fd7bf8ea6b09bd90fa 100644 (file)
--- a/src/daComposant/daAlgorithms/EnsembleKalmanFilter.py
+++ b/src/daComposant/daAlgorithms/EnsembleKalmanFilter.py
@@ -72,6 +72,7 @@ class ElementaryAlgorithm(BasicObjects.Algorithm):
                 "CostFunctionJbAtCurrentOptimum",
                 "CostFunctionJo",
                 "CostFunctionJoAtCurrentOptimum",
+                "CurrentIterationNumber",
                 "CurrentOptimum",
                 "CurrentState",
                 "ForecastState",
@@ -220,6 +221,7 @@ class ElementaryAlgorithm(BasicObjects.Algorithm):
                 _HXa = numpy.asmatrix(numpy.ravel( H((Xa, Un)) )).T
                 _Innovation = Ynpu - _HXa
             #
+            self.StoredVariables["CurrentIterationNumber"].store( len(self.StoredVariables["Analysis"]) )
             # ---> avec analysis
             self.StoredVariables["Analysis"].store( Xa )
             if self._toStore("SimulatedObservationAtCurrentAnalysis"):
@@ -289,6 +291,7 @@ class ElementaryAlgorithm(BasicObjects.Algorithm):
         # Stockage final supplémentaire de l'optimum en estimation de paramètres
         # ----------------------------------------------------------------------
         if self._parameters["EstimationOf"] == "Parameters":
+            self.StoredVariables["CurrentIterationNumber"].store( len(self.StoredVariables["Analysis"]) )
             self.StoredVariables["Analysis"].store( XaMin )
             if self._toStore("APosterioriCovariance"):
                 self.StoredVariables["APosterioriCovariance"].store( covarianceXaMin )

diff --git a/src/daComposant/daAlgorithms/ExtendedKalmanFilter.py b/src/daComposant/daAlgorithms/ExtendedKalmanFilter.py
index 6b831e5c1bdf6c3638a6da4c7ebfaedce911ef59..a2a39d608602e29f03dcfa195b5ec39322738336 100644 (file)
--- a/src/daComposant/daAlgorithms/ExtendedKalmanFilter.py
+++ b/src/daComposant/daAlgorithms/ExtendedKalmanFilter.py
@@ -66,6 +66,7 @@ class ElementaryAlgorithm(BasicObjects.Algorithm):
                 "CostFunctionJbAtCurrentOptimum",
                 "CostFunctionJo",
                 "CostFunctionJoAtCurrentOptimum",
+                "CurrentIterationNumber",
                 "CurrentOptimum",
                 "CurrentState",
                 "ForecastState",
@@ -134,6 +135,7 @@ class ElementaryAlgorithm(BasicObjects.Algorithm):
         Pn = B
         #
         if len(self.StoredVariables["Analysis"])==0 or not self._parameters["nextStep"]:
+            self.StoredVariables["CurrentIterationNumber"].store( len(self.StoredVariables["Analysis"]) )
             self.StoredVariables["Analysis"].store( numpy.ravel(Xn) )
             if self._toStore("APosterioriCovariance"):
                 self.StoredVariables["APosterioriCovariance"].store( Pn.asfullmatrix(Xn.size) )
@@ -201,6 +203,7 @@ class ElementaryAlgorithm(BasicObjects.Algorithm):
             Pn = Pn_predicted - Kn * Ht * Pn_predicted
             Xa, _HXa = Xn, _HX # Pointeurs
             #
+            self.StoredVariables["CurrentIterationNumber"].store( len(self.StoredVariables["Analysis"]) )
             # ---> avec analysis
             self.StoredVariables["Analysis"].store( Xa )
             if self._toStore("SimulatedObservationAtCurrentAnalysis"):
@@ -265,6 +268,7 @@ class ElementaryAlgorithm(BasicObjects.Algorithm):
         # Stockage final supplémentaire de l'optimum en estimation de paramètres
         # ----------------------------------------------------------------------
         if self._parameters["EstimationOf"] == "Parameters":
+            self.StoredVariables["CurrentIterationNumber"].store( len(self.StoredVariables["Analysis"]) )
             self.StoredVariables["Analysis"].store( XaMin )
             if self._toStore("APosterioriCovariance"):
                 self.StoredVariables["APosterioriCovariance"].store( covarianceXaMin )

diff --git a/src/daComposant/daAlgorithms/KalmanFilter.py b/src/daComposant/daAlgorithms/KalmanFilter.py
index bfa4167bf84cedd368140b97577190161811844c..2465136045de35c2213c99c28c38c841708f82f2 100644 (file)
--- a/src/daComposant/daAlgorithms/KalmanFilter.py
+++ b/src/daComposant/daAlgorithms/KalmanFilter.py
@@ -59,6 +59,7 @@ class ElementaryAlgorithm(BasicObjects.Algorithm):
                 "CostFunctionJbAtCurrentOptimum",
                 "CostFunctionJo",
                 "CostFunctionJoAtCurrentOptimum",
+                "CurrentIterationNumber",
                 "CurrentOptimum",
                 "CurrentState",
                 "ForecastState",
@@ -125,6 +126,7 @@ class ElementaryAlgorithm(BasicObjects.Algorithm):
         Pn = B
         #
         if len(self.StoredVariables["Analysis"])==0 or not self._parameters["nextStep"]:
+            self.StoredVariables["CurrentIterationNumber"].store( len(self.StoredVariables["Analysis"]) )
             self.StoredVariables["Analysis"].store( numpy.ravel(Xn) )
             if self._toStore("APosterioriCovariance"):
                 self.StoredVariables["APosterioriCovariance"].store( Pn.asfullmatrix(Xn.size) )
@@ -176,6 +178,7 @@ class ElementaryAlgorithm(BasicObjects.Algorithm):
             Pn = Pn_predicted - Kn * Ht * Pn_predicted
             Xa, _HXa = Xn, _HX # Pointeurs
             #
+            self.StoredVariables["CurrentIterationNumber"].store( len(self.StoredVariables["Analysis"]) )
             # ---> avec analysis
             self.StoredVariables["Analysis"].store( Xa )
             if self._toStore("SimulatedObservationAtCurrentAnalysis"):
@@ -240,6 +243,7 @@ class ElementaryAlgorithm(BasicObjects.Algorithm):
         # Stockage final supplémentaire de l'optimum en estimation de paramètres
         # ----------------------------------------------------------------------
         if self._parameters["EstimationOf"] == "Parameters":
+            self.StoredVariables["CurrentIterationNumber"].store( len(self.StoredVariables["Analysis"]) )
             self.StoredVariables["Analysis"].store( XaMin )
             if self._toStore("APosterioriCovariance"):
                 self.StoredVariables["APosterioriCovariance"].store( covarianceXaMin )

diff --git a/src/daComposant/daAlgorithms/NonLinearLeastSquares.py b/src/daComposant/daAlgorithms/NonLinearLeastSquares.py
index 0d976d95926fa24f35ee8f0ee618cae9efd78bd6..eebcf2afb37acebc5e44b99af0b57a2f8f672d48 100644 (file)
--- a/src/daComposant/daAlgorithms/NonLinearLeastSquares.py
+++ b/src/daComposant/daAlgorithms/NonLinearLeastSquares.py
@@ -83,6 +83,7 @@ class ElementaryAlgorithm(BasicObjects.Algorithm):
                 "CostFunctionJbAtCurrentOptimum",
                 "CostFunctionJo",
                 "CostFunctionJoAtCurrentOptimum",
+                "CurrentIterationNumber",
                 "CurrentOptimum",
                 "CurrentState",
                 "IndexOfOptimum",
@@ -160,6 +161,7 @@ class ElementaryAlgorithm(BasicObjects.Algorithm):
             Jo  = float( 0.5 * _Innovation.T * RI * _Innovation )
             J   = Jb + Jo
             #
+            self.StoredVariables["CurrentIterationNumber"].store( len(self.StoredVariables["CostFunctionJ"]) )
             self.StoredVariables["CostFunctionJb"].store( Jb )
             self.StoredVariables["CostFunctionJo"].store( Jo )
             self.StoredVariables["CostFunctionJ" ].store( J )

diff --git a/src/daComposant/daAlgorithms/ParticleSwarmOptimization.py b/src/daComposant/daAlgorithms/ParticleSwarmOptimization.py
index 3125052557db3beb09c285ebd12ee1a79fbf4df0..4c4eec00caf064b1806ca660963b28b7f88f34b9 100644 (file)
--- a/src/daComposant/daAlgorithms/ParticleSwarmOptimization.py
+++ b/src/daComposant/daAlgorithms/ParticleSwarmOptimization.py
@@ -94,10 +94,11 @@ class ElementaryAlgorithm(BasicObjects.Algorithm):
             listval  = [
                 "Analysis",
                 "BMA",
-                "CurrentState",
                 "CostFunctionJ",
                 "CostFunctionJb",
                 "CostFunctionJo",
+                "CurrentIterationNumber",
+                "CurrentState",
                 "Innovation",
                 "OMA",
                 "OMB",
@@ -219,6 +220,7 @@ class ElementaryAlgorithm(BasicObjects.Algorithm):
                 qBest = copy.copy( quality )
         logging.debug("%s Initialisation, Insecte = %s, Qualité = %s"%(self._name, str(Best), str(qBest)))
         #
+        self.StoredVariables["CurrentIterationNumber"].store( len(self.StoredVariables["CostFunctionJ"]) )
         if self._parameters["StoreInternalVariables"] or self._toStore("CurrentState"):
             self.StoredVariables["CurrentState"].store( Best )
         self.StoredVariables["CostFunctionJb"].store( 0. )
@@ -245,6 +247,7 @@ class ElementaryAlgorithm(BasicObjects.Algorithm):
                         qBest = copy.copy( quality )
             logging.debug("%s Etape %i, Insecte = %s, Qualité = %s"%(self._name, n, str(Best), str(qBest)))
             #
+            self.StoredVariables["CurrentIterationNumber"].store( len(self.StoredVariables["CostFunctionJ"]) )
             if self._parameters["StoreInternalVariables"] or self._toStore("CurrentState"):
                 self.StoredVariables["CurrentState"].store( Best )
             if self._toStore("SimulatedObservationAtCurrentState"):

diff --git a/src/daComposant/daAlgorithms/QuantileRegression.py b/src/daComposant/daAlgorithms/QuantileRegression.py
index c6615675132e3fb68275dedb08e7cf2d3347d644..0e59770300152194334cebe7a0c70711906fb99a 100644 (file)
--- a/src/daComposant/daAlgorithms/QuantileRegression.py
+++ b/src/daComposant/daAlgorithms/QuantileRegression.py
@@ -73,6 +73,7 @@ class ElementaryAlgorithm(BasicObjects.Algorithm):
                 "CostFunctionJ",
                 "CostFunctionJb",
                 "CostFunctionJo",
+                "CurrentIterationNumber",
                 "CurrentState",
                 "Innovation",
                 "OMA",
@@ -129,6 +130,8 @@ class ElementaryAlgorithm(BasicObjects.Algorithm):
             Jb  = 0.
             Jo  = 0.
             J   = Jb + Jo
+            #
+            self.StoredVariables["CurrentIterationNumber"].store( len(self.StoredVariables["CostFunctionJ"]) )
             self.StoredVariables["CostFunctionJb"].store( Jb )
             self.StoredVariables["CostFunctionJo"].store( Jo )
             self.StoredVariables["CostFunctionJ" ].store( J )

diff --git a/src/daComposant/daAlgorithms/TabuSearch.py b/src/daComposant/daAlgorithms/TabuSearch.py
index f239a15083a4331bda8d0a655608511af10ac951..fd7ad9692426d82310891779a84c83909ac2b4d3 100644 (file)
--- a/src/daComposant/daAlgorithms/TabuSearch.py
+++ b/src/daComposant/daAlgorithms/TabuSearch.py
@@ -106,10 +106,11 @@ class ElementaryAlgorithm(BasicObjects.Algorithm):
             listval  = [
                 "Analysis",
                 "BMA",
-                "CurrentState",
                 "CostFunctionJ",
                 "CostFunctionJb",
                 "CostFunctionJo",
+                "CurrentIterationNumber",
+                "CurrentState",
                 "Innovation",
                 "OMA",
                 "OMB",
@@ -247,6 +248,7 @@ class ElementaryAlgorithm(BasicObjects.Algorithm):
                 _HmX = Hm( numpy.asmatrix(numpy.ravel( _Best )).T )
                 _HmX = numpy.asmatrix(numpy.ravel( _HmX )).T
                 self.StoredVariables["SimulatedObservationAtCurrentState"].store( _HmX )
+            self.StoredVariables["CurrentIterationNumber"].store( len(self.StoredVariables["CostFunctionJ"]) )
             self.StoredVariables["CostFunctionJb"].store( 0. )
             self.StoredVariables["CostFunctionJo"].store( 0. )
             self.StoredVariables["CostFunctionJ" ].store( _qualityBest )

diff --git a/src/daComposant/daAlgorithms/UnscentedKalmanFilter.py b/src/daComposant/daAlgorithms/UnscentedKalmanFilter.py
index 496f5d32399ba54e2ab11932c8c4ba51ffe53b66..5af253c871afaf642be6bc23b1bfe24e39fb70b8 100644 (file)
--- a/src/daComposant/daAlgorithms/UnscentedKalmanFilter.py
+++ b/src/daComposant/daAlgorithms/UnscentedKalmanFilter.py
@@ -92,6 +92,7 @@ class ElementaryAlgorithm(BasicObjects.Algorithm):
                 "CostFunctionJ",
                 "CostFunctionJb",
                 "CostFunctionJo",
+                "CurrentIterationNumber",
                 "CurrentState",
                 "InnovationAtCurrentState",
                 ]
@@ -281,6 +282,7 @@ class ElementaryAlgorithm(BasicObjects.Algorithm):
                 Xn = numpy.min(numpy.hstack((Xn,numpy.asmatrix(self._parameters["Bounds"])[:,1])),axis=1)
             Xa = Xn # Pointeurs
             #
+            self.StoredVariables["CurrentIterationNumber"].store( len(self.StoredVariables["Analysis"]) )
             # ---> avec analysis
             self.StoredVariables["Analysis"].store( Xa )
             if self._toStore("APosterioriCovariance"):
@@ -311,6 +313,7 @@ class ElementaryAlgorithm(BasicObjects.Algorithm):
         # Stockage final supplémentaire de l'optimum en estimation de paramètres
         # ----------------------------------------------------------------------
         if self._parameters["EstimationOf"] == "Parameters":
+            self.StoredVariables["CurrentIterationNumber"].store( len(self.StoredVariables["Analysis"]) )
             self.StoredVariables["Analysis"].store( XaMin )
             if self._toStore("APosterioriCovariance"):
                 self.StoredVariables["APosterioriCovariance"].store( covarianceXaMin )

diff --git a/src/daComposant/daCore/BasicObjects.py b/src/daComposant/daCore/BasicObjects.py
index a3893603705ab650069f8c22f423cd5630736cb5..27d98e9fc85f158483ad9b627494ba9cbdb9688f 100644 (file)
--- a/src/daComposant/daCore/BasicObjects.py
+++ b/src/daComposant/daCore/BasicObjects.py
@@ -591,6 +591,7 @@ class Algorithm(object):
             - CostFunctionJbAtCurrentOptimum : partie ébauche à l'état optimal courant lors d'itérations
             - CostFunctionJo : partie observations de la fonction-coût : Jo
             - CostFunctionJoAtCurrentOptimum : partie observations à l'état optimal courant lors d'itérations
+            - CurrentIterationNumber : numéro courant d'itération dans les algorithmes itératifs, à partir de 0
             - CurrentOptimum : état optimal courant lors d'itérations
             - CurrentState : état courant lors d'itérations
             - GradientOfCostFunctionJ  : gradient de la fonction-coût globale
@@ -645,6 +646,7 @@ class Algorithm(object):
         self.StoredVariables["CostFunctionJbAtCurrentOptimum"]       = Persistence.OneScalar(name = "CostFunctionJbAtCurrentOptimum")
         self.StoredVariables["CostFunctionJo"]                       = Persistence.OneScalar(name = "CostFunctionJo")
         self.StoredVariables["CostFunctionJoAtCurrentOptimum"]       = Persistence.OneScalar(name = "CostFunctionJoAtCurrentOptimum")
+        self.StoredVariables["CurrentIterationNumber"]               = Persistence.OneIndex(name = "CurrentIterationNumber")
         self.StoredVariables["CurrentOptimum"]                       = Persistence.OneVector(name = "CurrentOptimum")
         self.StoredVariables["CurrentState"]                         = Persistence.OneVector(name = "CurrentState")
         self.StoredVariables["ForecastState"]                        = Persistence.OneVector(name = "ForecastState")