Minor documentation and code review corrections (36)

diff --git a/doc/en/scripts/simple_3DVAR.py b/doc/en/scripts/simple_3DVAR.py
index 65a390dcd920a4942297eb9cd0a7c99312e43c23..f2078878364d84dcf9d5e705ef91a63ac962037e 100644 (file)
--- a/doc/en/scripts/simple_3DVAR.py
+++ b/doc/en/scripts/simple_3DVAR.py
@@ -19,7 +19,7 @@ print("Resolution of the calibration problem")
 print("-------------------------------------")
 print("")
 from adao import adaoBuilder
-case = adaoBuilder.New('')
+case = adaoBuilder.New()
 case.setBackground( Vector = Xb, Stored=True )
 case.setBackgroundError( ScalarSparseMatrix = 1.e6 )
 case.setObservation( Vector = Yobs, Stored=True )

diff --git a/doc/en/scripts/simple_AdjointTest.py b/doc/en/scripts/simple_AdjointTest.py
index a68f18edbe9f7280cf745229713f8d960615fe3d..9a73ddaf6af8c6c74802fa4e9b8ba598ca442176 100644 (file)
--- a/doc/en/scripts/simple_AdjointTest.py
+++ b/doc/en/scripts/simple_AdjointTest.py
@@ -2,7 +2,7 @@
 #
 from numpy import array, eye
 from adao import adaoBuilder
-case = adaoBuilder.New('')
+case = adaoBuilder.New()
 case.setCheckingPoint( Vector = array([0., 1., 2.]), Stored=True )
 case.setObservation( Vector = [10., 11., 12.] )
 case.setObservationOperator( Matrix = eye(3), )

diff --git a/doc/en/scripts/simple_Blue.py b/doc/en/scripts/simple_Blue.py
index 58cf086f2b4c64cbc039e73a9412b6bf36ee167f..c5ed14a61cc93d4787de0cb9dfb0149f65e6d335 100644 (file)
--- a/doc/en/scripts/simple_Blue.py
+++ b/doc/en/scripts/simple_Blue.py
@@ -2,7 +2,7 @@
 #
 from numpy import array, ravel
 from adao import adaoBuilder
-case = adaoBuilder.New('')
+case = adaoBuilder.New()
 case.setBackground( Vector = array([0., 1., 2.]), Stored=True )
 case.setBackgroundError( ScalarSparseMatrix = 1. )
 case.setObservation( Vector=array([10., 11., 12.]), Stored=True )

diff --git a/doc/en/scripts/simple_DerivativeFreeOptimization.py b/doc/en/scripts/simple_DerivativeFreeOptimization.py
index 7fb30839857d51e114514d4149ccbe2deec5e61c..ab25a7f2acba1f102a0339b600ba6d920b925152 100644 (file)
--- a/doc/en/scripts/simple_DerivativeFreeOptimization.py
+++ b/doc/en/scripts/simple_DerivativeFreeOptimization.py
@@ -19,7 +19,7 @@ print("Resolution of the calibration problem")
 print("-------------------------------------")
 print("")
 from adao import adaoBuilder
-case = adaoBuilder.New('')
+case = adaoBuilder.New()
 case.setBackground( Vector = Xb, Stored=True )
 case.setBackgroundError( ScalarSparseMatrix = 1.e6 )
 case.setObservation( Vector = Yobs, Stored=True )

diff --git a/doc/en/scripts/simple_ExtendedBlue.py b/doc/en/scripts/simple_ExtendedBlue.py
index 03ef1ca93832b5534423a00b4dcbf439930b6a2e..4a7ff5f789025542f280db930d66b37b148652b3 100644 (file)
--- a/doc/en/scripts/simple_ExtendedBlue.py
+++ b/doc/en/scripts/simple_ExtendedBlue.py
@@ -2,7 +2,7 @@
 #
 from numpy import array, ravel
 from adao import adaoBuilder
-case = adaoBuilder.New('')
+case = adaoBuilder.New()
 case.setBackground( Vector = array([0., 1., 2.]), Stored=True )
 case.setBackgroundError( ScalarSparseMatrix = 1. )
 case.setObservation( Vector=array([10., 11., 12.]), Stored=True )

diff --git a/doc/en/scripts/simple_KalmanFilter1.py b/doc/en/scripts/simple_KalmanFilter1.py
index b4fac0f06a871465bd71c817b9aa222d63d4a261..4910a21124252989438576a48015b9cbd7ce1353 100644 (file)
--- a/doc/en/scripts/simple_KalmanFilter1.py
+++ b/doc/en/scripts/simple_KalmanFilter1.py
@@ -12,7 +12,7 @@ print("----------------------------------------------")
 print("  Noisy measurements acquired on %i time steps"%(len(Yobs)-1,))
 print("")
 from adao import adaoBuilder
-case = adaoBuilder.New('')
+case = adaoBuilder.New()
 #
 case.setBackground         (Vector             = [0.])
 case.setBackgroundError    (ScalarSparseMatrix = 1.)

diff --git a/doc/en/scripts/simple_KalmanFilter2.py b/doc/en/scripts/simple_KalmanFilter2.py
index f677dad5a8e412e92cff4d0a1c83ef01b59cb27d..cc30384b0af390c49f094bcd909817f56560acf4 100644 (file)
--- a/doc/en/scripts/simple_KalmanFilter2.py
+++ b/doc/en/scripts/simple_KalmanFilter2.py
@@ -12,7 +12,7 @@ print("----------------------------------------------")
 print("  Noisy measurements acquired on %i time steps"%(len(Yobs)-1,))
 print("")
 from adao import adaoBuilder
-case = adaoBuilder.New('')
+case = adaoBuilder.New()
 #
 case.setBackground         (Vector             = [0.])
 case.setBackgroundError    (ScalarSparseMatrix = 1.)

diff --git a/doc/en/scripts/simple_NonLinearLeastSquares.py b/doc/en/scripts/simple_NonLinearLeastSquares.py
index 6bae4905aa25bea131038952a92de234b3762d4c..8b208ebf93df0232866714a02a63049550194718 100644 (file)
--- a/doc/en/scripts/simple_NonLinearLeastSquares.py
+++ b/doc/en/scripts/simple_NonLinearLeastSquares.py
@@ -19,7 +19,7 @@ print("Resolution of the calibration problem")
 print("-------------------------------------")
 print("")
 from adao import adaoBuilder
-case = adaoBuilder.New('')
+case = adaoBuilder.New()
 case.setBackground( Vector = Xb, Stored=True )
 case.setObservation( Vector = Yobs, Stored=True )
 case.setObservationError( ScalarSparseMatrix = 1. )

diff --git a/doc/en/scripts/simple_ParallelFunctionTest.py b/doc/en/scripts/simple_ParallelFunctionTest.py
index dde6bc192e093520df87c20155e6a296fd31da5d..7a6d6a8ec95288591d5f7002c11daea76e83617b 100644 (file)
--- a/doc/en/scripts/simple_ParallelFunctionTest.py
+++ b/doc/en/scripts/simple_ParallelFunctionTest.py
@@ -6,7 +6,7 @@ from adao import adaoBuilder
 def SomeOperator( x ):
     return numpy.dot(numpy.eye(x.size), numpy.ravel(x))
 #
-case = adaoBuilder.New('')
+case = adaoBuilder.New()
 case.setAlgorithmParameters(
     Algorithm='ParallelFunctionTest',
     Parameters={

diff --git a/doc/en/tutorials_in_salome.rst b/doc/en/tutorials_in_salome.rst
index dc701950dfa17cfaadc3e9551d08d91d02fd91f6..9b9028f7f350b2f1c6d92d5d80c824ab527e8f9e 100644 (file)
--- a/doc/en/tutorials_in_salome.rst
+++ b/doc/en/tutorials_in_salome.rst
@@ -585,6 +585,7 @@ the following parameters can be defined in a Python script file named
             ],
         "StoreSupplementaryCalculations" : [
             "CurrentState",
+            "CostFunctionJ",
             ],
     }
 

diff --git a/doc/fr/scripts/simple_3DVAR.py b/doc/fr/scripts/simple_3DVAR.py
index cde70b4485cc3c86aa9fe8fdd28ca9c2393dafb9..88c307cdae1f1d5ee4be9512bd5a515dd4f8e3a6 100644 (file)
--- a/doc/fr/scripts/simple_3DVAR.py
+++ b/doc/fr/scripts/simple_3DVAR.py
@@ -19,7 +19,7 @@ print("Résolution du problème de calage")
 print("--------------------------------")
 print("")
 from adao import adaoBuilder
-case = adaoBuilder.New('')
+case = adaoBuilder.New()
 case.setBackground( Vector = Xb, Stored=True )
 case.setBackgroundError( ScalarSparseMatrix = 1.e6 )
 case.setObservation( Vector = Yobs, Stored=True )

diff --git a/doc/fr/scripts/simple_AdjointTest.py b/doc/fr/scripts/simple_AdjointTest.py
index a68f18edbe9f7280cf745229713f8d960615fe3d..9a73ddaf6af8c6c74802fa4e9b8ba598ca442176 100644 (file)
--- a/doc/fr/scripts/simple_AdjointTest.py
+++ b/doc/fr/scripts/simple_AdjointTest.py
@@ -2,7 +2,7 @@
 #
 from numpy import array, eye
 from adao import adaoBuilder
-case = adaoBuilder.New('')
+case = adaoBuilder.New()
 case.setCheckingPoint( Vector = array([0., 1., 2.]), Stored=True )
 case.setObservation( Vector = [10., 11., 12.] )
 case.setObservationOperator( Matrix = eye(3), )

diff --git a/doc/fr/scripts/simple_Blue.py b/doc/fr/scripts/simple_Blue.py
index edef24dae5ed36be7fbd173e505b0ee8e416b0a5..0f81f69fe1c7468ba7a37d400ba810dc9057a361 100644 (file)
--- a/doc/fr/scripts/simple_Blue.py
+++ b/doc/fr/scripts/simple_Blue.py
@@ -2,7 +2,7 @@
 #
 from numpy import array, ravel
 from adao import adaoBuilder
-case = adaoBuilder.New('')
+case = adaoBuilder.New()
 case.setBackground( Vector = array([0., 1., 2.]), Stored=True )
 case.setBackgroundError( ScalarSparseMatrix = 1. )
 case.setObservation( Vector = array([10., 11., 12.]), Stored=True )

diff --git a/doc/fr/scripts/simple_DerivativeFreeOptimization.py b/doc/fr/scripts/simple_DerivativeFreeOptimization.py
index 361106de3ba9ebc9586e0ee2fdef68f2aeaa6fed..101137749e71aed7afea76f394f8f1d12cdf7363 100644 (file)
--- a/doc/fr/scripts/simple_DerivativeFreeOptimization.py
+++ b/doc/fr/scripts/simple_DerivativeFreeOptimization.py
@@ -19,7 +19,7 @@ print("Résolution du problème de calage")
 print("--------------------------------")
 print("")
 from adao import adaoBuilder
-case = adaoBuilder.New('')
+case = adaoBuilder.New()
 case.setBackground( Vector = Xb, Stored=True )
 case.setBackgroundError( ScalarSparseMatrix = 1.e6 )
 case.setObservation( Vector = Yobs, Stored=True )

diff --git a/doc/fr/scripts/simple_ExtendedBlue.py b/doc/fr/scripts/simple_ExtendedBlue.py
index 7508fe713570fe070c1caa64bee38a21de380d96..fb2ea6938771e96143188f5c0b9c3a3dba806ffc 100644 (file)
--- a/doc/fr/scripts/simple_ExtendedBlue.py
+++ b/doc/fr/scripts/simple_ExtendedBlue.py
@@ -2,7 +2,7 @@
 #
 from numpy import array, ravel
 from adao import adaoBuilder
-case = adaoBuilder.New('')
+case = adaoBuilder.New()
 case.setBackground( Vector = array([0., 1., 2.]), Stored=True )
 case.setBackgroundError( ScalarSparseMatrix = 1. )
 case.setObservation( Vector = array([10., 11., 12.]), Stored=True )

diff --git a/doc/fr/scripts/simple_KalmanFilter1.py b/doc/fr/scripts/simple_KalmanFilter1.py
index afa3924cdb2e37d16b35c444eecd30d1e1baa07e..c81d2a51ffd14c8e0f7a0a77b506c2ec84073a29 100644 (file)
--- a/doc/fr/scripts/simple_KalmanFilter1.py
+++ b/doc/fr/scripts/simple_KalmanFilter1.py
@@ -12,7 +12,7 @@ print("------------------------------------------------")
 print("  Observations bruitées acquises sur %i pas de temps"%(len(Yobs)-1,))
 print("")
 from adao import adaoBuilder
-case = adaoBuilder.New('')
+case = adaoBuilder.New()
 #
 case.setBackground         (Vector             = [0.])
 case.setBackgroundError    (ScalarSparseMatrix = 1.)

diff --git a/doc/fr/scripts/simple_KalmanFilter2.py b/doc/fr/scripts/simple_KalmanFilter2.py
index 01dc98e900aebf2d4e37d38a46c403e4388e3559..a7b4de8cc722f204fd819891b78ba1a2da882ad6 100644 (file)
--- a/doc/fr/scripts/simple_KalmanFilter2.py
+++ b/doc/fr/scripts/simple_KalmanFilter2.py
@@ -12,7 +12,7 @@ print("------------------------------------------------")
 print("  Observations bruitées acquises sur %i pas de temps"%(len(Yobs)-1,))
 print("")
 from adao import adaoBuilder
-case = adaoBuilder.New('')
+case = adaoBuilder.New()
 #
 case.setBackground         (Vector             = [0.])
 case.setBackgroundError    (ScalarSparseMatrix = 1.)

diff --git a/doc/fr/scripts/simple_NonLinearLeastSquares.py b/doc/fr/scripts/simple_NonLinearLeastSquares.py
index 9f3ed1d5ab058832153282ab1802ce4f644adff5..7854987903c8bf983438999c233364888a044aca 100644 (file)
--- a/doc/fr/scripts/simple_NonLinearLeastSquares.py
+++ b/doc/fr/scripts/simple_NonLinearLeastSquares.py
@@ -19,7 +19,7 @@ print("Résolution du problème de calage")
 print("--------------------------------")
 print("")
 from adao import adaoBuilder
-case = adaoBuilder.New('')
+case = adaoBuilder.New()
 case.setBackground( Vector = Xb, Stored=True )
 case.setObservation( Vector = Yobs, Stored=True )
 case.setObservationError( ScalarSparseMatrix = 1. )

diff --git a/doc/fr/scripts/simple_ParallelFunctionTest.py b/doc/fr/scripts/simple_ParallelFunctionTest.py
index dde6bc192e093520df87c20155e6a296fd31da5d..7a6d6a8ec95288591d5f7002c11daea76e83617b 100644 (file)
--- a/doc/fr/scripts/simple_ParallelFunctionTest.py
+++ b/doc/fr/scripts/simple_ParallelFunctionTest.py
@@ -6,7 +6,7 @@ from adao import adaoBuilder
 def SomeOperator( x ):
     return numpy.dot(numpy.eye(x.size), numpy.ravel(x))
 #
-case = adaoBuilder.New('')
+case = adaoBuilder.New()
 case.setAlgorithmParameters(
     Algorithm='ParallelFunctionTest',
     Parameters={

diff --git a/doc/fr/tutorials_in_salome.rst b/doc/fr/tutorials_in_salome.rst
index 88c53eb0c3ad647d957974007b73150f160794a6..bca38043d97c1c3bcca750bea2716c7be3cb6b29 100644 (file)
--- a/doc/fr/tutorials_in_salome.rst
+++ b/doc/fr/tutorials_in_salome.rst
@@ -616,6 +616,7 @@ définis dans un fichier de script Python nommé
             ],
         "StoreSupplementaryCalculations" : [
             "CurrentState",
+            "CostFunctionJ",
             ],
     }
 

diff --git a/src/daComposant/daAlgorithms/Atoms/c2ukf.py b/src/daComposant/daAlgorithms/Atoms/c2ukf.py
index 1ba2dc844212a4fca996ebb4a2d11db7780afb52..d736544f26a0c8675a396c8583bc6c1cf1b87bf3 100644 (file)
--- a/src/daComposant/daAlgorithms/Atoms/c2ukf.py
+++ b/src/daComposant/daAlgorithms/Atoms/c2ukf.py
@@ -69,7 +69,7 @@ def c2ukf(selfA, Xb, Y, U, HO, EM, CM, R, B, Q):
         __p = numpy.cumprod(Y.shape())[-1]
     else:
         duration = 2
-        __p = numpy.array(Y).size
+        __p = numpy.size(Y)
     #
     # Précalcul des inversions de B et R
     if selfA._parameters["StoreInternalVariables"] \

diff --git a/src/daComposant/daAlgorithms/Atoms/cekf.py b/src/daComposant/daAlgorithms/Atoms/cekf.py
index f1a814c0fd09b7e71dc64d4223e25d022cf2bd20..67932dc1f1897e134a15716519a0be7864f47aed 100644 (file)
--- a/src/daComposant/daAlgorithms/Atoms/cekf.py
+++ b/src/daComposant/daAlgorithms/Atoms/cekf.py
@@ -46,7 +46,7 @@ def cekf(selfA, Xb, Y, U, HO, EM, CM, R, B, Q):
         __p = numpy.cumprod(Y.shape())[-1]
     else:
         duration = 2
-        __p = numpy.array(Y).size
+        __p = numpy.size(Y)
     __n = Xb.size
     #
     # Précalcul des inversions de B et R

diff --git a/src/daComposant/daAlgorithms/Atoms/etkf.py b/src/daComposant/daAlgorithms/Atoms/etkf.py
index e9b5d0618a97fee5b7f8db4cef9c35a4103eb3bf..0063e14a466464a9f99b5e4e79b1c67125525b9f 100644 (file)
--- a/src/daComposant/daAlgorithms/Atoms/etkf.py
+++ b/src/daComposant/daAlgorithms/Atoms/etkf.py
@@ -62,7 +62,7 @@ def etkf(selfA, Xb, Y, U, HO, EM, CM, R, B, Q,
         __p = numpy.cumprod(Y.shape())[-1]
     else:
         duration = 2
-        __p = numpy.array(Y).size
+        __p = numpy.size(Y)
     #
     # Précalcul des inversions de B et R
     if selfA._parameters["StoreInternalVariables"] \

diff --git a/src/daComposant/daAlgorithms/Atoms/exkf.py b/src/daComposant/daAlgorithms/Atoms/exkf.py
index befd65cad8ddc5c00f138baef69cc7ca50e81867..4c8b0363be413c02a9146f449ddfa78d1033f3af 100644 (file)
--- a/src/daComposant/daAlgorithms/Atoms/exkf.py
+++ b/src/daComposant/daAlgorithms/Atoms/exkf.py
@@ -44,7 +44,7 @@ def exkf(selfA, Xb, Y, U, HO, EM, CM, R, B, Q):
         __p = numpy.cumprod(Y.shape())[-1]
     else:
         duration = 2
-        __p = numpy.array(Y).size
+        __p = numpy.size(Y)
     __n = Xb.size
     #
     # Précalcul des inversions de B et R

diff --git a/src/daComposant/daAlgorithms/Atoms/ienkf.py b/src/daComposant/daAlgorithms/Atoms/ienkf.py
index 048ce731d1b19ae10bd3b3d26e389ff7702caaa2..7212d4202ce73684d4dfe691de7b0d6fbdef7ef5 100644 (file)
--- a/src/daComposant/daAlgorithms/Atoms/ienkf.py
+++ b/src/daComposant/daAlgorithms/Atoms/ienkf.py
@@ -61,7 +61,7 @@ def ienkf(selfA, Xb, Y, U, HO, EM, CM, R, B, Q, VariantM="IEnKF12",
         __p = numpy.cumprod(Y.shape())[-1]
     else:
         duration = 2
-        __p = numpy.array(Y).size
+        __p = numpy.size(Y)
     #
     # Précalcul des inversions de B et R
     if selfA._parameters["StoreInternalVariables"] \

diff --git a/src/daComposant/daAlgorithms/Atoms/mlef.py b/src/daComposant/daAlgorithms/Atoms/mlef.py
index e727206e2e5468de7333585d021241847d1efa1d..f2228f9afd9f003f0115061b2a0db7d03829547c 100644 (file)
--- a/src/daComposant/daAlgorithms/Atoms/mlef.py
+++ b/src/daComposant/daAlgorithms/Atoms/mlef.py
@@ -65,7 +65,7 @@ def mlef(selfA, Xb, Y, U, HO, EM, CM, R, B, Q,
         __p = numpy.cumprod(Y.shape())[-1]
     else:
         duration = 2
-        __p = numpy.array(Y).size
+        __p = numpy.size(Y)
     #
     # Précalcul des inversions de B et R
     if selfA._parameters["StoreInternalVariables"] \

diff --git a/src/daComposant/daAlgorithms/Atoms/senkf.py b/src/daComposant/daAlgorithms/Atoms/senkf.py
index b1a0da3ab840d6fda90f7de3202ddd71482507d5..c70788349bed86df4f436acaa92ab9e15db3a018 100644 (file)
--- a/src/daComposant/daAlgorithms/Atoms/senkf.py
+++ b/src/daComposant/daAlgorithms/Atoms/senkf.py
@@ -66,7 +66,7 @@ def senkf(selfA, Xb, Y, U, HO, EM, CM, R, B, Q,
         __p = numpy.cumprod(Y.shape())[-1]
     else:
         duration = 2
-        __p = numpy.array(Y).size
+        __p = numpy.size(Y)
     #
     # Précalcul des inversions de B et R
     if selfA._parameters["StoreInternalVariables"] \

diff --git a/src/daComposant/daAlgorithms/Atoms/uskf.py b/src/daComposant/daAlgorithms/Atoms/uskf.py
index d5e7c957e9d810e7c9d2701f79cdf03f826e2ca0..02e3d5537cac58c7f99bdf7c07b9260612bbf991 100644 (file)
--- a/src/daComposant/daAlgorithms/Atoms/uskf.py
+++ b/src/daComposant/daAlgorithms/Atoms/uskf.py
@@ -67,7 +67,7 @@ def uskf(selfA, Xb, Y, U, HO, EM, CM, R, B, Q):
         __p = numpy.cumprod(Y.shape())[-1]
     else:
         duration = 2
-        __p = numpy.array(Y).size
+        __p = numpy.size(Y)
     #
     # Précalcul des inversions de B et R
     if selfA._parameters["StoreInternalVariables"] \

diff --git a/src/daComposant/daAlgorithms/SamplingTest.py b/src/daComposant/daAlgorithms/SamplingTest.py
index befabadef2b887dbb2f82a2aa4d1abbb9a86ebf8..d6edee1a12d647302c170123c12582b1007bdb9a 100644 (file)
--- a/src/daComposant/daAlgorithms/SamplingTest.py
+++ b/src/daComposant/daAlgorithms/SamplingTest.py
@@ -97,7 +97,7 @@ class ElementaryAlgorithm(BasicObjects.Algorithm):
             message  = "Graine fixée pour le générateur aléatoire",
             )
         self.requireInputArguments(
-            mandatory= ("Xb", "HO"),
+            mandatory= ("Xb", "Y", "HO", "R", "B"),
             )
         self.setAttributes(tags=(
             "Checking",

diff --git a/src/daComposant/daCore/BasicObjects.py b/src/daComposant/daCore/BasicObjects.py
index 5723da3d670be0c4f155c487c5928d331f43258f..4cdcfeb86c6b1face38a530ce2b5e280a960dd61 100644 (file)
--- a/src/daComposant/daCore/BasicObjects.py
+++ b/src/daComposant/daCore/BasicObjects.py
@@ -84,11 +84,11 @@ class CacheManager(object):
     def storeValueInX(self, xValue, HxValue, oName="" ):
         "Stocke pour un opérateur o un calcul Hx correspondant à la valeur x"
         if self.__lengthOR < 0:
-            self.__lengthOR = 2 * min(xValue.size, 50) + 2 # 2 * xValue.size + 2
+            self.__lengthOR = 2 * min(numpy.size(xValue), 50) + 2
             self.__initlnOR = self.__lengthOR
             self.__seenNames.append(str(oName))
         if str(oName) not in self.__seenNames: # Etend la liste si nouveau
-            self.__lengthOR += 2 * min(xValue.size, 50) + 2 # 2 * xValue.size + 2
+            self.__lengthOR += 2 * min(numpy.size(xValue), 50) + 2
             self.__initlnOR += self.__lengthOR
             self.__seenNames.append(str(oName))
         while len(self.__listOPCV) > self.__lengthOR: