Debut ajout definition variables

diff --git a/bin/AdaoCatalogGenerator.py b/bin/AdaoCatalogGenerator.py
index 6146eeef6c713ac5451569c79311d1c92924dd8b..548cecf66a2e4ded3af9a96a467d787cbf35a8c8 100644 (file)
--- a/bin/AdaoCatalogGenerator.py
+++ b/bin/AdaoCatalogGenerator.py
@@ -92,6 +92,13 @@ assim_data_choice = """
 """
 
 assim_study = """
+
+def F_variables(statut) : return FACT(statut=statut,
+                                      regles = ( MEME_NOMBRE ('NAMES', 'SIZES')),
+                                      NAMES = SIMP(statut="o", typ="TXM", max="**", validators=NoRepeat()),
+                                      SIZES = SIMP(statut="o", typ="I", val_min=1, max="**")
+                                      )
+
 ASSIMILATION_STUDY = PROC(nom="ASSIMILATION_STUDY",
                           op=None,
                           repetable           = "n",
@@ -106,7 +113,9 @@ ASSIMILATION_STUDY = PROC(nom="ASSIMILATION_STUDY",
                           ObservationOperator = F_ObservationOperator("o"),
                           AlgorithmParameters = F_AlgorithmParameters("f"),
                           UserDataInit        = F_Init("f"),
-                          UserPostAnalysis    = F_UserPostAnalysis("f")
+                          UserPostAnalysis    = F_UserPostAnalysis("f"),
+                          InputVariables      = F_variables("o"),
+                          OutputVariables     = F_variables("o")
                          )
 """
 

diff --git a/src/daEficas/generator_adao.py b/src/daEficas/generator_adao.py
index bdfe980bc6a0be3db781ea4a7de01ecc0f029f29..1bf9ecd96814c6f8740d0b2144af8e10a93072d7 100644 (file)
--- a/src/daEficas/generator_adao.py
+++ b/src/daEficas/generator_adao.py
@@ -66,6 +66,8 @@ class AdaoGenerator(PythonGenerator):
     """
     clef=""
     for i in obj.get_genealogie() :
+      print obj
+      print obj.get_genealogie()
       clef=clef+"__"+i
     self.dictMCVal[clef]=obj.valeur
 
@@ -187,5 +189,3 @@ class AdaoGenerator(PythonGenerator):
       self.text_da += "study_config[\"UserPostAnalysis\"] = Analysis_config \n"
     else:
       raise Exception('From Type unknown', from_type)
-
-