Ajout du support de : AlgorithmParameters

Ajout du support de : FunctionDict

diff --git a/bin/AdaoCalatogGenerator.py b/bin/AdaoCalatogGenerator.py
index 7c27456eead00bf915867e3da7370da6c12d07c4..6524ad48dca936c7117f457523c3a7de18eaf640 100644 (file)
--- a/bin/AdaoCalatogGenerator.py
+++ b/bin/AdaoCalatogGenerator.py
@@ -53,21 +53,22 @@ String_data_bloc = """
 """
 
 Script_data_bloc = """
-                                     FILE_DATA = BLOC ( condition = " FROM in ( 'File', ) ",
+                                     FILE_DATA = BLOC ( condition = " FROM in ( 'Script', ) ",
 
                                                   FILE = SIMP(statut = "o", typ = "Fichier"),
                                                  ),
 """
 
 Dict_data_bloc = """
-                                     FILE_DATA = BLOC ( condition = " FROM in ( 'File', ) ",
+                                     FILE_DATA = BLOC ( condition = " FROM in ( 'Script', ) ",
 
                                                   FILE = SIMP(statut = "o", typ = "Fichier"),
                                                  ),
 """
 
+# Pour l'instant on ne gère qu'un seul script pour toutes les functions
 FunctionDict_data_bloc = """
-                                     FILE_DATA = BLOC ( condition = " FROM in ( 'File', ) ",
+                                     FILE_DATA = BLOC ( condition = " FROM in ( 'FunctionDict', ) ",
 
                                                   FILE = SIMP(statut = "o", typ = "Fichier"),
                                                  ),
@@ -104,6 +105,7 @@ assim_algo = """
                                                  Observation = F_Observation("o"),
                                                  ObservationError = F_ObservationError("o"),
                                                  ObservationOperator = F_ObservationOperator("o"),
+                                                 AlgorithmParameters = F_AlgorithmParameters("f"),
 ${decl_opts}
                                                 ),
 """