From 22df5cecb0d4d022942c3176bf16cc019a55cfe7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andr=C3=A9=20Ribes?= Date: Wed, 23 Mar 2011 18:55:05 +0100 Subject: [PATCH] Debut ajout definition variables --- bin/AdaoCatalogGenerator.py | 11 ++++++++++- src/daEficas/generator_adao.py | 4 ++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/bin/AdaoCatalogGenerator.py b/bin/AdaoCatalogGenerator.py index 6146eee..548cecf 100644 --- 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 bdfe980..1bf9ecd 100644 --- 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) - - -- 2.39.2