Fixing some interface args syntax

diff --git a/src/daComposant/daCore/Aidsm.py b/src/daComposant/daCore/Aidsm.py
index 50cbd33ab46a36d35fcd745160ab481d04105b32..7b8f5da885ad416fda8c339ab38a89d0daa3161a 100644 (file)
--- a/src/daComposant/daCore/Aidsm.py
+++ b/src/daComposant/daCore/Aidsm.py
@@ -94,9 +94,9 @@ class Aidsm(object):
             ColNames             = None,
             DataFile             = None,
             DiagonalSparseMatrix = None,
-            ExtraArgs            = None,
+            ExtraArguments       = None,
             Info                 = None,
-            InputAsMF            = False,
+            InputFunctionAsMulti = False,
             Matrix               = None,
             ObjectFunction       = None,
             ObjectMatrix         = None,
@@ -140,14 +140,14 @@ class Aidsm(object):
             elif Concept == "ObservationOperator":
                 self.setObservationOperator(
                     Matrix, OneFunction, ThreeFunctions, AppliedInXb,
-                    Parameters, Script, ExtraArgs,
-                    Stored, AvoidRC, InputAsMF, Checked )
+                    Parameters, Script, ExtraArguments,
+                    Stored, AvoidRC, InputFunctionAsMulti, Checked )
             elif Concept in ("EvolutionModel", "ControlModel"):
                 commande = getattr(self,"set"+Concept)
                 commande(
                     Matrix, OneFunction, ThreeFunctions,
-                    Parameters, Script, Scheduler, ExtraArgs,
-                    Stored, AvoidRC, InputAsMF, Checked )
+                    Parameters, Script, Scheduler, ExtraArguments,
+                    Stored, AvoidRC, InputFunctionAsMulti, Checked )
             else:
                 raise ValueError("the variable named '%s' is not allowed."%str(Concept))
         except Exception as e:
@@ -345,17 +345,17 @@ class Aidsm(object):
         return 0
 
     def setObservationOperator(self,
-            Matrix         = None,
-            OneFunction    = None,
-            ThreeFunctions = None,
-            AppliedInXb    = None,
-            Parameters     = None,
-            Script         = None,
-            ExtraArgs      = None,
-            Stored         = False,
-            AvoidRC        = True,
-            InputAsMF      = False,
-            Checked        = False):
+            Matrix               = None,
+            OneFunction          = None,
+            ThreeFunctions       = None,
+            AppliedInXb          = None,
+            Parameters           = None,
+            Script               = None,
+            ExtraArguments       = None,
+            Stored               = False,
+            AvoidRC              = True,
+            InputFunctionAsMulti = False,
+            Checked              = False):
         "Definition d'un concept de calcul"
         Concept = "ObservationOperator"
         self.__case.register("set"+Concept, dir(), locals())
@@ -367,9 +367,9 @@ class Aidsm(object):
             asScript         = self.__with_directory(Script),
             asDict           = Parameters,
             appliedInX       = AppliedInXb,
-            extraArguments   = ExtraArgs,
+            extraArguments   = ExtraArguments,
             avoidRC          = AvoidRC,
-            inputAsMF        = InputAsMF,
+            inputAsMF        = InputFunctionAsMulti,
             scheduledBy      = None,
             toBeChecked      = Checked,
             )
@@ -378,17 +378,17 @@ class Aidsm(object):
         return 0
 
     def setEvolutionModel(self,
-            Matrix         = None,
-            OneFunction    = None,
-            ThreeFunctions = None,
-            Parameters     = None,
-            Script         = None,
-            Scheduler      = None,
-            ExtraArgs      = None,
-            Stored         = False,
-            AvoidRC        = True,
-            InputAsMF      = False,
-            Checked        = False):
+            Matrix               = None,
+            OneFunction          = None,
+            ThreeFunctions       = None,
+            Parameters           = None,
+            Script               = None,
+            Scheduler            = None,
+            ExtraArguments       = None,
+            Stored               = False,
+            AvoidRC              = True,
+            InputFunctionAsMulti = False,
+            Checked              = False):
         "Definition d'un concept de calcul"
         Concept = "EvolutionModel"
         self.__case.register("set"+Concept, dir(), locals())
@@ -400,9 +400,9 @@ class Aidsm(object):
             asScript         = self.__with_directory(Script),
             asDict           = Parameters,
             appliedInX       = None,
-            extraArguments   = ExtraArgs,
+            extraArguments   = ExtraArguments,
             avoidRC          = AvoidRC,
-            inputAsMF        = InputAsMF,
+            inputAsMF        = InputFunctionAsMulti,
             scheduledBy      = Scheduler,
             toBeChecked      = Checked,
             )
@@ -411,17 +411,17 @@ class Aidsm(object):
         return 0
 
     def setControlModel(self,
-            Matrix         = None,
-            OneFunction    = None,
-            ThreeFunctions = None,
-            Parameters     = None,
-            Script         = None,
-            Scheduler      = None,
-            ExtraArgs      = None,
-            Stored         = False,
-            AvoidRC        = True,
-            InputAsMF      = False,
-            Checked        = False):
+            Matrix               = None,
+            OneFunction          = None,
+            ThreeFunctions       = None,
+            Parameters           = None,
+            Script               = None,
+            Scheduler            = None,
+            ExtraArguments       = None,
+            Stored               = False,
+            AvoidRC              = True,
+            InputFunctionAsMulti = False,
+            Checked              = False):
         "Definition d'un concept de calcul"
         Concept = "ControlModel"
         self.__case.register("set"+Concept, dir(), locals())
@@ -433,9 +433,9 @@ class Aidsm(object):
             asScript         = self.__with_directory(Script),
             asDict           = Parameters,
             appliedInX       = None,
-            extraArguments   = ExtraArgs,
+            extraArguments   = ExtraArguments,
             avoidRC          = AvoidRC,
-            inputAsMF        = InputAsMF,
+            inputAsMF        = InputFunctionAsMulti,
             scheduledBy      = Scheduler,
             toBeChecked      = Checked,
             )

diff --git a/src/daComposant/daCore/Interfaces.py b/src/daComposant/daCore/Interfaces.py
index 7f6d8b4f550cffea76571541a119990ae9b4c8aa..796ccb8ee35cddc201a148c3fe5b142faee2bc2a 100644 (file)
--- a/src/daComposant/daCore/Interfaces.py
+++ b/src/daComposant/daCore/Interfaces.py
@@ -118,11 +118,11 @@ class _TUIViewer(GenericCaseViewer):
             for k in __keys:
                 __v = __local[k]
                 if __v is None: continue
-                if   k == "Checked"   and not __v: continue
-                if   k == "Stored"    and not __v: continue
-                if   k == "ColMajor"  and not __v: continue
-                if   k == "InputAsMF" and not __v: continue
-                if   k == "AvoidRC"   and     __v: continue
+                if   k == "Checked"              and not __v: continue
+                if   k == "Stored"               and not __v: continue
+                if   k == "ColMajor"             and not __v: continue
+                if   k == "InputFunctionAsMulti" and not __v: continue
+                if   k == "AvoidRC"              and     __v: continue
                 if   k == "noDetails":             continue
                 if isinstance(__v,Persistence.Persistence): __v = __v.values()
                 if callable(__v): __text = self._missing%__v.__name__+__text
@@ -393,7 +393,7 @@ class _SCDViewer(GenericCaseViewer):
                     __text += "%s_config['From'] = '%s'\n"%(__command,__f)
                     __text += "%s_config['Data'] = %s\n"%(__command,__v)
                     __text = __text.replace("''","'")
-                elif __k in ('Stored', 'Checked', 'ColMajor', 'InputAsMF'):
+                elif __k in ('Stored', 'Checked', 'ColMajor', 'InputFunctionAsMulti'):
                     if bool(__v):
                         __text += "%s_config['%s'] = '%s'\n"%(__command,__k,int(bool(__v)))
                 elif __k in ('AvoidRC', 'noDetails'):

diff --git a/test/test6903/Verification_des_mono_et_multi_fonctions_A.py b/test/test6903/Verification_des_mono_et_multi_fonctions_A.py
index 8630ec59ec4562291bbef0b91d718038d4107d7c..f615adba1e63e2827b600f503ea7e3f5a86363f6 100644 (file)
--- a/test/test6903/Verification_des_mono_et_multi_fonctions_A.py
+++ b/test/test6903/Verification_des_mono_et_multi_fonctions_A.py
@@ -72,7 +72,7 @@ def test1():
         adaopy.setBackgroundError    (ScalarSparseMatrix = 1.)
         adaopy.setObservation        (Vector = [0.5,1.5,2.5])
         adaopy.setObservationError   (DiagonalSparseMatrix = "1 1 1")
-        adaopy.setObservationOperator(OneFunction = MultiFonction, InputAsMF = True)
+        adaopy.setObservationOperator(OneFunction = MultiFonction, InputFunctionAsMulti = True)
         adaopy.setObserver("Analysis",Template="ValuePrinter")
         adaopy.execute()
         Xa["Multi/"+algo] = adaopy.get("Analysis")[-1]

diff --git a/test/test6903/Verification_des_mono_et_multi_fonctions_B.py b/test/test6903/Verification_des_mono_et_multi_fonctions_B.py
index 69a0eb816aa14f0883625a5077cdbc427f80182e..3f9ef9ece8a487f0572d20c1bbd00a2f3eebeff2 100644 (file)
--- a/test/test6903/Verification_des_mono_et_multi_fonctions_B.py
+++ b/test/test6903/Verification_des_mono_et_multi_fonctions_B.py
@@ -74,7 +74,7 @@ def test1():
         adaopy.setBackgroundError    (ScalarSparseMatrix = 1.)
         adaopy.setObservation        (Vector = [0.5,1.5,2.5])
         adaopy.setObservationError   (DiagonalSparseMatrix = "1 1 1")
-        adaopy.setObservationOperator(OneFunction = MultiFonction, InputAsMF = True)
+        adaopy.setObservationOperator(OneFunction = MultiFonction, InputFunctionAsMulti = True)
         adaopy.setEvolutionError     (ScalarSparseMatrix = 1.)
         adaopy.setEvolutionModel     (Matrix = "1 0 0;0 1 0;0 0 1")
         adaopy.setObserver("Analysis",Template="ValuePrinter")

diff --git a/test/test6903/Verification_des_mono_et_multi_fonctions_C.py b/test/test6903/Verification_des_mono_et_multi_fonctions_C.py
index 08f9a997f074ff3187f4e110b761495fc1aad1b6..c4f18c6c3804e5e43f80d71f2d37e65a7733a48f 100644 (file)
--- a/test/test6903/Verification_des_mono_et_multi_fonctions_C.py
+++ b/test/test6903/Verification_des_mono_et_multi_fonctions_C.py
@@ -72,7 +72,7 @@ def test1():
         adaopy.setBackgroundError    (ScalarSparseMatrix = 1.)
         adaopy.setObservation        (Vector = [0.5,1.5,2.5])
         adaopy.setObservationError   (DiagonalSparseMatrix = "1 2 3")
-        adaopy.setObservationOperator(OneFunction = MultiFonction, InputAsMF = True)
+        adaopy.setObservationOperator(OneFunction = MultiFonction, InputFunctionAsMulti = True)
         adaopy.setObserver("Analysis",Template="ValuePrinter")
         adaopy.execute()
         Xa["Multi/"+algo] = adaopy.get("Analysis")[-1]

diff --git a/test/test6903/Verification_des_mono_et_multi_fonctions_D.py b/test/test6903/Verification_des_mono_et_multi_fonctions_D.py
index bbd418a9f89dffe947950205c7b10e06b332ba2c..bcccedf127493c6abbf3770f1b9dccde2aa7312e 100644 (file)
--- a/test/test6903/Verification_des_mono_et_multi_fonctions_D.py
+++ b/test/test6903/Verification_des_mono_et_multi_fonctions_D.py
@@ -100,7 +100,7 @@ def test1():
         adaopy.setBackgroundError    (ScalarSparseMatrix = 1.)
         adaopy.setObservation        (Vector = [0.5,1.5,2.5,0.5,1.5,2.5,0.5,1.5,2.5])
         adaopy.setObservationError   (DiagonalSparseMatrix = "1 1 1 1 1 1 1 1 1")
-        adaopy.setObservationOperator(OneFunction = MultiFonction01, InputAsMF = True)
+        adaopy.setObservationOperator(OneFunction = MultiFonction01, InputFunctionAsMulti = True)
         adaopy.setObserver("Analysis",Template="ValuePrinter")
         adaopy.execute()
         Xa["Multi/"+algo] = adaopy.get("Analysis")[-1]

diff --git a/test/test6903/Verification_des_mono_et_multi_fonctions_E.py b/test/test6903/Verification_des_mono_et_multi_fonctions_E.py
index 894c242b50be5c85d5dfed8faf3f1a7d946c8dc5..e5324e56f20acf345e7819d99b0278e0972dc614 100644 (file)
--- a/test/test6903/Verification_des_mono_et_multi_fonctions_E.py
+++ b/test/test6903/Verification_des_mono_et_multi_fonctions_E.py
@@ -102,7 +102,7 @@ def test1():
         adaopy.setBackgroundError    (ScalarSparseMatrix = 1.)
         adaopy.setObservation        (Vector = [0.5,1.5,2.5,0.5,1.5,2.5,0.5,1.5,2.5])
         adaopy.setObservationError   (DiagonalSparseMatrix = "1 1 1 1 1 1 1 1 1")
-        adaopy.setObservationOperator(OneFunction = MultiFonction01, InputAsMF = True)
+        adaopy.setObservationOperator(OneFunction = MultiFonction01, InputFunctionAsMulti = True)
         adaopy.setEvolutionError     (ScalarSparseMatrix = 1.)
         adaopy.setEvolutionModel     (Matrix = "1 0 0;0 1 0;0 0 1")
         adaopy.setObserver("Analysis",Template="ValuePrinter")

diff --git a/test/test6903/Verification_des_mono_et_multi_fonctions_F.py b/test/test6903/Verification_des_mono_et_multi_fonctions_F.py
index d07435f676d4a56a894cf95fd8bad47950f30d88..0cc31e87759f1dd4495ce27c829f136115bbf23e 100644 (file)
--- a/test/test6903/Verification_des_mono_et_multi_fonctions_F.py
+++ b/test/test6903/Verification_des_mono_et_multi_fonctions_F.py
@@ -100,7 +100,7 @@ def test1():
         adaopy.setBackgroundError    (ScalarSparseMatrix = 1.)
         adaopy.setObservation        (Vector = [0.5,1.5,2.5,0.5,1.5,2.5,0.5,1.5,2.5])
         adaopy.setObservationError   (DiagonalSparseMatrix = "1 1 1 1 1 1 1 1 1")
-        adaopy.setObservationOperator(OneFunction = MultiFonction01, InputAsMF = True)
+        adaopy.setObservationOperator(OneFunction = MultiFonction01, InputFunctionAsMulti = True)
         adaopy.setObserver("Analysis",Template="ValuePrinter")
         adaopy.execute()
         Xa["Multi/"+algo] = adaopy.get("Analysis")[-1]