diff --git a/executablecode/Makefile.src b/executablecode/Makefile.src
index e09b9d9e99d1ff21a5e6505e66dba1994f06713c..2b4059ec6690a462f82dbd5da91db2df9eb3b73d 100755
--- a/executablecode/Makefile.src
+++ b/executablecode/Makefile.src
@@ -1 +1 @@
-SRCS = generated_src/main.c generated_src/RemotelyControlledMicrowave.c generated_src/WirelessInterface.c generated_src/RemoteControl.c generated_src/MicroWaveOven.c generated_src/ObserverProp1.c generated_src/Door.c generated_src/Magnetron.c generated_src/Controller.c generated_src/ControlPanel.c generated_src/Bell.c
\ No newline at end of file
+SRCS = generated_src/main.c generated_src/B.c generated_src/A.c
\ No newline at end of file
diff --git a/modeling/CoffeeMachine_Avatar.xml b/modeling/CoffeeMachine_Avatar.xml
index 64c79745d3328c0087b67b722d0ff34f0c27eb6b..600d23c64741149a35aea9da7aed60917dcacb82 100644
--- a/modeling/CoffeeMachine_Avatar.xml
+++ b/modeling/CoffeeMachine_Avatar.xml
@@ -506,7 +506,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="265" />
-<P1 x="313" y="261" id="309" />
+<P1 x="313" y="261" id="296" />
<P2 x="361" y="261" id="284" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -524,7 +524,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="269" />
-<P1 x="309" y="211" id="296" />
+<P1 x="309" y="211" id="309" />
<P2 x="361" y="211" id="283" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -613,11 +613,11 @@
</COMPONENT>
<SUBCOMPONENT type="5304" id="306" >
<father id="344" num="0" />
-<cdparam x="170" y="191" />
-<sizeparam width="139" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="165" y="241" />
+<sizeparam width="148" height="40" minWidth="100" minHeight="0" 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="294" />
<TGConnectingPoint num="1" id="295" />
<TGConnectingPoint num="2" id="296" />
@@ -633,11 +633,11 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="5304" id="319" >
<father id="344" num="1" />
-<cdparam x="165" y="241" />
-<sizeparam width="148" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="170" y="191" />
+<sizeparam width="139" height="40" minWidth="100" minHeight="0" 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="307" />
<TGConnectingPoint num="1" id="308" />
<TGConnectingPoint num="2" id="309" />
@@ -767,7 +767,7 @@
<TGConnectingPoint num="0" id="403" />
<TGConnectingPoint num="1" id="404" />
<TGConnectingPoint num="2" id="405" />
-<P1 x="581" y="154" id="479" />
+<P1 x="581" y="154" id="492" />
<P2 x="546" y="305" id="549" />
<Point x="518" y="154" />
<Point x="518" y="305" />
@@ -795,7 +795,7 @@
<infoparam name="connector from TGComponent to TGComponent" value="" />
<TGConnectingPoint num="0" id="408" />
<TGConnectingPoint num="1" id="409" />
-<P1 x="631" y="164" id="474" />
+<P1 x="631" y="164" id="487" />
<P2 x="667" y="310" id="536" />
<Point x="631" y="310" />
<AutomaticDrawing data="true" />
@@ -823,7 +823,7 @@
<infoparam name="connector from TGComponent to TGComponent" value="" />
<TGConnectingPoint num="0" id="414" />
<TGConnectingPoint num="1" id="415" />
-<P1 x="721" y="158" id="485" />
+<P1 x="721" y="158" id="472" />
<P2 x="700" y="204" id="526" />
<Point x="700" y="158" />
<AutomaticDrawing data="true" />
@@ -978,13 +978,13 @@
<TGConnectingPoint num="22" id="519" />
<TGConnectingPoint num="23" id="520" />
</COMPONENT>
-<SUBCOMPONENT type="5304" id="483" >
+<SUBCOMPONENT type="5303" id="483" >
<father id="521" num="0" />
-<cdparam x="581" y="125" />
-<sizeparam width="100" height="39" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="721" y="133" />
+<sizeparam width="100" height="50" minWidth="100" minHeight="0" 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="471" />
<TGConnectingPoint num="1" id="472" />
<TGConnectingPoint num="2" id="473" />
@@ -997,14 +997,17 @@
<TGConnectingPoint num="9" id="480" />
<TGConnectingPoint num="10" id="481" />
<TGConnectingPoint num="11" id="482" />
+<extraparam>
+<Toggle value="" />
+</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="5303" id="496" >
+<SUBCOMPONENT type="5304" id="496" >
<father id="521" num="1" />
-<cdparam x="721" y="133" />
-<sizeparam width="100" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="581" y="125" />
+<sizeparam width="100" height="39" minWidth="100" minHeight="0" 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="484" />
<TGConnectingPoint num="1" id="485" />
<TGConnectingPoint num="2" id="486" />
@@ -1017,9 +1020,6 @@
<TGConnectingPoint num="9" id="493" />
<TGConnectingPoint num="10" id="494" />
<TGConnectingPoint num="11" id="495" />
-<extraparam>
-<Toggle value="" />
-</extraparam>
</SUBCOMPONENT>
<COMPONENT type="5306" id="533" >
@@ -1141,7 +1141,7 @@
<MainCode value="void __user_init() {"/>
<MainCode value="}"/>
<Optimized value="true" />
-<Validated value="" />
+<Validated value="Wallet;CoffeeMachine;CoffeeButton;TeaButton;" />
<Ignored value="" />
<CONNECTOR type="5002" id="587" >
@@ -1149,7 +1149,7 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Block1 to Block0" value="" />
<TGConnectingPoint num="0" id="586" />
-<P1 x="559" y="330" id="648" />
+<P1 x="559" y="330" id="623" />
<P2 x="560" y="377" id="681" />
<AutomaticDrawing data="true" />
<extraparam>
@@ -1179,7 +1179,7 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Block1 to Block0" value="" />
<TGConnectingPoint num="0" id="590" />
-<P1 x="789" y="326" id="623" />
+<P1 x="789" y="326" id="648" />
<P2 x="790" y="377" id="682" />
<AutomaticDrawing data="true" />
<extraparam>
@@ -1278,11 +1278,11 @@
</COMPONENT>
<SUBCOMPONENT type="5000" id="641" >
<father id="691" num="0" />
-<cdparam x="695" y="224" />
-<sizeparam width="189" height="102" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="464" y="228" />
+<sizeparam width="190" height="102" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="272" minY="0" maxY="256" />
-<infoparam name="Block1" value="TeaButton" />
+<cdrectangleparam minX="0" maxX="271" minY="0" maxY="256" />
+<infoparam name="Block1" value="CoffeeButton" />
<TGConnectingPoint num="0" id="617" />
<TGConnectingPoint num="1" id="618" />
<TGConnectingPoint num="2" id="619" />
@@ -1315,11 +1315,11 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="5000" id="666" >
<father id="691" num="1" />
-<cdparam x="464" y="228" />
-<sizeparam width="190" height="102" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="695" y="224" />
+<sizeparam width="189" height="102" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="271" minY="0" maxY="256" />
-<infoparam name="Block1" value="CoffeeButton" />
+<cdrectangleparam minX="0" maxX="272" minY="0" maxY="256" />
+<infoparam name="Block1" value="TeaButton" />
<TGConnectingPoint num="0" id="642" />
<TGConnectingPoint num="1" id="643" />
<TGConnectingPoint num="2" id="644" />
@@ -1732,7 +1732,7 @@
<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="886" />
-<P1 x="437" y="525" id="1220" />
+<P1 x="437" y="525" id="1285" />
<P2 x="323" y="748" id="1146" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="885" >
@@ -1761,8 +1761,8 @@
<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="893" />
-<P1 x="321" y="455" id="1247" />
-<P2 x="437" y="495" id="1219" />
+<P1 x="321" y="455" id="1234" />
+<P2 x="437" y="495" id="1284" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="892" >
<father id="894" num="0" />
@@ -1789,7 +1789,7 @@
<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="900" />
-<P1 x="293" y="552" id="1285" />
+<P1 x="293" y="552" id="1220" />
<P2 x="289" y="748" id="1138" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="899" >
@@ -1819,8 +1819,8 @@
<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="907" />
-<P1 x="288" y="475" id="1258" />
-<P2 x="293" y="522" id="1284" />
+<P1 x="288" y="475" id="1245" />
+<P2 x="293" y="522" id="1219" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="906" >
<father id="908" num="0" />
@@ -1847,7 +1847,7 @@
<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="914" />
-<P1 x="121" y="552" id="1231" />
+<P1 x="121" y="552" id="1274" />
<P2 x="255" y="748" id="1145" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="913" >
@@ -1877,8 +1877,8 @@
<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="921" />
-<P1 x="222" y="475" id="1257" />
-<P2 x="121" y="522" id="1230" />
+<P1 x="222" y="475" id="1244" />
+<P2 x="121" y="522" id="1273" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="920" >
<father id="922" num="0" />
@@ -1905,8 +1905,8 @@
<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="928" />
-<P1 x="256" y="419" id="1241" />
-<P2 x="255" y="435" id="1244" />
+<P1 x="256" y="419" id="1271" />
+<P2 x="255" y="435" id="1231" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="927" >
<father id="929" num="0" />
@@ -2127,11 +2127,11 @@
</SUBCOMPONENT>
<COMPONENT type="5104" id="989" >
-<cdparam x="242" y="141" />
-<sizeparam width="128" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="268" y="141" />
+<sizeparam width="76" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="Receive signal" value="getCoin(nbOfCoins)" />
+<infoparam name="Receive signal" value="getCoin(x)" />
<TGConnectingPoint num="0" id="979" />
<TGConnectingPoint num="1" id="980" />
<TGConnectingPoint num="2" id="981" />
@@ -2489,13 +2489,13 @@
<extraparam>
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="5103" id="1229" >
+<SUBCOMPONENT type="5104" id="1229" >
<father id="1335" num="0" />
-<cdparam x="372" y="500" />
-<sizeparam width="130" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="237" y="527" />
+<sizeparam width="112" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="447" minY="0" maxY="334" />
-<infoparam name="Send signal" value="ejectCoin(nbOfCoins)" />
+<cdrectangleparam minX="0" maxX="465" minY="0" maxY="334" />
+<infoparam name="Send signal" value="pushTeaButton()" />
<TGConnectingPoint num="0" id="1219" />
<TGConnectingPoint num="1" id="1220" />
<TGConnectingPoint num="2" id="1221" />
@@ -2508,13 +2508,13 @@
<TGConnectingPoint num="9" id="1228" />
<accessibility />
</SUBCOMPONENT>
-<SUBCOMPONENT type="5104" id="1240" >
+<SUBCOMPONENT type="5106" id="1270" >
<father id="1335" num="1" />
-<cdparam x="58" y="527" />
-<sizeparam width="127" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="189" y="435" />
+<sizeparam width="132" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="450" minY="0" maxY="334" />
-<infoparam name="Send signal" value="pushCoffeeButton()" />
+<cdrectangleparam minX="0" maxX="445" minY="0" maxY="314" />
+<infoparam name="state0" value="WaitingForSelection" />
<TGConnectingPoint num="0" id="1230" />
<TGConnectingPoint num="1" id="1231" />
<TGConnectingPoint num="2" id="1232" />
@@ -2525,74 +2525,74 @@
<TGConnectingPoint num="7" id="1237" />
<TGConnectingPoint num="8" id="1238" />
<TGConnectingPoint num="9" id="1239" />
-<accessibility />
+<TGConnectingPoint num="10" id="1240" />
+<TGConnectingPoint num="11" id="1241" />
+<TGConnectingPoint num="12" id="1242" />
+<TGConnectingPoint num="13" id="1243" />
+<TGConnectingPoint num="14" id="1244" />
+<TGConnectingPoint num="15" id="1245" />
+<TGConnectingPoint num="16" id="1246" />
+<TGConnectingPoint num="17" id="1247" />
+<TGConnectingPoint num="18" id="1248" />
+<TGConnectingPoint num="19" id="1249" />
+<TGConnectingPoint num="20" id="1250" />
+<TGConnectingPoint num="21" id="1251" />
+<TGConnectingPoint num="22" id="1252" />
+<TGConnectingPoint num="23" id="1253" />
+<TGConnectingPoint num="24" id="1254" />
+<TGConnectingPoint num="25" id="1255" />
+<TGConnectingPoint num="26" id="1256" />
+<TGConnectingPoint num="27" id="1257" />
+<TGConnectingPoint num="28" id="1258" />
+<TGConnectingPoint num="29" id="1259" />
+<TGConnectingPoint num="30" id="1260" />
+<TGConnectingPoint num="31" id="1261" />
+<TGConnectingPoint num="32" id="1262" />
+<TGConnectingPoint num="33" id="1263" />
+<TGConnectingPoint num="34" id="1264" />
+<TGConnectingPoint num="35" id="1265" />
+<TGConnectingPoint num="36" id="1266" />
+<TGConnectingPoint num="37" id="1267" />
+<TGConnectingPoint num="38" id="1268" />
+<TGConnectingPoint num="39" id="1269" />
+<extraparam>
+</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="5100" id="1242" >
+<SUBCOMPONENT type="5100" id="1272" >
<father id="1335" num="2" />
<cdparam x="249" y="399" />
<sizeparam width="15" height="15" minWidth="0" minHeight="0" 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="1241" />
+<TGConnectingPoint num="0" id="1271" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="5106" id="1283" >
+<SUBCOMPONENT type="5104" id="1283" >
<father id="1335" num="3" />
-<cdparam x="189" y="435" />
-<sizeparam width="132" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="58" y="527" />
+<sizeparam width="127" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="445" minY="0" maxY="314" />
-<infoparam name="state0" value="WaitingForSelection" />
-<TGConnectingPoint num="0" id="1243" />
-<TGConnectingPoint num="1" id="1244" />
-<TGConnectingPoint num="2" id="1245" />
-<TGConnectingPoint num="3" id="1246" />
-<TGConnectingPoint num="4" id="1247" />
-<TGConnectingPoint num="5" id="1248" />
-<TGConnectingPoint num="6" id="1249" />
-<TGConnectingPoint num="7" id="1250" />
-<TGConnectingPoint num="8" id="1251" />
-<TGConnectingPoint num="9" id="1252" />
-<TGConnectingPoint num="10" id="1253" />
-<TGConnectingPoint num="11" id="1254" />
-<TGConnectingPoint num="12" id="1255" />
-<TGConnectingPoint num="13" id="1256" />
-<TGConnectingPoint num="14" id="1257" />
-<TGConnectingPoint num="15" id="1258" />
-<TGConnectingPoint num="16" id="1259" />
-<TGConnectingPoint num="17" id="1260" />
-<TGConnectingPoint num="18" id="1261" />
-<TGConnectingPoint num="19" id="1262" />
-<TGConnectingPoint num="20" id="1263" />
-<TGConnectingPoint num="21" id="1264" />
-<TGConnectingPoint num="22" id="1265" />
-<TGConnectingPoint num="23" id="1266" />
-<TGConnectingPoint num="24" id="1267" />
-<TGConnectingPoint num="25" id="1268" />
-<TGConnectingPoint num="26" id="1269" />
-<TGConnectingPoint num="27" id="1270" />
-<TGConnectingPoint num="28" id="1271" />
-<TGConnectingPoint num="29" id="1272" />
-<TGConnectingPoint num="30" id="1273" />
-<TGConnectingPoint num="31" id="1274" />
-<TGConnectingPoint num="32" id="1275" />
-<TGConnectingPoint num="33" id="1276" />
-<TGConnectingPoint num="34" id="1277" />
-<TGConnectingPoint num="35" id="1278" />
-<TGConnectingPoint num="36" id="1279" />
-<TGConnectingPoint num="37" id="1280" />
-<TGConnectingPoint num="38" id="1281" />
-<TGConnectingPoint num="39" id="1282" />
-<extraparam>
-</extraparam>
+<cdrectangleparam minX="0" maxX="450" minY="0" maxY="334" />
+<infoparam name="Send signal" value="pushCoffeeButton()" />
+<TGConnectingPoint num="0" id="1273" />
+<TGConnectingPoint num="1" id="1274" />
+<TGConnectingPoint num="2" id="1275" />
+<TGConnectingPoint num="3" id="1276" />
+<TGConnectingPoint num="4" id="1277" />
+<TGConnectingPoint num="5" id="1278" />
+<TGConnectingPoint num="6" id="1279" />
+<TGConnectingPoint num="7" id="1280" />
+<TGConnectingPoint num="8" id="1281" />
+<TGConnectingPoint num="9" id="1282" />
+<accessibility />
</SUBCOMPONENT>
-<SUBCOMPONENT type="5104" id="1294" >
+<SUBCOMPONENT type="5103" id="1294" >
<father id="1335" num="4" />
-<cdparam x="237" y="527" />
-<sizeparam width="112" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="372" y="500" />
+<sizeparam width="130" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="465" minY="0" maxY="334" />
-<infoparam name="Send signal" value="pushTeaButton()" />
+<cdrectangleparam minX="0" maxX="447" minY="0" maxY="334" />
+<infoparam name="Send signal" value="ejectCoin(nbOfCoins)" />
<TGConnectingPoint num="0" id="1284" />
<TGConnectingPoint num="1" id="1285" />
<TGConnectingPoint num="2" id="1286" />
@@ -2609,19 +2609,19 @@
</AVATARStateMachineDiagramPanel>
-<AVATARStateMachineDiagramPanel name="CoffeeButton" minX="10" maxX="1400" minY="10" maxY="900" >
+<AVATARStateMachineDiagramPanel name="TeaButton" minX="10" maxX="1400" minY="10" maxY="900" >
<CONNECTOR type="5102" id="1342" >
-<cdparam x="177" y="199" />
+<cdparam x="363" y="193" />
<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" />
+<infoparam name="connector from Send signal to state0" value="null" />
<TGConnectingPoint num="0" id="1341" />
-<P1 x="340" y="233" id="1448" />
-<P2 x="353" y="252" id="1450" />
+<P1 x="363" y="204" id="1358" />
+<P2 x="362" y="257" id="1369" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="1340" >
<father id="1342" num="0" />
-<cdparam x="177" y="239" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="380" y="228" />
+<sizeparam width="135" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
@@ -2631,7 +2631,7 @@
<TGConnectingPoint num="3" id="1339" />
<extraparam>
<guard value="[ ]" />
-<afterMin value="" />
+<afterMin value="mechanicalDelay" />
<afterMax value="" />
<computeMin value="" />
<computeMax value="" />
@@ -2639,16 +2639,16 @@
</SUBCOMPONENT>
<CONNECTOR type="5102" id="1349" >
-<cdparam x="322" y="69" />
+<cdparam x="363" y="150" />
<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" />
+<infoparam name="connector from state0 to Send signal" value="null" />
<TGConnectingPoint num="0" id="1348" />
-<P1 x="322" y="69" id="1446" />
-<P2 x="323" y="88" id="1406" />
+<P1 x="363" y="150" id="1415" />
+<P2 x="363" y="174" id="1357" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="1347" >
<father id="1349" num="0" />
-<cdparam x="322" y="109" />
+<cdparam x="363" y="190" />
<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -2667,16 +2667,16 @@
</SUBCOMPONENT>
<CONNECTOR type="5102" id="1356" >
-<cdparam x="377" y="144" />
+<cdparam x="362" y="101" />
<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" />
+<infoparam name="connector from start state to state0" value="null" />
<TGConnectingPoint num="0" id="1355" />
-<P1 x="323" y="118" id="1411" />
-<P2 x="356" y="174" id="1462" />
+<P1 x="362" y="101" id="1450" />
+<P2 x="363" y="120" id="1410" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="1354" >
<father id="1356" num="0" />
-<cdparam x="377" y="184" />
+<cdparam x="362" y="141" />
<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -2694,271 +2694,184 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1363" >
-<cdparam x="377" y="187" />
-<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="1362" />
-<P1 x="353" y="282" id="1451" />
-<P2 x="399" y="352" id="1365" />
-<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1361" >
-<father id="1363" num="0" />
-<cdparam x="417" y="335" />
-<sizeparam width="135" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5103" id="1367" >
+<cdparam x="340" y="179" />
+<sizeparam width="46" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<infoparam name="Send signal" value="push()" />
<TGConnectingPoint num="0" id="1357" />
<TGConnectingPoint num="1" id="1358" />
<TGConnectingPoint num="2" id="1359" />
<TGConnectingPoint num="3" id="1360" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="mechanicalDelay" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-</extraparam>
-</SUBCOMPONENT>
+<TGConnectingPoint num="4" id="1361" />
+<TGConnectingPoint num="5" id="1362" />
+<TGConnectingPoint num="6" id="1363" />
+<TGConnectingPoint num="7" id="1364" />
+<TGConnectingPoint num="8" id="1365" />
+<TGConnectingPoint num="9" id="1366" />
+</COMPONENT>
-<COMPONENT type="5106" id="1404" >
-<cdparam x="374" y="352" />
+<COMPONENT type="5106" id="1408" >
+<cdparam x="337" y="257" />
<sizeparam width="50" height="30" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="state0" value="main" />
-<TGConnectingPoint num="0" id="1364" />
-<TGConnectingPoint num="1" id="1365" />
-<TGConnectingPoint num="2" id="1366" />
-<TGConnectingPoint num="3" id="1367" />
-<TGConnectingPoint num="4" id="1368" />
-<TGConnectingPoint num="5" id="1369" />
-<TGConnectingPoint num="6" id="1370" />
-<TGConnectingPoint num="7" id="1371" />
-<TGConnectingPoint num="8" id="1372" />
-<TGConnectingPoint num="9" id="1373" />
-<TGConnectingPoint num="10" id="1374" />
-<TGConnectingPoint num="11" id="1375" />
-<TGConnectingPoint num="12" id="1376" />
-<TGConnectingPoint num="13" id="1377" />
-<TGConnectingPoint num="14" id="1378" />
-<TGConnectingPoint num="15" id="1379" />
-<TGConnectingPoint num="16" id="1380" />
-<TGConnectingPoint num="17" id="1381" />
-<TGConnectingPoint num="18" id="1382" />
-<TGConnectingPoint num="19" id="1383" />
-<TGConnectingPoint num="20" id="1384" />
-<TGConnectingPoint num="21" id="1385" />
-<TGConnectingPoint num="22" id="1386" />
-<TGConnectingPoint num="23" id="1387" />
-<TGConnectingPoint num="24" id="1388" />
-<TGConnectingPoint num="25" id="1389" />
-<TGConnectingPoint num="26" id="1390" />
-<TGConnectingPoint num="27" id="1391" />
-<TGConnectingPoint num="28" id="1392" />
-<TGConnectingPoint num="29" id="1393" />
-<TGConnectingPoint num="30" id="1394" />
-<TGConnectingPoint num="31" id="1395" />
-<TGConnectingPoint num="32" id="1396" />
-<TGConnectingPoint num="33" id="1397" />
-<TGConnectingPoint num="34" id="1398" />
-<TGConnectingPoint num="35" id="1399" />
-<TGConnectingPoint num="36" id="1400" />
-<TGConnectingPoint num="37" id="1401" />
-<TGConnectingPoint num="38" id="1402" />
-<TGConnectingPoint num="39" id="1403" />
+<TGConnectingPoint num="0" id="1368" />
+<TGConnectingPoint num="1" id="1369" />
+<TGConnectingPoint num="2" id="1370" />
+<TGConnectingPoint num="3" id="1371" />
+<TGConnectingPoint num="4" id="1372" />
+<TGConnectingPoint num="5" id="1373" />
+<TGConnectingPoint num="6" id="1374" />
+<TGConnectingPoint num="7" id="1375" />
+<TGConnectingPoint num="8" id="1376" />
+<TGConnectingPoint num="9" id="1377" />
+<TGConnectingPoint num="10" id="1378" />
+<TGConnectingPoint num="11" id="1379" />
+<TGConnectingPoint num="12" id="1380" />
+<TGConnectingPoint num="13" id="1381" />
+<TGConnectingPoint num="14" id="1382" />
+<TGConnectingPoint num="15" id="1383" />
+<TGConnectingPoint num="16" id="1384" />
+<TGConnectingPoint num="17" id="1385" />
+<TGConnectingPoint num="18" id="1386" />
+<TGConnectingPoint num="19" id="1387" />
+<TGConnectingPoint num="20" id="1388" />
+<TGConnectingPoint num="21" id="1389" />
+<TGConnectingPoint num="22" id="1390" />
+<TGConnectingPoint num="23" id="1391" />
+<TGConnectingPoint num="24" id="1392" />
+<TGConnectingPoint num="25" id="1393" />
+<TGConnectingPoint num="26" id="1394" />
+<TGConnectingPoint num="27" id="1395" />
+<TGConnectingPoint num="28" id="1396" />
+<TGConnectingPoint num="29" id="1397" />
+<TGConnectingPoint num="30" id="1398" />
+<TGConnectingPoint num="31" id="1399" />
+<TGConnectingPoint num="32" id="1400" />
+<TGConnectingPoint num="33" id="1401" />
+<TGConnectingPoint num="34" id="1402" />
+<TGConnectingPoint num="35" id="1403" />
+<TGConnectingPoint num="36" id="1404" />
+<TGConnectingPoint num="37" id="1405" />
+<TGConnectingPoint num="38" id="1406" />
+<TGConnectingPoint num="39" id="1407" />
<extraparam>
</extraparam>
</COMPONENT>
-<COMPONENT type="5106" id="1445" >
-<cdparam x="298" y="88" />
+<COMPONENT type="5106" id="1449" >
+<cdparam x="338" y="120" />
<sizeparam width="50" height="30" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="state0" value="main" />
-<TGConnectingPoint num="0" id="1405" />
-<TGConnectingPoint num="1" id="1406" />
-<TGConnectingPoint num="2" id="1407" />
-<TGConnectingPoint num="3" id="1408" />
-<TGConnectingPoint num="4" id="1409" />
-<TGConnectingPoint num="5" id="1410" />
-<TGConnectingPoint num="6" id="1411" />
-<TGConnectingPoint num="7" id="1412" />
-<TGConnectingPoint num="8" id="1413" />
-<TGConnectingPoint num="9" id="1414" />
-<TGConnectingPoint num="10" id="1415" />
-<TGConnectingPoint num="11" id="1416" />
-<TGConnectingPoint num="12" id="1417" />
-<TGConnectingPoint num="13" id="1418" />
-<TGConnectingPoint num="14" id="1419" />
-<TGConnectingPoint num="15" id="1420" />
-<TGConnectingPoint num="16" id="1421" />
-<TGConnectingPoint num="17" id="1422" />
-<TGConnectingPoint num="18" id="1423" />
-<TGConnectingPoint num="19" id="1424" />
-<TGConnectingPoint num="20" id="1425" />
-<TGConnectingPoint num="21" id="1426" />
-<TGConnectingPoint num="22" id="1427" />
-<TGConnectingPoint num="23" id="1428" />
-<TGConnectingPoint num="24" id="1429" />
-<TGConnectingPoint num="25" id="1430" />
-<TGConnectingPoint num="26" id="1431" />
-<TGConnectingPoint num="27" id="1432" />
-<TGConnectingPoint num="28" id="1433" />
-<TGConnectingPoint num="29" id="1434" />
-<TGConnectingPoint num="30" id="1435" />
-<TGConnectingPoint num="31" id="1436" />
-<TGConnectingPoint num="32" id="1437" />
-<TGConnectingPoint num="33" id="1438" />
-<TGConnectingPoint num="34" id="1439" />
-<TGConnectingPoint num="35" id="1440" />
-<TGConnectingPoint num="36" id="1441" />
-<TGConnectingPoint num="37" id="1442" />
-<TGConnectingPoint num="38" id="1443" />
-<TGConnectingPoint num="39" id="1444" />
+<TGConnectingPoint num="0" id="1409" />
+<TGConnectingPoint num="1" id="1410" />
+<TGConnectingPoint num="2" id="1411" />
+<TGConnectingPoint num="3" id="1412" />
+<TGConnectingPoint num="4" id="1413" />
+<TGConnectingPoint num="5" id="1414" />
+<TGConnectingPoint num="6" id="1415" />
+<TGConnectingPoint num="7" id="1416" />
+<TGConnectingPoint num="8" id="1417" />
+<TGConnectingPoint num="9" id="1418" />
+<TGConnectingPoint num="10" id="1419" />
+<TGConnectingPoint num="11" id="1420" />
+<TGConnectingPoint num="12" id="1421" />
+<TGConnectingPoint num="13" id="1422" />
+<TGConnectingPoint num="14" id="1423" />
+<TGConnectingPoint num="15" id="1424" />
+<TGConnectingPoint num="16" id="1425" />
+<TGConnectingPoint num="17" id="1426" />
+<TGConnectingPoint num="18" id="1427" />
+<TGConnectingPoint num="19" id="1428" />
+<TGConnectingPoint num="20" id="1429" />
+<TGConnectingPoint num="21" id="1430" />
+<TGConnectingPoint num="22" id="1431" />
+<TGConnectingPoint num="23" id="1432" />
+<TGConnectingPoint num="24" id="1433" />
+<TGConnectingPoint num="25" id="1434" />
+<TGConnectingPoint num="26" id="1435" />
+<TGConnectingPoint num="27" id="1436" />
+<TGConnectingPoint num="28" id="1437" />
+<TGConnectingPoint num="29" id="1438" />
+<TGConnectingPoint num="30" id="1439" />
+<TGConnectingPoint num="31" id="1440" />
+<TGConnectingPoint num="32" id="1441" />
+<TGConnectingPoint num="33" id="1442" />
+<TGConnectingPoint num="34" id="1443" />
+<TGConnectingPoint num="35" id="1444" />
+<TGConnectingPoint num="36" id="1445" />
+<TGConnectingPoint num="37" id="1446" />
+<TGConnectingPoint num="38" id="1447" />
+<TGConnectingPoint num="39" id="1448" />
<extraparam>
</extraparam>
</COMPONENT>
-<COMPONENT type="5100" id="1447" >
-<cdparam x="315" y="49" />
+<COMPONENT type="5100" id="1451" >
+<cdparam x="355" y="81" />
<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="1446" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="1501" >
-<cdparam x="264" y="174" />
-<sizeparam width="184" height="130" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="state0" />
-<TGConnectingPoint num="0" id="1461" />
-<TGConnectingPoint num="1" id="1462" />
-<TGConnectingPoint num="2" id="1463" />
-<TGConnectingPoint num="3" id="1464" />
-<TGConnectingPoint num="4" id="1465" />
-<TGConnectingPoint num="5" id="1466" />
-<TGConnectingPoint num="6" id="1467" />
-<TGConnectingPoint num="7" id="1468" />
-<TGConnectingPoint num="8" id="1469" />
-<TGConnectingPoint num="9" id="1470" />
-<TGConnectingPoint num="10" id="1471" />
-<TGConnectingPoint num="11" id="1472" />
-<TGConnectingPoint num="12" id="1473" />
-<TGConnectingPoint num="13" id="1474" />
-<TGConnectingPoint num="14" id="1475" />
-<TGConnectingPoint num="15" id="1476" />
-<TGConnectingPoint num="16" id="1477" />
-<TGConnectingPoint num="17" id="1478" />
-<TGConnectingPoint num="18" id="1479" />
-<TGConnectingPoint num="19" id="1480" />
-<TGConnectingPoint num="20" id="1481" />
-<TGConnectingPoint num="21" id="1482" />
-<TGConnectingPoint num="22" id="1483" />
-<TGConnectingPoint num="23" id="1484" />
-<TGConnectingPoint num="24" id="1485" />
-<TGConnectingPoint num="25" id="1486" />
-<TGConnectingPoint num="26" id="1487" />
-<TGConnectingPoint num="27" id="1488" />
-<TGConnectingPoint num="28" id="1489" />
-<TGConnectingPoint num="29" id="1490" />
-<TGConnectingPoint num="30" id="1491" />
-<TGConnectingPoint num="31" id="1492" />
-<TGConnectingPoint num="32" id="1493" />
-<TGConnectingPoint num="33" id="1494" />
-<TGConnectingPoint num="34" id="1495" />
-<TGConnectingPoint num="35" id="1496" />
-<TGConnectingPoint num="36" id="1497" />
-<TGConnectingPoint num="37" id="1498" />
-<TGConnectingPoint num="38" id="1499" />
-<TGConnectingPoint num="39" id="1500" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-<SUBCOMPONENT type="5100" id="1449" >
-<father id="1501" num="0" />
-<cdparam x="333" y="213" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" 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="1448" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="5103" id="1460" >
-<father id="1501" num="1" />
-<cdparam x="330" y="257" />
-<sizeparam width="46" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="138" minY="0" maxY="110" />
-<infoparam name="Send signal" value="push()" />
<TGConnectingPoint num="0" id="1450" />
-<TGConnectingPoint num="1" id="1451" />
-<TGConnectingPoint num="2" id="1452" />
-<TGConnectingPoint num="3" id="1453" />
-<TGConnectingPoint num="4" id="1454" />
-<TGConnectingPoint num="5" id="1455" />
-<TGConnectingPoint num="6" id="1456" />
-<TGConnectingPoint num="7" id="1457" />
-<TGConnectingPoint num="8" id="1458" />
-<TGConnectingPoint num="9" id="1459" />
-</SUBCOMPONENT>
+</COMPONENT>
</AVATARStateMachineDiagramPanel>
-<AVATARStateMachineDiagramPanel name="TeaButton" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="1508" >
-<cdparam x="363" y="193" />
+<AVATARStateMachineDiagramPanel name="CoffeeButton" minX="10" maxX="1400" minY="10" maxY="900" >
+<CONNECTOR type="5102" id="1458" >
+<cdparam x="177" y="199" />
<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="1507" />
-<P1 x="363" y="204" id="1524" />
-<P2 x="362" y="257" id="1535" />
+<infoparam name="connector from start state to Send signal" value="null" />
+<TGConnectingPoint num="0" id="1457" />
+<P1 x="340" y="233" id="1575" />
+<P2 x="353" y="252" id="1564" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1506" >
-<father id="1508" num="0" />
-<cdparam x="380" y="228" />
-<sizeparam width="135" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1456" >
+<father id="1458" num="0" />
+<cdparam x="177" y="239" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1502" />
-<TGConnectingPoint num="1" id="1503" />
-<TGConnectingPoint num="2" id="1504" />
-<TGConnectingPoint num="3" id="1505" />
+<TGConnectingPoint num="0" id="1452" />
+<TGConnectingPoint num="1" id="1453" />
+<TGConnectingPoint num="2" id="1454" />
+<TGConnectingPoint num="3" id="1455" />
<extraparam>
<guard value="[ ]" />
-<afterMin value="mechanicalDelay" />
+<afterMin value="" />
<afterMax value="" />
<computeMin value="" />
<computeMax value="" />
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1515" >
-<cdparam x="363" y="150" />
+<CONNECTOR type="5102" id="1465" >
+<cdparam x="322" y="69" />
<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="1514" />
-<P1 x="363" y="150" id="1581" />
-<P2 x="363" y="174" id="1523" />
+<infoparam name="connector from start state to state0" value="null" />
+<TGConnectingPoint num="0" id="1464" />
+<P1 x="322" y="69" id="1562" />
+<P2 x="323" y="88" id="1522" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1513" >
-<father id="1515" num="0" />
-<cdparam x="363" y="190" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1463" >
+<father id="1465" num="0" />
+<cdparam x="322" y="109" />
<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1509" />
-<TGConnectingPoint num="1" id="1510" />
-<TGConnectingPoint num="2" id="1511" />
-<TGConnectingPoint num="3" id="1512" />
+<TGConnectingPoint num="0" id="1459" />
+<TGConnectingPoint num="1" id="1460" />
+<TGConnectingPoint num="2" id="1461" />
+<TGConnectingPoint num="3" id="1462" />
<extraparam>
<guard value="[ ]" />
<afterMin value="" />
@@ -2968,25 +2881,25 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1522" >
-<cdparam x="362" y="101" />
+<CONNECTOR type="5102" id="1472" >
+<cdparam x="377" y="144" />
<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="1521" />
-<P1 x="362" y="101" id="1616" />
-<P2 x="363" y="120" id="1576" />
+<infoparam name="connector from state0 to Send signal" value="null" />
+<TGConnectingPoint num="0" id="1471" />
+<P1 x="323" y="118" id="1527" />
+<P2 x="356" y="174" id="1578" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1520" >
-<father id="1522" num="0" />
-<cdparam x="362" y="141" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1470" >
+<father id="1472" num="0" />
+<cdparam x="377" y="184" />
<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1516" />
-<TGConnectingPoint num="1" id="1517" />
-<TGConnectingPoint num="2" id="1518" />
-<TGConnectingPoint num="3" id="1519" />
+<TGConnectingPoint num="0" id="1466" />
+<TGConnectingPoint num="1" id="1467" />
+<TGConnectingPoint num="2" id="1468" />
+<TGConnectingPoint num="3" id="1469" />
<extraparam>
<guard value="[ ]" />
<afterMin value="" />
@@ -2996,132 +2909,219 @@
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="5103" id="1533" >
-<cdparam x="340" y="179" />
-<sizeparam width="46" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<CONNECTOR type="5102" id="1479" >
+<cdparam x="377" y="187" />
+<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="1478" />
+<P1 x="353" y="282" id="1565" />
+<P2 x="399" y="352" id="1481" />
+<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1477" >
+<father id="1479" num="0" />
+<cdparam x="417" y="335" />
+<sizeparam width="135" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Send signal" value="push()" />
-<TGConnectingPoint num="0" id="1523" />
-<TGConnectingPoint num="1" id="1524" />
-<TGConnectingPoint num="2" id="1525" />
-<TGConnectingPoint num="3" id="1526" />
-<TGConnectingPoint num="4" id="1527" />
-<TGConnectingPoint num="5" id="1528" />
-<TGConnectingPoint num="6" id="1529" />
-<TGConnectingPoint num="7" id="1530" />
-<TGConnectingPoint num="8" id="1531" />
-<TGConnectingPoint num="9" id="1532" />
-</COMPONENT>
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="1473" />
+<TGConnectingPoint num="1" id="1474" />
+<TGConnectingPoint num="2" id="1475" />
+<TGConnectingPoint num="3" id="1476" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="mechanicalDelay" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+</extraparam>
+</SUBCOMPONENT>
-<COMPONENT type="5106" id="1574" >
-<cdparam x="337" y="257" />
+<COMPONENT type="5106" id="1520" >
+<cdparam x="374" y="352" />
<sizeparam width="50" height="30" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="state0" value="main" />
-<TGConnectingPoint num="0" id="1534" />
-<TGConnectingPoint num="1" id="1535" />
-<TGConnectingPoint num="2" id="1536" />
-<TGConnectingPoint num="3" id="1537" />
-<TGConnectingPoint num="4" id="1538" />
-<TGConnectingPoint num="5" id="1539" />
-<TGConnectingPoint num="6" id="1540" />
-<TGConnectingPoint num="7" id="1541" />
-<TGConnectingPoint num="8" id="1542" />
-<TGConnectingPoint num="9" id="1543" />
-<TGConnectingPoint num="10" id="1544" />
-<TGConnectingPoint num="11" id="1545" />
-<TGConnectingPoint num="12" id="1546" />
-<TGConnectingPoint num="13" id="1547" />
-<TGConnectingPoint num="14" id="1548" />
-<TGConnectingPoint num="15" id="1549" />
-<TGConnectingPoint num="16" id="1550" />
-<TGConnectingPoint num="17" id="1551" />
-<TGConnectingPoint num="18" id="1552" />
-<TGConnectingPoint num="19" id="1553" />
-<TGConnectingPoint num="20" id="1554" />
-<TGConnectingPoint num="21" id="1555" />
-<TGConnectingPoint num="22" id="1556" />
-<TGConnectingPoint num="23" id="1557" />
-<TGConnectingPoint num="24" id="1558" />
-<TGConnectingPoint num="25" id="1559" />
-<TGConnectingPoint num="26" id="1560" />
-<TGConnectingPoint num="27" id="1561" />
-<TGConnectingPoint num="28" id="1562" />
-<TGConnectingPoint num="29" id="1563" />
-<TGConnectingPoint num="30" id="1564" />
-<TGConnectingPoint num="31" id="1565" />
-<TGConnectingPoint num="32" id="1566" />
-<TGConnectingPoint num="33" id="1567" />
-<TGConnectingPoint num="34" id="1568" />
-<TGConnectingPoint num="35" id="1569" />
-<TGConnectingPoint num="36" id="1570" />
-<TGConnectingPoint num="37" id="1571" />
-<TGConnectingPoint num="38" id="1572" />
-<TGConnectingPoint num="39" id="1573" />
+<TGConnectingPoint num="0" id="1480" />
+<TGConnectingPoint num="1" id="1481" />
+<TGConnectingPoint num="2" id="1482" />
+<TGConnectingPoint num="3" id="1483" />
+<TGConnectingPoint num="4" id="1484" />
+<TGConnectingPoint num="5" id="1485" />
+<TGConnectingPoint num="6" id="1486" />
+<TGConnectingPoint num="7" id="1487" />
+<TGConnectingPoint num="8" id="1488" />
+<TGConnectingPoint num="9" id="1489" />
+<TGConnectingPoint num="10" id="1490" />
+<TGConnectingPoint num="11" id="1491" />
+<TGConnectingPoint num="12" id="1492" />
+<TGConnectingPoint num="13" id="1493" />
+<TGConnectingPoint num="14" id="1494" />
+<TGConnectingPoint num="15" id="1495" />
+<TGConnectingPoint num="16" id="1496" />
+<TGConnectingPoint num="17" id="1497" />
+<TGConnectingPoint num="18" id="1498" />
+<TGConnectingPoint num="19" id="1499" />
+<TGConnectingPoint num="20" id="1500" />
+<TGConnectingPoint num="21" id="1501" />
+<TGConnectingPoint num="22" id="1502" />
+<TGConnectingPoint num="23" id="1503" />
+<TGConnectingPoint num="24" id="1504" />
+<TGConnectingPoint num="25" id="1505" />
+<TGConnectingPoint num="26" id="1506" />
+<TGConnectingPoint num="27" id="1507" />
+<TGConnectingPoint num="28" id="1508" />
+<TGConnectingPoint num="29" id="1509" />
+<TGConnectingPoint num="30" id="1510" />
+<TGConnectingPoint num="31" id="1511" />
+<TGConnectingPoint num="32" id="1512" />
+<TGConnectingPoint num="33" id="1513" />
+<TGConnectingPoint num="34" id="1514" />
+<TGConnectingPoint num="35" id="1515" />
+<TGConnectingPoint num="36" id="1516" />
+<TGConnectingPoint num="37" id="1517" />
+<TGConnectingPoint num="38" id="1518" />
+<TGConnectingPoint num="39" id="1519" />
<extraparam>
</extraparam>
</COMPONENT>
-<COMPONENT type="5106" id="1615" >
-<cdparam x="338" y="120" />
+<COMPONENT type="5106" id="1561" >
+<cdparam x="298" y="88" />
<sizeparam width="50" height="30" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="state0" value="main" />
-<TGConnectingPoint num="0" id="1575" />
-<TGConnectingPoint num="1" id="1576" />
-<TGConnectingPoint num="2" id="1577" />
-<TGConnectingPoint num="3" id="1578" />
-<TGConnectingPoint num="4" id="1579" />
-<TGConnectingPoint num="5" id="1580" />
-<TGConnectingPoint num="6" id="1581" />
-<TGConnectingPoint num="7" id="1582" />
-<TGConnectingPoint num="8" id="1583" />
-<TGConnectingPoint num="9" id="1584" />
-<TGConnectingPoint num="10" id="1585" />
-<TGConnectingPoint num="11" id="1586" />
-<TGConnectingPoint num="12" id="1587" />
-<TGConnectingPoint num="13" id="1588" />
-<TGConnectingPoint num="14" id="1589" />
-<TGConnectingPoint num="15" id="1590" />
-<TGConnectingPoint num="16" id="1591" />
-<TGConnectingPoint num="17" id="1592" />
-<TGConnectingPoint num="18" id="1593" />
-<TGConnectingPoint num="19" id="1594" />
-<TGConnectingPoint num="20" id="1595" />
-<TGConnectingPoint num="21" id="1596" />
-<TGConnectingPoint num="22" id="1597" />
-<TGConnectingPoint num="23" id="1598" />
-<TGConnectingPoint num="24" id="1599" />
-<TGConnectingPoint num="25" id="1600" />
-<TGConnectingPoint num="26" id="1601" />
-<TGConnectingPoint num="27" id="1602" />
-<TGConnectingPoint num="28" id="1603" />
-<TGConnectingPoint num="29" id="1604" />
-<TGConnectingPoint num="30" id="1605" />
-<TGConnectingPoint num="31" id="1606" />
-<TGConnectingPoint num="32" id="1607" />
-<TGConnectingPoint num="33" id="1608" />
-<TGConnectingPoint num="34" id="1609" />
-<TGConnectingPoint num="35" id="1610" />
-<TGConnectingPoint num="36" id="1611" />
-<TGConnectingPoint num="37" id="1612" />
-<TGConnectingPoint num="38" id="1613" />
-<TGConnectingPoint num="39" id="1614" />
+<TGConnectingPoint num="0" id="1521" />
+<TGConnectingPoint num="1" id="1522" />
+<TGConnectingPoint num="2" id="1523" />
+<TGConnectingPoint num="3" id="1524" />
+<TGConnectingPoint num="4" id="1525" />
+<TGConnectingPoint num="5" id="1526" />
+<TGConnectingPoint num="6" id="1527" />
+<TGConnectingPoint num="7" id="1528" />
+<TGConnectingPoint num="8" id="1529" />
+<TGConnectingPoint num="9" id="1530" />
+<TGConnectingPoint num="10" id="1531" />
+<TGConnectingPoint num="11" id="1532" />
+<TGConnectingPoint num="12" id="1533" />
+<TGConnectingPoint num="13" id="1534" />
+<TGConnectingPoint num="14" id="1535" />
+<TGConnectingPoint num="15" id="1536" />
+<TGConnectingPoint num="16" id="1537" />
+<TGConnectingPoint num="17" id="1538" />
+<TGConnectingPoint num="18" id="1539" />
+<TGConnectingPoint num="19" id="1540" />
+<TGConnectingPoint num="20" id="1541" />
+<TGConnectingPoint num="21" id="1542" />
+<TGConnectingPoint num="22" id="1543" />
+<TGConnectingPoint num="23" id="1544" />
+<TGConnectingPoint num="24" id="1545" />
+<TGConnectingPoint num="25" id="1546" />
+<TGConnectingPoint num="26" id="1547" />
+<TGConnectingPoint num="27" id="1548" />
+<TGConnectingPoint num="28" id="1549" />
+<TGConnectingPoint num="29" id="1550" />
+<TGConnectingPoint num="30" id="1551" />
+<TGConnectingPoint num="31" id="1552" />
+<TGConnectingPoint num="32" id="1553" />
+<TGConnectingPoint num="33" id="1554" />
+<TGConnectingPoint num="34" id="1555" />
+<TGConnectingPoint num="35" id="1556" />
+<TGConnectingPoint num="36" id="1557" />
+<TGConnectingPoint num="37" id="1558" />
+<TGConnectingPoint num="38" id="1559" />
+<TGConnectingPoint num="39" id="1560" />
<extraparam>
</extraparam>
</COMPONENT>
-<COMPONENT type="5100" id="1617" >
-<cdparam x="355" y="81" />
+<COMPONENT type="5100" id="1563" >
+<cdparam x="315" y="49" />
<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="1616" />
+<TGConnectingPoint num="0" id="1562" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="1617" >
+<cdparam x="264" y="174" />
+<sizeparam width="184" height="130" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="state0" value="state0" />
+<TGConnectingPoint num="0" id="1577" />
+<TGConnectingPoint num="1" id="1578" />
+<TGConnectingPoint num="2" id="1579" />
+<TGConnectingPoint num="3" id="1580" />
+<TGConnectingPoint num="4" id="1581" />
+<TGConnectingPoint num="5" id="1582" />
+<TGConnectingPoint num="6" id="1583" />
+<TGConnectingPoint num="7" id="1584" />
+<TGConnectingPoint num="8" id="1585" />
+<TGConnectingPoint num="9" id="1586" />
+<TGConnectingPoint num="10" id="1587" />
+<TGConnectingPoint num="11" id="1588" />
+<TGConnectingPoint num="12" id="1589" />
+<TGConnectingPoint num="13" id="1590" />
+<TGConnectingPoint num="14" id="1591" />
+<TGConnectingPoint num="15" id="1592" />
+<TGConnectingPoint num="16" id="1593" />
+<TGConnectingPoint num="17" id="1594" />
+<TGConnectingPoint num="18" id="1595" />
+<TGConnectingPoint num="19" id="1596" />
+<TGConnectingPoint num="20" id="1597" />
+<TGConnectingPoint num="21" id="1598" />
+<TGConnectingPoint num="22" id="1599" />
+<TGConnectingPoint num="23" id="1600" />
+<TGConnectingPoint num="24" id="1601" />
+<TGConnectingPoint num="25" id="1602" />
+<TGConnectingPoint num="26" id="1603" />
+<TGConnectingPoint num="27" id="1604" />
+<TGConnectingPoint num="28" id="1605" />
+<TGConnectingPoint num="29" id="1606" />
+<TGConnectingPoint num="30" id="1607" />
+<TGConnectingPoint num="31" id="1608" />
+<TGConnectingPoint num="32" id="1609" />
+<TGConnectingPoint num="33" id="1610" />
+<TGConnectingPoint num="34" id="1611" />
+<TGConnectingPoint num="35" id="1612" />
+<TGConnectingPoint num="36" id="1613" />
+<TGConnectingPoint num="37" id="1614" />
+<TGConnectingPoint num="38" id="1615" />
+<TGConnectingPoint num="39" id="1616" />
+<extraparam>
+</extraparam>
</COMPONENT>
+<SUBCOMPONENT type="5103" id="1574" >
+<father id="1617" num="0" />
+<cdparam x="330" y="257" />
+<sizeparam width="46" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="138" minY="0" maxY="110" />
+<infoparam name="Send signal" value="push()" />
+<TGConnectingPoint num="0" id="1564" />
+<TGConnectingPoint num="1" id="1565" />
+<TGConnectingPoint num="2" id="1566" />
+<TGConnectingPoint num="3" id="1567" />
+<TGConnectingPoint num="4" id="1568" />
+<TGConnectingPoint num="5" id="1569" />
+<TGConnectingPoint num="6" id="1570" />
+<TGConnectingPoint num="7" id="1571" />
+<TGConnectingPoint num="8" id="1572" />
+<TGConnectingPoint num="9" id="1573" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="5100" id="1576" >
+<father id="1617" num="1" />
+<cdparam x="333" y="213" />
+<sizeparam width="15" height="15" minWidth="0" minHeight="0" 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="1575" />
+</SUBCOMPONENT>
</AVATARStateMachineDiagramPanel>
diff --git a/src/avatartranslator/toproverif/AVATAR2ProVerif.java b/src/avatartranslator/toproverif/AVATAR2ProVerif.java
index 29a66551baa8a5173614b533083ccacac5b6f19d..e884f577b44c09c6597abb247545afe1990a4306 100755
--- a/src/avatartranslator/toproverif/AVATAR2ProVerif.java
+++ b/src/avatartranslator/toproverif/AVATAR2ProVerif.java
@@ -147,6 +147,18 @@ public class AVATAR2ProVerif {
return "";
}
+ private String makeLetActionFromBlockParam(String _block, String _param, String known) {
+ String tmp = makeAttrName(_block, _param);
+ String tmpH = declarations.get(tmp);
+ if (tmpH == null) {
+ declarations.put(tmp, tmp);
+ tmp = "let " + tmp + " =" + known + " in \n";
+ return tmp;
+ }
+
+ return "";
+ }
+
private void addDeclarationsFromList(int startIndex, String[] list, String result) {
String tmp, blockName, paramName;
String tmp1;
@@ -761,6 +773,8 @@ public class AVATAR2ProVerif {
p.processName = "starting__";
LinkedList<AvatarBlock> blocks = avspec.getListOfBlocks();
+ HashMap<String, String> pubs = new HashMap<String, String>();
+
//LinkedList<String> createdVariables = new LinkedList<String>();
String[] list;
String blockName, paramName;
@@ -780,7 +794,13 @@ public class AVATAR2ProVerif {
blockName = tmp.substring(0, index).trim();
paramName = tmp.substring(index+1, tmp.length());
- action += makeActionFromBlockParam(blockName, paramName);
+ String known = pubs.get(blockName + "__" + paramName);
+ if (known != null) {
+ action += makeLetActionFromBlockParam(blockName, paramName, known);
+ } else {
+ action += makeActionFromBlockParam(blockName, paramName);
+ }
+ TraceManager.addDev("Adding action=" + action);
addDeclarationsFromList(1, list, makeAttrName(blockName, paramName));
}
}
@@ -823,6 +843,8 @@ public class AVATAR2ProVerif {
privK = tmp2.substring(0, index).trim();
pubK = tmp2.substring(index+1, tmp2.length()).trim();
+ pubs.put(blockName + "__" + pubK, pubK);
+
action += makeActionFromBlockParam(blockName, privK);
action += "let " + makeAttrName(blockName, pubK) + " = pk(" + makeAttrName(blockName, privK) + ") in \n";