diff --git a/modeling/AVATAR/CoffeeMachine_Avatar.xml b/modeling/AVATAR/CoffeeMachine_Avatar.xml
index 096e4f323856c7ed99d3a4217e33fb74fe209a59..40d4b1f67944b185fe388a225e71a5bc091e88df 100644
--- a/modeling/AVATAR/CoffeeMachine_Avatar.xml
+++ b/modeling/AVATAR/CoffeeMachine_Avatar.xml
@@ -810,7 +810,7 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from TGComponent to TGComponent" value="" />
<TGConnectingPoint num="0" id="468" />
-<P1 x="302" y="261" id="499" />
+<P1 x="302" y="261" id="512" />
<P2 x="361" y="261" id="487" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -828,7 +828,7 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from TGComponent to TGComponent" value="" />
<TGConnectingPoint num="0" id="472" />
-<P1 x="305" y="211" id="512" />
+<P1 x="305" y="211" id="499" />
<P2 x="361" y="211" id="486" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -915,13 +915,13 @@
<TGConnectingPoint num="22" id="545" />
<TGConnectingPoint num="23" id="546" />
</COMPONENT>
-<SUBCOMPONENT type="5304" id="509" index="13" uid="e14fd5a7-c9ae-42ab-b99a-306f91c69127" >
+<SUBCOMPONENT type="5304" id="509" index="13" uid="2dbef5cf-57eb-4674-94d5-4b37c6777b4a" >
<father id="547" num="0" />
-<cdparam x="154" y="241" />
-<sizeparam width="148" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="166" y="191" />
+<sizeparam width="139" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="20" minY="0" maxY="114" />
-<infoparam name="TGComponent" value="WaitingForFirstCoin_enter" />
+<cdrectangleparam minX="0" maxX="29" minY="0" maxY="114" />
+<infoparam name="TGComponent" value="WaitingForFirstCoin_exit" />
<TGConnectingPoint num="0" id="497" />
<TGConnectingPoint num="1" id="498" />
<TGConnectingPoint num="2" id="499" />
@@ -935,13 +935,13 @@
<TGConnectingPoint num="10" id="507" />
<TGConnectingPoint num="11" id="508" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="5304" id="522" index="14" uid="2dbef5cf-57eb-4674-94d5-4b37c6777b4a" >
+<SUBCOMPONENT type="5304" id="522" index="14" uid="e14fd5a7-c9ae-42ab-b99a-306f91c69127" >
<father id="547" num="1" />
-<cdparam x="166" y="191" />
-<sizeparam width="139" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="154" y="241" />
+<sizeparam width="148" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="29" minY="0" maxY="114" />
-<infoparam name="TGComponent" value="WaitingForFirstCoin_exit" />
+<cdrectangleparam minX="0" maxX="20" minY="0" maxY="114" />
+<infoparam name="TGComponent" value="WaitingForFirstCoin_enter" />
<TGConnectingPoint num="0" id="510" />
<TGConnectingPoint num="1" id="511" />
<TGConnectingPoint num="2" id="512" />
@@ -1071,7 +1071,7 @@
<TGConnectingPoint num="0" id="606" />
<TGConnectingPoint num="1" id="607" />
<TGConnectingPoint num="2" id="608" />
-<P1 x="581" y="154" id="695" />
+<P1 x="581" y="154" id="682" />
<P2 x="546" y="305" id="752" />
<Point x="518" y="154" />
<Point x="518" y="305" />
@@ -1099,7 +1099,7 @@
<infoparam name="connector from TGComponent to TGComponent" value="" />
<TGConnectingPoint num="0" id="611" />
<TGConnectingPoint num="1" id="612" />
-<P1 x="631" y="164" id="690" />
+<P1 x="631" y="164" id="677" />
<P2 x="667" y="310" id="739" />
<Point x="631" y="310" />
<AutomaticDrawing data="true" />
@@ -1127,7 +1127,7 @@
<infoparam name="connector from TGComponent to TGComponent" value="" />
<TGConnectingPoint num="0" id="617" />
<TGConnectingPoint num="1" id="618" />
-<P1 x="721" y="158" id="675" />
+<P1 x="721" y="158" id="688" />
<P2 x="700" y="204" id="729" />
<Point x="700" y="158" />
<AutomaticDrawing data="true" />
@@ -1282,13 +1282,13 @@
<TGConnectingPoint num="22" id="722" />
<TGConnectingPoint num="23" id="723" />
</COMPONENT>
-<SUBCOMPONENT type="5303" id="686" index="24" uid="bf44a33b-5344-46b2-9170-509d38670a83" >
+<SUBCOMPONENT type="5304" id="686" index="24" uid="5ba2c908-950a-4288-889b-0b4c00bd9d79" >
<father id="724" num="0" />
-<cdparam x="721" y="133" />
-<sizeparam width="100" height="50" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="581" y="125" />
+<sizeparam width="100" height="39" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="168" minY="0" maxY="65" />
-<infoparam name="TGComponent" value="nbOfCoins" />
+<cdrectangleparam minX="0" maxX="168" minY="0" maxY="76" />
+<infoparam name="TGComponent" value="Start" />
<TGConnectingPoint num="0" id="674" />
<TGConnectingPoint num="1" id="675" />
<TGConnectingPoint num="2" id="676" />
@@ -1301,17 +1301,14 @@
<TGConnectingPoint num="9" id="683" />
<TGConnectingPoint num="10" id="684" />
<TGConnectingPoint num="11" id="685" />
-<extraparam>
-<Toggle value="" />
-</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="5304" id="699" index="25" uid="5ba2c908-950a-4288-889b-0b4c00bd9d79" >
+<SUBCOMPONENT type="5303" id="699" index="25" uid="bf44a33b-5344-46b2-9170-509d38670a83" >
<father id="724" num="1" />
-<cdparam x="581" y="125" />
-<sizeparam width="100" height="39" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="721" y="133" />
+<sizeparam width="100" height="50" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="168" minY="0" maxY="76" />
-<infoparam name="TGComponent" value="Start" />
+<cdrectangleparam minX="0" maxX="168" minY="0" maxY="65" />
+<infoparam name="TGComponent" value="nbOfCoins" />
<TGConnectingPoint num="0" id="687" />
<TGConnectingPoint num="1" id="688" />
<TGConnectingPoint num="2" id="689" />
@@ -1324,6 +1321,9 @@
<TGConnectingPoint num="9" id="696" />
<TGConnectingPoint num="10" id="697" />
<TGConnectingPoint num="11" id="698" />
+<extraparam>
+<Toggle value="" />
+</extraparam>
</SUBCOMPONENT>
<COMPONENT type="5306" id="736" index="14" uid="7a1c9320-1617-4710-a22f-ae8365f354ef" >
@@ -1454,7 +1454,7 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="800" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Block1 to Block0" value="" />
<TGConnectingPoint num="0" id="789" />
-<P1 x="446" y="279" id="843" />
+<P1 x="446" y="279" id="868" />
<P2 x="447" y="301" id="901" />
<AutomaticDrawing data="true" />
<extraparam>
@@ -1484,7 +1484,7 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="800" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Block1 to Block0" value="" />
<TGConnectingPoint num="0" id="793" />
-<P1 x="631" y="278" id="868" />
+<P1 x="631" y="278" id="843" />
<P2 x="631" y="301" id="902" />
<AutomaticDrawing data="true" />
<extraparam>
@@ -1643,13 +1643,13 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
<Signal value="out ejectCoin(int nbOfCoins)" attached="true" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="5000" id="861" index="6" uid="7a21d6ab-e515-4a9c-b908-bcb26c800cfb" >
+<SUBCOMPONENT type="5000" id="861" index="6" uid="a5114e80-03e3-4820-b57a-bfcefd90a9c8" >
<father id="911" num="0" />
-<cdparam x="371" y="198" />
-<sizeparam width="151" height="81" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="556" y="197" />
+<sizeparam width="150" height="81" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="217" minY="0" maxY="205" />
-<infoparam name="Block1" value="CoffeeButton" />
+<cdrectangleparam minX="0" maxX="218" minY="0" maxY="205" />
+<infoparam name="Block1" value="TeaButton" />
<TGConnectingPoint num="0" id="837" />
<TGConnectingPoint num="1" id="838" />
<TGConnectingPoint num="2" id="839" />
@@ -1681,13 +1681,13 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
<Signal value="out push()" attached="true" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="5000" id="886" index="7" uid="a5114e80-03e3-4820-b57a-bfcefd90a9c8" >
+<SUBCOMPONENT type="5000" id="886" index="7" uid="7a21d6ab-e515-4a9c-b908-bcb26c800cfb" >
<father id="911" num="1" />
-<cdparam x="556" y="197" />
-<sizeparam width="150" height="81" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="371" y="198" />
+<sizeparam width="151" height="81" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="218" minY="0" maxY="205" />
-<infoparam name="Block1" value="TeaButton" />
+<cdrectangleparam minX="0" maxX="217" minY="0" maxY="205" />
+<infoparam name="Block1" value="CoffeeButton" />
<TGConnectingPoint num="0" id="862" />
<TGConnectingPoint num="1" id="863" />
<TGConnectingPoint num="2" id="864" />
@@ -1729,8 +1729,8 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from start state to Send signal" value="null" />
<TGConnectingPoint num="0" id="917" />
-<P1 x="340" y="233" id="1099" />
-<P2 x="353" y="252" id="1088" />
+<P1 x="340" y="233" id="1088" />
+<P2 x="353" y="252" id="1090" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="916" index="8" uid="4b47f2ec-3073-4a06-b6e0-da7704454345" >
<father id="918" num="0" />
@@ -1828,7 +1828,7 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Send signal to state0" value="null" />
<TGConnectingPoint num="0" id="938" />
-<P1 x="353" y="282" id="1089" />
+<P1 x="353" y="282" id="1091" />
<P2 x="399" y="352" id="941" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="937" index="11" uid="ef1e1204-6711-4c2c-b81f-515c0e412fcb" >
@@ -2113,33 +2113,33 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
<extraparam>
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="5103" id="1098" index="12" uid="71f14636-3c96-4e4e-8d0e-c1cd11e52641" >
+<SUBCOMPONENT type="5100" id="1089" index="12" uid="4ea28494-de50-4f99-8981-3ef7a87d7d34" >
<father id="1173" num="0" />
+<cdparam x="333" y="213" />
+<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="169" minY="0" maxY="115" />
+<infoparam name="start state" value="null" />
+<TGConnectingPoint num="0" id="1088" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="5103" id="1100" index="13" uid="71f14636-3c96-4e4e-8d0e-c1cd11e52641" >
+<father id="1173" num="1" />
<cdparam x="330" y="257" />
<sizeparam width="46" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="0" maxX="138" minY="0" maxY="110" />
<infoparam name="Send signal" value="push()" />
-<TGConnectingPoint num="0" id="1088" />
-<TGConnectingPoint num="1" id="1089" />
-<TGConnectingPoint num="2" id="1090" />
-<TGConnectingPoint num="3" id="1091" />
-<TGConnectingPoint num="4" id="1092" />
-<TGConnectingPoint num="5" id="1093" />
-<TGConnectingPoint num="6" id="1094" />
-<TGConnectingPoint num="7" id="1095" />
-<TGConnectingPoint num="8" id="1096" />
-<TGConnectingPoint num="9" id="1097" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="5100" id="1100" index="13" uid="4ea28494-de50-4f99-8981-3ef7a87d7d34" >
-<father id="1173" num="1" />
-<cdparam x="333" y="213" />
-<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="169" minY="0" maxY="115" />
-<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="1099" />
+<TGConnectingPoint num="0" id="1090" />
+<TGConnectingPoint num="1" id="1091" />
+<TGConnectingPoint num="2" id="1092" />
+<TGConnectingPoint num="3" id="1093" />
+<TGConnectingPoint num="4" id="1094" />
+<TGConnectingPoint num="5" id="1095" />
+<TGConnectingPoint num="6" id="1096" />
+<TGConnectingPoint num="7" id="1097" />
+<TGConnectingPoint num="8" id="1098" />
+<TGConnectingPoint num="9" id="1099" />
</SUBCOMPONENT>
@@ -2716,8 +2716,8 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from start state to state0" value="null" />
<TGConnectingPoint num="0" id="1415" />
-<P1 x="261" y="421" id="2050" />
-<P2 x="260" y="437" id="1978" />
+<P1 x="261" y="421" id="2061" />
+<P2 x="260" y="437" id="2064" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="1414" index="38" uid="a28ea541-81ef-4713-8ea6-c7f5ba166daa" >
<father id="1416" num="0" />
@@ -2749,8 +2749,8 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from state0 to Send signal" value="null" />
<TGConnectingPoint num="0" id="1422" />
-<P1 x="227" y="477" id="1991" />
-<P2 x="126" y="524" id="2052" />
+<P1 x="227" y="477" id="2077" />
+<P2 x="126" y="524" id="2050" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="1421" index="39" uid="2484893a-3443-40dc-8f74-e1443edc2bde" >
<father id="1423" num="0" />
@@ -2782,8 +2782,8 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Send signal to stop state" value="null" />
<TGConnectingPoint num="0" id="1429" />
-<P1 x="126" y="554" id="2053" />
-<P2 x="126" y="653" id="2075" />
+<P1 x="126" y="554" id="2051" />
+<P2 x="126" y="653" id="1967" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="1428" index="40" uid="6f6c6e3e-0702-4e99-b1e6-da999207526e" >
<father id="1430" num="0" />
@@ -2817,8 +2817,8 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from state0 to Send signal" value="null" />
<TGConnectingPoint num="0" id="1436" />
-<P1 x="293" y="477" id="1992" />
-<P2 x="298" y="524" id="1966" />
+<P1 x="293" y="477" id="2078" />
+<P2 x="298" y="524" id="2136" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="1435" index="41" uid="18f77c23-d770-43b2-a9ca-161802d8a987" >
<father id="1437" num="0" />
@@ -2850,7 +2850,7 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Send signal to stop state" value="null" />
<TGConnectingPoint num="0" id="1443" />
-<P1 x="298" y="554" id="1967" />
+<P1 x="298" y="554" id="2137" />
<P2 x="296" y="650" id="1894" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="1442" index="42" uid="a2a44349-5c04-4880-b1fb-76fa61d0f788" >
@@ -2885,8 +2885,8 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from state0 to Send signal" value="null" />
<TGConnectingPoint num="0" id="1450" />
-<P1 x="326" y="457" id="1981" />
-<P2 x="442" y="497" id="2063" />
+<P1 x="326" y="457" id="2067" />
+<P2 x="442" y="497" id="2039" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="1449" index="43" uid="1286b08f-20a2-44ff-9ae2-d3d09cf02647" >
<father id="1451" num="0" />
@@ -2919,7 +2919,7 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
<infoparam name="connector from Send signal to stop state" value="null" />
<TGConnectingPoint num="0" id="1458" />
<TGConnectingPoint num="1" id="1459" />
-<P1 x="442" y="527" id="2064" />
+<P1 x="442" y="527" id="2040" />
<P2 x="323" y="748" id="1756" />
<Point x="442" y="737" />
<AutomaticDrawing data="true" />
@@ -3003,7 +3003,7 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
<TGConnectingPoint num="0" id="1474" />
-<P1 x="126" y="702" id="2080" />
+<P1 x="126" y="702" id="1972" />
<P2 x="221" y="758" id="1757" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="1473" index="47" uid="96753e12-f1ba-45d7-9fc5-e71fe53eb22b" >
@@ -3707,14 +3707,14 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
<extraparam>
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="5104" id="1976" index="48" uid="8718a1dd-4942-43e5-b6ce-b5f78b82a355" >
+<SUBCOMPONENT type="5106" id="2038" index="48" uid="52044bb2-8b01-4108-a1ac-b5e7886ea624" >
<father id="2219" num="0" />
-<cdparam x="242" y="529" />
-<sizeparam width="112" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="53" y="653" />
+<sizeparam width="146" height="49" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="0" maxX="465" minY="0" maxY="334" />
-<infoparam name="Send signal" value="pushTeaButton()" />
+<cdrectangleparam minX="0" maxX="431" minY="0" maxY="305" />
+<infoparam name="state0" value="CoffeeDelivered" />
<TGConnectingPoint num="0" id="1966" />
<TGConnectingPoint num="1" id="1967" />
<TGConnectingPoint num="2" id="1968" />
@@ -3725,129 +3725,128 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
<TGConnectingPoint num="7" id="1973" />
<TGConnectingPoint num="8" id="1974" />
<TGConnectingPoint num="9" id="1975" />
-<accessibility />
+<TGConnectingPoint num="10" id="1976" />
+<TGConnectingPoint num="11" id="1977" />
+<TGConnectingPoint num="12" id="1978" />
+<TGConnectingPoint num="13" id="1979" />
+<TGConnectingPoint num="14" id="1980" />
+<TGConnectingPoint num="15" id="1981" />
+<TGConnectingPoint num="16" id="1982" />
+<TGConnectingPoint num="17" id="1983" />
+<TGConnectingPoint num="18" id="1984" />
+<TGConnectingPoint num="19" id="1985" />
+<TGConnectingPoint num="20" id="1986" />
+<TGConnectingPoint num="21" id="1987" />
+<TGConnectingPoint num="22" id="1988" />
+<TGConnectingPoint num="23" id="1989" />
+<TGConnectingPoint num="24" id="1990" />
+<TGConnectingPoint num="25" id="1991" />
+<TGConnectingPoint num="26" id="1992" />
+<TGConnectingPoint num="27" id="1993" />
+<TGConnectingPoint num="28" id="1994" />
+<TGConnectingPoint num="29" id="1995" />
+<TGConnectingPoint num="30" id="1996" />
+<TGConnectingPoint num="31" id="1997" />
+<TGConnectingPoint num="32" id="1998" />
+<TGConnectingPoint num="33" id="1999" />
+<TGConnectingPoint num="34" id="2000" />
+<TGConnectingPoint num="35" id="2001" />
+<TGConnectingPoint num="36" id="2002" />
+<TGConnectingPoint num="37" id="2003" />
+<TGConnectingPoint num="38" id="2004" />
+<TGConnectingPoint num="39" id="2005" />
+<TGConnectingPoint num="40" id="2006" />
+<TGConnectingPoint num="41" id="2007" />
+<TGConnectingPoint num="42" id="2008" />
+<TGConnectingPoint num="43" id="2009" />
+<TGConnectingPoint num="44" id="2010" />
+<TGConnectingPoint num="45" id="2011" />
+<TGConnectingPoint num="46" id="2012" />
+<TGConnectingPoint num="47" id="2013" />
+<TGConnectingPoint num="48" id="2014" />
+<TGConnectingPoint num="49" id="2015" />
+<TGConnectingPoint num="50" id="2016" />
+<TGConnectingPoint num="51" id="2017" />
+<TGConnectingPoint num="52" id="2018" />
+<TGConnectingPoint num="53" id="2019" />
+<TGConnectingPoint num="54" id="2020" />
+<TGConnectingPoint num="55" id="2021" />
+<TGConnectingPoint num="56" id="2022" />
+<TGConnectingPoint num="57" id="2023" />
+<TGConnectingPoint num="58" id="2024" />
+<TGConnectingPoint num="59" id="2025" />
+<TGConnectingPoint num="60" id="2026" />
+<TGConnectingPoint num="61" id="2027" />
+<TGConnectingPoint num="62" id="2028" />
+<TGConnectingPoint num="63" id="2029" />
+<TGConnectingPoint num="64" id="2030" />
+<TGConnectingPoint num="65" id="2031" />
+<TGConnectingPoint num="66" id="2032" />
+<TGConnectingPoint num="67" id="2033" />
+<TGConnectingPoint num="68" id="2034" />
+<TGConnectingPoint num="69" id="2035" />
+<TGConnectingPoint num="70" id="2036" />
+<TGConnectingPoint num="71" id="2037" />
+<extraparam>
+</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="5106" id="2049" index="49" uid="542c0583-8080-46a1-9ae2-775c6446817c" >
+<SUBCOMPONENT type="5103" id="2049" index="49" uid="9c813d39-192a-47ff-98b2-607e27617acf" >
<father id="2219" num="1" />
-<cdparam x="194" y="437" />
-<sizeparam width="132" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="377" y="502" />
+<sizeparam width="130" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="0" maxX="445" minY="0" maxY="314" />
-<infoparam name="state0" value="WaitingForSelection" />
-<TGConnectingPoint num="0" id="1977" />
-<TGConnectingPoint num="1" id="1978" />
-<TGConnectingPoint num="2" id="1979" />
-<TGConnectingPoint num="3" id="1980" />
-<TGConnectingPoint num="4" id="1981" />
-<TGConnectingPoint num="5" id="1982" />
-<TGConnectingPoint num="6" id="1983" />
-<TGConnectingPoint num="7" id="1984" />
-<TGConnectingPoint num="8" id="1985" />
-<TGConnectingPoint num="9" id="1986" />
-<TGConnectingPoint num="10" id="1987" />
-<TGConnectingPoint num="11" id="1988" />
-<TGConnectingPoint num="12" id="1989" />
-<TGConnectingPoint num="13" id="1990" />
-<TGConnectingPoint num="14" id="1991" />
-<TGConnectingPoint num="15" id="1992" />
-<TGConnectingPoint num="16" id="1993" />
-<TGConnectingPoint num="17" id="1994" />
-<TGConnectingPoint num="18" id="1995" />
-<TGConnectingPoint num="19" id="1996" />
-<TGConnectingPoint num="20" id="1997" />
-<TGConnectingPoint num="21" id="1998" />
-<TGConnectingPoint num="22" id="1999" />
-<TGConnectingPoint num="23" id="2000" />
-<TGConnectingPoint num="24" id="2001" />
-<TGConnectingPoint num="25" id="2002" />
-<TGConnectingPoint num="26" id="2003" />
-<TGConnectingPoint num="27" id="2004" />
-<TGConnectingPoint num="28" id="2005" />
-<TGConnectingPoint num="29" id="2006" />
-<TGConnectingPoint num="30" id="2007" />
-<TGConnectingPoint num="31" id="2008" />
-<TGConnectingPoint num="32" id="2009" />
-<TGConnectingPoint num="33" id="2010" />
-<TGConnectingPoint num="34" id="2011" />
-<TGConnectingPoint num="35" id="2012" />
-<TGConnectingPoint num="36" id="2013" />
-<TGConnectingPoint num="37" id="2014" />
-<TGConnectingPoint num="38" id="2015" />
-<TGConnectingPoint num="39" id="2016" />
-<TGConnectingPoint num="40" id="2017" />
-<TGConnectingPoint num="41" id="2018" />
-<TGConnectingPoint num="42" id="2019" />
-<TGConnectingPoint num="43" id="2020" />
-<TGConnectingPoint num="44" id="2021" />
-<TGConnectingPoint num="45" id="2022" />
-<TGConnectingPoint num="46" id="2023" />
-<TGConnectingPoint num="47" id="2024" />
-<TGConnectingPoint num="48" id="2025" />
-<TGConnectingPoint num="49" id="2026" />
-<TGConnectingPoint num="50" id="2027" />
-<TGConnectingPoint num="51" id="2028" />
-<TGConnectingPoint num="52" id="2029" />
-<TGConnectingPoint num="53" id="2030" />
-<TGConnectingPoint num="54" id="2031" />
-<TGConnectingPoint num="55" id="2032" />
-<TGConnectingPoint num="56" id="2033" />
-<TGConnectingPoint num="57" id="2034" />
-<TGConnectingPoint num="58" id="2035" />
-<TGConnectingPoint num="59" id="2036" />
-<TGConnectingPoint num="60" id="2037" />
-<TGConnectingPoint num="61" id="2038" />
-<TGConnectingPoint num="62" id="2039" />
-<TGConnectingPoint num="63" id="2040" />
-<TGConnectingPoint num="64" id="2041" />
-<TGConnectingPoint num="65" id="2042" />
-<TGConnectingPoint num="66" id="2043" />
-<TGConnectingPoint num="67" id="2044" />
-<TGConnectingPoint num="68" id="2045" />
-<TGConnectingPoint num="69" id="2046" />
-<TGConnectingPoint num="70" id="2047" />
-<TGConnectingPoint num="71" id="2048" />
-<latencyCheck />
-<extraparam>
-</extraparam>
+<cdrectangleparam minX="0" maxX="447" minY="0" maxY="334" />
+<infoparam name="Send signal" value="ejectCoin(nbOfCoins)" />
+<TGConnectingPoint num="0" id="2039" />
+<TGConnectingPoint num="1" id="2040" />
+<TGConnectingPoint num="2" id="2041" />
+<TGConnectingPoint num="3" id="2042" />
+<TGConnectingPoint num="4" id="2043" />
+<TGConnectingPoint num="5" id="2044" />
+<TGConnectingPoint num="6" id="2045" />
+<TGConnectingPoint num="7" id="2046" />
+<TGConnectingPoint num="8" id="2047" />
+<TGConnectingPoint num="9" id="2048" />
+<accessibility />
</SUBCOMPONENT>
-<SUBCOMPONENT type="5100" id="2051" index="50" uid="d60fd6d2-14be-4b25-b424-35a9ae5e3ba3" >
+<SUBCOMPONENT type="5104" id="2060" index="50" uid="f73b994e-357b-446d-a13d-97a66d7a4653" >
<father id="2219" num="2" />
-<cdparam x="254" y="401" />
-<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="562" minY="0" maxY="339" />
-<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="2050" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="5104" id="2062" index="51" uid="f73b994e-357b-446d-a13d-97a66d7a4653" >
-<father id="2219" num="3" />
<cdparam x="63" y="529" />
<sizeparam width="127" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="0" maxX="450" minY="0" maxY="334" />
<infoparam name="Send signal" value="pushCoffeeButton()" />
-<TGConnectingPoint num="0" id="2052" />
-<TGConnectingPoint num="1" id="2053" />
-<TGConnectingPoint num="2" id="2054" />
-<TGConnectingPoint num="3" id="2055" />
-<TGConnectingPoint num="4" id="2056" />
-<TGConnectingPoint num="5" id="2057" />
-<TGConnectingPoint num="6" id="2058" />
-<TGConnectingPoint num="7" id="2059" />
-<TGConnectingPoint num="8" id="2060" />
-<TGConnectingPoint num="9" id="2061" />
+<TGConnectingPoint num="0" id="2050" />
+<TGConnectingPoint num="1" id="2051" />
+<TGConnectingPoint num="2" id="2052" />
+<TGConnectingPoint num="3" id="2053" />
+<TGConnectingPoint num="4" id="2054" />
+<TGConnectingPoint num="5" id="2055" />
+<TGConnectingPoint num="6" id="2056" />
+<TGConnectingPoint num="7" id="2057" />
+<TGConnectingPoint num="8" id="2058" />
+<TGConnectingPoint num="9" id="2059" />
<accessibility />
</SUBCOMPONENT>
-<SUBCOMPONENT type="5103" id="2073" index="52" uid="9c813d39-192a-47ff-98b2-607e27617acf" >
+<SUBCOMPONENT type="5100" id="2062" index="51" uid="d60fd6d2-14be-4b25-b424-35a9ae5e3ba3" >
+<father id="2219" num="3" />
+<cdparam x="254" y="401" />
+<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="562" minY="0" maxY="339" />
+<infoparam name="start state" value="null" />
+<TGConnectingPoint num="0" id="2061" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="5106" id="2135" index="52" uid="542c0583-8080-46a1-9ae2-775c6446817c" >
<father id="2219" num="4" />
-<cdparam x="377" y="502" />
-<sizeparam width="130" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="194" y="437" />
+<sizeparam width="132" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="0" maxX="447" minY="0" maxY="334" />
-<infoparam name="Send signal" value="ejectCoin(nbOfCoins)" />
+<cdrectangleparam minX="0" maxX="445" minY="0" maxY="314" />
+<infoparam name="state0" value="WaitingForSelection" />
<TGConnectingPoint num="0" id="2063" />
<TGConnectingPoint num="1" id="2064" />
<TGConnectingPoint num="2" id="2065" />
@@ -3858,90 +3857,91 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
<TGConnectingPoint num="7" id="2070" />
<TGConnectingPoint num="8" id="2071" />
<TGConnectingPoint num="9" id="2072" />
-<accessibility />
+<TGConnectingPoint num="10" id="2073" />
+<TGConnectingPoint num="11" id="2074" />
+<TGConnectingPoint num="12" id="2075" />
+<TGConnectingPoint num="13" id="2076" />
+<TGConnectingPoint num="14" id="2077" />
+<TGConnectingPoint num="15" id="2078" />
+<TGConnectingPoint num="16" id="2079" />
+<TGConnectingPoint num="17" id="2080" />
+<TGConnectingPoint num="18" id="2081" />
+<TGConnectingPoint num="19" id="2082" />
+<TGConnectingPoint num="20" id="2083" />
+<TGConnectingPoint num="21" id="2084" />
+<TGConnectingPoint num="22" id="2085" />
+<TGConnectingPoint num="23" id="2086" />
+<TGConnectingPoint num="24" id="2087" />
+<TGConnectingPoint num="25" id="2088" />
+<TGConnectingPoint num="26" id="2089" />
+<TGConnectingPoint num="27" id="2090" />
+<TGConnectingPoint num="28" id="2091" />
+<TGConnectingPoint num="29" id="2092" />
+<TGConnectingPoint num="30" id="2093" />
+<TGConnectingPoint num="31" id="2094" />
+<TGConnectingPoint num="32" id="2095" />
+<TGConnectingPoint num="33" id="2096" />
+<TGConnectingPoint num="34" id="2097" />
+<TGConnectingPoint num="35" id="2098" />
+<TGConnectingPoint num="36" id="2099" />
+<TGConnectingPoint num="37" id="2100" />
+<TGConnectingPoint num="38" id="2101" />
+<TGConnectingPoint num="39" id="2102" />
+<TGConnectingPoint num="40" id="2103" />
+<TGConnectingPoint num="41" id="2104" />
+<TGConnectingPoint num="42" id="2105" />
+<TGConnectingPoint num="43" id="2106" />
+<TGConnectingPoint num="44" id="2107" />
+<TGConnectingPoint num="45" id="2108" />
+<TGConnectingPoint num="46" id="2109" />
+<TGConnectingPoint num="47" id="2110" />
+<TGConnectingPoint num="48" id="2111" />
+<TGConnectingPoint num="49" id="2112" />
+<TGConnectingPoint num="50" id="2113" />
+<TGConnectingPoint num="51" id="2114" />
+<TGConnectingPoint num="52" id="2115" />
+<TGConnectingPoint num="53" id="2116" />
+<TGConnectingPoint num="54" id="2117" />
+<TGConnectingPoint num="55" id="2118" />
+<TGConnectingPoint num="56" id="2119" />
+<TGConnectingPoint num="57" id="2120" />
+<TGConnectingPoint num="58" id="2121" />
+<TGConnectingPoint num="59" id="2122" />
+<TGConnectingPoint num="60" id="2123" />
+<TGConnectingPoint num="61" id="2124" />
+<TGConnectingPoint num="62" id="2125" />
+<TGConnectingPoint num="63" id="2126" />
+<TGConnectingPoint num="64" id="2127" />
+<TGConnectingPoint num="65" id="2128" />
+<TGConnectingPoint num="66" id="2129" />
+<TGConnectingPoint num="67" id="2130" />
+<TGConnectingPoint num="68" id="2131" />
+<TGConnectingPoint num="69" id="2132" />
+<TGConnectingPoint num="70" id="2133" />
+<TGConnectingPoint num="71" id="2134" />
+<latencyCheck />
+<extraparam>
+</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="5106" id="2146" index="53" uid="52044bb2-8b01-4108-a1ac-b5e7886ea624" >
+<SUBCOMPONENT type="5104" id="2146" index="53" uid="8718a1dd-4942-43e5-b6ce-b5f78b82a355" >
<father id="2219" num="5" />
-<cdparam x="53" y="653" />
-<sizeparam width="146" height="49" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="242" y="529" />
+<sizeparam width="112" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
-<cdrectangleparam minX="0" maxX="431" minY="0" maxY="305" />
-<infoparam name="state0" value="CoffeeDelivered" />
-<TGConnectingPoint num="0" id="2074" />
-<TGConnectingPoint num="1" id="2075" />
-<TGConnectingPoint num="2" id="2076" />
-<TGConnectingPoint num="3" id="2077" />
-<TGConnectingPoint num="4" id="2078" />
-<TGConnectingPoint num="5" id="2079" />
-<TGConnectingPoint num="6" id="2080" />
-<TGConnectingPoint num="7" id="2081" />
-<TGConnectingPoint num="8" id="2082" />
-<TGConnectingPoint num="9" id="2083" />
-<TGConnectingPoint num="10" id="2084" />
-<TGConnectingPoint num="11" id="2085" />
-<TGConnectingPoint num="12" id="2086" />
-<TGConnectingPoint num="13" id="2087" />
-<TGConnectingPoint num="14" id="2088" />
-<TGConnectingPoint num="15" id="2089" />
-<TGConnectingPoint num="16" id="2090" />
-<TGConnectingPoint num="17" id="2091" />
-<TGConnectingPoint num="18" id="2092" />
-<TGConnectingPoint num="19" id="2093" />
-<TGConnectingPoint num="20" id="2094" />
-<TGConnectingPoint num="21" id="2095" />
-<TGConnectingPoint num="22" id="2096" />
-<TGConnectingPoint num="23" id="2097" />
-<TGConnectingPoint num="24" id="2098" />
-<TGConnectingPoint num="25" id="2099" />
-<TGConnectingPoint num="26" id="2100" />
-<TGConnectingPoint num="27" id="2101" />
-<TGConnectingPoint num="28" id="2102" />
-<TGConnectingPoint num="29" id="2103" />
-<TGConnectingPoint num="30" id="2104" />
-<TGConnectingPoint num="31" id="2105" />
-<TGConnectingPoint num="32" id="2106" />
-<TGConnectingPoint num="33" id="2107" />
-<TGConnectingPoint num="34" id="2108" />
-<TGConnectingPoint num="35" id="2109" />
-<TGConnectingPoint num="36" id="2110" />
-<TGConnectingPoint num="37" id="2111" />
-<TGConnectingPoint num="38" id="2112" />
-<TGConnectingPoint num="39" id="2113" />
-<TGConnectingPoint num="40" id="2114" />
-<TGConnectingPoint num="41" id="2115" />
-<TGConnectingPoint num="42" id="2116" />
-<TGConnectingPoint num="43" id="2117" />
-<TGConnectingPoint num="44" id="2118" />
-<TGConnectingPoint num="45" id="2119" />
-<TGConnectingPoint num="46" id="2120" />
-<TGConnectingPoint num="47" id="2121" />
-<TGConnectingPoint num="48" id="2122" />
-<TGConnectingPoint num="49" id="2123" />
-<TGConnectingPoint num="50" id="2124" />
-<TGConnectingPoint num="51" id="2125" />
-<TGConnectingPoint num="52" id="2126" />
-<TGConnectingPoint num="53" id="2127" />
-<TGConnectingPoint num="54" id="2128" />
-<TGConnectingPoint num="55" id="2129" />
-<TGConnectingPoint num="56" id="2130" />
-<TGConnectingPoint num="57" id="2131" />
-<TGConnectingPoint num="58" id="2132" />
-<TGConnectingPoint num="59" id="2133" />
-<TGConnectingPoint num="60" id="2134" />
-<TGConnectingPoint num="61" id="2135" />
-<TGConnectingPoint num="62" id="2136" />
-<TGConnectingPoint num="63" id="2137" />
-<TGConnectingPoint num="64" id="2138" />
-<TGConnectingPoint num="65" id="2139" />
-<TGConnectingPoint num="66" id="2140" />
-<TGConnectingPoint num="67" id="2141" />
-<TGConnectingPoint num="68" id="2142" />
-<TGConnectingPoint num="69" id="2143" />
-<TGConnectingPoint num="70" id="2144" />
-<TGConnectingPoint num="71" id="2145" />
-<extraparam>
-</extraparam>
+<cdrectangleparam minX="0" maxX="465" minY="0" maxY="334" />
+<infoparam name="Send signal" value="pushTeaButton()" />
+<TGConnectingPoint num="0" id="2136" />
+<TGConnectingPoint num="1" id="2137" />
+<TGConnectingPoint num="2" id="2138" />
+<TGConnectingPoint num="3" id="2139" />
+<TGConnectingPoint num="4" id="2140" />
+<TGConnectingPoint num="5" id="2141" />
+<TGConnectingPoint num="6" id="2142" />
+<TGConnectingPoint num="7" id="2143" />
+<TGConnectingPoint num="8" id="2144" />
+<TGConnectingPoint num="9" id="2145" />
+<accessibility />
</SUBCOMPONENT>
diff --git a/modeling/AVATAR/schemas.xml b/modeling/AVATAR/schemas.xml
index f4d3baa9877f9992f962b74247bd1624400e1b83..4fd41cad2b0abe49ada2bcb0cb8625ddeac8ddf1 100644
--- a/modeling/AVATAR/schemas.xml
+++ b/modeling/AVATAR/schemas.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<TURTLEGMODELING version="1.0beta" ANIMATE_INTERACTIVE_SIMULATION="true" ACTIVATE_PENALTIES="true" UPDATE_INFORMATION_DIPLO_SIM="true" ANIMATE_WITH_INFO_DIPLO_SIM="true" OPEN_DIAG_DIPLO_SIM="false" LAST_SELECTED_MAIN_TAB="1" LAST_SELECTED_SUB_TAB="0">
+<TURTLEGMODELING version="1.0beta" ANIMATE_INTERACTIVE_SIMULATION="true" ACTIVATE_PENALTIES="true" UPDATE_INFORMATION_DIPLO_SIM="true" ANIMATE_WITH_INFO_DIPLO_SIM="true" OPEN_DIAG_DIPLO_SIM="false" LAST_SELECTED_MAIN_TAB="0" LAST_SELECTED_SUB_TAB="0">
<Modeling type="Avatar Analysis" nameTab="GDR_IE" >
<AvatarCDPanel name="ContextDiagram 0" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0" >
@@ -550,49 +550,49 @@
<Modeling type="Avatar Analysis" nameTab="Models2021" >
<AvatarCDPanel name="ContextDiagram 0" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0" >
-<CONNECTOR type="5406" id="502" index="0" uid="4e077c3c-d6c2-4fd2-87fb-4f4349ad7ed6" >
+<CONNECTOR type="5406" id="238" index="0" uid="4e077c3c-d6c2-4fd2-87fb-4f4349ad7ed6" >
<cdparam x="660" y="319" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
-<TGConnectingPoint num="0" id="503" />
-<P1 x="660" y="319" id="327" />
-<P2 x="660" y="169" id="482" />
+<TGConnectingPoint num="0" id="237" />
+<P1 x="660" y="319" id="330" />
+<P2 x="660" y="169" id="485" />
<AutomaticDrawing data="true" />
<extraparam>
<multiplicity origin="" destination="" />
</extraparam>
-</CONNECTOR><SUBCOMPONENT type="-1" id="504" index="21" uid="a5c89687-a3b7-4bfd-8c07-3341268a4dfd" >
-<father id="502" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="236" index="21" uid="a5c89687-a3b7-4bfd-8c07-3341268a4dfd" >
+<father id="238" num="0" />
<cdparam x="605" y="253" />
-<sizeparam width="49" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="49" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="semantics" value="relies on" />
</SUBCOMPONENT>
-<CONNECTOR type="5406" id="240" index="1" uid="049644f1-c2a3-41c2-b1b1-a30a964d8438" >
+<CONNECTOR type="5406" id="243" index="1" uid="049644f1-c2a3-41c2-b1b1-a30a964d8438" >
<cdparam x="733" y="325" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
-<TGConnectingPoint num="0" id="238" />
-<TGConnectingPoint num="1" id="239" />
-<P1 x="733" y="325" id="337" />
-<P2 x="800" y="240" id="357" />
+<TGConnectingPoint num="0" id="241" />
+<TGConnectingPoint num="1" id="242" />
+<P1 x="733" y="325" id="340" />
+<P2 x="800" y="240" id="360" />
<Point x="800" y="325" />
<AutomaticDrawing data="true" />
<extraparam>
<multiplicity origin="" destination="" />
</extraparam>
-</CONNECTOR><SUBCOMPONENT type="-1" id="236" index="22" uid="0e904cee-4f57-4c3a-86e3-4aad92c3b9c7" >
-<father id="240" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="239" index="22" uid="0e904cee-4f57-4c3a-86e3-4aad92c3b9c7" >
+<father id="243" num="0" />
<cdparam x="800" y="325" />
<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="point " value="null" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="237" index="23" uid="03d3c8f4-0699-49d5-afc0-a1e19a50050c" >
-<father id="240" num="1" />
+<SUBCOMPONENT type="-1" id="240" index="23" uid="03d3c8f4-0699-49d5-afc0-a1e19a50050c" >
+<father id="243" num="1" />
<cdparam x="804" y="288" />
<sizeparam width="49" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -600,29 +600,29 @@
<infoparam name="semantics" value="relies on" />
</SUBCOMPONENT>
-<CONNECTOR type="5406" id="245" index="2" uid="a69c4764-b46f-486a-b890-90ddc88b5859" >
+<CONNECTOR type="5406" id="248" index="2" uid="a69c4764-b46f-486a-b890-90ddc88b5859" >
<cdparam x="623" y="344" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
-<TGConnectingPoint num="0" id="243" />
-<TGConnectingPoint num="1" id="244" />
-<P1 x="623" y="344" id="340" />
-<P2 x="468" y="428" id="405" />
+<TGConnectingPoint num="0" id="246" />
+<TGConnectingPoint num="1" id="247" />
+<P1 x="623" y="344" id="343" />
+<P2 x="468" y="428" id="408" />
<Point x="623" y="428" />
<AutomaticDrawing data="true" />
<extraparam>
<multiplicity origin="" destination="" />
</extraparam>
-</CONNECTOR><SUBCOMPONENT type="-1" id="241" index="24" uid="27143a1c-142e-4762-80c4-77370f29aaab" >
-<father id="245" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="244" index="24" uid="27143a1c-142e-4762-80c4-77370f29aaab" >
+<father id="248" num="0" />
<cdparam x="623" y="428" />
<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="point " value="null" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="242" index="25" uid="5dd85955-9c79-48f8-9476-7535b03dddd7" >
-<father id="245" num="1" />
+<SUBCOMPONENT type="-1" id="245" index="25" uid="5dd85955-9c79-48f8-9476-7535b03dddd7" >
+<father id="248" num="1" />
<cdparam x="532" y="409" />
<sizeparam width="51" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -630,29 +630,29 @@
<infoparam name="semantics" value="classifies" />
</SUBCOMPONENT>
-<CONNECTOR type="5406" id="250" index="3" uid="d92343ac-9f02-406c-90e9-d23736975f65" >
+<CONNECTOR type="5406" id="253" index="3" uid="d92343ac-9f02-406c-90e9-d23736975f65" >
<cdparam x="786" y="225" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
-<TGConnectingPoint num="0" id="248" />
-<TGConnectingPoint num="1" id="249" />
-<P1 x="800" y="216" id="352" />
-<P2 x="723" y="157" id="480" />
+<TGConnectingPoint num="0" id="251" />
+<TGConnectingPoint num="1" id="252" />
+<P1 x="800" y="216" id="355" />
+<P2 x="723" y="157" id="483" />
<Point x="800" y="157" />
<AutomaticDrawing data="true" />
<extraparam>
<multiplicity origin="" destination="" />
</extraparam>
-</CONNECTOR><SUBCOMPONENT type="-1" id="246" index="26" uid="de9c39dd-6d1b-4b8d-b478-01f7fd40d810" >
-<father id="250" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="249" index="26" uid="de9c39dd-6d1b-4b8d-b478-01f7fd40d810" >
+<father id="253" num="0" />
<cdparam x="800" y="157" />
<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="point " value="null" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="247" index="27" uid="d7024dc5-4048-42a3-a488-b688cdaa9b2a" >
-<father id="250" num="1" />
+<SUBCOMPONENT type="-1" id="250" index="27" uid="d7024dc5-4048-42a3-a488-b688cdaa9b2a" >
+<father id="253" num="1" />
<cdparam x="770" y="146" />
<sizeparam width="69" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -660,19 +660,19 @@
<infoparam name="semantics" value="is built from" />
</SUBCOMPONENT>
-<CONNECTOR type="5406" id="253" index="4" uid="aa082920-0605-408a-b249-496c0e226038" >
+<CONNECTOR type="5406" id="256" index="4" uid="aa082920-0605-408a-b249-496c0e226038" >
<cdparam x="857" y="-50" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
-<TGConnectingPoint num="0" id="252" />
-<P1 x="587" y="331" id="329" />
-<P2 x="468" y="331" id="280" />
+<TGConnectingPoint num="0" id="255" />
+<P1 x="587" y="331" id="332" />
+<P2 x="468" y="331" id="283" />
<AutomaticDrawing data="true" />
<extraparam>
<multiplicity origin="" destination="" />
</extraparam>
-</CONNECTOR><SUBCOMPONENT type="-1" id="251" index="28" uid="71efa252-14be-4109-a0e3-7fcb80cc1aac" >
-<father id="253" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="254" index="28" uid="71efa252-14be-4109-a0e3-7fcb80cc1aac" >
+<father id="256" num="0" />
<cdparam x="505" y="324" />
<sizeparam width="50" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -680,19 +680,19 @@
<infoparam name="semantics" value="analyzes" />
</SUBCOMPONENT>
-<CONNECTOR type="5406" id="256" index="5" uid="0adaa4dd-4991-4dde-b8e2-29d963b11770" >
+<CONNECTOR type="5406" id="259" index="5" uid="0adaa4dd-4991-4dde-b8e2-29d963b11770" >
<cdparam x="637" y="166" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
-<TGConnectingPoint num="0" id="255" />
-<P1 x="383" y="265" id="382" />
-<P2 x="383" y="320" id="277" />
+<TGConnectingPoint num="0" id="258" />
+<P1 x="383" y="265" id="385" />
+<P2 x="383" y="320" id="280" />
<AutomaticDrawing data="true" />
<extraparam>
<multiplicity origin="" destination="" />
</extraparam>
-</CONNECTOR><SUBCOMPONENT type="-1" id="254" index="29" uid="a6682dbc-543e-497f-8b91-3e671ddf9bd2" >
-<father id="256" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="257" index="29" uid="a6682dbc-543e-497f-8b91-3e671ddf9bd2" >
+<father id="259" num="0" />
<cdparam x="316" y="298" />
<sizeparam width="57" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -700,31 +700,31 @@
<infoparam name="semantics" value="generates" />
</SUBCOMPONENT>
-<CONNECTOR type="5403" id="258" index="6" uid="4287ce98-54fd-4803-adf7-a6ce9ad8f10a" >
+<CONNECTOR type="5403" id="261" index="6" uid="4287ce98-54fd-4803-adf7-a6ce9ad8f10a" >
<cdparam x="347" y="188" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="{info}" />
-<TGConnectingPoint num="0" id="257" />
-<P1 x="383" y="417" id="402" />
-<P2 x="383" y="342" id="282" />
+<TGConnectingPoint num="0" id="260" />
+<P1 x="383" y="417" id="405" />
+<P2 x="383" y="342" id="285" />
<AutomaticDrawing data="true" />
<extraparam>
<multiplicity origin="1..*" destination="" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="5406" id="261" index="7" uid="ce784331-5cf2-4a24-94a2-4ada7425bc68" >
+<CONNECTOR type="5406" id="264" index="7" uid="ce784331-5cf2-4a24-94a2-4ada7425bc68" >
<cdparam x="408" y="-96" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
-<TGConnectingPoint num="0" id="260" />
-<P1 x="446" y="247" id="387" />
-<P2 x="597" y="163" id="488" />
+<TGConnectingPoint num="0" id="263" />
+<P1 x="446" y="247" id="390" />
+<P2 x="597" y="163" id="491" />
<AutomaticDrawing data="true" />
<extraparam>
<multiplicity origin="" destination="" />
</extraparam>
-</CONNECTOR><SUBCOMPONENT type="-1" id="259" index="30" uid="e3466010-10d9-40b8-820b-c0d2ba4b8895" >
-<father id="261" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="262" index="30" uid="e3466010-10d9-40b8-820b-c0d2ba4b8895" >
+<father id="264" num="0" />
<cdparam x="462" y="201" />
<sizeparam width="54" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -732,29 +732,29 @@
<infoparam name="semantics" value="simulates" />
</SUBCOMPONENT>
-<CONNECTOR type="138" id="262" index="8" uid="2ab4cb4a-8f61-46c3-b96d-4e2efcb17add" >
+<CONNECTOR type="138" id="265" index="8" uid="2ab4cb4a-8f61-46c3-b96d-4e2efcb17add" >
<cdparam x="58" y="398" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="194" y="202" id="302" />
-<P2 x="194" y="167" id="457" />
+<P1 x="194" y="202" id="305" />
+<P2 x="194" y="167" id="460" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="5403" id="266" index="9" uid="af83ac60-0b7c-49dc-8901-040a3a0fb41f" >
+<CONNECTOR type="5403" id="269" index="9" uid="af83ac60-0b7c-49dc-8901-040a3a0fb41f" >
<cdparam x="58" y="282" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="{info}" />
-<TGConnectingPoint num="0" id="264" />
-<TGConnectingPoint num="1" id="265" />
-<P1 x="194" y="143" id="452" />
-<P2 x="311" y="70" id="429" />
+<TGConnectingPoint num="0" id="267" />
+<TGConnectingPoint num="1" id="268" />
+<P1 x="194" y="143" id="455" />
+<P2 x="311" y="70" id="432" />
<Point x="194" y="70" />
<AutomaticDrawing data="true" />
<extraparam>
<multiplicity origin="1..*" destination="" />
</extraparam>
-</CONNECTOR><SUBCOMPONENT type="-1" id="263" index="31" uid="69a8bb2c-8edf-43bb-a5e9-69a47337cde8" >
-<father id="266" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="266" index="31" uid="69a8bb2c-8edf-43bb-a5e9-69a47337cde8" >
+<father id="269" num="0" />
<cdparam x="194" y="70" />
<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -762,21 +762,21 @@
<infoparam name="point " value="null" />
</SUBCOMPONENT>
-<CONNECTOR type="5403" id="270" index="10" uid="87d068f1-42f7-4a1e-8ffa-4e70af4d043a" >
+<CONNECTOR type="5403" id="273" index="10" uid="87d068f1-42f7-4a1e-8ffa-4e70af4d043a" >
<cdparam x="671" y="180" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="{info}" />
-<TGConnectingPoint num="0" id="268" />
-<TGConnectingPoint num="1" id="269" />
-<P1 x="660" y="145" id="477" />
-<P2 x="437" y="70" id="430" />
+<TGConnectingPoint num="0" id="271" />
+<TGConnectingPoint num="1" id="272" />
+<P1 x="660" y="145" id="480" />
+<P2 x="437" y="70" id="433" />
<Point x="660" y="70" />
<AutomaticDrawing data="true" />
<extraparam>
<multiplicity origin="1" destination="" />
</extraparam>
-</CONNECTOR><SUBCOMPONENT type="-1" id="267" index="32" uid="de783ca7-8ea2-49cc-bb91-73d1ce23f01f" >
-<father id="270" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="270" index="32" uid="de783ca7-8ea2-49cc-bb91-73d1ce23f01f" >
+<father id="273" num="0" />
<cdparam x="660" y="70" />
<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -784,29 +784,29 @@
<infoparam name="point " value="null" />
</SUBCOMPONENT>
-<CONNECTOR type="5406" id="275" index="11" uid="5995bf7f-4d4f-4437-b752-f03808e08592" >
+<CONNECTOR type="5406" id="278" index="11" uid="5995bf7f-4d4f-4437-b752-f03808e08592" >
<cdparam x="240" y="296" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
-<TGConnectingPoint num="0" id="273" />
-<TGConnectingPoint num="1" id="274" />
-<P1 x="320" y="253" id="379" />
-<P2 x="194" y="226" id="307" />
+<TGConnectingPoint num="0" id="276" />
+<TGConnectingPoint num="1" id="277" />
+<P1 x="320" y="253" id="382" />
+<P2 x="194" y="226" id="310" />
<Point x="194" y="253" />
<AutomaticDrawing data="true" />
<extraparam>
<multiplicity origin="" destination="*" />
</extraparam>
-</CONNECTOR><SUBCOMPONENT type="-1" id="271" index="33" uid="8d47d51d-7575-4a7d-8ce0-f77056f83977" >
-<father id="275" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="274" index="33" uid="8d47d51d-7575-4a7d-8ce0-f77056f83977" >
+<father id="278" num="0" />
<cdparam x="194" y="253" />
<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="point " value="null" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="272" index="34" uid="903132da-8bcc-4baa-ac7a-4bcc89d61b15" >
-<father id="275" num="1" />
+<SUBCOMPONENT type="-1" id="275" index="34" uid="903132da-8bcc-4baa-ac7a-4bcc89d61b15" >
+<father id="278" num="1" />
<cdparam x="240" y="267" />
<sizeparam width="39" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -814,36 +814,36 @@
<infoparam name="semantics" value="checks" />
</SUBCOMPONENT>
-<COMPONENT type="5400" id="300" index="12" uid="0a6e9b5f-1138-4c24-88d3-942147890942" >
+<COMPONENT type="5400" id="303" index="12" uid="0a6e9b5f-1138-4c24-88d3-942147890942" >
<cdparam x="299" y="320" />
<sizeparam width="169" height="22" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="Block0" value="Execution trace" />
-<TGConnectingPoint num="0" id="276" />
-<TGConnectingPoint num="1" id="277" />
-<TGConnectingPoint num="2" id="278" />
-<TGConnectingPoint num="3" id="279" />
-<TGConnectingPoint num="4" id="280" />
-<TGConnectingPoint num="5" id="281" />
-<TGConnectingPoint num="6" id="282" />
-<TGConnectingPoint num="7" id="283" />
-<TGConnectingPoint num="8" id="284" />
-<TGConnectingPoint num="9" id="285" />
-<TGConnectingPoint num="10" id="286" />
-<TGConnectingPoint num="11" id="287" />
-<TGConnectingPoint num="12" id="288" />
-<TGConnectingPoint num="13" id="289" />
-<TGConnectingPoint num="14" id="290" />
-<TGConnectingPoint num="15" id="291" />
-<TGConnectingPoint num="16" id="292" />
-<TGConnectingPoint num="17" id="293" />
-<TGConnectingPoint num="18" id="294" />
-<TGConnectingPoint num="19" id="295" />
-<TGConnectingPoint num="20" id="296" />
-<TGConnectingPoint num="21" id="297" />
-<TGConnectingPoint num="22" id="298" />
-<TGConnectingPoint num="23" id="299" />
+<TGConnectingPoint num="0" id="279" />
+<TGConnectingPoint num="1" id="280" />
+<TGConnectingPoint num="2" id="281" />
+<TGConnectingPoint num="3" id="282" />
+<TGConnectingPoint num="4" id="283" />
+<TGConnectingPoint num="5" id="284" />
+<TGConnectingPoint num="6" id="285" />
+<TGConnectingPoint num="7" id="286" />
+<TGConnectingPoint num="8" id="287" />
+<TGConnectingPoint num="9" id="288" />
+<TGConnectingPoint num="10" id="289" />
+<TGConnectingPoint num="11" id="290" />
+<TGConnectingPoint num="12" id="291" />
+<TGConnectingPoint num="13" id="292" />
+<TGConnectingPoint num="14" id="293" />
+<TGConnectingPoint num="15" id="294" />
+<TGConnectingPoint num="16" id="295" />
+<TGConnectingPoint num="17" id="296" />
+<TGConnectingPoint num="18" id="297" />
+<TGConnectingPoint num="19" id="298" />
+<TGConnectingPoint num="20" id="299" />
+<TGConnectingPoint num="21" id="300" />
+<TGConnectingPoint num="22" id="301" />
+<TGConnectingPoint num="23" id="302" />
<color value="-1" />
<extraparam>
<stereotype value="" />
@@ -852,36 +852,36 @@
</extraparam>
</COMPONENT>
-<COMPONENT type="5400" id="325" index="13" uid="0a6e9b5f-1138-4c24-88d3-942147890942" >
+<COMPONENT type="5400" id="328" index="13" uid="0a6e9b5f-1138-4c24-88d3-942147890942" >
<cdparam x="131" y="202" />
<sizeparam width="126" height="24" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="Block0" value="Latency requirement" />
-<TGConnectingPoint num="0" id="301" />
-<TGConnectingPoint num="1" id="302" />
-<TGConnectingPoint num="2" id="303" />
-<TGConnectingPoint num="3" id="304" />
-<TGConnectingPoint num="4" id="305" />
-<TGConnectingPoint num="5" id="306" />
-<TGConnectingPoint num="6" id="307" />
-<TGConnectingPoint num="7" id="308" />
-<TGConnectingPoint num="8" id="309" />
-<TGConnectingPoint num="9" id="310" />
-<TGConnectingPoint num="10" id="311" />
-<TGConnectingPoint num="11" id="312" />
-<TGConnectingPoint num="12" id="313" />
-<TGConnectingPoint num="13" id="314" />
-<TGConnectingPoint num="14" id="315" />
-<TGConnectingPoint num="15" id="316" />
-<TGConnectingPoint num="16" id="317" />
-<TGConnectingPoint num="17" id="318" />
-<TGConnectingPoint num="18" id="319" />
-<TGConnectingPoint num="19" id="320" />
-<TGConnectingPoint num="20" id="321" />
-<TGConnectingPoint num="21" id="322" />
-<TGConnectingPoint num="22" id="323" />
-<TGConnectingPoint num="23" id="324" />
+<TGConnectingPoint num="0" id="304" />
+<TGConnectingPoint num="1" id="305" />
+<TGConnectingPoint num="2" id="306" />
+<TGConnectingPoint num="3" id="307" />
+<TGConnectingPoint num="4" id="308" />
+<TGConnectingPoint num="5" id="309" />
+<TGConnectingPoint num="6" id="310" />
+<TGConnectingPoint num="7" id="311" />
+<TGConnectingPoint num="8" id="312" />
+<TGConnectingPoint num="9" id="313" />
+<TGConnectingPoint num="10" id="314" />
+<TGConnectingPoint num="11" id="315" />
+<TGConnectingPoint num="12" id="316" />
+<TGConnectingPoint num="13" id="317" />
+<TGConnectingPoint num="14" id="318" />
+<TGConnectingPoint num="15" id="319" />
+<TGConnectingPoint num="16" id="320" />
+<TGConnectingPoint num="17" id="321" />
+<TGConnectingPoint num="18" id="322" />
+<TGConnectingPoint num="19" id="323" />
+<TGConnectingPoint num="20" id="324" />
+<TGConnectingPoint num="21" id="325" />
+<TGConnectingPoint num="22" id="326" />
+<TGConnectingPoint num="23" id="327" />
<color value="-1" />
<extraparam>
<stereotype value="" />
@@ -890,36 +890,36 @@
</extraparam>
</COMPONENT>
-<COMPONENT type="5400" id="350" index="14" uid="0a6e9b5f-1138-4c24-88d3-942147890942" >
+<COMPONENT type="5400" id="353" index="14" uid="0a6e9b5f-1138-4c24-88d3-942147890942" >
<cdparam x="587" y="319" />
<sizeparam width="146" height="25" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="Block0" value="PLAN" />
-<TGConnectingPoint num="0" id="326" />
-<TGConnectingPoint num="1" id="327" />
-<TGConnectingPoint num="2" id="328" />
-<TGConnectingPoint num="3" id="329" />
-<TGConnectingPoint num="4" id="330" />
-<TGConnectingPoint num="5" id="331" />
-<TGConnectingPoint num="6" id="332" />
-<TGConnectingPoint num="7" id="333" />
-<TGConnectingPoint num="8" id="334" />
-<TGConnectingPoint num="9" id="335" />
-<TGConnectingPoint num="10" id="336" />
-<TGConnectingPoint num="11" id="337" />
-<TGConnectingPoint num="12" id="338" />
-<TGConnectingPoint num="13" id="339" />
-<TGConnectingPoint num="14" id="340" />
-<TGConnectingPoint num="15" id="341" />
-<TGConnectingPoint num="16" id="342" />
-<TGConnectingPoint num="17" id="343" />
-<TGConnectingPoint num="18" id="344" />
-<TGConnectingPoint num="19" id="345" />
-<TGConnectingPoint num="20" id="346" />
-<TGConnectingPoint num="21" id="347" />
-<TGConnectingPoint num="22" id="348" />
-<TGConnectingPoint num="23" id="349" />
+<TGConnectingPoint num="0" id="329" />
+<TGConnectingPoint num="1" id="330" />
+<TGConnectingPoint num="2" id="331" />
+<TGConnectingPoint num="3" id="332" />
+<TGConnectingPoint num="4" id="333" />
+<TGConnectingPoint num="5" id="334" />
+<TGConnectingPoint num="6" id="335" />
+<TGConnectingPoint num="7" id="336" />
+<TGConnectingPoint num="8" id="337" />
+<TGConnectingPoint num="9" id="338" />
+<TGConnectingPoint num="10" id="339" />
+<TGConnectingPoint num="11" id="340" />
+<TGConnectingPoint num="12" id="341" />
+<TGConnectingPoint num="13" id="342" />
+<TGConnectingPoint num="14" id="343" />
+<TGConnectingPoint num="15" id="344" />
+<TGConnectingPoint num="16" id="345" />
+<TGConnectingPoint num="17" id="346" />
+<TGConnectingPoint num="18" id="347" />
+<TGConnectingPoint num="19" id="348" />
+<TGConnectingPoint num="20" id="349" />
+<TGConnectingPoint num="21" id="350" />
+<TGConnectingPoint num="22" id="351" />
+<TGConnectingPoint num="23" id="352" />
<color value="-13210" />
<extraparam>
<stereotype value="" />
@@ -928,36 +928,36 @@
</extraparam>
</COMPONENT>
-<COMPONENT type="5400" id="375" index="15" uid="0a6e9b5f-1138-4c24-88d3-942147890942" >
+<COMPONENT type="5400" id="378" index="15" uid="0a6e9b5f-1138-4c24-88d3-942147890942" >
<cdparam x="737" y="216" />
<sizeparam width="126" height="24" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="Block0" value="Dependency graph" />
-<TGConnectingPoint num="0" id="351" />
-<TGConnectingPoint num="1" id="352" />
-<TGConnectingPoint num="2" id="353" />
-<TGConnectingPoint num="3" id="354" />
-<TGConnectingPoint num="4" id="355" />
-<TGConnectingPoint num="5" id="356" />
-<TGConnectingPoint num="6" id="357" />
-<TGConnectingPoint num="7" id="358" />
-<TGConnectingPoint num="8" id="359" />
-<TGConnectingPoint num="9" id="360" />
-<TGConnectingPoint num="10" id="361" />
-<TGConnectingPoint num="11" id="362" />
-<TGConnectingPoint num="12" id="363" />
-<TGConnectingPoint num="13" id="364" />
-<TGConnectingPoint num="14" id="365" />
-<TGConnectingPoint num="15" id="366" />
-<TGConnectingPoint num="16" id="367" />
-<TGConnectingPoint num="17" id="368" />
-<TGConnectingPoint num="18" id="369" />
-<TGConnectingPoint num="19" id="370" />
-<TGConnectingPoint num="20" id="371" />
-<TGConnectingPoint num="21" id="372" />
-<TGConnectingPoint num="22" id="373" />
-<TGConnectingPoint num="23" id="374" />
+<TGConnectingPoint num="0" id="354" />
+<TGConnectingPoint num="1" id="355" />
+<TGConnectingPoint num="2" id="356" />
+<TGConnectingPoint num="3" id="357" />
+<TGConnectingPoint num="4" id="358" />
+<TGConnectingPoint num="5" id="359" />
+<TGConnectingPoint num="6" id="360" />
+<TGConnectingPoint num="7" id="361" />
+<TGConnectingPoint num="8" id="362" />
+<TGConnectingPoint num="9" id="363" />
+<TGConnectingPoint num="10" id="364" />
+<TGConnectingPoint num="11" id="365" />
+<TGConnectingPoint num="12" id="366" />
+<TGConnectingPoint num="13" id="367" />
+<TGConnectingPoint num="14" id="368" />
+<TGConnectingPoint num="15" id="369" />
+<TGConnectingPoint num="16" id="370" />
+<TGConnectingPoint num="17" id="371" />
+<TGConnectingPoint num="18" id="372" />
+<TGConnectingPoint num="19" id="373" />
+<TGConnectingPoint num="20" id="374" />
+<TGConnectingPoint num="21" id="375" />
+<TGConnectingPoint num="22" id="376" />
+<TGConnectingPoint num="23" id="377" />
<color value="-1" />
<extraparam>
<stereotype value="" />
@@ -966,36 +966,36 @@
</extraparam>
</COMPONENT>
-<COMPONENT type="5400" id="400" index="16" uid="0a6e9b5f-1138-4c24-88d3-942147890942" >
+<COMPONENT type="5400" id="403" index="16" uid="0a6e9b5f-1138-4c24-88d3-942147890942" >
<cdparam x="320" y="241" />
<sizeparam width="126" height="24" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="Block0" value="Simulator" />
-<TGConnectingPoint num="0" id="376" />
-<TGConnectingPoint num="1" id="377" />
-<TGConnectingPoint num="2" id="378" />
-<TGConnectingPoint num="3" id="379" />
-<TGConnectingPoint num="4" id="380" />
-<TGConnectingPoint num="5" id="381" />
-<TGConnectingPoint num="6" id="382" />
-<TGConnectingPoint num="7" id="383" />
-<TGConnectingPoint num="8" id="384" />
-<TGConnectingPoint num="9" id="385" />
-<TGConnectingPoint num="10" id="386" />
-<TGConnectingPoint num="11" id="387" />
-<TGConnectingPoint num="12" id="388" />
-<TGConnectingPoint num="13" id="389" />
-<TGConnectingPoint num="14" id="390" />
-<TGConnectingPoint num="15" id="391" />
-<TGConnectingPoint num="16" id="392" />
-<TGConnectingPoint num="17" id="393" />
-<TGConnectingPoint num="18" id="394" />
-<TGConnectingPoint num="19" id="395" />
-<TGConnectingPoint num="20" id="396" />
-<TGConnectingPoint num="21" id="397" />
-<TGConnectingPoint num="22" id="398" />
-<TGConnectingPoint num="23" id="399" />
+<TGConnectingPoint num="0" id="379" />
+<TGConnectingPoint num="1" id="380" />
+<TGConnectingPoint num="2" id="381" />
+<TGConnectingPoint num="3" id="382" />
+<TGConnectingPoint num="4" id="383" />
+<TGConnectingPoint num="5" id="384" />
+<TGConnectingPoint num="6" id="385" />
+<TGConnectingPoint num="7" id="386" />
+<TGConnectingPoint num="8" id="387" />
+<TGConnectingPoint num="9" id="388" />
+<TGConnectingPoint num="10" id="389" />
+<TGConnectingPoint num="11" id="390" />
+<TGConnectingPoint num="12" id="391" />
+<TGConnectingPoint num="13" id="392" />
+<TGConnectingPoint num="14" id="393" />
+<TGConnectingPoint num="15" id="394" />
+<TGConnectingPoint num="16" id="395" />
+<TGConnectingPoint num="17" id="396" />
+<TGConnectingPoint num="18" id="397" />
+<TGConnectingPoint num="19" id="398" />
+<TGConnectingPoint num="20" id="399" />
+<TGConnectingPoint num="21" id="400" />
+<TGConnectingPoint num="22" id="401" />
+<TGConnectingPoint num="23" id="402" />
<color value="-1" />
<extraparam>
<stereotype value="" />
@@ -1004,36 +1004,36 @@
</extraparam>
</COMPONENT>
-<COMPONENT type="5400" id="425" index="17" uid="0a6e9b5f-1138-4c24-88d3-942147890942" >
+<COMPONENT type="5400" id="428" index="17" uid="0a6e9b5f-1138-4c24-88d3-942147890942" >
<cdparam x="299" y="417" />
<sizeparam width="169" height="22" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="Block0" value="Transaction" />
-<TGConnectingPoint num="0" id="401" />
-<TGConnectingPoint num="1" id="402" />
-<TGConnectingPoint num="2" id="403" />
-<TGConnectingPoint num="3" id="404" />
-<TGConnectingPoint num="4" id="405" />
-<TGConnectingPoint num="5" id="406" />
-<TGConnectingPoint num="6" id="407" />
-<TGConnectingPoint num="7" id="408" />
-<TGConnectingPoint num="8" id="409" />
-<TGConnectingPoint num="9" id="410" />
-<TGConnectingPoint num="10" id="411" />
-<TGConnectingPoint num="11" id="412" />
-<TGConnectingPoint num="12" id="413" />
-<TGConnectingPoint num="13" id="414" />
-<TGConnectingPoint num="14" id="415" />
-<TGConnectingPoint num="15" id="416" />
-<TGConnectingPoint num="16" id="417" />
-<TGConnectingPoint num="17" id="418" />
-<TGConnectingPoint num="18" id="419" />
-<TGConnectingPoint num="19" id="420" />
-<TGConnectingPoint num="20" id="421" />
-<TGConnectingPoint num="21" id="422" />
-<TGConnectingPoint num="22" id="423" />
-<TGConnectingPoint num="23" id="424" />
+<TGConnectingPoint num="0" id="404" />
+<TGConnectingPoint num="1" id="405" />
+<TGConnectingPoint num="2" id="406" />
+<TGConnectingPoint num="3" id="407" />
+<TGConnectingPoint num="4" id="408" />
+<TGConnectingPoint num="5" id="409" />
+<TGConnectingPoint num="6" id="410" />
+<TGConnectingPoint num="7" id="411" />
+<TGConnectingPoint num="8" id="412" />
+<TGConnectingPoint num="9" id="413" />
+<TGConnectingPoint num="10" id="414" />
+<TGConnectingPoint num="11" id="415" />
+<TGConnectingPoint num="12" id="416" />
+<TGConnectingPoint num="13" id="417" />
+<TGConnectingPoint num="14" id="418" />
+<TGConnectingPoint num="15" id="419" />
+<TGConnectingPoint num="16" id="420" />
+<TGConnectingPoint num="17" id="421" />
+<TGConnectingPoint num="18" id="422" />
+<TGConnectingPoint num="19" id="423" />
+<TGConnectingPoint num="20" id="424" />
+<TGConnectingPoint num="21" id="425" />
+<TGConnectingPoint num="22" id="426" />
+<TGConnectingPoint num="23" id="427" />
<color value="-1" />
<extraparam>
<stereotype value="" />
@@ -1042,36 +1042,36 @@
</extraparam>
</COMPONENT>
-<COMPONENT type="5400" id="450" index="18" uid="0a6e9b5f-1138-4c24-88d3-942147890942" >
+<COMPONENT type="5400" id="453" index="18" uid="0a6e9b5f-1138-4c24-88d3-942147890942" >
<cdparam x="311" y="58" />
<sizeparam width="126" height="24" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="Block0" value="System Model" />
-<TGConnectingPoint num="0" id="426" />
-<TGConnectingPoint num="1" id="427" />
-<TGConnectingPoint num="2" id="428" />
-<TGConnectingPoint num="3" id="429" />
-<TGConnectingPoint num="4" id="430" />
-<TGConnectingPoint num="5" id="431" />
-<TGConnectingPoint num="6" id="432" />
-<TGConnectingPoint num="7" id="433" />
-<TGConnectingPoint num="8" id="434" />
-<TGConnectingPoint num="9" id="435" />
-<TGConnectingPoint num="10" id="436" />
-<TGConnectingPoint num="11" id="437" />
-<TGConnectingPoint num="12" id="438" />
-<TGConnectingPoint num="13" id="439" />
-<TGConnectingPoint num="14" id="440" />
-<TGConnectingPoint num="15" id="441" />
-<TGConnectingPoint num="16" id="442" />
-<TGConnectingPoint num="17" id="443" />
-<TGConnectingPoint num="18" id="444" />
-<TGConnectingPoint num="19" id="445" />
-<TGConnectingPoint num="20" id="446" />
-<TGConnectingPoint num="21" id="447" />
-<TGConnectingPoint num="22" id="448" />
-<TGConnectingPoint num="23" id="449" />
+<TGConnectingPoint num="0" id="429" />
+<TGConnectingPoint num="1" id="430" />
+<TGConnectingPoint num="2" id="431" />
+<TGConnectingPoint num="3" id="432" />
+<TGConnectingPoint num="4" id="433" />
+<TGConnectingPoint num="5" id="434" />
+<TGConnectingPoint num="6" id="435" />
+<TGConnectingPoint num="7" id="436" />
+<TGConnectingPoint num="8" id="437" />
+<TGConnectingPoint num="9" id="438" />
+<TGConnectingPoint num="10" id="439" />
+<TGConnectingPoint num="11" id="440" />
+<TGConnectingPoint num="12" id="441" />
+<TGConnectingPoint num="13" id="442" />
+<TGConnectingPoint num="14" id="443" />
+<TGConnectingPoint num="15" id="444" />
+<TGConnectingPoint num="16" id="445" />
+<TGConnectingPoint num="17" id="446" />
+<TGConnectingPoint num="18" id="447" />
+<TGConnectingPoint num="19" id="448" />
+<TGConnectingPoint num="20" id="449" />
+<TGConnectingPoint num="21" id="450" />
+<TGConnectingPoint num="22" id="451" />
+<TGConnectingPoint num="23" id="452" />
<color value="-1" />
<extraparam>
<stereotype value="" />
@@ -1080,36 +1080,36 @@
</extraparam>
</COMPONENT>
-<COMPONENT type="5400" id="475" index="19" uid="0a6e9b5f-1138-4c24-88d3-942147890942" >
+<COMPONENT type="5400" id="478" index="19" uid="0a6e9b5f-1138-4c24-88d3-942147890942" >
<cdparam x="131" y="143" />
<sizeparam width="126" height="24" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="Block0" value="Requirement" />
-<TGConnectingPoint num="0" id="451" />
-<TGConnectingPoint num="1" id="452" />
-<TGConnectingPoint num="2" id="453" />
-<TGConnectingPoint num="3" id="454" />
-<TGConnectingPoint num="4" id="455" />
-<TGConnectingPoint num="5" id="456" />
-<TGConnectingPoint num="6" id="457" />
-<TGConnectingPoint num="7" id="458" />
-<TGConnectingPoint num="8" id="459" />
-<TGConnectingPoint num="9" id="460" />
-<TGConnectingPoint num="10" id="461" />
-<TGConnectingPoint num="11" id="462" />
-<TGConnectingPoint num="12" id="463" />
-<TGConnectingPoint num="13" id="464" />
-<TGConnectingPoint num="14" id="465" />
-<TGConnectingPoint num="15" id="466" />
-<TGConnectingPoint num="16" id="467" />
-<TGConnectingPoint num="17" id="468" />
-<TGConnectingPoint num="18" id="469" />
-<TGConnectingPoint num="19" id="470" />
-<TGConnectingPoint num="20" id="471" />
-<TGConnectingPoint num="21" id="472" />
-<TGConnectingPoint num="22" id="473" />
-<TGConnectingPoint num="23" id="474" />
+<TGConnectingPoint num="0" id="454" />
+<TGConnectingPoint num="1" id="455" />
+<TGConnectingPoint num="2" id="456" />
+<TGConnectingPoint num="3" id="457" />
+<TGConnectingPoint num="4" id="458" />
+<TGConnectingPoint num="5" id="459" />
+<TGConnectingPoint num="6" id="460" />
+<TGConnectingPoint num="7" id="461" />
+<TGConnectingPoint num="8" id="462" />
+<TGConnectingPoint num="9" id="463" />
+<TGConnectingPoint num="10" id="464" />
+<TGConnectingPoint num="11" id="465" />
+<TGConnectingPoint num="12" id="466" />
+<TGConnectingPoint num="13" id="467" />
+<TGConnectingPoint num="14" id="468" />
+<TGConnectingPoint num="15" id="469" />
+<TGConnectingPoint num="16" id="470" />
+<TGConnectingPoint num="17" id="471" />
+<TGConnectingPoint num="18" id="472" />
+<TGConnectingPoint num="19" id="473" />
+<TGConnectingPoint num="20" id="474" />
+<TGConnectingPoint num="21" id="475" />
+<TGConnectingPoint num="22" id="476" />
+<TGConnectingPoint num="23" id="477" />
<color value="-1" />
<extraparam>
<stereotype value="" />
@@ -1118,36 +1118,36 @@
</extraparam>
</COMPONENT>
-<COMPONENT type="5400" id="500" index="20" uid="0a6e9b5f-1138-4c24-88d3-942147890942" >
+<COMPONENT type="5400" id="503" index="20" uid="0a6e9b5f-1138-4c24-88d3-942147890942" >
<cdparam x="597" y="145" />
<sizeparam width="126" height="24" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="Block0" value="Partitioning model" />
-<TGConnectingPoint num="0" id="476" />
-<TGConnectingPoint num="1" id="477" />
-<TGConnectingPoint num="2" id="478" />
-<TGConnectingPoint num="3" id="479" />
-<TGConnectingPoint num="4" id="480" />
-<TGConnectingPoint num="5" id="481" />
-<TGConnectingPoint num="6" id="482" />
-<TGConnectingPoint num="7" id="483" />
-<TGConnectingPoint num="8" id="484" />
-<TGConnectingPoint num="9" id="485" />
-<TGConnectingPoint num="10" id="486" />
-<TGConnectingPoint num="11" id="487" />
-<TGConnectingPoint num="12" id="488" />
-<TGConnectingPoint num="13" id="489" />
-<TGConnectingPoint num="14" id="490" />
-<TGConnectingPoint num="15" id="491" />
-<TGConnectingPoint num="16" id="492" />
-<TGConnectingPoint num="17" id="493" />
-<TGConnectingPoint num="18" id="494" />
-<TGConnectingPoint num="19" id="495" />
-<TGConnectingPoint num="20" id="496" />
-<TGConnectingPoint num="21" id="497" />
-<TGConnectingPoint num="22" id="498" />
-<TGConnectingPoint num="23" id="499" />
+<TGConnectingPoint num="0" id="479" />
+<TGConnectingPoint num="1" id="480" />
+<TGConnectingPoint num="2" id="481" />
+<TGConnectingPoint num="3" id="482" />
+<TGConnectingPoint num="4" id="483" />
+<TGConnectingPoint num="5" id="484" />
+<TGConnectingPoint num="6" id="485" />
+<TGConnectingPoint num="7" id="486" />
+<TGConnectingPoint num="8" id="487" />
+<TGConnectingPoint num="9" id="488" />
+<TGConnectingPoint num="10" id="489" />
+<TGConnectingPoint num="11" id="490" />
+<TGConnectingPoint num="12" id="491" />
+<TGConnectingPoint num="13" id="492" />
+<TGConnectingPoint num="14" id="493" />
+<TGConnectingPoint num="15" id="494" />
+<TGConnectingPoint num="16" id="495" />
+<TGConnectingPoint num="17" id="496" />
+<TGConnectingPoint num="18" id="497" />
+<TGConnectingPoint num="19" id="498" />
+<TGConnectingPoint num="20" id="499" />
+<TGConnectingPoint num="21" id="500" />
+<TGConnectingPoint num="22" id="501" />
+<TGConnectingPoint num="23" id="502" />
<color value="-1" />
<extraparam>
<stereotype value="" />
diff --git a/src/main/java/ui/window/JFrameHelp.java b/src/main/java/ui/window/JFrameHelp.java
index 0faef50577b5205e32d1c875c9a516ece7df4326..fd2ed438fcf3bfb0538c01828cf2351782890716 100644
--- a/src/main/java/ui/window/JFrameHelp.java
+++ b/src/main/java/ui/window/JFrameHelp.java
@@ -142,9 +142,15 @@ public class JFrameHelp extends JFrame implements ActionListener {
String line;
while ((line = in.readLine()) != null) {
+ TraceManager.addDev("Line of css: " + line);
styleSheet.addRule(line);
}
+
+ //styleSheet.addRule("h3 {color: green; margin-top: 15px;}");
+ //styleSheet.addRule("p {color: blue; margin-top: 5em; margin-bottom: 5em;}");
+
} catch (Exception e) {
+ TraceManager.addDev("Failed style HTML:" + e.getMessage());
styleSheet.addRule("body {color:#000; font-family:times; margin: 4px; }");
styleSheet.addRule("h1 {color: blue; margin-top: 20px;}");
styleSheet.addRule("h2 {color: #ff0000; margin-top: 20px;}");
diff --git a/src/main/resources/help/help.css b/src/main/resources/help/help.css
index 4cafed02ffa2edd42cc74a2cb3fa31e9780acc34..a3c8b3c73103f04414ca5ce6577c87523ff52e2a 100644
--- a/src/main/resources/help/help.css
+++ b/src/main/resources/help/help.css
@@ -1,4 +1,5 @@
body {color:#000; font-family:times; margin: 4px; }
-h1 {color: green; margin-top: 20px;}
-h2 {color: #ff0000; margin-top: 20px;}
-h3 {color: green; margin-top: 15px;}
\ No newline at end of file
+h1 {color: #ff0000; margin-top: 40px; margin-bottom: 25px; }
+h2 {color: green; margin-top: 35px; margin-bottom: 20px; }
+h3 {color: blue; margin-top: 30px; margin-bottom: 20px; }
+p{margin-top: 10px; margin-bottom: 15px; }
diff --git a/src/main/resources/help/requirements.html b/src/main/resources/help/requirements.html
index 90836be859d3540d018e0da0028d672e506a1a42..69418dca30ca7b41b6a379f3b3919f82ed12543a 100644
--- a/src/main/resources/help/requirements.html
+++ b/src/main/resources/help/requirements.html
@@ -6,10 +6,143 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
<title>TTool help</title>
<style>
- code{white-space: pre-wrap;}
- span.smallcaps{font-variant: small-caps;}
- span.underline{text-decoration: underline;}
- div.column{display: inline-block; vertical-align: top; width: 50%;}
+ html {
+ line-height: 1.5;
+ font-family: Georgia, serif;
+ font-size: 20px;
+ color: #1a1a1a;
+ background-color: #fdfdfd;
+ }
+ body {
+ margin: 0 auto;
+ max-width: 36em;
+ padding-left: 50px;
+ padding-right: 50px;
+ padding-top: 50px;
+ padding-bottom: 50px;
+ hyphens: auto;
+ word-wrap: break-word;
+ text-rendering: optimizeLegibility;
+ font-kerning: normal;
+ }
+ @media (max-width: 600px) {
+ body {
+ font-size: 0.9em;
+ padding: 1em;
+ }
+ }
+ @media print {
+ body {
+ background-color: transparent;
+ color: black;
+ font-size: 12pt;
+ }
+ p, h2, h3 {
+ orphans: 3;
+ widows: 3;
+ }
+ h2, h3, h4 {
+ page-break-after: avoid;
+ }
+ }
+ p {
+ margin: 1em 0;
+ }
+ a {
+ color: #1a1a1a;
+ }
+ a:visited {
+ color: #1a1a1a;
+ }
+ img {
+ max-width: 100%;
+ }
+ h1, h2, h3, h4, h5, h6 {
+ margin-top: 1.4em;
+ }
+ h5, h6 {
+ font-size: 1em;
+ font-style: italic;
+ }
+ h6 {
+ font-weight: normal;
+ }
+ ol, ul {
+ padding-left: 1.7em;
+ margin-top: 1em;
+ }
+ li > ol, li > ul {
+ margin-top: 0;
+ }
+ blockquote {
+ margin: 1em 0 1em 1.7em;
+ padding-left: 1em;
+ border-left: 2px solid #e6e6e6;
+ color: #606060;
+ }
+ code {
+ font-family: Menlo, Monaco, 'Lucida Console', Consolas, monospace;
+ font-size: 85%;
+ margin: 0;
+ }
+ pre {
+ margin: 1em 0;
+ overflow: auto;
+ }
+ pre code {
+ padding: 0;
+ overflow: visible;
+ }
+ .sourceCode {
+ background-color: transparent;
+ overflow: visible;
+ }
+ hr {
+ background-color: #1a1a1a;
+ border: none;
+ height: 1px;
+ margin: 1em 0;
+ }
+ table {
+ margin: 1em 0;
+ border-collapse: collapse;
+ width: 100%;
+ overflow-x: auto;
+ display: block;
+ font-variant-numeric: lining-nums tabular-nums;
+ }
+ table caption {
+ margin-bottom: 0.75em;
+ }
+ tbody {
+ margin-top: 0.5em;
+ border-top: 1px solid #1a1a1a;
+ border-bottom: 1px solid #1a1a1a;
+ }
+ th {
+ border-top: 1px solid #1a1a1a;
+ padding: 0.25em 0.5em 0.25em 0.5em;
+ }
+ td {
+ padding: 0.125em 0.5em 0.25em 0.5em;
+ }
+ header {
+ margin-bottom: 4em;
+ text-align: center;
+ }
+ #TOC li {
+ list-style: none;
+ }
+ #TOC a:not(:hover) {
+ text-decoration: none;
+ }
+ code{white-space: pre-wrap;}
+ span.smallcaps{font-variant: small-caps;}
+ span.underline{text-decoration: underline;}
+ div.column{display: inline-block; vertical-align: top; width: 50%;}
+ div.hanging-indent{margin-left: 1.5em; text-indent: -1.5em;}
+ ul.task-list{list-style: none;}
+ .display.math{display: block; text-align: center; margin: 0.5rem auto;}
</style>
<!--[if lt IE 9]>
<script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv-printshiv.min.js"></script>
@@ -21,7 +154,19 @@
<h2 id="requirement-node">Requirement node</h2>
<h2 id="relations-between-requirements">Relations between requirements</h2>
<h3 id="composition">Composition</h3>
+<p>A composition <img src="file:../ui/util/reqcomp.gif" alt="syntax checking icon" /> links a high-level requirements “r” to requirements that are supposed to compose “r”.</p>
<h3 id="refine">Refine</h3>
+<p>A refine relation <img src="file:../ui/util/reqref.gif" alt="syntax checking icon" /> expresses a requirement which gives more details (e.g., more concrete values, or more concrete model elements) to a requirement.</p>
<h3 id="derivereqt">DeriveReqt</h3>
+<p>A DereiveReqt relation <img src="file:../ui/util/reqder.gif" alt="syntax checking icon" /> builds a requirement from other requirements (i.e. it is derived from other requirements). This relation is particularly used when a requirement expresses required techincal aspects from non technical requirements.</p>
+<h2 id="security-requirements">Security requirements</h2>
+<p>Security requirements in TTool can be made explicit, with e.g. “confidentiality”, “integrity”, etc. The following definitions make these terms more explicit.</p>
+<h3 id="privacy">Privacy</h3>
+<p>Privacy is guaranteed if the <strong>relation</strong> between an <strong>entity</strong> and a <strong>set of information</strong> is confidential.</p>
+<p>An example: <em>In a social network, for non administrator users, the user of a message shall not be linkable to that message but two messages sent by the same user shall be linkable to each other</em>.</p>
+<h3 id="confidentiality">Confidentiality</h3>
+<p>Confidentiality is satisfied when authorized <strong>entities</strong> are the only ones that can know a given <strong>quantum of information</strong>.</p>
+<p>Examples: - <em>The content of Messages sent from A to B shall be known only by A and B</em> - <em>The state of a state machine shall be known only by its execution engine</em></p>
+<h3 id="section"></h3>
</body>
</html>
diff --git a/src/main/resources/help/requirements.md b/src/main/resources/help/requirements.md
index ceb755c444b283867b31c9326cc8e2e431bedf4c..103cb11ac33108c1769586ef6b826cf02ae45b01 100644
--- a/src/main/resources/help/requirements.md
+++ b/src/main/resources/help/requirements.md
@@ -1,15 +1,54 @@
# Requirements
Requirements can be captured in SysML Requirement Diagrams.
+
## Requirement node
+
## Relations between requirements
+
### Composition
+A composition  links a high-level requirements "r" to requirements that are supposed to compose "r".
+
### Refine
+A refine relation  expresses a requirement which gives more details (e.g., more concrete values, or more concrete model elements) to a requirement.
+
### DeriveReqt
+A DereiveReqt relation  builds a requirement from other requirements (i.e. it is derived from other requirements). This relation is particularly used when a requirement expresses required techincal aspects from non technical requirements.
+
+
+## Security requirements
+
+Security requirements in TTool can be made explicit, with e.g. "confidentiality", "integrity", etc. The following definitions make these terms more explicit.
+
+
+### Privacy
+
+Privacy is guaranteed if the **relation** between an **entity** and
+a **set of information** is confidential.
+
+
+An example: *In a social network, for non administrator users, the user of
+a message shall not be linkable to that message but two
+messages sent by the same user shall be linkable to each
+other*.
+
+
+### Confidentiality
+
+Confidentiality is satisfied when authorized **entities** are the
+only ones that can know a given **quantum of information**.
+
+Examples:
+- *The content of Messages sent from A to B shall be known
+only by A and B*
+- *The state of a state machine shall be known only by its
+execution engine*
+
+###