Correction of catalogue and version setting

diff --git a/bin/AdaoCatalogGenerator.py b/bin/AdaoCatalogGenerator.py
index fd320623139260c27a52cd12b5beb0ac454328e7..dd7842f653d6ad9eadc3959b244129f71362ebfc 100644 (file)
--- a/bin/AdaoCatalogGenerator.py
+++ b/bin/AdaoCatalogGenerator.py
@@ -78,27 +78,27 @@ NoCheckInNS.info = ""
 def DirectOperatorInNS(filename):
     if os.path.exists(filename):
         fc = open(filename, 'r').readlines()
-        cr = re.compile("^DirectOperator[\s]*=")
+        cr = re.compile("^def[\s]*DirectOperator[\s]*\(")
         for ln in fc:
             if cr.match(ln): return 1
     return 0
-DirectOperatorInNS.info = u"The Python file has to contain explicitly a \\"DirectOperator\\" variable."
+DirectOperatorInNS.info = u"The Python file has to contain explicitly a \\"DirectOperator\\" function definition with only one vector as argument."
 def TangentOperatorInNS(filename):
     if os.path.exists(filename):
         fc = open(filename, 'r').readlines()
-        cr = re.compile("^TangentOperator[\s]*=")
+        cr = re.compile("^def[\s]*TangentOperator[\s]*\(")
         for ln in fc:
             if cr.match(ln): return 1
     return 0
-TangentOperatorInNS.info = u"The Python file has to contain explicitly a \\"TangentOperator\\" variable."
+TangentOperatorInNS.info = u"The Python file has to contain explicitly a \\"TangentOperator\\" function definition with only one pair of vectors as argument."
 def AdjointOperatorInNS(filename):
     if os.path.exists(filename):
         fc = open(filename, 'r').readlines()
-        cr = re.compile("^AdjointOperator[\s]*=")
+        cr = re.compile("^def[\s]*AdjointOperator[\s]*\(")
         for ln in fc:
             if cr.match(ln): return 1
     return 0
-AdjointOperatorInNS.info = u"The Python file has to contain explicitly a \\"AdjointOperator\\" variable."
+AdjointOperatorInNS.info = u"The Python file has to contain explicitly an \\"AdjointOperator\\" function definition with only one pair of vectors as argument."
 """%(module_version.name,module_version.version)
 
 # Important : validators=[...] pour que les conditions soient traitées simultanément, en "ET", et pas en "OU" (choisi dans le cas du tuple à la place de la liste)

diff --git a/resources/SalomeApp.xml b/resources/SalomeApp.xml
index 683cd79267fce90f91508ed3ccc40312611b0bc1..8b9a8e56e69dc715b403c614511f68e33de24b12 100644 (file)
--- a/resources/SalomeApp.xml
+++ b/resources/SalomeApp.xml
@@ -28,7 +28,7 @@
     <parameter name="icon"          value="ADAO.png"/>
     <parameter name="library"       value="SalomePyQtGUI"/>
     <parameter name="documentation" value="adao_help"/>
-    <parameter name="version"       value="7.5.1"/>
+    <parameter name="version"       value="7.6.0"/>
   </section>
   <section name="resources">
     <!-- Module resources -->

diff --git a/src/daComposant/daCore/BasicObjects.py b/src/daComposant/daCore/BasicObjects.py
index d1715d638ef3c81a60d0ee7c1722cd3e4f9a0b45..e5cccdfbfafb973593c9d61d9fd23f67bf023678 100644 (file)
--- a/src/daComposant/daCore/BasicObjects.py
+++ b/src/daComposant/daCore/BasicObjects.py
@@ -284,7 +284,7 @@ class Algorithm:
         self._m = PlatformInfo.SystemUsage()
         #
         self._name = str( name )
-        self._parameters = {}
+        self._parameters = {"StoreSupplementaryCalculations":[]}
         self.__required_parameters = {}
         self.StoredVariables = {}
         #
@@ -318,8 +318,7 @@ class Algorithm:
         return 0
 
     def _post_run(self,_oH=None):
-        if self._parameters.has_key("StoreSupplementaryCalculations") and \
-            "APosterioriCovariance" in self._parameters["StoreSupplementaryCalculations"]:
+        if "APosterioriCovariance" in self._parameters["StoreSupplementaryCalculations"]:
             for _A in self.StoredVariables["APosterioriCovariance"]:
                 if "APosterioriVariances" in self._parameters["StoreSupplementaryCalculations"]:
                     self.StoredVariables["APosterioriVariances"].store( numpy.diag(_A) )

diff --git a/src/daComposant/daCore/version.py b/src/daComposant/daCore/version.py
index 72427a41a505eb1189fcdfa7fa5e37f05ef19591..ec2d175ec8b434e5fdb053204a182461d72619c9 100644 (file)
--- a/src/daComposant/daCore/version.py
+++ b/src/daComposant/daCore/version.py
@@ -21,5 +21,5 @@
 #  Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D
 
 name    = "Data Assimilation Package"
-version = "0.10.1"
-date    = "vendredi 30 janvier 2015, 12:12:12 (UTC+0100)"
+version = "0.11.0"
+date    = "jeudi 30 avril 2015, 12:12:12 (UTC+0100)"