Commit 8d2a6080 authored by Ludovic Apvrille's avatar Ludovic Apvrille

Adding minimization alfos debugged

parent 41780b51
......@@ -23,6 +23,7 @@ BUILD_TO_MODIFY = src/ui/DefaultText.java
TTOOL_BINARY = ttool.jar
LAUNCHER_BINARY = launcher.jar
GRAPHSHOW_BINARY = graphshow.jar
GRAPHMINIMIZE_BINARY = graphminimize.jar
TIFTRANSLATOR_BINARY = tiftranslator.jar
TMLTRANSLATOR_BINARY = tmltranslator.jar
GSCORE_BINARY = gs-core-1.3.jar
......@@ -36,6 +37,7 @@ RUNDSE_JAR_TXT = rundse.txt
TTOOL_JAR_TXT = ttool.txt
LAUNCHER_JAR_TXT = launcher.txt
GRAPHSHOW_JAR_TXT = graphshow.txt
GRAPHMINIMIZE_JAR_TXT = graphminimize.txt
TIFTRANSLATOR_JAR_TXT = tiftranslator.txt
TMLTRANSLATOR_JAR_TXT = tmltranslator.txt
WEBCRAWLER_SERVER_JAR_TXT = webcrawler.txt
......@@ -98,7 +100,7 @@ RELEASE_STD_FILES_WINDIWS_EXE = ttool_windows.bat
RELEASE_STD_FILES_XML = TURTLE/manual-HW.xml AVATAR/DrinkMachineV10.xml TURTLE/WebV01.xml TURTLE/Protocol_example1.xml TURTLE/BasicExchange.xml DIPLODOCUS/SmartCardProtocol.xml TURTLE/ProtocolPatterns.xml CTTool/COCOME_V50.xml AVATAR/CoffeeMachine_Avatar.xml AVATAR/Network_Avatar.xml AVATAR/MicroWaveOven_SafetySecurity_fullMethodo.xml
RELEASE_STD_FILES_LIB = TURTLE/TClock1.lib TURTLE/TTimerv01.lib
RELEASE_STD_FILES_BIN = $(LAUNCHER_BINARY) $(TTOOL_BINARY) $(TIFTRANSLATOR_BINARY) $(TMLTRANSLATOR_BINARY) $(REMOTESIMULATOR_BINARY) $(RUNDSE_BINARY) $(WEBCRAWLER_SERVER_BINARY) $(WEBCRAWLER_CLIENT_BINARY) $(GRAPHSHOW_BINARY)
RELEASE_STD_FILES_BIN = $(LAUNCHER_BINARY) $(TTOOL_BINARY) $(TIFTRANSLATOR_BINARY) $(TMLTRANSLATOR_BINARY) $(REMOTESIMULATOR_BINARY) $(RUNDSE_BINARY) $(WEBCRAWLER_SERVER_BINARY) $(WEBCRAWLER_CLIENT_BINARY) $(GRAPHSHOW_BINARY) $(GRAPHMINIMIZE_BINARY)
RELEASE_STD_FILES_LICENSES = LICENSE LICENSE_CECILL_ENG LICENSE_CECILL_FR
TEST_DIR = $(TTOOL_PATH)/tests
......@@ -165,7 +167,7 @@ basic:
jarttool: launcher ttooljar
jar: launcher ttooljar tiftranslator tmltranslator rundse remotesimulator webcrawler graphshow
jar: launcher ttooljar tiftranslator tmltranslator rundse remotesimulator webcrawler graphshow graphminimize
ttooljar:
rm -f $(TTOOL_BIN)/$(TTOOL_BINARY)
......@@ -176,8 +178,12 @@ launcher:
rm -f $(TTOOL_BIN)/$(LAUNCHER_BINARY)
cd $(TTOOL_SRC);$(JAR) cmf $(LAUNCHER_JAR_TXT) $(TTOOL_BIN)/$(LAUNCHER_BINARY) RTLLauncher.class launcher/*.class myutil/*.class
graphminimize:
rm -f $(TTOOL_BIN)/$(GRAPHMINIMIZE_BINARY)
cd $(TTOOL_SRC);$(JAR) cmf $(GRAPHMINIMIZE_JAR_TXT) $(TTOOL_BIN)/$(GRAPHMINIMIZE_BINARY) GraphMinimize.class myutil/*.class ui/graph/*.class
graphshow:
rm -f $(TTOOL_BIN)/$(TIFTRANSLATOR_BINARY)
rm -f $(TTOOL_BIN)/$(GRAPHSHOW_BINARY)
cd $(TTOOL_SRC);$(JAR) cmf $(GRAPHSHOW_JAR_TXT) $(TTOOL_BIN)/$(GRAPHSHOW_BINARY) GraphShow.class myutil/*.class ui/graph/*.class ui/IconManager.class ui/file/PNGFilter.class
tiftranslator:
......
......@@ -578,7 +578,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="337" />
<P1 x="313" y="261" id="368" />
<P1 x="313" y="261" id="381" />
<P2 x="361" y="261" id="356" />
<AutomaticDrawing data="true" />
</CONNECTOR>
......@@ -596,7 +596,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="341" />
<P1 x="309" y="211" id="381" />
<P1 x="309" y="211" id="368" />
<P2 x="361" y="211" id="355" />
<AutomaticDrawing data="true" />
</CONNECTOR>
......@@ -685,11 +685,11 @@
</COMPONENT>
<SUBCOMPONENT type="5304" id="378" >
<father id="416" num="0" />
<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="366" />
<TGConnectingPoint num="1" id="367" />
<TGConnectingPoint num="2" id="368" />
......@@ -705,11 +705,11 @@
</SUBCOMPONENT>
<SUBCOMPONENT type="5304" id="391" >
<father id="416" num="1" />
<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="379" />
<TGConnectingPoint num="1" id="380" />
<TGConnectingPoint num="2" id="381" />
......@@ -839,7 +839,7 @@
<TGConnectingPoint num="0" id="475" />
<TGConnectingPoint num="1" id="476" />
<TGConnectingPoint num="2" id="477" />
<P1 x="581" y="154" id="564" />
<P1 x="581" y="154" id="551" />
<P2 x="546" y="305" id="621" />
<Point x="518" y="154" />
<Point x="518" y="305" />
......@@ -867,7 +867,7 @@
<infoparam name="connector from TGComponent to TGComponent" value="" />
<TGConnectingPoint num="0" id="480" />
<TGConnectingPoint num="1" id="481" />
<P1 x="631" y="164" id="559" />
<P1 x="631" y="164" id="546" />
<P2 x="667" y="310" id="608" />
<Point x="631" y="310" />
<AutomaticDrawing data="true" />
......@@ -895,7 +895,7 @@
<infoparam name="connector from TGComponent to TGComponent" value="" />
<TGConnectingPoint num="0" id="486" />
<TGConnectingPoint num="1" id="487" />
<P1 x="721" y="158" id="544" />
<P1 x="721" y="158" id="557" />
<P2 x="700" y="204" id="598" />
<Point x="700" y="158" />
<AutomaticDrawing data="true" />
......@@ -1050,13 +1050,13 @@
<TGConnectingPoint num="22" id="591" />
<TGConnectingPoint num="23" id="592" />
</COMPONENT>
<SUBCOMPONENT type="5303" id="555" >
<SUBCOMPONENT type="5304" id="555" >
<father id="593" num="0" />
<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="543" />
<TGConnectingPoint num="1" id="544" />
<TGConnectingPoint num="2" id="545" />
......@@ -1069,17 +1069,14 @@
<TGConnectingPoint num="9" id="552" />
<TGConnectingPoint num="10" id="553" />
<TGConnectingPoint num="11" id="554" />
<extraparam>
<Toggle value="" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="5304" id="568" >
<SUBCOMPONENT type="5303" id="568" >
<father id="593" num="1" />
<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="556" />
<TGConnectingPoint num="1" id="557" />
<TGConnectingPoint num="2" id="558" />
......@@ -1092,6 +1089,9 @@
<TGConnectingPoint num="9" id="565" />
<TGConnectingPoint num="10" id="566" />
<TGConnectingPoint num="11" id="567" />
<extraparam>
<Toggle value="" />
</extraparam>
</SUBCOMPONENT>
<COMPONENT type="5306" id="605" >
......@@ -1221,7 +1221,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="658" />
<P1 x="559" y="330" id="695" />
<P1 x="559" y="330" id="720" />
<P2 x="560" y="377" id="753" />
<AutomaticDrawing data="true" />
<extraparam>
......@@ -1251,7 +1251,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="662" />
<P1 x="789" y="326" id="720" />
<P1 x="789" y="326" id="695" />
<P2 x="790" y="377" id="754" />
<AutomaticDrawing data="true" />
<extraparam>
......@@ -1350,11 +1350,11 @@
</COMPONENT>
<SUBCOMPONENT type="5000" id="713" >
<father id="763" num="0" />
<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="689" />
<TGConnectingPoint num="1" id="690" />
<TGConnectingPoint num="2" id="691" />
......@@ -1381,17 +1381,17 @@
<TGConnectingPoint num="23" id="712" />
<extraparam>
<CryptoBlock value="false" />
<Attribute access="0" id="mechanicalDelay" value="80" type="8" typeOther="" />
<Attribute access="0" id="mechanicalDelay" value="10" type="8" typeOther="" />
<Signal value="out push()" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="5000" id="738" >
<father id="763" num="1" />
<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="714" />
<TGConnectingPoint num="1" id="715" />
<TGConnectingPoint num="2" id="716" />
......@@ -1418,7 +1418,7 @@
<TGConnectingPoint num="23" id="737" />
<extraparam>
<CryptoBlock value="false" />
<Attribute access="0" id="mechanicalDelay" value="10" type="8" typeOther="" />
<Attribute access="0" id="mechanicalDelay" value="80" type="8" typeOther="" />
<Signal value="out push()" />
</extraparam>
</SUBCOMPONENT>
......@@ -1804,7 +1804,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="958" />
<P1 x="437" y="525" id="1357" />
<P1 x="437" y="525" id="1292" />
<P2 x="323" y="748" id="1218" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="957" >
......@@ -1833,8 +1833,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="965" />
<P1 x="321" y="455" id="1306" />
<P2 x="437" y="495" id="1356" />
<P1 x="321" y="455" id="1319" />
<P2 x="437" y="495" id="1291" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="964" >
<father id="966" num="0" />
......@@ -1861,7 +1861,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="972" />
<P1 x="293" y="552" id="1292" />
<P1 x="293" y="552" id="1357" />
<P2 x="289" y="748" id="1210" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="971" >
......@@ -1891,8 +1891,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="979" />
<P1 x="288" y="475" id="1317" />
<P2 x="293" y="522" id="1291" />
<P1 x="288" y="475" id="1330" />
<P2 x="293" y="522" id="1356" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="978" >
<father id="980" num="0" />
......@@ -1919,7 +1919,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="986" />
<P1 x="121" y="552" id="1346" />
<P1 x="121" y="552" id="1303" />
<P2 x="255" y="748" id="1217" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="985" >
......@@ -1949,8 +1949,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="993" />
<P1 x="222" y="475" id="1316" />
<P2 x="121" y="522" id="1345" />
<P1 x="222" y="475" id="1329" />
<P2 x="121" y="522" id="1302" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="992" >
<father id="994" num="0" />
......@@ -1977,8 +1977,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="1000" />
<P1 x="256" y="419" id="1343" />
<P2 x="255" y="435" id="1303" />
<P1 x="256" y="419" id="1313" />
<P2 x="255" y="435" id="1316" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="999" >
<father id="1001" num="0" />
......@@ -2561,13 +2561,13 @@
<extraparam>
</extraparam>
</COMPONENT>
<SUBCOMPONENT type="5104" id="1301" >
<SUBCOMPONENT type="5103" id="1301" >
<father id="1407" num="0" />
<cdparam x="231" y="527" />
<sizeparam width="124" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<cdparam x="367" y="500" />
<sizeparam width="141" 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="1291" />
<TGConnectingPoint num="1" id="1292" />
<TGConnectingPoint num="2" id="1293" />
......@@ -2580,13 +2580,13 @@
<TGConnectingPoint num="9" id="1300" />
<accessibility />
</SUBCOMPONENT>
<SUBCOMPONENT type="5106" id="1342" >
<SUBCOMPONENT type="5104" id="1312" >
<father id="1407" num="1" />
<cdparam x="189" y="435" />
<sizeparam width="132" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<cdparam x="51" y="527" />
<sizeparam width="141" 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" />
<cdrectangleparam minX="0" maxX="450" minY="0" maxY="334" />
<infoparam name="Send signal" value="pushCoffeeButton()" />
<TGConnectingPoint num="0" id="1302" />
<TGConnectingPoint num="1" id="1303" />
<TGConnectingPoint num="2" id="1304" />
......@@ -2597,74 +2597,74 @@
<TGConnectingPoint num="7" id="1309" />
<TGConnectingPoint num="8" id="1310" />
<TGConnectingPoint num="9" id="1311" />
<TGConnectingPoint num="10" id="1312" />
<TGConnectingPoint num="11" id="1313" />
<TGConnectingPoint num="12" id="1314" />
<TGConnectingPoint num="13" id="1315" />
<TGConnectingPoint num="14" id="1316" />
<TGConnectingPoint num="15" id="1317" />
<TGConnectingPoint num="16" id="1318" />
<TGConnectingPoint num="17" id="1319" />
<TGConnectingPoint num="18" id="1320" />
<TGConnectingPoint num="19" id="1321" />
<TGConnectingPoint num="20" id="1322" />
<TGConnectingPoint num="21" id="1323" />
<TGConnectingPoint num="22" id="1324" />
<TGConnectingPoint num="23" id="1325" />
<TGConnectingPoint num="24" id="1326" />
<TGConnectingPoint num="25" id="1327" />
<TGConnectingPoint num="26" id="1328" />
<TGConnectingPoint num="27" id="1329" />
<TGConnectingPoint num="28" id="1330" />
<TGConnectingPoint num="29" id="1331" />
<TGConnectingPoint num="30" id="1332" />
<TGConnectingPoint num="31" id="1333" />
<TGConnectingPoint num="32" id="1334" />
<TGConnectingPoint num="33" id="1335" />
<TGConnectingPoint num="34" id="1336" />
<TGConnectingPoint num="35" id="1337" />
<TGConnectingPoint num="36" id="1338" />
<TGConnectingPoint num="37" id="1339" />
<TGConnectingPoint num="38" id="1340" />
<TGConnectingPoint num="39" id="1341" />
<extraparam>
</extraparam>
<accessibility />
</SUBCOMPONENT>
<SUBCOMPONENT type="5100" id="1344" >
<SUBCOMPONENT type="5100" id="1314" >
<father id="1407" 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="1343" />
<TGConnectingPoint num="0" id="1313" />
</SUBCOMPONENT>
<SUBCOMPONENT type="5104" id="1355" >
<SUBCOMPONENT type="5106" id="1355" >
<father id="1407" num="3" />
<cdparam x="51" y="527" />
<sizeparam width="141" 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()" />
<TGConnectingPoint num="0" id="1345" />
<TGConnectingPoint num="1" id="1346" />
<TGConnectingPoint num="2" id="1347" />
<TGConnectingPoint num="3" id="1348" />
<TGConnectingPoint num="4" id="1349" />
<TGConnectingPoint num="5" id="1350" />
<TGConnectingPoint num="6" id="1351" />
<TGConnectingPoint num="7" id="1352" />
<TGConnectingPoint num="8" id="1353" />
<TGConnectingPoint num="9" id="1354" />
<accessibility />
<cdrectangleparam minX="0" maxX="445" minY="0" maxY="314" />
<infoparam name="state0" value="WaitingForSelection" />
<TGConnectingPoint num="0" id="1315" />
<TGConnectingPoint num="1" id="1316" />
<TGConnectingPoint num="2" id="1317" />
<TGConnectingPoint num="3" id="1318" />
<TGConnectingPoint num="4" id="1319" />
<TGConnectingPoint num="5" id="1320" />
<TGConnectingPoint num="6" id="1321" />
<TGConnectingPoint num="7" id="1322" />
<TGConnectingPoint num="8" id="1323" />
<TGConnectingPoint num="9" id="1324" />
<TGConnectingPoint num="10" id="1325" />
<TGConnectingPoint num="11" id="1326" />
<TGConnectingPoint num="12" id="1327" />
<TGConnectingPoint num="13" id="1328" />
<TGConnectingPoint num="14" id="1329" />
<TGConnectingPoint num="15" id="1330" />
<TGConnectingPoint num="16" id="1331" />
<TGConnectingPoint num="17" id="1332" />
<TGConnectingPoint num="18" id="1333" />
<TGConnectingPoint num="19" id="1334" />
<TGConnectingPoint num="20" id="1335" />
<TGConnectingPoint num="21" id="1336" />
<TGConnectingPoint num="22" id="1337" />
<TGConnectingPoint num="23" id="1338" />
<TGConnectingPoint num="24" id="1339" />
<TGConnectingPoint num="25" id="1340" />
<TGConnectingPoint num="26" id="1341" />
<TGConnectingPoint num="27" id="1342" />
<TGConnectingPoint num="28" id="1343" />
<TGConnectingPoint num="29" id="1344" />
<TGConnectingPoint num="30" id="1345" />
<TGConnectingPoint num="31" id="1346" />
<TGConnectingPoint num="32" id="1347" />
<TGConnectingPoint num="33" id="1348" />
<TGConnectingPoint num="34" id="1349" />
<TGConnectingPoint num="35" id="1350" />
<TGConnectingPoint num="36" id="1351" />
<TGConnectingPoint num="37" id="1352" />
<TGConnectingPoint num="38" id="1353" />
<TGConnectingPoint num="39" id="1354" />
<extraparam>
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="5103" id="1366" >
<SUBCOMPONENT type="5104" id="1366" >
<father id="1407" num="4" />
<cdparam x="367" y="500" />
<sizeparam width="141" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<cdparam x="231" y="527" />
<sizeparam width="124" 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="1356" />
<TGConnectingPoint num="1" id="1357" />
<TGConnectingPoint num="2" id="1358" />
......@@ -2681,19 +2681,19 @@
</AVATARStateMachineDiagramPanel>
<AVATARStateMachineDiagramPanel name="TeaButton" minX="10" maxX="1400" minY="10" maxY="900" >
<AVATARStateMachineDiagramPanel name="CoffeeButton" minX="10" maxX="1400" minY="10" maxY="900" >
<CONNECTOR type="5102" id="1414" >
<cdparam x="363" y="193" />
<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" />
<infoparam name="connector from start state to Send signal" value="null" />
<TGConnectingPoint num="0" id="1413" />
<P1 x="363" y="204" id="1430" />
<P2 x="362" y="257" id="1441" />
<P1 x="340" y="233" id="1520" />
<P2 x="353" y="252" id="1522" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="1412" >
<father id="1414" num="0" />
<cdparam x="380" y="228" />
<sizeparam width="149" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="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="" />
......@@ -2703,7 +2703,7 @@
<TGConnectingPoint num="3" id="1411" />
<extraparam>
<guard value="[ ]" />
<afterMin value="mechanicalDelay" />
<afterMin value="" />
<afterMax value="" />
<computeMin value="" />
<computeMax value="" />
......@@ -2711,16 +2711,16 @@
</SUBCOMPONENT>
<CONNECTOR type="5102" id="1421" >
<cdparam x="363" y="150" />
<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" />
<infoparam name="connector from start state to state0" value="null" />
<TGConnectingPoint num="0" id="1420" />
<P1 x="363" y="150" id="1487" />
<P2 x="363" y="174" id="1429" />
<P1 x="322" y="69" id="1518" />
<P2 x="323" y="88" id="1478" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="1419" >
<father id="1421" num="0" />
<cdparam x="363" y="190" />
<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" />
......@@ -2739,16 +2739,16 @@
</SUBCOMPONENT>
<CONNECTOR type="5102" id="1428" >
<cdparam x="362" y="101" />
<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" />
<infoparam name="connector from state0 to Send signal" value="null" />
<TGConnectingPoint num="0" id="1427" />
<P1 x="362" y="101" id="1522" />
<P2 x="363" y="120" id="1482" />
<P1 x="323" y="118" id="1483" />
<P2 x="356" y="174" id="1534" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="1426" >
<father id="1428" num="0" />
<cdparam x="362" y="141" />
<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" />
......@@ -2766,184 +2766,271 @@
</extraparam>
</SUBCOMPONENT>
<COMPONENT type="5103" id="1439" >
<cdparam x="338" y="179" />
<sizeparam width="51" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<CONNECTOR type="5102" id="1435" >
<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="1434" />
<P1 x="353" y="282" id="1523" />
<P2 x="399" y="352" id="1437" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="1433" >
<father id="1435" num="0" />
<cdparam x="417" y="335" />
<sizeparam width="149" 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()" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
<TGConnectingPoint num="0" id="1429" />
<TGConnectingPoint num="1" id="1430" />
<TGConnectingPoint num="2" id="1431" />
<TGConnectingPoint num="3" id="1432" />
<TGConnectingPoint num="4" id="1433" />
<TGConnectingPoint num="5" id="1434" />
<TGConnectingPoint num="6" id="1435" />
<TGConnectingPoint num="7" id="1436" />
<TGConnectingPoint num="8" id="1437" />
<TGConnectingPoint num="9" id="1438" />
</COMPONENT>
<extraparam>
<guard value="[ ]" />
<afterMin value="mechanicalDelay" />
<afterMax value="" />
<computeMin value="" />
<computeMax value="" />
</extraparam>
</SUBCOMPONENT>
<COMPONENT type="5106" id="1480" >
<cdparam x="337" y="257" />
<COMPONENT type="5106" id="1476" >
<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="1440" />
<TGConnectingPoint num="1" id="1441" />
<TGConnectingPoint num="2" id="1442" />
<TGConnectingPoint num="3" id="1443" />
<TGConnectingPoint num="4" id="1444" />
<TGConnectingPoint num="5" id="1445" />
<TGConnectingPoint num="6" id="1446" />
<TGConnectingPoint num="7" id="1447" />
<TGConnectingPoint num="8" id="1448" />
<TGConnectingPoint num="9" id="1449" />
<TGConnectingPoint num="10" id="1450" />
<TGConnectingPoint num="11" id="1451" />
<TGConnectingPoint num="12" id="1452" />
<TGConnectingPoint num="13" id="1453" />
<TGConnectingPoint num="14" id="1454" />
<TGConnectingPoint num="15" id="1455" />
<TGConnectingPoint num="16" id="1456" />
<TGConnectingPoint num="17" id="1457" />
<TGConnectingPoint num="18" id="1458" />
<TGConnectingPoint num="19" id="1459" />
<TGConnectingPoint num="20" id="1460" />
<TGConnectingPoint num="21" id="1461" />
<TGConnectingPoint num="22" id="1462" />
<TGConnectingPoint num="23" id="1463" />
<TGConnectingPoint num="24" id="1464" />
<TGConnectingPoint num="25" id="1465" />
<TGConnectingPoint num="26" id="1466" />
<TGConnectingPoint num="27" id="1467" />
<TGConnectingPoint num="28" id="1468" />
<TGConnectingPoint num="29" id="1469" />
<TGConnectingPoint num="30" id="1470" />
<TGConnectingPoint num="31" id="1471" />
<TGConnectingPoint num="32" id="1472" />
<TGConnectingPoint num="33" id="1473" />
<TGConnectingPoint num="34" id="1474" />
<TGConnectingPoint num="35" id="1475" />
<TGConnectingPoint num="36" id="1476" />
<TGConnectingPoint num="37" id="1477" />
<TGConnectingPoint num="38" id="1478" />
<TGConnectingPoint num="39" id="1479" />
<TGConnectingPoint num="0" id="1436" />
<TGConnectingPoint num="1" id="1437" />
<TGConnectingPoint num="2" id="1438" />
<TGConnectingPoint num="3" id="1439" />
<TGConnectingPoint num="4" id="1440" />
<TGConnectingPoint num="5" id="1441" />
<TGConnectingPoint num="6" id="1442" />
<TGConnectingPoint num="7" id="1443" />
<TGConnectingPoint num="8" id="1444" />
<TGConnectingPoint num="9" id="1445" />
<TGConnectingPoint num="10" id="1446" />
<TGConnectingPoint num="11" id="1447" />
<TGConnectingPoint num="12" id="1448" />
<TGConnectingPoint num="13" id="1449" />
<TGConnectingPoint num="14" id="1450" />
<TGConnectingPoint num="15" id="1451" />
<TGConnectingPoint num="16" id="1452" />
<TGConnectingPoint num="17" id="1453" />
<TGConnectingPoint num="18" id="1454" />
<TGConnectingPoint num="19" id="1455" />
<TGConnectingPoint num="20" id="1456" />
<TGConnectingPoint num="21" id="1457" />
<TGConnectingPoint num="22" id="1458" />
<TGConnectingPoint num="23" id="1459" />
<TGConnectingPoint num="24" id="1460" />
<TGConnectingPoint num="25" id="1461" />
<TGConnectingPoint num="26" id="1462" />
<TGConnectingPoint num="27" id="1463" />
<TGConnectingPoint num="28" id="1464" />
<TGConnectingPoint num="29" id="1465" />
<TGConnectingPoint num="30" id="1466" />
<TGConnectingPoint num="31" id="1467" />
<TGConnectingPoint num="32" id="1468" />
<TGConnectingPoint num="33" id="1469" />
<TGConnectingPoint num="34" id="1470" />
<TGConnectingPoint num="35" id="1471" />
<TGConnectingPoint num="36" id="1472" />
<TGConnectingPoint num="37" id="1473" />
<TGConnectingPoint num="38" id="1474" />
<TGConnectingPoint num="39" id="1475" />
<extraparam>
</extraparam>
</COMPONENT>
<COMPONENT type="5106" id="1521" >