That graph was wrong : 2 branches of the SwitchNode were executed at the same time...

diff --git a/examples/GraphGOTO.py b/examples/GraphGOTO.py
index d6af11f934aaa33295f5420214b8057b0c176b7a..4d555c2e0ecf1e367e9d57d1300477f81050ecc2 100644 (file)
--- a/examples/GraphGOTO.py
+++ b/examples/GraphGOTO.py
@@ -40,7 +40,7 @@ def DefGraphGOTO() :
     m3p1.SetAuthor( '' )
     m3p1.SetContainer( 'localhost/FactoryServer' )
     m3p1.SetComment( 'C_M3P1 from SyrComponent' )
-    m3p1.Coords( 784 , 36 )
+    m3p1.Coords( 861 , 46 )
     Im3p1anOddInteger = m3p1.GetInPort( 'anOddInteger' )
     Im3p1Gate = m3p1.GetInPort( 'Gate' )
     Om3p1anEvenInteger = m3p1.GetOutPort( 'anEvenInteger' )
@@ -51,7 +51,7 @@ def DefGraphGOTO() :
     div2.SetAuthor( '' )
     div2.SetContainer( 'localhost/FactoryServer' )
     div2.SetComment( 'C_DIV2 from SyrComponent' )
-    div2.Coords( 788 , 409 )
+    div2.Coords( 858 , 466 )
     Idiv2anEvenInteger = div2.GetInPort( 'anEvenInteger' )
     Idiv2Gate = div2.GetInPort( 'Gate' )
     Odiv2anInteger = div2.GetOutPort( 'anInteger' )
@@ -62,12 +62,23 @@ def DefGraphGOTO() :
     incr.SetAuthor( '' )
     incr.SetContainer( 'localhost/FactoryServer' )
     incr.SetComment( 'C_INCR from SyrComponent' )
-    incr.Coords( 788 , 230 )
+    incr.Coords( 865 , 169 )
     IincraCount = incr.GetInPort( 'aCount' )
     IincrGate = incr.GetInPort( 'Gate' )
     OincraNewCount = incr.GetOutPort( 'aNewCount' )
     OincrGate = incr.GetOutPort( 'Gate' )
     
+    incr_1 = GraphGOTO.FNode( 'SyrComponent' , 'SyrComponent' , 'C_INCR' )
+    incr_1.SetName( 'incr_1' )
+    incr_1.SetAuthor( '' )
+    incr_1.SetContainer( 'localhost/FactoryServer' )
+    incr_1.SetComment( 'C_INCR from SyrComponent' )
+    incr_1.Coords( 859 , 338 )
+    Iincr_1aCount = incr_1.GetInPort( 'aCount' )
+    Iincr_1Gate = incr_1.GetInPort( 'Gate' )
+    Oincr_1aNewCount = incr_1.GetOutPort( 'aNewCount' )
+    Oincr_1Gate = incr_1.GetOutPort( 'Gate' )
+    
     # Creation of InLine Nodes
     Pylabel_begin = []
     Pylabel_begin.append( 'def label_begin( NB , KB ):' )
@@ -126,7 +137,7 @@ def DefGraphGOTO() :
     EndSwitch_OneEven.SetName( 'EndSwitch_OneEven' )
     EndSwitch_OneEven.SetAuthor( '' )
     EndSwitch_OneEven.SetComment( 'Compute Node' )
-    EndSwitch_OneEven.Coords( 1152 , 292 )
+    EndSwitch_OneEven.Coords( 1256 , 305 )
     PyEndSwitch_OneEven = []
     PyEndSwitch_OneEven.append( 'def EndSwitch_OneEven( Finished , K ):' )
     PyEndSwitch_OneEven.append( '    print "label_begin",Finished,K' )
@@ -163,7 +174,7 @@ def DefGraphGOTO() :
     control_m3p1.SetName( 'control_m3p1' )
     control_m3p1.SetAuthor( '' )
     control_m3p1.SetComment( 'Compute Node' )
-    control_m3p1.Coords( 980 , 81 )
+    control_m3p1.Coords( 1073 , 87 )
     Icontrol_m3p1N = control_m3p1.InPort( 'N' , 'long' )
     Icontrol_m3p1K = control_m3p1.InPort( 'K' , 'long' )
     Icontrol_m3p1Gate = control_m3p1.GetInPort( 'Gate' )
@@ -180,7 +191,7 @@ def DefGraphGOTO() :
     control_div2.SetName( 'control_div2' )
     control_div2.SetAuthor( '' )
     control_div2.SetComment( 'Compute Node' )
-    control_div2.Coords( 1039 , 454 )
+    control_div2.Coords( 1128 , 453 )
     Icontrol_div2N = control_div2.InPort( 'N' , 'long' )
     Icontrol_div2K = control_div2.InPort( 'K' , 'long' )
     Icontrol_div2Gate = control_div2.GetInPort( 'Gate' )
@@ -202,12 +213,10 @@ def DefGraphGOTO() :
     Ldiv2anIntegercontrol_div2N = GraphGOTO.Link( Odiv2anInteger , Icontrol_div2N )
     
     LincraNewCountcontrol_m3p1K = GraphGOTO.Link( OincraNewCount , Icontrol_m3p1K )
-    LincraNewCountcontrol_m3p1K.AddCoord( 1 , 964 , 145 )
-    LincraNewCountcontrol_m3p1K.AddCoord( 2 , 964 , 309 )
+    LincraNewCountcontrol_m3p1K.AddCoord( 1 , 1048 , 139 )
+    LincraNewCountcontrol_m3p1K.AddCoord( 2 , 1048 , 241 )
     
-    LincraNewCountcontrol_div2K = GraphGOTO.Link( OincraNewCount , Icontrol_div2K )
-    LincraNewCountcontrol_div2K.AddCoord( 1 , 963 , 518 )
-    LincraNewCountcontrol_div2K.AddCoord( 2 , 964 , 312 )
+    Lincr_1aNewCountcontrol_div2K = GraphGOTO.Link( Oincr_1aNewCount , Icontrol_div2K )
     
     Llabel_beginNTlabel_testNT = GraphGOTO.Link( Olabel_beginNT , Ilabel_testNT )
     
@@ -236,55 +245,58 @@ def DefGraphGOTO() :
     
     LtestFinishedEndSwitch_OneEvenFinished = GraphGOTO.Link( OtestFinished , IEndSwitch_OneEvenFinished )
     
-    LtestIncrincrGate = GraphGOTO.Link( OtestIncr , IincrGate )
-    LtestIncrincrGate.AddCoord( 1 , 783 , 341 )
-    LtestIncrincrGate.AddCoord( 2 , 782 , 302 )
+    LtestEvenincr_1Gate = GraphGOTO.Link( OtestEven , Iincr_1Gate )
     
     LtestEvendiv2Gate = GraphGOTO.Link( OtestEven , Idiv2Gate )
-    LtestEvendiv2Gate.AddCoord( 1 , 754 , 518 )
-    LtestEvendiv2Gate.AddCoord( 2 , 753 , 330 )
+    LtestEvendiv2Gate.AddCoord( 1 , 793 , 561 )
+    LtestEvendiv2Gate.AddCoord( 2 , 794 , 310 )
+    
+    LtestOddincrGate = GraphGOTO.Link( OtestOdd , IincrGate )
     
     LtestOddm3p1Gate = GraphGOTO.Link( OtestOdd , Im3p1Gate )
-    LtestOddm3p1Gate.AddCoord( 1 , 758 , 145 )
-    LtestOddm3p1Gate.AddCoord( 2 , 760 , 359 )
+    LtestOddm3p1Gate.AddCoord( 1 , 778 , 138 )
+    LtestOddm3p1Gate.AddCoord( 2 , 780 , 328 )
     
     LtestNm3p1anOddInteger = GraphGOTO.Link( OtestN , Im3p1anOddInteger )
-    LtestNm3p1anOddInteger.AddCoord( 1 , 767 , 116 )
-    LtestNm3p1anOddInteger.AddCoord( 2 , 767 , 116 )
-    LtestNm3p1anOddInteger.AddCoord( 3 , 767 , 390 )
+    LtestNm3p1anOddInteger.AddCoord( 1 , 808 , 113 )
+    LtestNm3p1anOddInteger.AddCoord( 2 , 807 , 352 )
     
     LtestNdiv2anEvenInteger = GraphGOTO.Link( OtestN , Idiv2anEvenInteger )
-    LtestNdiv2anEvenInteger.AddCoord( 1 , 767 , 489 )
-    LtestNdiv2anEvenInteger.AddCoord( 2 , 766 , 389 )
+    LtestNdiv2anEvenInteger.AddCoord( 1 , 806 , 537 )
+    LtestNdiv2anEvenInteger.AddCoord( 2 , 807 , 351 )
     
     LtestKEndSwitch_OneEvenK = GraphGOTO.Link( OtestK , IEndSwitch_OneEvenK )
     
     LtestKincraCount = GraphGOTO.Link( OtestK , IincraCount )
-    LtestKincraCount.AddCoord( 1 , 772 , 311 )
-    LtestKincraCount.AddCoord( 2 , 772 , 417 )
-    LtestKincraCount.AddCoord( 3 , 772 , 417 )
+    LtestKincraCount.AddCoord( 1 , 773 , 236 )
+    LtestKincraCount.AddCoord( 2 , 773 , 370 )
+    
+    LtestKincr_1aCount = GraphGOTO.Link( OtestK , Iincr_1aCount )
+    LtestKincr_1aCount.AddCoord( 1 , 774 , 409 )
+    LtestKincr_1aCount.AddCoord( 2 , 773 , 368 )
     
     LtestDefaultEndSwitch_OneEvenDefault = GraphGOTO.Link( OtestDefault , IEndSwitch_OneEvenDefault )
-    LtestDefaultEndSwitch_OneEvenDefault.AddCoord( 1 , 778 , 384 )
-    LtestDefaultEndSwitch_OneEvenDefault.AddCoord( 2 , 778 , 448 )
+    LtestDefaultEndSwitch_OneEvenDefault.AddCoord( 1 , 840 , 381 )
+    LtestDefaultEndSwitch_OneEvenDefault.AddCoord( 2 , 839 , 394 )
     
     Lcontrol_m3p1Gatelabel_testGate = GraphGOTO.Link( Ocontrol_m3p1Gate , Ilabel_testGate )
     Lcontrol_m3p1Gatelabel_testGate.AddCoord( 1 , 388 , 388 )
     Lcontrol_m3p1Gatelabel_testGate.AddCoord( 2 , 389 , 597 )
-    Lcontrol_m3p1Gatelabel_testGate.AddCoord( 3 , 1319 , 597 )
-    Lcontrol_m3p1Gatelabel_testGate.AddCoord( 4 , 1318 , 231 )
+    Lcontrol_m3p1Gatelabel_testGate.AddCoord( 3 , 1441 , 604 )
+    Lcontrol_m3p1Gatelabel_testGate.AddCoord( 4 , 1441 , 199 )
     
     Lcontrol_div2Gatelabel_beginGate = GraphGOTO.Link( Ocontrol_div2Gate , Ilabel_beginGate )
     Lcontrol_div2Gatelabel_beginGate.AddCoord( 1 , 4 , 388 )
     Lcontrol_div2Gatelabel_beginGate.AddCoord( 2 , 3 , 587 )
-    Lcontrol_div2Gatelabel_beginGate.AddCoord( 3 , 1214 , 588 )
-    Lcontrol_div2Gatelabel_beginGate.AddCoord( 4 , 1213 , 546 )
+    Lcontrol_div2Gatelabel_beginGate.AddCoord( 3 , 1307 , 586 )
+    Lcontrol_div2Gatelabel_beginGate.AddCoord( 4 , 1307 , 528 )
     
     # Input datas
     Ilabel_beginNB.Input( 7 )
     Ilabel_beginKB.Input( 0 )
     
     # Output Ports of the graph
+    #OtestIncr = test.GetOutPort( 'Incr' )
     #OEndSwitch_OneEvenFinished = EndSwitch_OneEven.GetOutPort( 'Finished' )
     #OEndSwitch_OneEvenK = EndSwitch_OneEven.GetOutPort( 'K' )
     return GraphGOTO

diff --git a/examples/GraphGOTO.xml b/examples/GraphGOTO.xml
index 967674f27769ea52ba0cbc61454b65b2e237e9fa..fc3884b123029d74a2cbd9f0231aa9e4d0659680 100644 (file)
--- a/examples/GraphGOTO.xml
+++ b/examples/GraphGOTO.xml
@@ -5,11 +5,11 @@
 <node>
 <component-name>?</component-name>
     <interface-name>?</interface-name>
-    <node-name>GraphGOTO</node-name>
+    <node-name>GraphGOTO_2</node-name>
     <kind>1</kind>
     <coupled-node>?</coupled-node>
     <service>
-<service-name>GraphSyrControl</service-name>
+<service-name>GraphGOTO_2</service-name>
      <inParameter-list>
 <inParameter>
 <inParameter-type>long</inParameter-type>
@@ -19,6 +19,9 @@
        <inParameter-name>label_begin__KB</inParameter-name>      </inParameter>     </inParameter-list>
      <outParameter-list>
 <outParameter>
+<outParameter-type>long</outParameter-type>
+       <outParameter-name>test__Incr</outParameter-name>      </outParameter>
+      <outParameter>
 <outParameter-type>long</outParameter-type>
        <outParameter-name>EndSwitch_OneEven__Finished</outParameter-name>      </outParameter>
       <outParameter>
@@ -26,9 +29,9 @@
        <outParameter-name>EndSwitch_OneEven__K</outParameter-name>      </outParameter>     </outParameter-list>    </service>
     <DataStream-list/>
     <PyFunction-list/>
-    <creation-date>11/3/2003 - 18:34:21</creation-date>
-    <lastmodification-date>14/12/2004 - 15:48:37</lastmodification-date>
-    <editor-release>1.04</editor-release>
+    <creation-date>17/1/2005 - 13:44:46</creation-date>
+    <lastmodification-date>17/1/2005 - 13:47:40</lastmodification-date>
+    <editor-release>2.0</editor-release>
     <author>JR</author>
     <container>?</container>
     <comment>Syracuse algorithm</comment>
@@ -53,9 +56,9 @@
        <outParameter-name>BoolEven</outParameter-name>      </outParameter>     </outParameter-list>    </service>
     <DataStream-list/>
     <PyFunction-list/>
-    <creation-date>14/12/2004 - 15:48:37</creation-date>
-    <lastmodification-date>14/12/2004 - 15:48:37</lastmodification-date>
-    <editor-release>1.04</editor-release>
+    <creation-date>17/1/2005 - 13:45:36</creation-date>
+    <lastmodification-date>17/1/2005 - 13:45:36</lastmodification-date>
+    <editor-release>2.0</editor-release>
     <author>?</author>
     <container>localhost/FactoryServer</container>
     <comment>C_ISEVEN from SyrComponent</comment>
@@ -79,9 +82,9 @@
        <outParameter-name>BoolOne</outParameter-name>      </outParameter>     </outParameter-list>    </service>
     <DataStream-list/>
     <PyFunction-list/>
-    <creation-date>14/12/2004 - 15:48:37</creation-date>
-    <lastmodification-date>14/12/2004 - 15:48:37</lastmodification-date>
-    <editor-release>1.04</editor-release>
+    <creation-date>17/1/2005 - 13:45:36</creation-date>
+    <lastmodification-date>17/1/2005 - 13:45:36</lastmodification-date>
+    <editor-release>2.0</editor-release>
     <author>?</author>
     <container>localhost/FactoryServer</container>
     <comment>C_ISONE from SyrComponent</comment>
@@ -105,14 +108,14 @@
        <outParameter-name>anEvenInteger</outParameter-name>      </outParameter>     </outParameter-list>    </service>
     <DataStream-list/>
     <PyFunction-list/>
-    <creation-date>14/12/2004 - 15:48:37</creation-date>
-    <lastmodification-date>14/12/2004 - 15:48:37</lastmodification-date>
-    <editor-release>1.04</editor-release>
+    <creation-date>17/1/2005 - 13:45:36</creation-date>
+    <lastmodification-date>17/1/2005 - 13:45:36</lastmodification-date>
+    <editor-release>2.0</editor-release>
     <author>?</author>
     <container>localhost/FactoryServer</container>
     <comment>C_M3P1 from SyrComponent</comment>
-    <x-position>784</x-position>
-    <y-position>36</y-position>   </node>
+    <x-position>861</x-position>
+    <y-position>46</y-position>   </node>
    <node>
 <component-name>SyrComponent</component-name>
     <interface-name>SyrComponent</interface-name>
@@ -131,14 +134,14 @@
        <outParameter-name>anInteger</outParameter-name>      </outParameter>     </outParameter-list>    </service>
     <DataStream-list/>
     <PyFunction-list/>
-    <creation-date>14/12/2004 - 15:48:37</creation-date>
-    <lastmodification-date>14/12/2004 - 15:48:37</lastmodification-date>
-    <editor-release>1.04</editor-release>
+    <creation-date>17/1/2005 - 13:45:36</creation-date>
+    <lastmodification-date>17/1/2005 - 13:45:36</lastmodification-date>
+    <editor-release>2.0</editor-release>
     <author>?</author>
     <container>localhost/FactoryServer</container>
     <comment>C_DIV2 from SyrComponent</comment>
-    <x-position>788</x-position>
-    <y-position>409</y-position>   </node>
+    <x-position>858</x-position>
+    <y-position>466</y-position>   </node>
    <node>
 <component-name>SyrComponent</component-name>
     <interface-name>SyrComponent</interface-name>
@@ -157,14 +160,40 @@
        <outParameter-name>aNewCount</outParameter-name>      </outParameter>     </outParameter-list>    </service>
     <DataStream-list/>
     <PyFunction-list/>
-    <creation-date>14/12/2004 - 15:48:37</creation-date>
-    <lastmodification-date>14/12/2004 - 15:48:37</lastmodification-date>
-    <editor-release>1.04</editor-release>
+    <creation-date>17/1/2005 - 13:45:36</creation-date>
+    <lastmodification-date>17/1/2005 - 13:45:36</lastmodification-date>
+    <editor-release>2.0</editor-release>
     <author>?</author>
     <container>localhost/FactoryServer</container>
     <comment>C_INCR from SyrComponent</comment>
-    <x-position>788</x-position>
-    <y-position>230</y-position>   </node>
+    <x-position>865</x-position>
+    <y-position>169</y-position>   </node>
+   <node>
+<component-name>SyrComponent</component-name>
+    <interface-name>SyrComponent</interface-name>
+    <node-name>incr_1</node-name>
+    <kind>0</kind>
+    <coupled-node>?</coupled-node>
+    <service>
+<service-name>C_INCR</service-name>
+     <inParameter-list>
+<inParameter>
+<inParameter-type>long</inParameter-type>
+       <inParameter-name>aCount</inParameter-name>      </inParameter>     </inParameter-list>
+     <outParameter-list>
+<outParameter>
+<outParameter-type>long</outParameter-type>
+       <outParameter-name>aNewCount</outParameter-name>      </outParameter>     </outParameter-list>    </service>
+    <DataStream-list/>
+    <PyFunction-list/>
+    <creation-date>17/1/2005 - 13:45:36</creation-date>
+    <lastmodification-date>17/1/2005 - 13:45:36</lastmodification-date>
+    <editor-release>2.0</editor-release>
+    <author>?</author>
+    <container>localhost/FactoryServer</container>
+    <comment>C_INCR from SyrComponent</comment>
+    <x-position>859</x-position>
+    <y-position>338</y-position>   </node>
    <node>
 <component-name>?</component-name>
     <interface-name>?</interface-name>
@@ -194,9 +223,9 @@
       <PyFunc><![CDATA[def label_begin( NB , KB ):]]></PyFunc>
       <PyFunc><![CDATA[    print "label_begin",NB,KB]]></PyFunc>
       <PyFunc><![CDATA[    return NB,KB]]></PyFunc>     </PyFunction>    </PyFunction-list>
-    <creation-date>14/12/2004 - 15:48:37</creation-date>
-    <lastmodification-date>14/12/2004 - 15:48:37</lastmodification-date>
-    <editor-release>1.04</editor-release>
+    <creation-date>17/1/2005 - 13:45:36</creation-date>
+    <lastmodification-date>17/1/2005 - 13:45:36</lastmodification-date>
+    <editor-release>2.0</editor-release>
     <author>?</author>
     <container>?</container>
     <comment>Python function</comment>
@@ -243,9 +272,9 @@
       <PyFunc><![CDATA[def label_test( ValEven , ValOne , NB , KB ):]]></PyFunc>
       <PyFunc><![CDATA[    print "label_begin",ValEven,ValOne,NB,KB]]></PyFunc>
       <PyFunc><![CDATA[    return ValEven,ValOne,NB,KB]]></PyFunc>     </PyFunction>    </PyFunction-list>
-    <creation-date>14/12/2004 - 15:48:37</creation-date>
-    <lastmodification-date>14/12/2004 - 15:48:37</lastmodification-date>
-    <editor-release>1.04</editor-release>
+    <creation-date>17/1/2005 - 13:45:36</creation-date>
+    <lastmodification-date>17/1/2005 - 13:45:36</lastmodification-date>
+    <editor-release>2.0</editor-release>
     <author>?</author>
     <container>?</container>
     <comment>Python function</comment>
@@ -310,9 +339,9 @@
       <PyFunc><![CDATA[        Odd = 0]]></PyFunc>
       <PyFunc><![CDATA[    Even = ValEven]]></PyFunc>
       <PyFunc><![CDATA[    return Finished,Incr,Even,Odd,NT,KT]]></PyFunc>     </PyFunction>    </PyFunction-list>
-    <creation-date>14/12/2004 - 15:48:37</creation-date>
-    <lastmodification-date>14/12/2004 - 15:48:37</lastmodification-date>
-    <editor-release>1.04</editor-release>
+    <creation-date>17/1/2005 - 13:45:36</creation-date>
+    <lastmodification-date>17/1/2005 - 13:45:36</lastmodification-date>
+    <editor-release>2.0</editor-release>
     <author>?</author>
     <container>?</container>
     <comment>Compute Node</comment>
@@ -347,14 +376,14 @@
       <PyFunc><![CDATA[def EndSwitch_OneEven( Finished , K ):]]></PyFunc>
       <PyFunc><![CDATA[    print "label_begin",Finished,K]]></PyFunc>
       <PyFunc><![CDATA[    return Finished,K]]></PyFunc>     </PyFunction>    </PyFunction-list>
-    <creation-date>14/12/2004 - 15:48:37</creation-date>
-    <lastmodification-date>14/12/2004 - 15:48:37</lastmodification-date>
-    <editor-release>1.04</editor-release>
+    <creation-date>17/1/2005 - 13:45:36</creation-date>
+    <lastmodification-date>17/1/2005 - 13:45:36</lastmodification-date>
+    <editor-release>2.0</editor-release>
     <author>?</author>
     <container>?</container>
     <comment>Compute Node</comment>
-    <x-position>1152</x-position>
-    <y-position>292</y-position>   </node>
+    <x-position>1256</x-position>
+    <y-position>305</y-position>   </node>
    <node>
 <component-name>?</component-name>
     <interface-name>?</interface-name>
@@ -389,14 +418,14 @@
 <FuncName>control_m3p1</FuncName>
       <PyFunc><![CDATA[def control_m3p1( N , K ):]]></PyFunc>
       <PyFunc><![CDATA[    return 0,1,N,K]]></PyFunc>     </PyFunction>    </PyFunction-list>
-    <creation-date>14/12/2004 - 15:48:37</creation-date>
-    <lastmodification-date>14/12/2004 - 15:48:37</lastmodification-date>
-    <editor-release>1.04</editor-release>
+    <creation-date>17/1/2005 - 13:45:36</creation-date>
+    <lastmodification-date>17/1/2005 - 13:45:36</lastmodification-date>
+    <editor-release>2.0</editor-release>
     <author>?</author>
     <container>?</container>
     <comment>Compute Node</comment>
-    <x-position>980</x-position>
-    <y-position>81</y-position>   </node>
+    <x-position>1073</x-position>
+    <y-position>87</y-position>   </node>
    <node>
 <component-name>?</component-name>
     <interface-name>?</interface-name>
@@ -425,14 +454,14 @@
 <FuncName>control_div2</FuncName>
       <PyFunc><![CDATA[def control_div2( N , NB ) :]]></PyFunc>
       <PyFunc><![CDATA[    return N,NB]]></PyFunc>     </PyFunction>    </PyFunction-list>
-    <creation-date>14/12/2004 - 15:48:37</creation-date>
-    <lastmodification-date>14/12/2004 - 15:48:37</lastmodification-date>
-    <editor-release>1.04</editor-release>
+    <creation-date>17/1/2005 - 13:45:36</creation-date>
+    <lastmodification-date>17/1/2005 - 13:45:36</lastmodification-date>
+    <editor-release>2.0</editor-release>
     <author>?</author>
     <container>?</container>
     <comment>Compute Node</comment>
-    <x-position>1039</x-position>
-    <y-position>454</y-position>   </node>  </node-list>
+    <x-position>1128</x-position>
+    <y-position>453</y-position>   </node>  </node-list>
   <link-list>
 <link>
 <fromnode-name>test_ISEVEN</fromnode-name>
@@ -477,23 +506,17 @@
     <toserviceparameter-name>K</toserviceparameter-name>
     <coord-list>
 <coord>
-<x>964</x>
-      <y>145</y>     </coord>
+<x>1048</x>
+      <y>139</y>     </coord>
      <coord>
-<x>964</x>
-      <y>309</y>     </coord>    </coord-list>   </link>
+<x>1048</x>
+      <y>241</y>     </coord>    </coord-list>   </link>
    <link>
-<fromnode-name>incr</fromnode-name>
+<fromnode-name>incr_1</fromnode-name>
     <fromserviceparameter-name>aNewCount</fromserviceparameter-name>
     <tonode-name>control_div2</tonode-name>
     <toserviceparameter-name>K</toserviceparameter-name>
-    <coord-list>
-<coord>
-<x>963</x>
-      <y>518</y>     </coord>
-     <coord>
-<x>964</x>
-      <y>312</y>     </coord>    </coord-list>   </link>
+    <coord-list/>   </link>
    <link>
 <fromnode-name>label_begin</fromnode-name>
     <fromserviceparameter-name>NT</fromserviceparameter-name>
@@ -577,16 +600,10 @@
     <coord-list/>   </link>
    <link>
 <fromnode-name>test</fromnode-name>
-    <fromserviceparameter-name>Incr</fromserviceparameter-name>
-    <tonode-name>incr</tonode-name>
+    <fromserviceparameter-name>Even</fromserviceparameter-name>
+    <tonode-name>incr_1</tonode-name>
     <toserviceparameter-name>Gate</toserviceparameter-name>
-    <coord-list>
-<coord>
-<x>783</x>
-      <y>341</y>     </coord>
-     <coord>
-<x>782</x>
-      <y>302</y>     </coord>    </coord-list>   </link>
+    <coord-list/>   </link>
    <link>
 <fromnode-name>test</fromnode-name>
     <fromserviceparameter-name>Even</fromserviceparameter-name>
@@ -594,11 +611,17 @@
     <toserviceparameter-name>Gate</toserviceparameter-name>
     <coord-list>
 <coord>
-<x>754</x>
-      <y>518</y>     </coord>
+<x>793</x>
+      <y>561</y>     </coord>
      <coord>
-<x>753</x>
-      <y>330</y>     </coord>    </coord-list>   </link>
+<x>794</x>
+      <y>310</y>     </coord>    </coord-list>   </link>
+   <link>
+<fromnode-name>test</fromnode-name>
+    <fromserviceparameter-name>Odd</fromserviceparameter-name>
+    <tonode-name>incr</tonode-name>
+    <toserviceparameter-name>Gate</toserviceparameter-name>
+    <coord-list/>   </link>
    <link>
 <fromnode-name>test</fromnode-name>
     <fromserviceparameter-name>Odd</fromserviceparameter-name>
@@ -606,11 +629,11 @@
     <toserviceparameter-name>Gate</toserviceparameter-name>
     <coord-list>
 <coord>
-<x>758</x>
-      <y>145</y>     </coord>
+<x>778</x>
+      <y>138</y>     </coord>
      <coord>
-<x>760</x>
-      <y>359</y>     </coord>    </coord-list>   </link>
+<x>780</x>
+      <y>328</y>     </coord>    </coord-list>   </link>
    <link>
 <fromnode-name>test</fromnode-name>
     <fromserviceparameter-name>N</fromserviceparameter-name>
@@ -618,14 +641,11 @@
     <toserviceparameter-name>anOddInteger</toserviceparameter-name>
     <coord-list>
 <coord>
-<x>767</x>
-      <y>116</y>     </coord>
-     <coord>
-<x>767</x>
-      <y>116</y>     </coord>
+<x>808</x>
+      <y>113</y>     </coord>
      <coord>
-<x>767</x>
-      <y>390</y>     </coord>    </coord-list>   </link>
+<x>807</x>
+      <y>352</y>     </coord>    </coord-list>   </link>
    <link>
 <fromnode-name>test</fromnode-name>
     <fromserviceparameter-name>N</fromserviceparameter-name>
@@ -633,11 +653,11 @@
     <toserviceparameter-name>anEvenInteger</toserviceparameter-name>
     <coord-list>
 <coord>
-<x>767</x>
-      <y>489</y>     </coord>
+<x>806</x>
+      <y>537</y>     </coord>
      <coord>
-<x>766</x>
-      <y>389</y>     </coord>    </coord-list>   </link>
+<x>807</x>
+      <y>351</y>     </coord>    </coord-list>   </link>
    <link>
 <fromnode-name>test</fromnode-name>
     <fromserviceparameter-name>K</fromserviceparameter-name>
@@ -651,14 +671,23 @@
     <toserviceparameter-name>aCount</toserviceparameter-name>
     <coord-list>
 <coord>
-<x>772</x>
-      <y>311</y>     </coord>
+<x>773</x>
+      <y>236</y>     </coord>
      <coord>
-<x>772</x>
-      <y>417</y>     </coord>
+<x>773</x>
+      <y>370</y>     </coord>    </coord-list>   </link>
+   <link>
+<fromnode-name>test</fromnode-name>
+    <fromserviceparameter-name>K</fromserviceparameter-name>
+    <tonode-name>incr_1</tonode-name>
+    <toserviceparameter-name>aCount</toserviceparameter-name>
+    <coord-list>
+<coord>
+<x>774</x>
+      <y>409</y>     </coord>
      <coord>
-<x>772</x>
-      <y>417</y>     </coord>    </coord-list>   </link>
+<x>773</x>
+      <y>368</y>     </coord>    </coord-list>   </link>
    <link>
 <fromnode-name>test</fromnode-name>
     <fromserviceparameter-name>Default</fromserviceparameter-name>
@@ -666,11 +695,11 @@
     <toserviceparameter-name>Default</toserviceparameter-name>
     <coord-list>
 <coord>
-<x>778</x>
-      <y>384</y>     </coord>
+<x>840</x>
+      <y>381</y>     </coord>
      <coord>
-<x>778</x>
-      <y>448</y>     </coord>    </coord-list>   </link>
+<x>839</x>
+      <y>394</y>     </coord>    </coord-list>   </link>
    <link>
 <fromnode-name>control_m3p1</fromnode-name>
     <fromserviceparameter-name>Gate</fromserviceparameter-name>
@@ -684,11 +713,11 @@
 <x>389</x>
       <y>597</y>     </coord>
      <coord>
-<x>1319</x>
-      <y>597</y>     </coord>
+<x>1441</x>
+      <y>604</y>     </coord>
      <coord>
-<x>1318</x>
-      <y>231</y>     </coord>    </coord-list>   </link>
+<x>1441</x>
+      <y>199</y>     </coord>    </coord-list>   </link>
    <link>
 <fromnode-name>control_div2</fromnode-name>
     <fromserviceparameter-name>Gate</fromserviceparameter-name>
@@ -702,14 +731,14 @@
 <x>3</x>
       <y>587</y>     </coord>
      <coord>
-<x>1214</x>
-      <y>588</y>     </coord>
+<x>1307</x>
+      <y>586</y>     </coord>
      <coord>
-<x>1213</x>
-      <y>546</y>     </coord>    </coord-list>   </link>  </link-list>
+<x>1307</x>
+      <y>528</y>     </coord>    </coord-list>   </link>  </link-list>
   <data-list>
 <data>
-<fromnode-name>GraphGOTO</fromnode-name>
+<fromnode-name>GraphGOTO_2</fromnode-name>
     <fromserviceparameter-name>label_begin__NB</fromserviceparameter-name>
     <tonode-name>label_begin</tonode-name>
     <toserviceparameter-name>NB</toserviceparameter-name>
@@ -718,7 +747,7 @@
      <value>7</value>    </data-value>
     <coord-list/>   </data>
    <data>
-<fromnode-name>GraphGOTO</fromnode-name>
+<fromnode-name>GraphGOTO_2</fromnode-name>
     <fromserviceparameter-name>label_begin__KB</fromserviceparameter-name>
     <tonode-name>label_begin</tonode-name>
     <toserviceparameter-name>KB</toserviceparameter-name>