X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=resources%2Fyacs_01.fr.xml;h=0b57d6f5d61f312576190beffec904ae866b969f;hb=75bb11bdc8af56e993bd71345cd465820dcd7a87;hp=0e41d9e7656e4f0846e2632329f858d135c06e7a;hpb=df48f2f8906e43a3b04e5cfb4076647890a50b95;p=modules%2Fhomard.git

diff --git a/resources/yacs_01.fr.xml b/resources/yacs_01.fr.xml
index 0e41d9e7..0b57d6f5 100644
--- a/resources/yacs_01.fr.xml
+++ b/resources/yacs_01.fr.xml
@@ -28,9 +28,12 @@
    <sequence name="seqdblevec" content="dblevec"/>
    <sequence name="seqint" content="int"/>
    <sequence name="seqintvec" content="intvec"/>
+   <sequence name="seqpyobj" content="pyobj"/>
    <sequence name="stringvec" content="string"/>
    <sequence name="seqstringvec" content="stringvec"/>
    <container name="DefaultContainer">
+      <property name="container_kind" value="Salome"/>
+      <property name="attached_on_cloning" value="0"/>
       <property name="container_name" value="FactoryServer"/>
       <property name="name" value="localhost"/>
    </container>
@@ -53,23 +56,15 @@ import HOMARD_Hypothesis_idl
 import HOMARD_Zone_idl
 import HOMARD_Boundary_idl
 
-import salome
-salome.salome_init()
-CurrentStudy = salome.myStudy
+clt = orbmodule.client()
+CurrentStudy = clt.Resolve("/Study")
 ]]></code></script>
-         <outport name="CurrentStudy" type="Study"/>
       </inline>
-      <service name="SetCurrentStudy">
+      <service name="UpdateStudy">
          <component>HOMARD</component>
          <load container="DefaultContainer"/>
-         <method>SetCurrentStudy</method>
-         <inport name="theStudy" type="Study"/>
+         <method>UpdateStudy</method>
       </service>
-      <control> <fromnode>StudyCreation</fromnode> <tonode>SetCurrentStudy</tonode> </control>
-      <datalink control="false">
-         <fromnode>StudyCreation</fromnode> <fromport>CurrentStudy</fromport>
-         <tonode>SetCurrentStudy</tonode> <toport>theStudy</toport>
-      </datalink>
    </bloc>
    <while name="Boucle_de_convergence">
       <bloc name="Alternance_Calcul_HOMARD">
@@ -87,15 +82,15 @@ argu.append("--mesh_file="  + MeshFile)
 #
 Script_A = Script(argu)
 #
-Error, message_erreur, dico_resu = Script_A.compute ()
+Error, message_erreur, dict_resu = Script_A.compute ()
 #
-dico_resu["rep_calc"] = rep_calc
+dict_resu["rep_calc"] = rep_calc
 #
 ]]></code></script>
             <inport name="numCalc" type="int"/>
             <inport name="MeshFile" type="string"/>
             <outport name="Error" type="int"/>
-            <outport name="dico_resu" type="pyobj"/>
+            <outport name="dict_resu" type="pyobj"/>
          </inline>
          <inline name="Analyse">
             <script><code><![CDATA[
@@ -120,8 +115,8 @@ while not Error :
 #
 # Si le fichier n'a pas ete defini, on arrete :
 #
-    if dico_resu.has_key("FileName") :
-        FileName = dico_resu["FileName"]
+    if ( "FileName" in dict_resu ) :
+        FileName = dict_resu["FileName"]
     else :
         MessInfo = "Le fichier du maillage n'a pas ete defini"
         Error = -2
@@ -129,8 +124,8 @@ while not Error :
 #
 # Si le critere est respecte, on arrete :
 #
-    if dico_resu.has_key("V_TEST") :
-        valeur_v = dico_resu["V_TEST"]
+    if ( "V_TEST" in dict_resu ) :
+        valeur_v = dict_resu["V_TEST"]
         if NumCalc == 0 :
             resu1 = [valeur_v]
         else :
@@ -159,7 +154,7 @@ while not Error :
 ]]></code></script>
             <inport name="NumCalc" type="int"/>
             <inport name="ErrCalc" type="int"/>
-            <inport name="dico_resu" type="pyobj"/>
+            <inport name="dict_resu" type="pyobj"/>
             <outport name="Error" type="int"/>
             <outport name="NumCalcP1" type="int"/>
             <outport name="FileName" type="string"/>
@@ -173,6 +168,7 @@ while not Error :
 OK = 0
 MeshFile = " "
 ]]></code></script>
+                     <load container="DefaultContainer"/>
                      <inport name="MessInfo" type="string"/>
                      <outport name="OK" type="bool"/>
                      <outport name="MeshFile" type="string"/>
@@ -186,13 +182,13 @@ MeshFile = " "
                      <default>
                         <bloc name="Iter_n">
                            <service name="LastIteration">
-                              <node>Etude_Initialisation.SetCurrentStudy</node>
+                              <node>Etude_Initialisation.UpdateStudy</node>
                               <method>LastIteration</method>
                               <inport name="CaseName" type="string"/>
                               <outport name="return" type="HOMARD_Iteration"/>
                            </service>
                            <service name="GetHypothesis">
-                              <node>Etude_Initialisation.SetCurrentStudy</node>
+                              <node>Etude_Initialisation.UpdateStudy</node>
                               <method>GetHypothesis</method>
                               <inport name="HypoName" type="string"/>
                               <outport name="return" type="HOMARD_Hypothesis"/>
@@ -203,7 +199,7 @@ MeshFile = " "
                      <case id="1">
                         <bloc name="Iter_1">
                            <service name="CreateCase">
-                              <node>Etude_Initialisation.SetCurrentStudy</node>
+                              <node>Etude_Initialisation.UpdateStudy</node>
                               <method>CreateCase</method>
                               <inport name="CaseName" type="string"/>
                               <inport name="MeshName" type="string"/>
@@ -222,7 +218,7 @@ Iter0 = Case.GetIter0()
                               <outport name="Iter0" type="HOMARD_Iteration"/>
                            </inline>
                            <service name="CreateHypothesis">
-                              <node>Etude_Initialisation.SetCurrentStudy</node>
+                              <node>Etude_Initialisation.UpdateStudy</node>
                               <method>CreateHypothesis</method>
                               <inport name="HypoName" type="string"/>
                               <outport name="return" type="HOMARD_Hypothesis"/>
@@ -282,7 +278,7 @@ MeshFile = os.path.join (DirName, "maill."+aux+".med")
 Iter.SetMeshFile(MeshFile)
 #
 # . Le fichier contenant les champs
-FileName = dico_resu["FileName"]
+FileName = dict_resu["FileName"]
 Iter.SetFieldFile(FileName)
 #
 HOMARD_Exec_Iter_Options
@@ -303,7 +299,7 @@ else :
                      <inport name="NumAdapt" type="int"/>
                      <inport name="LastIter" type="HOMARD_Iteration"/>
                      <inport name="Hypo" type="HOMARD_Hypothesis"/>
-                     <inport name="dico_resu" type="pyobj"/>
+                     <inport name="dict_resu" type="pyobj"/>
                      <outport name="OK" type="bool"/>
                      <outport name="MessInfo" type="string"/>
                      <outport name="MeshFile" type="string"/>
@@ -330,21 +326,33 @@ else :
          </switch>
          <control> <fromnode>Calcul</fromnode> <tonode>Analyse</tonode> </control>
          <control> <fromnode>Analyse</fromnode> <tonode>Adaptation</tonode> </control>
+         <datalink control="false">
+            <fromnode>Calcul</fromnode> <fromport>Error</fromport>
+            <tonode>Analyse</tonode> <toport>ErrCalc</toport>
+         </datalink>
+         <datalink control="false">
+            <fromnode>Calcul</fromnode> <fromport>dict_resu</fromport>
+            <tonode>Analyse</tonode> <toport>dict_resu</toport>
+         </datalink>
+         <datalink control="false">
+            <fromnode>Calcul</fromnode> <fromport>dict_resu</fromport>
+            <tonode>Adaptation.p0_Adaptation_HOMARD.HOMARD_Exec</tonode> <toport>dict_resu</toport>
+         </datalink>
          <datalink control="false">
             <fromnode>Analyse</fromnode> <fromport>Error</fromport>
             <tonode>Adaptation</tonode> <toport>select</toport>
          </datalink>
          <datalink control="false">
             <fromnode>Analyse</fromnode> <fromport>NumCalcP1</fromport>
-            <tonode>Calcul</tonode> <toport>numCalc</toport>
+            <tonode>Adaptation.p0_Adaptation_HOMARD.HOMARD_Exec</tonode> <toport>NumAdapt</toport>
          </datalink>
          <datalink control="false">
             <fromnode>Analyse</fromnode> <fromport>NumCalcP1</fromport>
-            <tonode>Adaptation.p0_Adaptation_HOMARD.HOMARD_Initialisation</tonode> <toport>select</toport>
+            <tonode>Calcul</tonode> <toport>numCalc</toport>
          </datalink>
          <datalink control="false">
             <fromnode>Analyse</fromnode> <fromport>NumCalcP1</fromport>
-            <tonode>Adaptation.p0_Adaptation_HOMARD.HOMARD_Exec</tonode> <toport>NumAdapt</toport>
+            <tonode>Adaptation.p0_Adaptation_HOMARD.HOMARD_Initialisation</tonode> <toport>select</toport>
          </datalink>
          <datalink control="false">
             <fromnode>Analyse</fromnode> <fromport>FileName</fromport>
@@ -354,18 +362,6 @@ else :
             <fromnode>Analyse</fromnode> <fromport>MessInfo</fromport>
             <tonode>Adaptation.default_Arret_boucle.Arret</tonode> <toport>MessInfo</toport>
          </datalink>
-         <datalink control="false">
-            <fromnode>Calcul</fromnode> <fromport>Error</fromport>
-            <tonode>Analyse</tonode> <toport>ErrCalc</toport>
-         </datalink>
-         <datalink control="false">
-            <fromnode>Calcul</fromnode> <fromport>dico_resu</fromport>
-            <tonode>Analyse</tonode> <toport>dico_resu</toport>
-         </datalink>
-         <datalink control="false">
-            <fromnode>Calcul</fromnode> <fromport>dico_resu</fromport>
-            <tonode>Adaptation.p0_Adaptation_HOMARD.HOMARD_Exec</tonode> <toport>dico_resu</toport>
-         </datalink>
          <datalink control="false">
             <fromnode>Adaptation.default_Arret_boucle.Arret</fromnode> <fromport>MeshFile</fromport>
             <tonode>Calcul</tonode> <toport>MeshFile</toport>
@@ -382,16 +378,17 @@ else :
    </while>
    <inline name="Bilan">
       <script><code><![CDATA[
-from PyQt4 import QtGui
+from PyQt5 import QtWidgets
 import sys
-app = QtGui.QApplication(sys.argv)
+app = QtWidgets.QApplication(sys.argv)
 MessageBoxTitle = "Bilan"
 if MessInfo == "" :
     MessInfo = "Le calcul est converge."
-    QtGui.QMessageBox.information(None, MessageBoxTitle, MessInfo)
+    QtWidgets.QMessageBox.information(None, MessageBoxTitle, MessInfo)
 else :
-    QtGui.QMessageBox.critical(None, MessageBoxTitle, MessInfo)
+    QtWidgets.QMessageBox.critical(None, MessageBoxTitle, MessInfo)
 ]]></code></script>
+      <load container="DefaultContainer"/>
       <inport name="MessInfo" type="string"/>
    </inline>
    <control> <fromnode>DataInit</fromnode> <tonode>Etude_Initialisation</tonode> </control>
@@ -418,8 +415,12 @@ else :
       <tonode>Bilan</tonode> <toport>MessInfo</toport>
    </datalink>
    <parameter>
-      <tonode>Boucle_de_convergence.Alternance_Calcul_HOMARD.Adaptation.p0_Adaptation_HOMARD.HOMARD_Initialisation.p1_Iter_1.CreateCase</tonode><toport>CaseName</toport>
-      <value><string>Calcul</string></value>
+      <tonode>Boucle_de_convergence.Alternance_Calcul_HOMARD.Analyse</tonode><toport>NumCalc</toport>
+      <value><int>0</int></value>
+   </parameter>
+   <parameter>
+      <tonode>Boucle_de_convergence.Alternance_Calcul_HOMARD.Analyse</tonode><toport>ErrCalc</toport>
+      <value><int>0</int></value>
    </parameter>
    <parameter>
       <tonode>Boucle_de_convergence.Alternance_Calcul_HOMARD.Calcul</tonode><toport>numCalc</toport>
@@ -434,51 +435,51 @@ else :
       <value><int>0</int></value>
    </parameter>
    <parameter>
-      <tonode>Boucle_de_convergence.Alternance_Calcul_HOMARD.Adaptation.p0_Adaptation_HOMARD.HOMARD_Initialisation.default_Iter_n.LastIteration</tonode><toport>CaseName</toport>
-      <value><string>Calcul</string></value>
+      <tonode>Boucle_de_convergence</tonode><toport>condition</toport>
+      <value><boolean>true</boolean></value>
    </parameter>
    <parameter>
-      <tonode>Boucle_de_convergence.Alternance_Calcul_HOMARD.Adaptation.p0_Adaptation_HOMARD.HOMARD_Initialisation.default_Iter_n.GetHypothesis</tonode><toport>HypoName</toport>
-      <value><string>Hypo</string></value>
+      <tonode>Boucle_de_convergence.Alternance_Calcul_HOMARD.Adaptation.p0_Adaptation_HOMARD.HOMARD_Initialisation.p1_Iter_1.CreateCase</tonode><toport>CaseName</toport>
+      <value><string>Calcul</string></value>
    </parameter>
    <parameter>
-      <tonode>Boucle_de_convergence.Alternance_Calcul_HOMARD.Adaptation.p0_Adaptation_HOMARD.HOMARD_Initialisation.p1_Iter_1.CreateHypothesis</tonode><toport>HypoName</toport>
-      <value><string>Hypo</string></value>
+      <tonode>Boucle_de_convergence.Alternance_Calcul_HOMARD.Adaptation.p0_Adaptation_HOMARD.HOMARD_Initialisation.p1_Iter_1.CreateCase</tonode><toport>MeshName</toport>
+      <value><string>MAILL</string></value>
    </parameter>
    <parameter>
-      <tonode>Boucle_de_convergence</tonode><toport>condition</toport>
-      <value><boolean>true</boolean></value>
+      <tonode>Boucle_de_convergence.Alternance_Calcul_HOMARD.Adaptation.p0_Adaptation_HOMARD.HOMARD_Initialisation.default_Iter_n.LastIteration</tonode><toport>CaseName</toport>
+      <value><string>Calcul</string></value>
    </parameter>
    <parameter>
-      <tonode>Boucle_de_convergence.Alternance_Calcul_HOMARD.Analyse</tonode><toport>NumCalc</toport>
-      <value><int>0</int></value>
+      <tonode>Boucle_de_convergence.Alternance_Calcul_HOMARD.Adaptation.p0_Adaptation_HOMARD.HOMARD_Initialisation.default_Iter_n.GetHypothesis</tonode><toport>HypoName</toport>
+      <value><string>Hypo</string></value>
    </parameter>
    <parameter>
-      <tonode>Boucle_de_convergence.Alternance_Calcul_HOMARD.Analyse</tonode><toport>ErrCalc</toport>
-      <value><int>0</int></value>
+      <tonode>Boucle_de_convergence.Alternance_Calcul_HOMARD.Adaptation.p0_Adaptation_HOMARD.HOMARD_Initialisation.p1_Iter_1.CreateHypothesis</tonode><toport>HypoName</toport>
+      <value><string>Hypo</string></value>
    </parameter>
 PARAMETRES
-   <presentation name="__ROOT__" x="0" y="0" width="704" height="977" expanded="1" expx="0" expy="0" expWidth="704" expHeight="977" shownState="0"/>
-   <presentation name="DataInit" x="4" y="32" width="158" height="63" expanded="1" expx="4" expy="32" expWidth="158" expHeight="63" shownState="0"/>
-   <presentation name="Etude_Initialisation" x="175" y="32" width="158" height="38" expanded="0" expx="175" expy="32" expWidth="162.5" expHeight="40.5" shownState="1"/>
    <presentation name="Etude_Initialisation.StudyCreation" x="0" y="0" width="158" height="36" expanded="1" expx="4" expy="32" expWidth="158" expHeight="36" shownState="2"/>
-   <presentation name="Etude_Initialisation.SetCurrentStudy" x="0" y="0" width="158" height="36" expanded="1" expx="163" expy="32" expWidth="158" expHeight="36" shownState="2"/>
-   <presentation name="Boucle_de_convergence" x="4" y="103" width="569" height="514" expanded="1" expx="4" expy="103" expWidth="569" expHeight="514" shownState="0"/>
-   <presentation name="Boucle_de_convergence.Alternance_Calcul_HOMARD" x="4" y="59" width="561" height="451" expanded="1" expx="10" expy="59" expWidth="561" expHeight="451" shownState="0"/>
-   <presentation name="Boucle_de_convergence.Alternance_Calcul_HOMARD.Calcul" x="4" y="32" width="158" height="90" expanded="1" expx="4" expy="32" expWidth="158" expHeight="90" shownState="0"/>
-   <presentation name="Boucle_de_convergence.Alternance_Calcul_HOMARD.Analyse" x="181" y="32" width="158" height="171" expanded="1" expx="181" expy="32" expWidth="158" expHeight="171" shownState="0"/>
-   <presentation name="Boucle_de_convergence.Alternance_Calcul_HOMARD.Adaptation" x="4" y="204" width="553" height="243" expanded="1" expx="4" expy="204" expWidth="553" expHeight="243" shownState="0"/>
+   <presentation name="Boucle_de_convergence.Alternance_Calcul_HOMARD.Adaptation.p0_Adaptation_HOMARD.HOMARD_Exec" x="163" y="32" width="158" height="144" expanded="1" expx="163" expy="32" expWidth="158" expHeight="144" shownState="0"/>
    <presentation name="Boucle_de_convergence.Alternance_Calcul_HOMARD.Adaptation.default_Arret_boucle" x="4" y="59" width="166" height="153" expanded="1" expx="4" expy="59" expWidth="166" expHeight="153" shownState="0"/>
+   <presentation name="Boucle_de_convergence.Alternance_Calcul_HOMARD.Analyse" x="163" y="32" width="158" height="144" expanded="1" expx="163" expy="32" expWidth="158" expHeight="144" shownState="0"/>
+   <presentation name="Boucle_de_convergence.Alternance_Calcul_HOMARD.Calcul" x="4" y="32" width="158" height="90" expanded="1" expx="4" expy="32" expWidth="158" expHeight="90" shownState="0"/>
+   <presentation name="Boucle_de_convergence.Alternance_Calcul_HOMARD.Adaptation" x="4" y="177" width="499.5" height="243" expanded="1" expx="4" expy="177" expWidth="499.5" expHeight="243" shownState="0"/>
+   <presentation name="Boucle_de_convergence.Alternance_Calcul_HOMARD.Adaptation.p0_Adaptation_HOMARD.HOMARD_Initialisation" x="4" y="32" width="158" height="65" expanded="0" expx="4" expy="32" expWidth="158" expHeight="65" shownState="1"/>
    <presentation name="Boucle_de_convergence.Alternance_Calcul_HOMARD.Adaptation.default_Arret_boucle.Arret" x="4" y="32" width="158" height="117" expanded="1" expx="4" expy="32" expWidth="158" expHeight="117" shownState="0"/>
-   <presentation name="Boucle_de_convergence.Alternance_Calcul_HOMARD.Adaptation.p0_Adaptation_HOMARD"  x="202" y="59" width="347" height="180" expanded="1" expx="202" expy="59" expWidth="347" expHeight="180" shownState="0"/>
-   <presentation name="Boucle_de_convergence.Alternance_Calcul_HOMARD.Adaptation.p0_Adaptation_HOMARD.HOMARD_Initialisation" x="4" y="32" width="158" height="65" expanded="0" expx="4" expy="32" expWidth="167" expHeight="67.5" shownState="1"/>
+   <presentation name="Boucle_de_convergence.Alternance_Calcul_HOMARD" x="4" y="59" width="507.5" height="424" expanded="1" expx="4" expy="59" expWidth="507.5" expHeight="424" shownState="0"/>
+   <presentation name="Boucle_de_convergence" x="4" y="96" width="515.5" height="487" expanded="1" expx="4" expy="96" expWidth="515.5" expHeight="487" shownState="0"/>
+   <presentation name="Etude_Initialisation.UpdateStudy" x="0" y="0" width="158" height="36" expanded="1" expx="163" expy="32" expWidth="158" expHeight="36" shownState="2"/>
+   <presentation name="Etude_Initialisation" x="163" y="32" width="158" height="38" expanded="0" expx="163" expy="32" expWidth="158" expHeight="38" shownState="1"/>
    <presentation name="Boucle_de_convergence.Alternance_Calcul_HOMARD.Adaptation.p0_Adaptation_HOMARD.HOMARD_Initialisation.p1_Iter_1" x="0" y="0" width="162.5" height="40.5" expanded="1" expx="4" expy="59" expWidth="162.5" expHeight="40.5" shownState="2"/>
+   <presentation name="DataInit" x="4" y="32" width="158" height="63" expanded="1" expx="4" expy="32" expWidth="158" expHeight="63" shownState="0"/>
    <presentation name="Boucle_de_convergence.Alternance_Calcul_HOMARD.Adaptation.p0_Adaptation_HOMARD.HOMARD_Initialisation.p1_Iter_1.CreateCase" x="0" y="0" width="158" height="36" expanded="1" expx="4" expy="32" expWidth="158" expHeight="36" shownState="2"/>
-   <presentation name="Boucle_de_convergence.Alternance_Calcul_HOMARD.Adaptation.p0_Adaptation_HOMARD.HOMARD_Initialisation.p1_Iter_1.Case_Options" x="0" y="0" width="158" height="36" expanded="1" expx="163" expy="32" expWidth="158" expHeight="36" shownState="2"/>
-   <presentation name="Boucle_de_convergence.Alternance_Calcul_HOMARD.Adaptation.p0_Adaptation_HOMARD.HOMARD_Initialisation.p1_Iter_1.CreateHypothesis" x="0" y="0" width="158" height="36" expanded="1" expx="322" expy="32" expWidth="158" expHeight="36" shownState="2"/>
    <presentation name="Boucle_de_convergence.Alternance_Calcul_HOMARD.Adaptation.p0_Adaptation_HOMARD.HOMARD_Initialisation.default_Iter_n" x="0" y="0" width="162.5" height="40.5" expanded="1" expx="4" expy="1639.5" expWidth="162.5" expHeight="40.5" shownState="2"/>
+   <presentation name="Bilan" x="361" y="32" width="158" height="63" expanded="1" expx="361" expy="32" expWidth="158" expHeight="63" shownState="0"/>
+   <presentation name="Boucle_de_convergence.Alternance_Calcul_HOMARD.Adaptation.p0_Adaptation_HOMARD" x="170.5" y="59" width="325" height="180" expanded="1" expx="170.5" expy="59" expWidth="325" expHeight="180" shownState="0"/>
    <presentation name="Boucle_de_convergence.Alternance_Calcul_HOMARD.Adaptation.p0_Adaptation_HOMARD.HOMARD_Initialisation.default_Iter_n.LastIteration" x="0" y="0" width="158" height="36" expanded="1" expx="4" expy="32" expWidth="158" expHeight="36" shownState="2"/>
    <presentation name="Boucle_de_convergence.Alternance_Calcul_HOMARD.Adaptation.p0_Adaptation_HOMARD.HOMARD_Initialisation.default_Iter_n.GetHypothesis" x="0" y="0" width="158" height="36" expanded="1" expx="163" expy="32" expWidth="158" expHeight="36" shownState="2"/>
-   <presentation name="Boucle_de_convergence.Alternance_Calcul_HOMARD.Adaptation.p0_Adaptation_HOMARD.HOMARD_Exec" x="185" y="32" width="158" height="144" expanded="1" expx="185" expy="32" expWidth="158" expHeight="144" shownState="0"/>
-   <presentation name="Bilan" x="350" y="32" width="158" height="63" expanded="1" expx="350" expy="32" expWidth="158" expHeight="63" shownState="0"/>
+   <presentation name="Boucle_de_convergence.Alternance_Calcul_HOMARD.Adaptation.p0_Adaptation_HOMARD.HOMARD_Initialisation.p1_Iter_1.Case_Options" x="0" y="0" width="158" height="36" expanded="1" expx="163" expy="32" expWidth="158" expHeight="36" shownState="2"/>
+   <presentation name="Boucle_de_convergence.Alternance_Calcul_HOMARD.Adaptation.p0_Adaptation_HOMARD.HOMARD_Initialisation.p1_Iter_1.CreateHypothesis" x="0" y="0" width="158" height="36" expanded="1" expx="322" expy="32" expWidth="158" expHeight="36" shownState="2"/>
+   <presentation name="__ROOT__" x="0" y="0" width="523.5" height="587" expanded="1" expx="0" expy="0" expWidth="523.5" expHeight="587" shownState="0"/>
 </proc>