sauve0206

[tools/eficas.git] / Openturns_Study / OpenTURNS_Cata_Study_V8.py

diff --git a/Openturns_Study/OpenTURNS_Cata_Study_V8.py b/Openturns_Study/OpenTURNS_Cata_Study_V8.py
index 5681d6d0402632d3738bc5a01c03c11cf4bd9c15..9e43e5436ce54fe03e4d66124ef03d995ac1a0ee 100644 (file)
--- a/Openturns_Study/OpenTURNS_Cata_Study_V8.py
+++ b/Openturns_Study/OpenTURNS_Cata_Study_V8.py
@@ -74,7 +74,7 @@ JdC = JDC_CATA ( code = 'OPENTURNS_STUDY',
                  execmodul = None,
                  regles = ( AU_MOINS_UN ( 'CRITERIA' ),
                             AU_MOINS_UN ( 'MODEL' ),
-                            AVANT ( ('DISTRIBUTION', 'MODEL'), 'VARIABLE' ),
+#                            AVANT ( ('DISTRIBUTION', 'MODEL'), 'VARIABLE' ),
 #                            A_CLASSER ( 'VARIABLE',                'CORRELATION' ),
 #                            A_CLASSER ( 'VARIABLE',                'CRITERIA' ),
 #                            A_CLASSER ( 'CORRELATION',             'CRITERIA' ),
@@ -151,19 +151,25 @@ SIMULATION = PROC ( nom = "SIMULATION",
 
 # Nota : les variables de type OPER doivent etre en majuscules !
 # Nota : les variables de type OPER doivent etre de premier niveau (pas imbriquees dans un autre type)
-DISTRIBUTION = OPER ( nom = "DISTRIBUTION",
-                      sd_prod = loi,
-                      op = 68,
+#VARIABLE2=OPER( nom= "VARIABLE2",
+             
+#DISTRIBUTION = OPER ( nom = "DISTRIBUTION",
+VARIABLE2=OPER(nom="VARIABLE2",
+                      sd_prod = variable,
+                      #sd_prod = None,
+                      op = None,
                       fr = "Definitions des lois marginales utilisees par les variables d'entree", 
                       
+ #VARIABLE = FACT (statut='f',max='**',
+ #             NOM=SIMP(statut = "o", typ = "TXM",),
                       
+#DISTRIBUTION= FACT(statut = "o",
 #====
 # Type de distribution
 #====
 
   Kind = SIMP ( statut = "o", typ = "TXM",
                 into = ( "Beta",
-                         "Pascale",
                          "Exponential",
                          "Gamma",
                          "Geometric",
@@ -186,6 +192,7 @@ DISTRIBUTION = OPER ( nom = "DISTRIBUTION",
                          ),
                 fr = "Choix du type de la loi marginale",
                 ang = "1D marginal distribution",
+                defaut="Beta",
                 ),
 
 #====
@@ -211,6 +218,7 @@ DISTRIBUTION = OPER ( nom = "DISTRIBUTION",
                                                  val_min = 0.,
                                                  fr = "Parametre R de la loi | R > 0",
                                                  ang = "R parameter | R > 0",
+                                                 defaut=1,
                                                  ),
 
                                       # T > R
@@ -220,6 +228,7 @@ DISTRIBUTION = OPER ( nom = "DISTRIBUTION",
                                                  val_min = 0.,
                                                  fr = "Parametre T de la loi | T > R",
                                                  ang = "T parameter | T > R",
+                                                 defaut=2,
                                                  ),
 
                                       ), # Fin BLOC RT_Parameters
@@ -429,7 +438,7 @@ DISTRIBUTION = OPER ( nom = "DISTRIBUTION",
                        # Il faut definir une collection de couples ( x,p ) 
                        Values = SIMP ( statut = 'o',
                                        typ = Tuple(2),
-                                       max = '**', 
+                                       #max = '**', 
                                        fr = "Liste de couples : largeur de classe, hauteur de classe",
                                        ang = "Class bandwidth, class height couple list",
                                        validators=VerifTypeTuple(('R','R')),
@@ -458,35 +467,6 @@ DISTRIBUTION = OPER ( nom = "DISTRIBUTION",
 
   ), # Fin BLOC LAPLACE
 
-  BLOC1 = BLOC ( condition = " Kind in ( 'Pascale', ) ",
-                     Settings = SIMP ( statut = "o",
-                                       typ = "TXM",
-                                       max = 1,
-                                       into = ( "Cas1", "Cas2", "Cas3" ),
-                                       defaut = "Cas1",
-                                       fr = "Parametrage de la loi lognormale",
-                                       ang = "Lognormal distribution parameter set",
-                                       ),
-                     BLOC2_1 = BLOC ( condition = " Settings in ( 'Cas1', ) ",
-
-                                                 Mu = SIMP ( statut = "o",
-                                                             typ = "R",
-                                                             max = 1,
-                                                             fr = "Moyenne de la loi",
-                                                             ang = "Mean value",
-                                                             ),
-
-                                    ),
-                     BLOC2_2 = BLOC ( condition = " Settings in ( 'Cas2', ) ",
-
-                                                 Sigma = SIMP ( statut = "o",
-                                                                typ = "R",
-                                                                max = 1,
-                                                                val_min = 0.,
-                                                                fr = "Ecart type de la loi",
-                                                             ),
-                                    ),
-                   ),
   LOGNORMAL = BLOC ( condition = " Kind in ( 'LogNormal', ) ",
 
                      Settings = SIMP ( statut = "o",
@@ -869,8 +849,9 @@ DISTRIBUTION = OPER ( nom = "DISTRIBUTION",
 
     ), # Fin BLOC WEIBULL
 
+#), # Fin OPER DISTRIBUTION
+#), # Fin OPER DISTRIBUTION
 ) # Fin OPER DISTRIBUTION
-# Ordre Catalogue DISTRIBUTION