diff --git a/modeling/AVATAR/CoffeeMachine_Avatar.xml b/modeling/AVATAR/CoffeeMachine_Avatar.xml
index aee83ee6592f09c6e10c63c7ed1da8e39c64c674..fb7afdfa8e258f67f6180cba5c177ffbd6a3adc4 100644
--- a/modeling/AVATAR/CoffeeMachine_Avatar.xml
+++ b/modeling/AVATAR/CoffeeMachine_Avatar.xml
@@ -1,60 +1,61 @@
<?xml version="1.0" encoding="UTF-8"?>
-<TURTLEGMODELING version="1.0beta" ANIMATE_INTERACTIVE_SIMULATION="false" ACTIVATE_PENALTIES="true" UPDATE_INFORMATION_DIPLO_SIM="false" ANIMATE_WITH_INFO_DIPLO_SIM="true" OPEN_DIAG_DIPLO_SIM="false" LAST_SELECTED_MAIN_TAB="0" LAST_SELECTED_SUB_TAB="0">
+<TURTLEGMODELING version="1.0beta" ANIMATE_INTERACTIVE_SIMULATION="false" ACTIVATE_PENALTIES="true" UPDATE_INFORMATION_DIPLO_SIM="false" ANIMATE_WITH_INFO_DIPLO_SIM="true" OPEN_DIAG_DIPLO_SIM="false" LAST_SELECTED_MAIN_TAB="1" LAST_SELECTED_SUB_TAB="2">
<Modeling type="Avatar Requirement" nameTab="AVATAR Requirements" >
<AvatarRDPanel name="AVATAR RD" minX="10" maxX="1900" minY="10" maxY="1400" zoom="1.0" >
-<COMPONENT type="5200" id="2404" uid="21634324-f1ec-471d-b025-373bb090c963" >
+<COMPONENT type="5200" id="44" uid="21634324-f1ec-471d-b025-373bb090c963" >
<cdparam x="693" y="512" />
<sizeparam width="200" height="120" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1400" />
<infoparam name="Requirement" value="Requirement_0" />
-<TGConnectingPoint num="0" id="2405" />
-<TGConnectingPoint num="1" id="2406" />
-<TGConnectingPoint num="2" id="2407" />
-<TGConnectingPoint num="3" id="2408" />
-<TGConnectingPoint num="4" id="2409" />
-<TGConnectingPoint num="5" id="2410" />
-<TGConnectingPoint num="6" id="2411" />
-<TGConnectingPoint num="7" id="2412" />
-<TGConnectingPoint num="8" id="2413" />
-<TGConnectingPoint num="9" id="2414" />
-<TGConnectingPoint num="10" id="2415" />
-<TGConnectingPoint num="11" id="2416" />
-<TGConnectingPoint num="12" id="2417" />
-<TGConnectingPoint num="13" id="2418" />
-<TGConnectingPoint num="14" id="2419" />
-<TGConnectingPoint num="15" id="2420" />
-<TGConnectingPoint num="16" id="2421" />
-<TGConnectingPoint num="17" id="2422" />
-<TGConnectingPoint num="18" id="2423" />
-<TGConnectingPoint num="19" id="2424" />
-<TGConnectingPoint num="20" id="2425" />
-<TGConnectingPoint num="21" id="2426" />
-<TGConnectingPoint num="22" id="2427" />
-<TGConnectingPoint num="23" id="2428" />
-<TGConnectingPoint num="24" id="2429" />
-<TGConnectingPoint num="25" id="2430" />
-<TGConnectingPoint num="26" id="2431" />
-<TGConnectingPoint num="27" id="2432" />
-<TGConnectingPoint num="28" id="2433" />
-<TGConnectingPoint num="29" id="2434" />
-<TGConnectingPoint num="30" id="2435" />
-<TGConnectingPoint num="31" id="2436" />
-<TGConnectingPoint num="32" id="2437" />
-<TGConnectingPoint num="33" id="2438" />
-<TGConnectingPoint num="34" id="2439" />
-<TGConnectingPoint num="35" id="2440" />
-<TGConnectingPoint num="36" id="2441" />
-<TGConnectingPoint num="37" id="2442" />
-<TGConnectingPoint num="38" id="2443" />
-<TGConnectingPoint num="39" id="2444" />
-<TGConnectingPoint num="40" id="2445" />
-<TGConnectingPoint num="41" id="2446" />
-<TGConnectingPoint num="42" id="2447" />
+<TGConnectingPoint num="0" id="1" />
+<TGConnectingPoint num="1" id="2" />
+<TGConnectingPoint num="2" id="3" />
+<TGConnectingPoint num="3" id="4" />
+<TGConnectingPoint num="4" id="5" />
+<TGConnectingPoint num="5" id="6" />
+<TGConnectingPoint num="6" id="7" />
+<TGConnectingPoint num="7" id="8" />
+<TGConnectingPoint num="8" id="9" />
+<TGConnectingPoint num="9" id="10" />
+<TGConnectingPoint num="10" id="11" />
+<TGConnectingPoint num="11" id="12" />
+<TGConnectingPoint num="12" id="13" />
+<TGConnectingPoint num="13" id="14" />
+<TGConnectingPoint num="14" id="15" />
+<TGConnectingPoint num="15" id="16" />
+<TGConnectingPoint num="16" id="17" />
+<TGConnectingPoint num="17" id="18" />
+<TGConnectingPoint num="18" id="19" />
+<TGConnectingPoint num="19" id="20" />
+<TGConnectingPoint num="20" id="21" />
+<TGConnectingPoint num="21" id="22" />
+<TGConnectingPoint num="22" id="23" />
+<TGConnectingPoint num="23" id="24" />
+<TGConnectingPoint num="24" id="25" />
+<TGConnectingPoint num="25" id="26" />
+<TGConnectingPoint num="26" id="27" />
+<TGConnectingPoint num="27" id="28" />
+<TGConnectingPoint num="28" id="29" />
+<TGConnectingPoint num="29" id="30" />
+<TGConnectingPoint num="30" id="31" />
+<TGConnectingPoint num="31" id="32" />
+<TGConnectingPoint num="32" id="33" />
+<TGConnectingPoint num="33" id="34" />
+<TGConnectingPoint num="34" id="35" />
+<TGConnectingPoint num="35" id="36" />
+<TGConnectingPoint num="36" id="37" />
+<TGConnectingPoint num="37" id="38" />
+<TGConnectingPoint num="38" id="39" />
+<TGConnectingPoint num="39" id="40" />
+<TGConnectingPoint num="40" id="41" />
+<TGConnectingPoint num="41" id="42" />
+<TGConnectingPoint num="42" id="43" />
<extraparam>
-<textline data="" />
+<textline data="Requirement description:" />
+<textline data="Double-click to edit" />
<kind data="" />
<criticality data="" />
<reqType data="Requirement" color="-1773070" />
@@ -67,122 +68,58 @@
</extraparam>
</COMPONENT>
-<COMPONENT type="5207" id="16" uid="34f78e28-10b6-4963-9df8-aa79601cc946" >
+<COMPONENT type="5207" id="60" uid="34f78e28-10b6-4963-9df8-aa79601cc946" >
<cdparam x="727" y="252" />
<sizeparam width="150" height="30" minWidth="10" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="107" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1400" />
<infoparam name="AvatarElementReference" value="CoffeeMachine" />
-<TGConnectingPoint num="0" id="1" />
-<TGConnectingPoint num="1" id="2" />
-<TGConnectingPoint num="2" id="3" />
-<TGConnectingPoint num="3" id="4" />
-<TGConnectingPoint num="4" id="5" />
-<TGConnectingPoint num="5" id="6" />
-<TGConnectingPoint num="6" id="7" />
-<TGConnectingPoint num="7" id="8" />
-<TGConnectingPoint num="8" id="9" />
-<TGConnectingPoint num="9" id="10" />
-<TGConnectingPoint num="10" id="11" />
-<TGConnectingPoint num="11" id="12" />
-<TGConnectingPoint num="12" id="13" />
-<TGConnectingPoint num="13" id="14" />
-<TGConnectingPoint num="14" id="15" />
+<TGConnectingPoint num="0" id="45" />
+<TGConnectingPoint num="1" id="46" />
+<TGConnectingPoint num="2" id="47" />
+<TGConnectingPoint num="3" id="48" />
+<TGConnectingPoint num="4" id="49" />
+<TGConnectingPoint num="5" id="50" />
+<TGConnectingPoint num="6" id="51" />
+<TGConnectingPoint num="7" id="52" />
+<TGConnectingPoint num="8" id="53" />
+<TGConnectingPoint num="9" id="54" />
+<TGConnectingPoint num="10" id="55" />
+<TGConnectingPoint num="11" id="56" />
+<TGConnectingPoint num="12" id="57" />
+<TGConnectingPoint num="13" id="58" />
+<TGConnectingPoint num="14" id="59" />
</COMPONENT>
-<COMPONENT type="5207" id="32" uid="4ca34bf8-01db-44a8-bb8c-0d28c1a6414c" >
+<COMPONENT type="5207" id="76" uid="4ca34bf8-01db-44a8-bb8c-0d28c1a6414c" >
<cdparam x="724" y="202" />
<sizeparam width="150" height="30" minWidth="10" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="57" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1400" />
<infoparam name="AvatarElementReference" value="Wallet" />
-<TGConnectingPoint num="0" id="17" />
-<TGConnectingPoint num="1" id="18" />
-<TGConnectingPoint num="2" id="19" />
-<TGConnectingPoint num="3" id="20" />
-<TGConnectingPoint num="4" id="21" />
-<TGConnectingPoint num="5" id="22" />
-<TGConnectingPoint num="6" id="23" />
-<TGConnectingPoint num="7" id="24" />
-<TGConnectingPoint num="8" id="25" />
-<TGConnectingPoint num="9" id="26" />
-<TGConnectingPoint num="10" id="27" />
-<TGConnectingPoint num="11" id="28" />
-<TGConnectingPoint num="12" id="29" />
-<TGConnectingPoint num="13" id="30" />
-<TGConnectingPoint num="14" id="31" />
+<TGConnectingPoint num="0" id="61" />
+<TGConnectingPoint num="1" id="62" />
+<TGConnectingPoint num="2" id="63" />
+<TGConnectingPoint num="3" id="64" />
+<TGConnectingPoint num="4" id="65" />
+<TGConnectingPoint num="5" id="66" />
+<TGConnectingPoint num="6" id="67" />
+<TGConnectingPoint num="7" id="68" />
+<TGConnectingPoint num="8" id="69" />
+<TGConnectingPoint num="9" id="70" />
+<TGConnectingPoint num="10" id="71" />
+<TGConnectingPoint num="11" id="72" />
+<TGConnectingPoint num="12" id="73" />
+<TGConnectingPoint num="13" id="74" />
+<TGConnectingPoint num="14" id="75" />
</COMPONENT>
-<COMPONENT type="5200" id="76" uid="6a44a70b-341e-4094-9eb3-95ef05784845" >
+<COMPONENT type="5200" id="120" uid="6a44a70b-341e-4094-9eb3-95ef05784845" >
<cdparam x="660" y="10" />
<sizeparam width="278" height="120" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="59" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1400" />
<infoparam name="Requirement" value="req00" />
-<TGConnectingPoint num="0" id="33" />
-<TGConnectingPoint num="1" id="34" />
-<TGConnectingPoint num="2" id="35" />
-<TGConnectingPoint num="3" id="36" />
-<TGConnectingPoint num="4" id="37" />
-<TGConnectingPoint num="5" id="38" />
-<TGConnectingPoint num="6" id="39" />
-<TGConnectingPoint num="7" id="40" />
-<TGConnectingPoint num="8" id="41" />
-<TGConnectingPoint num="9" id="42" />
-<TGConnectingPoint num="10" id="43" />
-<TGConnectingPoint num="11" id="44" />
-<TGConnectingPoint num="12" id="45" />
-<TGConnectingPoint num="13" id="46" />
-<TGConnectingPoint num="14" id="47" />
-<TGConnectingPoint num="15" id="48" />
-<TGConnectingPoint num="16" id="49" />
-<TGConnectingPoint num="17" id="50" />
-<TGConnectingPoint num="18" id="51" />
-<TGConnectingPoint num="19" id="52" />
-<TGConnectingPoint num="20" id="53" />
-<TGConnectingPoint num="21" id="54" />
-<TGConnectingPoint num="22" id="55" />
-<TGConnectingPoint num="23" id="56" />
-<TGConnectingPoint num="24" id="57" />
-<TGConnectingPoint num="25" id="58" />
-<TGConnectingPoint num="26" id="59" />
-<TGConnectingPoint num="27" id="60" />
-<TGConnectingPoint num="28" id="61" />
-<TGConnectingPoint num="29" id="62" />
-<TGConnectingPoint num="30" id="63" />
-<TGConnectingPoint num="31" id="64" />
-<TGConnectingPoint num="32" id="65" />
-<TGConnectingPoint num="33" id="66" />
-<TGConnectingPoint num="34" id="67" />
-<TGConnectingPoint num="35" id="68" />
-<TGConnectingPoint num="36" id="69" />
-<TGConnectingPoint num="37" id="70" />
-<TGConnectingPoint num="38" id="71" />
-<TGConnectingPoint num="39" id="72" />
-<TGConnectingPoint num="40" id="73" />
-<TGConnectingPoint num="41" id="74" />
-<TGConnectingPoint num="42" id="75" />
-<extraparam>
-<textline data="A coin not used within 50 seconds " />
-<textline data="must be ejected" />
-<kind data="Functional" />
-<criticality data="Low" />
-<reqType data="Requirement" color="-1773070" />
-<id data="0.1.1" />
-<satisfied data="false" />
-<verified data="false" />
-<attackTreeNode data="" />
-<violatedAction data="" />
-<referenceElements data="" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5200" id="120" uid="2db149ef-c53b-4707-8c0f-285eea3e4257" >
-<cdparam x="46" y="491" />
-<sizeparam width="301" height="120" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="113" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1400" />
-<infoparam name="Requirement" value="Req_Availability" />
<TGConnectingPoint num="0" id="77" />
<TGConnectingPoint num="1" id="78" />
<TGConnectingPoint num="2" id="79" />
@@ -227,26 +164,26 @@
<TGConnectingPoint num="41" id="118" />
<TGConnectingPoint num="42" id="119" />
<extraparam>
-<textline data="The availability of the machine shall be" />
-<textline data="no less than 99.99%" />
+<textline data="A coin not used within 50 seconds " />
+<textline data="must be ejected" />
<kind data="Functional" />
<criticality data="Low" />
<reqType data="Requirement" color="-1773070" />
-<id data="0.4" />
-<satisfied data="true" />
-<verified data="true" />
+<id data="0.1.1" />
+<satisfied data="false" />
+<verified data="false" />
<attackTreeNode data="" />
<violatedAction data="" />
<referenceElements data="" />
</extraparam>
</COMPONENT>
-<COMPONENT type="5200" id="164" uid="e73051aa-2858-45ad-9538-4bb540752766" >
-<cdparam x="10" y="182" />
-<sizeparam width="150" height="120" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="136" minDesiredHeight="0" />
+<COMPONENT type="5200" id="164" uid="2db149ef-c53b-4707-8c0f-285eea3e4257" >
+<cdparam x="46" y="491" />
+<sizeparam width="301" height="120" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="113" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1400" />
-<infoparam name="Requirement" value="Req_CoffeeMachine" />
+<infoparam name="Requirement" value="Req_Availability" />
<TGConnectingPoint num="0" id="121" />
<TGConnectingPoint num="1" id="122" />
<TGConnectingPoint num="2" id="123" />
@@ -291,25 +228,26 @@
<TGConnectingPoint num="41" id="162" />
<TGConnectingPoint num="42" id="163" />
<extraparam>
-<textline data="Requirements of the coffee machine" />
+<textline data="The availability of the machine shall be" />
+<textline data="no less than 99.99%" />
<kind data="Functional" />
<criticality data="Low" />
<reqType data="Requirement" color="-1773070" />
-<id data="0" />
-<satisfied data="false" />
-<verified data="false" />
+<id data="0.4" />
+<satisfied data="true" />
+<verified data="true" />
<attackTreeNode data="" />
<violatedAction data="" />
<referenceElements data="" />
</extraparam>
</COMPONENT>
-<COMPONENT type="5201" id="180" uid="13281d49-f5cd-41bd-b16d-e239622a41f2" >
-<cdparam x="682" y="367" />
-<sizeparam width="171" height="30" minWidth="10" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="158" minDesiredHeight="0" />
+<COMPONENT type="5200" id="208" uid="e73051aa-2858-45ad-9538-4bb540752766" >
+<cdparam x="10" y="182" />
+<sizeparam width="150" height="120" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="136" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1400" />
-<infoparam name="AvatarProperty" value="BeverageDeliverProperty" />
+<infoparam name="Requirement" value="Req_CoffeeMachine" />
<TGConnectingPoint num="0" id="165" />
<TGConnectingPoint num="1" id="166" />
<TGConnectingPoint num="2" id="167" />
@@ -325,101 +263,100 @@
<TGConnectingPoint num="12" id="177" />
<TGConnectingPoint num="13" id="178" />
<TGConnectingPoint num="14" id="179" />
+<TGConnectingPoint num="15" id="180" />
+<TGConnectingPoint num="16" id="181" />
+<TGConnectingPoint num="17" id="182" />
+<TGConnectingPoint num="18" id="183" />
+<TGConnectingPoint num="19" id="184" />
+<TGConnectingPoint num="20" id="185" />
+<TGConnectingPoint num="21" id="186" />
+<TGConnectingPoint num="22" id="187" />
+<TGConnectingPoint num="23" id="188" />
+<TGConnectingPoint num="24" id="189" />
+<TGConnectingPoint num="25" id="190" />
+<TGConnectingPoint num="26" id="191" />
+<TGConnectingPoint num="27" id="192" />
+<TGConnectingPoint num="28" id="193" />
+<TGConnectingPoint num="29" id="194" />
+<TGConnectingPoint num="30" id="195" />
+<TGConnectingPoint num="31" id="196" />
+<TGConnectingPoint num="32" id="197" />
+<TGConnectingPoint num="33" id="198" />
+<TGConnectingPoint num="34" id="199" />
+<TGConnectingPoint num="35" id="200" />
+<TGConnectingPoint num="36" id="201" />
+<TGConnectingPoint num="37" id="202" />
+<TGConnectingPoint num="38" id="203" />
+<TGConnectingPoint num="39" id="204" />
+<TGConnectingPoint num="40" id="205" />
+<TGConnectingPoint num="41" id="206" />
+<TGConnectingPoint num="42" id="207" />
+<extraparam>
+<textline data="Requirements of the coffee machine" />
+<kind data="Functional" />
+<criticality data="Low" />
+<reqType data="Requirement" color="-1773070" />
+<id data="0" />
+<satisfied data="false" />
+<verified data="false" />
+<attackTreeNode data="" />
+<violatedAction data="" />
+<referenceElements data="" />
+</extraparam>
</COMPONENT>
-<COMPONENT type="5201" id="196" uid="b8c39bfa-aea4-445a-a7c8-53f5f38cf5d7" >
+<COMPONENT type="5201" id="224" uid="13281d49-f5cd-41bd-b16d-e239622a41f2" >
+<cdparam x="682" y="367" />
+<sizeparam width="171" height="30" minWidth="10" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="158" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1400" />
+<infoparam name="AvatarProperty" value="BeverageDeliverProperty" />
+<TGConnectingPoint num="0" id="209" />
+<TGConnectingPoint num="1" id="210" />
+<TGConnectingPoint num="2" id="211" />
+<TGConnectingPoint num="3" id="212" />
+<TGConnectingPoint num="4" id="213" />
+<TGConnectingPoint num="5" id="214" />
+<TGConnectingPoint num="6" id="215" />
+<TGConnectingPoint num="7" id="216" />
+<TGConnectingPoint num="8" id="217" />
+<TGConnectingPoint num="9" id="218" />
+<TGConnectingPoint num="10" id="219" />
+<TGConnectingPoint num="11" id="220" />
+<TGConnectingPoint num="12" id="221" />
+<TGConnectingPoint num="13" id="222" />
+<TGConnectingPoint num="14" id="223" />
+</COMPONENT>
+
+<COMPONENT type="5201" id="240" uid="b8c39bfa-aea4-445a-a7c8-53f5f38cf5d7" >
<cdparam x="728" y="304" />
<sizeparam width="150" height="30" minWidth="10" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="128" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1400" />
<infoparam name="AvatarProperty" value="WalletCoinProperty" />
-<TGConnectingPoint num="0" id="181" />
-<TGConnectingPoint num="1" id="182" />
-<TGConnectingPoint num="2" id="183" />
-<TGConnectingPoint num="3" id="184" />
-<TGConnectingPoint num="4" id="185" />
-<TGConnectingPoint num="5" id="186" />
-<TGConnectingPoint num="6" id="187" />
-<TGConnectingPoint num="7" id="188" />
-<TGConnectingPoint num="8" id="189" />
-<TGConnectingPoint num="9" id="190" />
-<TGConnectingPoint num="10" id="191" />
-<TGConnectingPoint num="11" id="192" />
-<TGConnectingPoint num="12" id="193" />
-<TGConnectingPoint num="13" id="194" />
-<TGConnectingPoint num="14" id="195" />
+<TGConnectingPoint num="0" id="225" />
+<TGConnectingPoint num="1" id="226" />
+<TGConnectingPoint num="2" id="227" />
+<TGConnectingPoint num="3" id="228" />
+<TGConnectingPoint num="4" id="229" />
+<TGConnectingPoint num="5" id="230" />
+<TGConnectingPoint num="6" id="231" />
+<TGConnectingPoint num="7" id="232" />
+<TGConnectingPoint num="8" id="233" />
+<TGConnectingPoint num="9" id="234" />
+<TGConnectingPoint num="10" id="235" />
+<TGConnectingPoint num="11" id="236" />
+<TGConnectingPoint num="12" id="237" />
+<TGConnectingPoint num="13" id="238" />
+<TGConnectingPoint num="14" id="239" />
</COMPONENT>
-<COMPONENT type="5200" id="240" uid="d6ff748e-4216-4bb2-b0ce-81e64e2dbd68" >
+<COMPONENT type="5200" id="284" uid="d6ff748e-4216-4bb2-b0ce-81e64e2dbd68" >
<cdparam x="233" y="147" />
<sizeparam width="271" height="104" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="48" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1400" />
<infoparam name="Requirement" value="req1" />
-<TGConnectingPoint num="0" id="197" />
-<TGConnectingPoint num="1" id="198" />
-<TGConnectingPoint num="2" id="199" />
-<TGConnectingPoint num="3" id="200" />
-<TGConnectingPoint num="4" id="201" />
-<TGConnectingPoint num="5" id="202" />
-<TGConnectingPoint num="6" id="203" />
-<TGConnectingPoint num="7" id="204" />
-<TGConnectingPoint num="8" id="205" />
-<TGConnectingPoint num="9" id="206" />
-<TGConnectingPoint num="10" id="207" />
-<TGConnectingPoint num="11" id="208" />
-<TGConnectingPoint num="12" id="209" />
-<TGConnectingPoint num="13" id="210" />
-<TGConnectingPoint num="14" id="211" />
-<TGConnectingPoint num="15" id="212" />
-<TGConnectingPoint num="16" id="213" />
-<TGConnectingPoint num="17" id="214" />
-<TGConnectingPoint num="18" id="215" />
-<TGConnectingPoint num="19" id="216" />
-<TGConnectingPoint num="20" id="217" />
-<TGConnectingPoint num="21" id="218" />
-<TGConnectingPoint num="22" id="219" />
-<TGConnectingPoint num="23" id="220" />
-<TGConnectingPoint num="24" id="221" />
-<TGConnectingPoint num="25" id="222" />
-<TGConnectingPoint num="26" id="223" />
-<TGConnectingPoint num="27" id="224" />
-<TGConnectingPoint num="28" id="225" />
-<TGConnectingPoint num="29" id="226" />
-<TGConnectingPoint num="30" id="227" />
-<TGConnectingPoint num="31" id="228" />
-<TGConnectingPoint num="32" id="229" />
-<TGConnectingPoint num="33" id="230" />
-<TGConnectingPoint num="34" id="231" />
-<TGConnectingPoint num="35" id="232" />
-<TGConnectingPoint num="36" id="233" />
-<TGConnectingPoint num="37" id="234" />
-<TGConnectingPoint num="38" id="235" />
-<TGConnectingPoint num="39" id="236" />
-<TGConnectingPoint num="40" id="237" />
-<TGConnectingPoint num="41" id="238" />
-<TGConnectingPoint num="42" id="239" />
-<extraparam>
-<textline data="A wallet must never contain a " />
-<textline data="negative number of coins" />
-<kind data="Functional" />
-<criticality data="Low" />
-<reqType data="SafetyRequirement" color="-1773070" />
-<id data="0.2" />
-<satisfied data="true" />
-<verified data="true" />
-<attackTreeNode data="" />
-<violatedAction data="" />
-<referenceElements data="" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5201" id="256" uid="579a8979-6f5a-4f6d-9fed-784c03cd2678" >
-<cdparam x="632" y="151" />
-<sizeparam width="150" height="30" minWidth="10" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="117" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1400" />
-<infoparam name="AvatarProperty" value="OneCoinProperty" />
<TGConnectingPoint num="0" id="241" />
<TGConnectingPoint num="1" id="242" />
<TGConnectingPoint num="2" id="243" />
@@ -435,65 +372,42 @@
<TGConnectingPoint num="12" id="253" />
<TGConnectingPoint num="13" id="254" />
<TGConnectingPoint num="14" id="255" />
-</COMPONENT>
-
-<COMPONENT type="5200" id="300" uid="3f856106-1533-4f29-bb50-d5da20b70742" >
-<cdparam x="192" y="15" />
-<sizeparam width="307" height="120" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="51" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1400" />
-<infoparam name="Requirement" value="req0" />
-<TGConnectingPoint num="0" id="257" />
-<TGConnectingPoint num="1" id="258" />
-<TGConnectingPoint num="2" id="259" />
-<TGConnectingPoint num="3" id="260" />
-<TGConnectingPoint num="4" id="261" />
-<TGConnectingPoint num="5" id="262" />
-<TGConnectingPoint num="6" id="263" />
-<TGConnectingPoint num="7" id="264" />
-<TGConnectingPoint num="8" id="265" />
-<TGConnectingPoint num="9" id="266" />
-<TGConnectingPoint num="10" id="267" />
-<TGConnectingPoint num="11" id="268" />
-<TGConnectingPoint num="12" id="269" />
-<TGConnectingPoint num="13" id="270" />
-<TGConnectingPoint num="14" id="271" />
-<TGConnectingPoint num="15" id="272" />
-<TGConnectingPoint num="16" id="273" />
-<TGConnectingPoint num="17" id="274" />
-<TGConnectingPoint num="18" id="275" />
-<TGConnectingPoint num="19" id="276" />
-<TGConnectingPoint num="20" id="277" />
-<TGConnectingPoint num="21" id="278" />
-<TGConnectingPoint num="22" id="279" />
-<TGConnectingPoint num="23" id="280" />
-<TGConnectingPoint num="24" id="281" />
-<TGConnectingPoint num="25" id="282" />
-<TGConnectingPoint num="26" id="283" />
-<TGConnectingPoint num="27" id="284" />
-<TGConnectingPoint num="28" id="285" />
-<TGConnectingPoint num="29" id="286" />
-<TGConnectingPoint num="30" id="287" />
-<TGConnectingPoint num="31" id="288" />
-<TGConnectingPoint num="32" id="289" />
-<TGConnectingPoint num="33" id="290" />
-<TGConnectingPoint num="34" id="291" />
-<TGConnectingPoint num="35" id="292" />
-<TGConnectingPoint num="36" id="293" />
-<TGConnectingPoint num="37" id="294" />
-<TGConnectingPoint num="38" id="295" />
-<TGConnectingPoint num="39" id="296" />
-<TGConnectingPoint num="40" id="297" />
-<TGConnectingPoint num="41" id="298" />
-<TGConnectingPoint num="42" id="299" />
+<TGConnectingPoint num="15" id="256" />
+<TGConnectingPoint num="16" id="257" />
+<TGConnectingPoint num="17" id="258" />
+<TGConnectingPoint num="18" id="259" />
+<TGConnectingPoint num="19" id="260" />
+<TGConnectingPoint num="20" id="261" />
+<TGConnectingPoint num="21" id="262" />
+<TGConnectingPoint num="22" id="263" />
+<TGConnectingPoint num="23" id="264" />
+<TGConnectingPoint num="24" id="265" />
+<TGConnectingPoint num="25" id="266" />
+<TGConnectingPoint num="26" id="267" />
+<TGConnectingPoint num="27" id="268" />
+<TGConnectingPoint num="28" id="269" />
+<TGConnectingPoint num="29" id="270" />
+<TGConnectingPoint num="30" id="271" />
+<TGConnectingPoint num="31" id="272" />
+<TGConnectingPoint num="32" id="273" />
+<TGConnectingPoint num="33" id="274" />
+<TGConnectingPoint num="34" id="275" />
+<TGConnectingPoint num="35" id="276" />
+<TGConnectingPoint num="36" id="277" />
+<TGConnectingPoint num="37" id="278" />
+<TGConnectingPoint num="38" id="279" />
+<TGConnectingPoint num="39" id="280" />
+<TGConnectingPoint num="40" id="281" />
+<TGConnectingPoint num="41" id="282" />
+<TGConnectingPoint num="42" id="283" />
<extraparam>
-<textline data="The coffee machine never has one coin " />
-<textline data=" inserted more than 50 units of time" />
+<textline data="A wallet must never contain a " />
+<textline data="negative number of coins" />
<kind data="Functional" />
<criticality data="Low" />
-<reqType data="Requirement" color="-1773070" />
-<id data="0.1" />
-<satisfied data="false" />
+<reqType data="SafetyRequirement" color="-1773070" />
+<id data="0.2" />
+<satisfied data="true" />
<verified data="true" />
<attackTreeNode data="" />
<violatedAction data="" />
@@ -501,12 +415,35 @@
</extraparam>
</COMPONENT>
-<COMPONENT type="5200" id="344" uid="e1c3057e-2674-463d-8b8c-6d741b397711" >
-<cdparam x="208" y="294" />
-<sizeparam width="357" height="174" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="48" minDesiredHeight="0" />
+<COMPONENT type="5201" id="300" uid="579a8979-6f5a-4f6d-9fed-784c03cd2678" >
+<cdparam x="632" y="151" />
+<sizeparam width="150" height="30" minWidth="10" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="117" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1400" />
-<infoparam name="Requirement" value="req2" />
+<infoparam name="AvatarProperty" value="OneCoinProperty" />
+<TGConnectingPoint num="0" id="285" />
+<TGConnectingPoint num="1" id="286" />
+<TGConnectingPoint num="2" id="287" />
+<TGConnectingPoint num="3" id="288" />
+<TGConnectingPoint num="4" id="289" />
+<TGConnectingPoint num="5" id="290" />
+<TGConnectingPoint num="6" id="291" />
+<TGConnectingPoint num="7" id="292" />
+<TGConnectingPoint num="8" id="293" />
+<TGConnectingPoint num="9" id="294" />
+<TGConnectingPoint num="10" id="295" />
+<TGConnectingPoint num="11" id="296" />
+<TGConnectingPoint num="12" id="297" />
+<TGConnectingPoint num="13" id="298" />
+<TGConnectingPoint num="14" id="299" />
+</COMPONENT>
+
+<COMPONENT type="5200" id="344" uid="3f856106-1533-4f29-bb50-d5da20b70742" >
+<cdparam x="192" y="15" />
+<sizeparam width="307" height="120" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="51" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1400" />
+<infoparam name="Requirement" value="req0" />
<TGConnectingPoint num="0" id="301" />
<TGConnectingPoint num="1" id="302" />
<TGConnectingPoint num="2" id="303" />
@@ -551,6 +488,70 @@
<TGConnectingPoint num="41" id="342" />
<TGConnectingPoint num="42" id="343" />
<extraparam>
+<textline data="The coffee machine never has one coin " />
+<textline data=" inserted more than 50 units of time" />
+<kind data="Functional" />
+<criticality data="Low" />
+<reqType data="Requirement" color="-1773070" />
+<id data="0.1" />
+<satisfied data="false" />
+<verified data="true" />
+<attackTreeNode data="" />
+<violatedAction data="" />
+<referenceElements data="" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5200" id="388" uid="e1c3057e-2674-463d-8b8c-6d741b397711" >
+<cdparam x="208" y="294" />
+<sizeparam width="357" height="174" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="48" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1400" />
+<infoparam name="Requirement" value="req2" />
+<TGConnectingPoint num="0" id="345" />
+<TGConnectingPoint num="1" id="346" />
+<TGConnectingPoint num="2" id="347" />
+<TGConnectingPoint num="3" id="348" />
+<TGConnectingPoint num="4" id="349" />
+<TGConnectingPoint num="5" id="350" />
+<TGConnectingPoint num="6" id="351" />
+<TGConnectingPoint num="7" id="352" />
+<TGConnectingPoint num="8" id="353" />
+<TGConnectingPoint num="9" id="354" />
+<TGConnectingPoint num="10" id="355" />
+<TGConnectingPoint num="11" id="356" />
+<TGConnectingPoint num="12" id="357" />
+<TGConnectingPoint num="13" id="358" />
+<TGConnectingPoint num="14" id="359" />
+<TGConnectingPoint num="15" id="360" />
+<TGConnectingPoint num="16" id="361" />
+<TGConnectingPoint num="17" id="362" />
+<TGConnectingPoint num="18" id="363" />
+<TGConnectingPoint num="19" id="364" />
+<TGConnectingPoint num="20" id="365" />
+<TGConnectingPoint num="21" id="366" />
+<TGConnectingPoint num="22" id="367" />
+<TGConnectingPoint num="23" id="368" />
+<TGConnectingPoint num="24" id="369" />
+<TGConnectingPoint num="25" id="370" />
+<TGConnectingPoint num="26" id="371" />
+<TGConnectingPoint num="27" id="372" />
+<TGConnectingPoint num="28" id="373" />
+<TGConnectingPoint num="29" id="374" />
+<TGConnectingPoint num="30" id="375" />
+<TGConnectingPoint num="31" id="376" />
+<TGConnectingPoint num="32" id="377" />
+<TGConnectingPoint num="33" id="378" />
+<TGConnectingPoint num="34" id="379" />
+<TGConnectingPoint num="35" id="380" />
+<TGConnectingPoint num="36" id="381" />
+<TGConnectingPoint num="37" id="382" />
+<TGConnectingPoint num="38" id="383" />
+<TGConnectingPoint num="39" id="384" />
+<TGConnectingPoint num="40" id="385" />
+<TGConnectingPoint num="41" id="386" />
+<TGConnectingPoint num="42" id="387" />
+<extraparam>
<textline data="When the application starts, if the wallet contains " />
<textline data="at least 2 coins, then a beverage may be delivered. " />
<textline data="On the contrary, if the wallet contains less than 2" />
@@ -569,131 +570,131 @@
</extraparam>
</COMPONENT>
-<CONNECTOR type="5205" id="346" >
+<CONNECTOR type="5205" id="390" >
<cdparam x="661" y="76" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="<<composition>>" />
-<TGConnectingPoint num="0" id="345" />
-<P1 x="660" y="70" id="34" />
-<P2 x="499" y="75" id="261" />
+<TGConnectingPoint num="0" id="389" />
+<P1 x="660" y="70" id="78" />
+<P2 x="499" y="75" id="305" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="5208" id="348" >
+<CONNECTOR type="5208" id="392" >
<cdparam x="749" y="267" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="<<satisfy>>" />
-<TGConnectingPoint num="0" id="347" />
-<P1 x="727" y="267" id="2" />
-<P2 x="504" y="199" id="229" />
+<TGConnectingPoint num="0" id="391" />
+<P1 x="727" y="267" id="46" />
+<P2 x="504" y="199" id="273" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="5208" id="350" >
+<CONNECTOR type="5208" id="394" >
<cdparam x="783" y="223" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="<<satisfy>>" />
-<TGConnectingPoint num="0" id="349" />
-<P1 x="724" y="224" id="19" />
-<P2 x="504" y="173" id="228" />
+<TGConnectingPoint num="0" id="393" />
+<P1 x="724" y="224" id="63" />
+<P2 x="504" y="173" id="272" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="5205" id="352" >
+<CONNECTOR type="5205" id="396" >
<cdparam x="124" y="457" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Requirement to Requirement" value="<<composition>>" />
-<TGConnectingPoint num="0" id="351" />
-<P1 x="121" y="491" id="83" />
-<P2 x="122" y="302" id="132" />
+<TGConnectingPoint num="0" id="395" />
+<P1 x="121" y="491" id="127" />
+<P2 x="122" y="302" id="176" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="5205" id="354" >
+<CONNECTOR type="5205" id="398" >
<cdparam x="244" y="315" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Requirement to Requirement" value="<<composition>>" />
-<TGConnectingPoint num="0" id="353" />
-<P1 x="208" y="337" id="301" />
-<P2 x="160" y="272" id="126" />
+<TGConnectingPoint num="0" id="397" />
+<P1 x="208" y="337" id="345" />
+<P2 x="160" y="272" id="170" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="5205" id="356" >
+<CONNECTOR type="5205" id="400" >
<cdparam x="249" y="199" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Requirement to Requirement" value="<<composition>>" />
-<TGConnectingPoint num="0" id="355" />
-<P1 x="233" y="199" id="198" />
-<P2 x="160" y="212" id="124" />
+<TGConnectingPoint num="0" id="399" />
+<P1 x="233" y="199" id="242" />
+<P2 x="160" y="212" id="168" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="5205" id="358" >
+<CONNECTOR type="5205" id="402" >
<cdparam x="237" y="98" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Requirement to Requirement" value="<<composition>>" />
-<TGConnectingPoint num="0" id="357" />
-<P1 x="192" y="105" id="259" />
-<P2 x="122" y="182" id="129" />
+<TGConnectingPoint num="0" id="401" />
+<P1 x="192" y="105" id="303" />
+<P2 x="122" y="182" id="173" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="5203" id="360" >
+<CONNECTOR type="5203" id="404" >
<cdparam x="538" y="537" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from AvatarProperty to Requirement" value="<<verify>>" />
-<TGConnectingPoint num="0" id="359" />
-<P1 x="682" y="382" id="166" />
-<P2 x="565" y="381" id="317" />
+<TGConnectingPoint num="0" id="403" />
+<P1 x="682" y="382" id="210" />
+<P2 x="565" y="381" id="361" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="5203" id="362" >
+<CONNECTOR type="5203" id="406" >
<cdparam x="545" y="329" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from AvatarProperty to Requirement" value="<<verify>>" />
-<TGConnectingPoint num="0" id="361" />
-<P1 x="728" y="319" id="182" />
-<P2 x="504" y="199" id="213" />
+<TGConnectingPoint num="0" id="405" />
+<P1 x="728" y="319" id="226" />
+<P2 x="504" y="199" id="257" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="5203" id="364" >
+<CONNECTOR type="5203" id="408" >
<cdparam x="563" y="148" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from AvatarProperty to Requirement" value="<<verify>>" />
-<TGConnectingPoint num="0" id="363" />
-<P1 x="632" y="166" id="242" />
-<P2 x="499" y="105" id="274" />
+<TGConnectingPoint num="0" id="407" />
+<P1 x="632" y="166" id="286" />
+<P2 x="499" y="105" id="318" />
<AutomaticDrawing data="true" />
</CONNECTOR>
</AvatarRDPanel>
<AvatarPDPanel name="AVATAR PD" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0000000000000004" >
-<CONNECTOR type="5312" id="366" >
+<CONNECTOR type="5312" id="410" >
<cdparam x="582" y="248" />
<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="reg" />
-<TGConnectingPoint num="0" id="365" />
-<P1 x="502" y="258" id="491" />
-<P2 x="502" y="334" id="379" />
+<TGConnectingPoint num="0" id="409" />
+<P1 x="502" y="258" id="535" />
+<P2 x="502" y="334" id="423" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="5310" id="372" >
+<CONNECTOR type="5310" id="416" >
<cdparam x="247" y="616" />
<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="369" />
-<TGConnectingPoint num="1" id="370" />
-<TGConnectingPoint num="2" id="371" />
-<P1 x="492" y="126" id="454" />
-<P2 x="492" y="209" id="495" />
+<TGConnectingPoint num="0" id="413" />
+<TGConnectingPoint num="1" id="414" />
+<TGConnectingPoint num="2" id="415" />
+<P1 x="492" y="126" id="498" />
+<P2 x="492" y="209" id="539" />
<Point x="467" y="147" />
<Point x="467" y="192" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="367" uid="76f4a561-8f55-4177-bf7c-dc0cf0813ec2" >
-<father id="372" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="411" uid="76f4a561-8f55-4177-bf7c-dc0cf0813ec2" >
+<father id="416" num="0" />
<cdparam x="467" y="147" />
<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="point " value="null" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="368" uid="b40ad13e-3cf8-43fc-9186-740d4d6bbb0a" >
-<father id="372" num="1" />
+<SUBCOMPONENT type="-1" id="412" uid="b40ad13e-3cf8-43fc-9186-740d4d6bbb0a" >
+<father id="416" num="1" />
<cdparam x="467" y="192" />
<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -701,229 +702,229 @@
<infoparam name="point " value="null" />
</SUBCOMPONENT>
-<CONNECTOR type="5311" id="374" >
+<CONNECTOR type="5311" id="418" >
<cdparam x="280" y="200" />
<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="373" />
-<P1 x="302" y="261" id="417" />
-<P2 x="361" y="261" id="392" />
+<TGConnectingPoint num="0" id="417" />
+<P1 x="302" y="261" id="448" />
+<P2 x="361" y="261" id="436" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="5312" id="376" >
+<CONNECTOR type="5312" id="420" >
<cdparam x="473" y="190" />
<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="reg" />
-<TGConnectingPoint num="0" id="375" />
-<P1 x="390" y="286" id="390" />
-<P2 x="390" y="331" id="384" />
+<TGConnectingPoint num="0" id="419" />
+<P1 x="390" y="286" id="434" />
+<P2 x="390" y="331" id="428" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="5311" id="378" >
+<CONNECTOR type="5311" id="422" >
<cdparam x="276" y="190" />
<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="377" />
-<P1 x="305" y="211" id="404" />
-<P2 x="361" y="211" id="391" />
+<TGConnectingPoint num="0" id="421" />
+<P1 x="305" y="211" id="461" />
+<P2 x="361" y="211" id="435" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<COMPONENT type="5308" id="383" uid="fae3f1e2-3a0b-4232-91cd-bd992671f997" >
+<COMPONENT type="5308" id="427" uid="fae3f1e2-3a0b-4232-91cd-bd992671f997" >
<cdparam x="446" y="334" />
<sizeparam width="112" height="55" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="9" maxX="1399" minY="9" maxY="899" />
<infoparam name="TGComponent" value="WalletCoinProperty" />
-<TGConnectingPoint num="0" id="379" />
-<TGConnectingPoint num="1" id="380" />
-<TGConnectingPoint num="2" id="381" />
-<TGConnectingPoint num="3" id="382" />
+<TGConnectingPoint num="0" id="423" />
+<TGConnectingPoint num="1" id="424" />
+<TGConnectingPoint num="2" id="425" />
+<TGConnectingPoint num="3" id="426" />
<extraparam>
<liveness data="0" />
<not data="false" />
</extraparam>
</COMPONENT>
-<COMPONENT type="5308" id="388" uid="d2ab93ee-4487-4970-8b2e-9a3c2a0201fa" >
+<COMPONENT type="5308" id="432" uid="d2ab93ee-4487-4970-8b2e-9a3c2a0201fa" >
<cdparam x="340" y="331" />
<sizeparam width="100" height="55" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="9" maxX="1399" minY="9" maxY="899" />
<infoparam name="TGComponent" value="oneCoinProperty" />
-<TGConnectingPoint num="0" id="384" />
-<TGConnectingPoint num="1" id="385" />
-<TGConnectingPoint num="2" id="386" />
-<TGConnectingPoint num="3" id="387" />
+<TGConnectingPoint num="0" id="428" />
+<TGConnectingPoint num="1" id="429" />
+<TGConnectingPoint num="2" id="430" />
+<TGConnectingPoint num="3" id="431" />
<extraparam>
<liveness data="1" />
<not data="true" />
</extraparam>
</COMPONENT>
-<COMPONENT type="5302" id="401" uid="4323221d-cfa2-44e4-915f-11af59e9af62" >
+<COMPONENT type="5302" id="445" uid="4323221d-cfa2-44e4-915f-11af59e9af62" >
<cdparam x="361" y="187" />
<sizeparam width="59" height="99" minWidth="50" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="9" maxX="1399" minY="9" maxY="899" />
<infoparam name="TGComponent" value=">50" />
-<TGConnectingPoint num="0" id="389" />
-<TGConnectingPoint num="1" id="390" />
-<TGConnectingPoint num="2" id="391" />
-<TGConnectingPoint num="3" id="392" />
-<TGConnectingPoint num="4" id="393" />
-<TGConnectingPoint num="5" id="394" />
-<TGConnectingPoint num="6" id="395" />
-<TGConnectingPoint num="7" id="396" />
-<TGConnectingPoint num="8" id="397" />
-<TGConnectingPoint num="9" id="398" />
-<TGConnectingPoint num="10" id="399" />
-<TGConnectingPoint num="11" id="400" />
+<TGConnectingPoint num="0" id="433" />
+<TGConnectingPoint num="1" id="434" />
+<TGConnectingPoint num="2" id="435" />
+<TGConnectingPoint num="3" id="436" />
+<TGConnectingPoint num="4" id="437" />
+<TGConnectingPoint num="5" id="438" />
+<TGConnectingPoint num="6" id="439" />
+<TGConnectingPoint num="7" id="440" />
+<TGConnectingPoint num="8" id="441" />
+<TGConnectingPoint num="9" id="442" />
+<TGConnectingPoint num="10" id="443" />
+<TGConnectingPoint num="11" id="444" />
</COMPONENT>
-<COMPONENT type="5300" id="452" uid="19458285-e5f8-4cc6-8495-6c57a6e3a604" >
+<COMPONENT type="5300" id="496" uid="19458285-e5f8-4cc6-8495-6c57a6e3a604" >
<cdparam x="150" y="142" />
<sizeparam width="168" height="154" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="9" maxX="1399" minY="9" maxY="899" />
<infoparam name="Block0" value="CoffeeMachine" />
-<TGConnectingPoint num="0" id="428" />
-<TGConnectingPoint num="1" id="429" />
-<TGConnectingPoint num="2" id="430" />
-<TGConnectingPoint num="3" id="431" />
-<TGConnectingPoint num="4" id="432" />
-<TGConnectingPoint num="5" id="433" />
-<TGConnectingPoint num="6" id="434" />
-<TGConnectingPoint num="7" id="435" />
-<TGConnectingPoint num="8" id="436" />
-<TGConnectingPoint num="9" id="437" />
-<TGConnectingPoint num="10" id="438" />
-<TGConnectingPoint num="11" id="439" />
-<TGConnectingPoint num="12" id="440" />
-<TGConnectingPoint num="13" id="441" />
-<TGConnectingPoint num="14" id="442" />
-<TGConnectingPoint num="15" id="443" />
-<TGConnectingPoint num="16" id="444" />
-<TGConnectingPoint num="17" id="445" />
-<TGConnectingPoint num="18" id="446" />
-<TGConnectingPoint num="19" id="447" />
-<TGConnectingPoint num="20" id="448" />
-<TGConnectingPoint num="21" id="449" />
-<TGConnectingPoint num="22" id="450" />
-<TGConnectingPoint num="23" id="451" />
+<TGConnectingPoint num="0" id="472" />
+<TGConnectingPoint num="1" id="473" />
+<TGConnectingPoint num="2" id="474" />
+<TGConnectingPoint num="3" id="475" />
+<TGConnectingPoint num="4" id="476" />
+<TGConnectingPoint num="5" id="477" />
+<TGConnectingPoint num="6" id="478" />
+<TGConnectingPoint num="7" id="479" />
+<TGConnectingPoint num="8" id="480" />
+<TGConnectingPoint num="9" id="481" />
+<TGConnectingPoint num="10" id="482" />
+<TGConnectingPoint num="11" id="483" />
+<TGConnectingPoint num="12" id="484" />
+<TGConnectingPoint num="13" id="485" />
+<TGConnectingPoint num="14" id="486" />
+<TGConnectingPoint num="15" id="487" />
+<TGConnectingPoint num="16" id="488" />
+<TGConnectingPoint num="17" id="489" />
+<TGConnectingPoint num="18" id="490" />
+<TGConnectingPoint num="19" id="491" />
+<TGConnectingPoint num="20" id="492" />
+<TGConnectingPoint num="21" id="493" />
+<TGConnectingPoint num="22" id="494" />
+<TGConnectingPoint num="23" id="495" />
</COMPONENT>
-<SUBCOMPONENT type="5304" id="414" uid="2dbef5cf-57eb-4674-94d5-4b37c6777b4a" >
-<father id="452" num="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="29" minY="0" maxY="114" />
-<infoparam name="TGComponent" value="WaitingForFirstCoin_exit" />
-<TGConnectingPoint num="0" id="402" />
-<TGConnectingPoint num="1" id="403" />
-<TGConnectingPoint num="2" id="404" />
-<TGConnectingPoint num="3" id="405" />
-<TGConnectingPoint num="4" id="406" />
-<TGConnectingPoint num="5" id="407" />
-<TGConnectingPoint num="6" id="408" />
-<TGConnectingPoint num="7" id="409" />
-<TGConnectingPoint num="8" id="410" />
-<TGConnectingPoint num="9" id="411" />
-<TGConnectingPoint num="10" id="412" />
-<TGConnectingPoint num="11" id="413" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="5304" id="427" uid="e14fd5a7-c9ae-42ab-b99a-306f91c69127" >
-<father id="452" num="1" />
+<SUBCOMPONENT type="5304" id="458" uid="e14fd5a7-c9ae-42ab-b99a-306f91c69127" >
+<father id="496" num="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="20" minY="0" maxY="114" />
<infoparam name="TGComponent" value="WaitingForFirstCoin_enter" />
-<TGConnectingPoint num="0" id="415" />
-<TGConnectingPoint num="1" id="416" />
-<TGConnectingPoint num="2" id="417" />
-<TGConnectingPoint num="3" id="418" />
-<TGConnectingPoint num="4" id="419" />
-<TGConnectingPoint num="5" id="420" />
-<TGConnectingPoint num="6" id="421" />
-<TGConnectingPoint num="7" id="422" />
-<TGConnectingPoint num="8" id="423" />
-<TGConnectingPoint num="9" id="424" />
-<TGConnectingPoint num="10" id="425" />
-<TGConnectingPoint num="11" id="426" />
+<TGConnectingPoint num="0" id="446" />
+<TGConnectingPoint num="1" id="447" />
+<TGConnectingPoint num="2" id="448" />
+<TGConnectingPoint num="3" id="449" />
+<TGConnectingPoint num="4" id="450" />
+<TGConnectingPoint num="5" id="451" />
+<TGConnectingPoint num="6" id="452" />
+<TGConnectingPoint num="7" id="453" />
+<TGConnectingPoint num="8" id="454" />
+<TGConnectingPoint num="9" id="455" />
+<TGConnectingPoint num="10" id="456" />
+<TGConnectingPoint num="11" id="457" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="5304" id="471" uid="2dbef5cf-57eb-4674-94d5-4b37c6777b4a" >
+<father id="496" num="1" />
+<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="29" minY="0" maxY="114" />
+<infoparam name="TGComponent" value="WaitingForFirstCoin_exit" />
+<TGConnectingPoint num="0" id="459" />
+<TGConnectingPoint num="1" id="460" />
+<TGConnectingPoint num="2" id="461" />
+<TGConnectingPoint num="3" id="462" />
+<TGConnectingPoint num="4" id="463" />
+<TGConnectingPoint num="5" id="464" />
+<TGConnectingPoint num="6" id="465" />
+<TGConnectingPoint num="7" id="466" />
+<TGConnectingPoint num="8" id="467" />
+<TGConnectingPoint num="9" id="468" />
+<TGConnectingPoint num="10" id="469" />
+<TGConnectingPoint num="11" id="470" />
</SUBCOMPONENT>
-<COMPONENT type="5300" id="490" uid="5fc02a85-add5-4156-9375-73e189b6bfbb" >
+<COMPONENT type="5300" id="534" uid="5fc02a85-add5-4156-9375-73e189b6bfbb" >
<cdparam x="459" y="61" />
<sizeparam width="150" height="116" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="9" maxX="1399" minY="9" maxY="899" />
<infoparam name="Block0" value="Wallet" />
-<TGConnectingPoint num="0" id="466" />
-<TGConnectingPoint num="1" id="467" />
-<TGConnectingPoint num="2" id="468" />
-<TGConnectingPoint num="3" id="469" />
-<TGConnectingPoint num="4" id="470" />
-<TGConnectingPoint num="5" id="471" />
-<TGConnectingPoint num="6" id="472" />
-<TGConnectingPoint num="7" id="473" />
-<TGConnectingPoint num="8" id="474" />
-<TGConnectingPoint num="9" id="475" />
-<TGConnectingPoint num="10" id="476" />
-<TGConnectingPoint num="11" id="477" />
-<TGConnectingPoint num="12" id="478" />
-<TGConnectingPoint num="13" id="479" />
-<TGConnectingPoint num="14" id="480" />
-<TGConnectingPoint num="15" id="481" />
-<TGConnectingPoint num="16" id="482" />
-<TGConnectingPoint num="17" id="483" />
-<TGConnectingPoint num="18" id="484" />
-<TGConnectingPoint num="19" id="485" />
-<TGConnectingPoint num="20" id="486" />
-<TGConnectingPoint num="21" id="487" />
-<TGConnectingPoint num="22" id="488" />
-<TGConnectingPoint num="23" id="489" />
+<TGConnectingPoint num="0" id="510" />
+<TGConnectingPoint num="1" id="511" />
+<TGConnectingPoint num="2" id="512" />
+<TGConnectingPoint num="3" id="513" />
+<TGConnectingPoint num="4" id="514" />
+<TGConnectingPoint num="5" id="515" />
+<TGConnectingPoint num="6" id="516" />
+<TGConnectingPoint num="7" id="517" />
+<TGConnectingPoint num="8" id="518" />
+<TGConnectingPoint num="9" id="519" />
+<TGConnectingPoint num="10" id="520" />
+<TGConnectingPoint num="11" id="521" />
+<TGConnectingPoint num="12" id="522" />
+<TGConnectingPoint num="13" id="523" />
+<TGConnectingPoint num="14" id="524" />
+<TGConnectingPoint num="15" id="525" />
+<TGConnectingPoint num="16" id="526" />
+<TGConnectingPoint num="17" id="527" />
+<TGConnectingPoint num="18" id="528" />
+<TGConnectingPoint num="19" id="529" />
+<TGConnectingPoint num="20" id="530" />
+<TGConnectingPoint num="21" id="531" />
+<TGConnectingPoint num="22" id="532" />
+<TGConnectingPoint num="23" id="533" />
</COMPONENT>
-<SUBCOMPONENT type="5303" id="465" uid="f28bac3d-3521-4547-82e8-954be90918d4" >
-<father id="490" num="0" />
+<SUBCOMPONENT type="5303" id="509" uid="f28bac3d-3521-4547-82e8-954be90918d4" >
+<father id="534" num="0" />
<cdparam x="492" y="102" />
<sizeparam width="100" height="49" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="50" minY="0" maxY="67" />
<infoparam name="TGComponent" value="nbOfCoins" />
-<TGConnectingPoint num="0" id="453" />
-<TGConnectingPoint num="1" id="454" />
-<TGConnectingPoint num="2" id="455" />
-<TGConnectingPoint num="3" id="456" />
-<TGConnectingPoint num="4" id="457" />
-<TGConnectingPoint num="5" id="458" />
-<TGConnectingPoint num="6" id="459" />
-<TGConnectingPoint num="7" id="460" />
-<TGConnectingPoint num="8" id="461" />
-<TGConnectingPoint num="9" id="462" />
-<TGConnectingPoint num="10" id="463" />
-<TGConnectingPoint num="11" id="464" />
+<TGConnectingPoint num="0" id="497" />
+<TGConnectingPoint num="1" id="498" />
+<TGConnectingPoint num="2" id="499" />
+<TGConnectingPoint num="3" id="500" />
+<TGConnectingPoint num="4" id="501" />
+<TGConnectingPoint num="5" id="502" />
+<TGConnectingPoint num="6" id="503" />
+<TGConnectingPoint num="7" id="504" />
+<TGConnectingPoint num="8" id="505" />
+<TGConnectingPoint num="9" id="506" />
+<TGConnectingPoint num="10" id="507" />
+<TGConnectingPoint num="11" id="508" />
<extraparam>
<Toggle value="" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="5306" id="502" uid="ee18a19d-7d39-450d-8ec1-36a3f5d62bb6" >
+<COMPONENT type="5306" id="546" uid="ee18a19d-7d39-450d-8ec1-36a3f5d62bb6" >
<cdparam x="467" y="209" />
<sizeparam width="100" height="49" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="9" maxX="1399" minY="9" maxY="899" />
<infoparam name="TGComponent" value="nbOfCoins >= 0" />
-<TGConnectingPoint num="0" id="491" />
-<TGConnectingPoint num="1" id="492" />
-<TGConnectingPoint num="2" id="493" />
-<TGConnectingPoint num="3" id="494" />
-<TGConnectingPoint num="4" id="495" />
-<TGConnectingPoint num="5" id="496" />
-<TGConnectingPoint num="6" id="497" />
-<TGConnectingPoint num="7" id="498" />
-<TGConnectingPoint num="8" id="499" />
-<TGConnectingPoint num="9" id="500" />
-<TGConnectingPoint num="10" id="501" />
+<TGConnectingPoint num="0" id="535" />
+<TGConnectingPoint num="1" id="536" />
+<TGConnectingPoint num="2" id="537" />
+<TGConnectingPoint num="3" id="538" />
+<TGConnectingPoint num="4" id="539" />
+<TGConnectingPoint num="5" id="540" />
+<TGConnectingPoint num="6" id="541" />
+<TGConnectingPoint num="7" id="542" />
+<TGConnectingPoint num="8" id="543" />
+<TGConnectingPoint num="9" id="544" />
+<TGConnectingPoint num="10" id="545" />
<extraparam>
<Toggle value="" />
</extraparam>
@@ -933,55 +934,55 @@
</AvatarPDPanel>
<AvatarPDPanel name="AVATAR PD" minX="10" maxX="1400" minY="10" maxY="1400" zoom="1.0" >
-<CONNECTOR type="5312" id="504" >
+<CONNECTOR type="5312" id="548" >
<cdparam x="580" y="547" />
<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="reg" />
-<TGConnectingPoint num="0" id="503" />
-<P1 x="637" y="538" id="685" />
-<P2 x="632" y="563" id="536" />
+<TGConnectingPoint num="0" id="547" />
+<P1 x="637" y="538" id="729" />
+<P2 x="632" y="563" id="580" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="5312" id="506" >
+<CONNECTOR type="5312" id="550" >
<cdparam x="506" y="493" />
<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="reg" />
-<TGConnectingPoint num="0" id="505" />
-<P1 x="577" y="471" id="690" />
-<P2 x="617" y="498" id="678" />
+<TGConnectingPoint num="0" id="549" />
+<P1 x="577" y="471" id="734" />
+<P2 x="617" y="498" id="722" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="5312" id="508" >
+<CONNECTOR type="5312" id="552" >
<cdparam x="694" y="460" />
<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="reg" />
-<TGConnectingPoint num="0" id="507" />
-<P1 x="694" y="472" id="532" />
-<P2 x="657" y="498" id="680" />
+<TGConnectingPoint num="0" id="551" />
+<P1 x="694" y="472" id="576" />
+<P2 x="657" y="498" id="724" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="5311" id="514" >
+<CONNECTOR type="5311" id="558" >
<cdparam x="581" y="133" />
<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="511" />
-<TGConnectingPoint num="1" id="512" />
-<TGConnectingPoint num="2" id="513" />
-<P1 x="581" y="154" id="587" />
-<P2 x="546" y="305" id="657" />
+<TGConnectingPoint num="0" id="555" />
+<TGConnectingPoint num="1" id="556" />
+<TGConnectingPoint num="2" id="557" />
+<P1 x="581" y="154" id="644" />
+<P2 x="546" y="305" id="701" />
<Point x="518" y="154" />
<Point x="518" y="305" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="509" uid="1522829c-bbb2-4982-80f4-210a359a84ae" >
-<father id="514" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="553" uid="1522829c-bbb2-4982-80f4-210a359a84ae" >
+<father id="558" num="0" />
<cdparam x="518" y="154" />
<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="point " value="null" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="510" uid="8fe9fbbe-3a0b-4b35-9b2b-57dd0f1b9751" >
-<father id="514" num="1" />
+<SUBCOMPONENT type="-1" id="554" uid="8fe9fbbe-3a0b-4b35-9b2b-57dd0f1b9751" >
+<father id="558" num="1" />
<cdparam x="518" y="305" />
<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -989,18 +990,18 @@
<infoparam name="point " value="null" />
</SUBCOMPONENT>
-<CONNECTOR type="5311" id="518" >
+<CONNECTOR type="5311" id="562" >
<cdparam x="631" y="143" />
<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="516" />
-<TGConnectingPoint num="1" id="517" />
-<P1 x="631" y="164" id="582" />
-<P2 x="667" y="310" id="644" />
+<TGConnectingPoint num="0" id="560" />
+<TGConnectingPoint num="1" id="561" />
+<P1 x="631" y="164" id="639" />
+<P2 x="667" y="310" id="688" />
<Point x="631" y="310" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="515" uid="4ac0821c-3216-4a8e-8f05-24d25e2dd06b" >
-<father id="518" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="559" uid="4ac0821c-3216-4a8e-8f05-24d25e2dd06b" >
+<father id="562" num="0" />
<cdparam x="631" y="310" />
<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -1008,27 +1009,27 @@
<infoparam name="point " value="null" />
</SUBCOMPONENT>
-<CONNECTOR type="5312" id="520" >
+<CONNECTOR type="5312" id="564" >
<cdparam x="695" y="396" />
<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="reg" />
-<TGConnectingPoint num="0" id="519" />
-<P1 x="696" y="385" id="643" />
-<P2 x="694" y="417" id="531" />
+<TGConnectingPoint num="0" id="563" />
+<P1 x="696" y="385" id="687" />
+<P2 x="694" y="417" id="575" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="5310" id="524" >
+<CONNECTOR type="5310" id="568" >
<cdparam x="877" y="168" />
<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="522" />
-<TGConnectingPoint num="1" id="523" />
-<P1 x="721" y="158" id="593" />
-<P2 x="700" y="204" id="634" />
+<TGConnectingPoint num="0" id="566" />
+<TGConnectingPoint num="1" id="567" />
+<P1 x="721" y="158" id="624" />
+<P2 x="700" y="204" id="678" />
<Point x="700" y="158" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="521" uid="6b580922-daec-4433-aa3d-c7b3510046ed" >
-<father id="524" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="565" uid="6b580922-daec-4433-aa3d-c7b3510046ed" >
+<father id="568" num="0" />
<cdparam x="700" y="158" />
<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -1036,292 +1037,292 @@
<infoparam name="point " value="null" />
</SUBCOMPONENT>
-<CONNECTOR type="5312" id="526" >
+<CONNECTOR type="5312" id="570" >
<cdparam x="915" y="307" />
<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="reg" />
-<TGConnectingPoint num="0" id="525" />
-<P1 x="710" y="254" id="630" />
-<P2 x="711" y="285" id="642" />
+<TGConnectingPoint num="0" id="569" />
+<P1 x="710" y="254" id="674" />
+<P2 x="711" y="285" id="686" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="5312" id="528" >
+<CONNECTOR type="5312" id="572" >
<cdparam x="993" y="581" />
<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="reg" />
-<TGConnectingPoint num="0" id="527" />
-<P1 x="576" y="385" id="656" />
-<P2 x="577" y="416" id="689" />
+<TGConnectingPoint num="0" id="571" />
+<P1 x="576" y="385" id="700" />
+<P2 x="577" y="416" id="733" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="5311" id="530" >
+<CONNECTOR type="5311" id="574" >
<cdparam x="426" y="264" />
<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="529" />
-<P1 x="491" y="345" id="543" />
-<P2 x="546" y="345" id="661" />
+<TGConnectingPoint num="0" id="573" />
+<P1 x="491" y="345" id="587" />
+<P2 x="546" y="345" id="705" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<COMPONENT type="5308" id="535" uid="e3b7f45a-dbee-491c-b5c3-a72d033d4258" >
+<COMPONENT type="5308" id="579" uid="e3b7f45a-dbee-491c-b5c3-a72d033d4258" >
<cdparam x="644" y="417" />
<sizeparam width="100" height="55" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="TGComponent" value="prop01" />
-<TGConnectingPoint num="0" id="531" />
-<TGConnectingPoint num="1" id="532" />
-<TGConnectingPoint num="2" id="533" />
-<TGConnectingPoint num="3" id="534" />
+<TGConnectingPoint num="0" id="575" />
+<TGConnectingPoint num="1" id="576" />
+<TGConnectingPoint num="2" id="577" />
+<TGConnectingPoint num="3" id="578" />
<extraparam>
<liveness data="1" />
<not data="false" />
</extraparam>
</COMPONENT>
-<COMPONENT type="5308" id="540" uid="63239556-e68a-4da5-9a61-1975ad5a0701" >
+<COMPONENT type="5308" id="584" uid="63239556-e68a-4da5-9a61-1975ad5a0701" >
<cdparam x="559" y="563" />
<sizeparam width="146" height="54" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="TGComponent" value="BeverageDeliverProperty" />
-<TGConnectingPoint num="0" id="536" />
-<TGConnectingPoint num="1" id="537" />
-<TGConnectingPoint num="2" id="538" />
-<TGConnectingPoint num="3" id="539" />
+<TGConnectingPoint num="0" id="580" />
+<TGConnectingPoint num="1" id="581" />
+<TGConnectingPoint num="2" id="582" />
+<TGConnectingPoint num="3" id="583" />
<extraparam>
<liveness data="0" />
<not data="false" />
</extraparam>
</COMPONENT>
-<COMPONENT type="5300" id="578" uid="d39912db-1919-408c-8703-c96dfe900859" >
+<COMPONENT type="5300" id="622" uid="d39912db-1919-408c-8703-c96dfe900859" >
<cdparam x="372" y="227" />
<sizeparam width="132" height="153" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="Block0" value="CoffeeMachine" />
-<TGConnectingPoint num="0" id="554" />
-<TGConnectingPoint num="1" id="555" />
-<TGConnectingPoint num="2" id="556" />
-<TGConnectingPoint num="3" id="557" />
-<TGConnectingPoint num="4" id="558" />
-<TGConnectingPoint num="5" id="559" />
-<TGConnectingPoint num="6" id="560" />
-<TGConnectingPoint num="7" id="561" />
-<TGConnectingPoint num="8" id="562" />
-<TGConnectingPoint num="9" id="563" />
-<TGConnectingPoint num="10" id="564" />
-<TGConnectingPoint num="11" id="565" />
-<TGConnectingPoint num="12" id="566" />
-<TGConnectingPoint num="13" id="567" />
-<TGConnectingPoint num="14" id="568" />
-<TGConnectingPoint num="15" id="569" />
-<TGConnectingPoint num="16" id="570" />
-<TGConnectingPoint num="17" id="571" />
-<TGConnectingPoint num="18" id="572" />
-<TGConnectingPoint num="19" id="573" />
-<TGConnectingPoint num="20" id="574" />
-<TGConnectingPoint num="21" id="575" />
-<TGConnectingPoint num="22" id="576" />
-<TGConnectingPoint num="23" id="577" />
+<TGConnectingPoint num="0" id="598" />
+<TGConnectingPoint num="1" id="599" />
+<TGConnectingPoint num="2" id="600" />
+<TGConnectingPoint num="3" id="601" />
+<TGConnectingPoint num="4" id="602" />
+<TGConnectingPoint num="5" id="603" />
+<TGConnectingPoint num="6" id="604" />
+<TGConnectingPoint num="7" id="605" />
+<TGConnectingPoint num="8" id="606" />
+<TGConnectingPoint num="9" id="607" />
+<TGConnectingPoint num="10" id="608" />
+<TGConnectingPoint num="11" id="609" />
+<TGConnectingPoint num="12" id="610" />
+<TGConnectingPoint num="13" id="611" />
+<TGConnectingPoint num="14" id="612" />
+<TGConnectingPoint num="15" id="613" />
+<TGConnectingPoint num="16" id="614" />
+<TGConnectingPoint num="17" id="615" />
+<TGConnectingPoint num="18" id="616" />
+<TGConnectingPoint num="19" id="617" />
+<TGConnectingPoint num="20" id="618" />
+<TGConnectingPoint num="21" id="619" />
+<TGConnectingPoint num="22" id="620" />
+<TGConnectingPoint num="23" id="621" />
</COMPONENT>
-<SUBCOMPONENT type="5304" id="553" uid="5d1a626c-a563-4ec6-aa1c-9bc5df2f6e2f" >
-<father id="578" num="0" />
+<SUBCOMPONENT type="5304" id="597" uid="5d1a626c-a563-4ec6-aa1c-9bc5df2f6e2f" >
+<father id="622" num="0" />
<cdparam x="391" y="326" />
<sizeparam width="100" height="39" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="32" minY="0" maxY="114" />
<infoparam name="TGComponent" value="beverageReady" />
-<TGConnectingPoint num="0" id="541" />
-<TGConnectingPoint num="1" id="542" />
-<TGConnectingPoint num="2" id="543" />
-<TGConnectingPoint num="3" id="544" />
-<TGConnectingPoint num="4" id="545" />
-<TGConnectingPoint num="5" id="546" />
-<TGConnectingPoint num="6" id="547" />
-<TGConnectingPoint num="7" id="548" />
-<TGConnectingPoint num="8" id="549" />
-<TGConnectingPoint num="9" id="550" />
-<TGConnectingPoint num="10" id="551" />
-<TGConnectingPoint num="11" id="552" />
+<TGConnectingPoint num="0" id="585" />
+<TGConnectingPoint num="1" id="586" />
+<TGConnectingPoint num="2" id="587" />
+<TGConnectingPoint num="3" id="588" />
+<TGConnectingPoint num="4" id="589" />
+<TGConnectingPoint num="5" id="590" />
+<TGConnectingPoint num="6" id="591" />
+<TGConnectingPoint num="7" id="592" />
+<TGConnectingPoint num="8" id="593" />
+<TGConnectingPoint num="9" id="594" />
+<TGConnectingPoint num="10" id="595" />
+<TGConnectingPoint num="11" id="596" />
</SUBCOMPONENT>
-<COMPONENT type="5300" id="629" uid="2cb86cb8-7c0b-4009-8700-94f5734b69b6" >
+<COMPONENT type="5300" id="673" uid="2cb86cb8-7c0b-4009-8700-94f5734b69b6" >
<cdparam x="563" y="78" />
<sizeparam width="268" height="115" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="Block0" value="Wallet" />
-<TGConnectingPoint num="0" id="605" />
-<TGConnectingPoint num="1" id="606" />
-<TGConnectingPoint num="2" id="607" />
-<TGConnectingPoint num="3" id="608" />
-<TGConnectingPoint num="4" id="609" />
-<TGConnectingPoint num="5" id="610" />
-<TGConnectingPoint num="6" id="611" />
-<TGConnectingPoint num="7" id="612" />
-<TGConnectingPoint num="8" id="613" />
-<TGConnectingPoint num="9" id="614" />
-<TGConnectingPoint num="10" id="615" />
-<TGConnectingPoint num="11" id="616" />
-<TGConnectingPoint num="12" id="617" />
-<TGConnectingPoint num="13" id="618" />
-<TGConnectingPoint num="14" id="619" />
-<TGConnectingPoint num="15" id="620" />
-<TGConnectingPoint num="16" id="621" />
-<TGConnectingPoint num="17" id="622" />
-<TGConnectingPoint num="18" id="623" />
-<TGConnectingPoint num="19" id="624" />
-<TGConnectingPoint num="20" id="625" />
-<TGConnectingPoint num="21" id="626" />
-<TGConnectingPoint num="22" id="627" />
-<TGConnectingPoint num="23" id="628" />
+<TGConnectingPoint num="0" id="649" />
+<TGConnectingPoint num="1" id="650" />
+<TGConnectingPoint num="2" id="651" />
+<TGConnectingPoint num="3" id="652" />
+<TGConnectingPoint num="4" id="653" />
+<TGConnectingPoint num="5" id="654" />
+<TGConnectingPoint num="6" id="655" />
+<TGConnectingPoint num="7" id="656" />
+<TGConnectingPoint num="8" id="657" />
+<TGConnectingPoint num="9" id="658" />
+<TGConnectingPoint num="10" id="659" />
+<TGConnectingPoint num="11" id="660" />
+<TGConnectingPoint num="12" id="661" />
+<TGConnectingPoint num="13" id="662" />
+<TGConnectingPoint num="14" id="663" />
+<TGConnectingPoint num="15" id="664" />
+<TGConnectingPoint num="16" id="665" />
+<TGConnectingPoint num="17" id="666" />
+<TGConnectingPoint num="18" id="667" />
+<TGConnectingPoint num="19" id="668" />
+<TGConnectingPoint num="20" id="669" />
+<TGConnectingPoint num="21" id="670" />
+<TGConnectingPoint num="22" id="671" />
+<TGConnectingPoint num="23" id="672" />
</COMPONENT>
-<SUBCOMPONENT type="5304" id="591" uid="5ba2c908-950a-4288-889b-0b4c00bd9d79" >
-<father id="629" num="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="76" />
-<infoparam name="TGComponent" value="Start" />
-<TGConnectingPoint num="0" id="579" />
-<TGConnectingPoint num="1" id="580" />
-<TGConnectingPoint num="2" id="581" />
-<TGConnectingPoint num="3" id="582" />
-<TGConnectingPoint num="4" id="583" />
-<TGConnectingPoint num="5" id="584" />
-<TGConnectingPoint num="6" id="585" />
-<TGConnectingPoint num="7" id="586" />
-<TGConnectingPoint num="8" id="587" />
-<TGConnectingPoint num="9" id="588" />
-<TGConnectingPoint num="10" id="589" />
-<TGConnectingPoint num="11" id="590" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="5303" id="604" uid="bf44a33b-5344-46b2-9170-509d38670a83" >
-<father id="629" num="1" />
+<SUBCOMPONENT type="5303" id="635" uid="bf44a33b-5344-46b2-9170-509d38670a83" >
+<father id="673" num="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="65" />
<infoparam name="TGComponent" value="nbOfCoins" />
-<TGConnectingPoint num="0" id="592" />
-<TGConnectingPoint num="1" id="593" />
-<TGConnectingPoint num="2" id="594" />
-<TGConnectingPoint num="3" id="595" />
-<TGConnectingPoint num="4" id="596" />
-<TGConnectingPoint num="5" id="597" />
-<TGConnectingPoint num="6" id="598" />
-<TGConnectingPoint num="7" id="599" />
-<TGConnectingPoint num="8" id="600" />
-<TGConnectingPoint num="9" id="601" />
-<TGConnectingPoint num="10" id="602" />
-<TGConnectingPoint num="11" id="603" />
+<TGConnectingPoint num="0" id="623" />
+<TGConnectingPoint num="1" id="624" />
+<TGConnectingPoint num="2" id="625" />
+<TGConnectingPoint num="3" id="626" />
+<TGConnectingPoint num="4" id="627" />
+<TGConnectingPoint num="5" id="628" />
+<TGConnectingPoint num="6" id="629" />
+<TGConnectingPoint num="7" id="630" />
+<TGConnectingPoint num="8" id="631" />
+<TGConnectingPoint num="9" id="632" />
+<TGConnectingPoint num="10" id="633" />
+<TGConnectingPoint num="11" id="634" />
<extraparam>
<Toggle value="" />
</extraparam>
</SUBCOMPONENT>
+<SUBCOMPONENT type="5304" id="648" uid="5ba2c908-950a-4288-889b-0b4c00bd9d79" >
+<father id="673" num="1" />
+<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="76" />
+<infoparam name="TGComponent" value="Start" />
+<TGConnectingPoint num="0" id="636" />
+<TGConnectingPoint num="1" id="637" />
+<TGConnectingPoint num="2" id="638" />
+<TGConnectingPoint num="3" id="639" />
+<TGConnectingPoint num="4" id="640" />
+<TGConnectingPoint num="5" id="641" />
+<TGConnectingPoint num="6" id="642" />
+<TGConnectingPoint num="7" id="643" />
+<TGConnectingPoint num="8" id="644" />
+<TGConnectingPoint num="9" id="645" />
+<TGConnectingPoint num="10" id="646" />
+<TGConnectingPoint num="11" id="647" />
+</SUBCOMPONENT>
-<COMPONENT type="5306" id="641" uid="7a1c9320-1617-4710-a22f-ae8365f354ef" >
+<COMPONENT type="5306" id="685" uid="7a1c9320-1617-4710-a22f-ae8365f354ef" >
<cdparam x="675" y="204" />
<sizeparam width="100" height="50" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="TGComponent" value="nbOfCoins > 1" />
-<TGConnectingPoint num="0" id="630" />
-<TGConnectingPoint num="1" id="631" />
-<TGConnectingPoint num="2" id="632" />
-<TGConnectingPoint num="3" id="633" />
-<TGConnectingPoint num="4" id="634" />
-<TGConnectingPoint num="5" id="635" />
-<TGConnectingPoint num="6" id="636" />
-<TGConnectingPoint num="7" id="637" />
-<TGConnectingPoint num="8" id="638" />
-<TGConnectingPoint num="9" id="639" />
-<TGConnectingPoint num="10" id="640" />
+<TGConnectingPoint num="0" id="674" />
+<TGConnectingPoint num="1" id="675" />
+<TGConnectingPoint num="2" id="676" />
+<TGConnectingPoint num="3" id="677" />
+<TGConnectingPoint num="4" id="678" />
+<TGConnectingPoint num="5" id="679" />
+<TGConnectingPoint num="6" id="680" />
+<TGConnectingPoint num="7" id="681" />
+<TGConnectingPoint num="8" id="682" />
+<TGConnectingPoint num="9" id="683" />
+<TGConnectingPoint num="10" id="684" />
<extraparam>
<Toggle value="" />
</extraparam>
</COMPONENT>
-<COMPONENT type="5302" id="654" uid="30896ebb-7bcf-4961-bcf7-c9e5bdc72b01" >
+<COMPONENT type="5302" id="698" uid="30896ebb-7bcf-4961-bcf7-c9e5bdc72b01" >
<cdparam x="667" y="285" />
<sizeparam width="59" height="100" minWidth="50" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="TGComponent" value="=0" />
-<TGConnectingPoint num="0" id="642" />
-<TGConnectingPoint num="1" id="643" />
-<TGConnectingPoint num="2" id="644" />
-<TGConnectingPoint num="3" id="645" />
-<TGConnectingPoint num="4" id="646" />
-<TGConnectingPoint num="5" id="647" />
-<TGConnectingPoint num="6" id="648" />
-<TGConnectingPoint num="7" id="649" />
-<TGConnectingPoint num="8" id="650" />
-<TGConnectingPoint num="9" id="651" />
-<TGConnectingPoint num="10" id="652" />
-<TGConnectingPoint num="11" id="653" />
+<TGConnectingPoint num="0" id="686" />
+<TGConnectingPoint num="1" id="687" />
+<TGConnectingPoint num="2" id="688" />
+<TGConnectingPoint num="3" id="689" />
+<TGConnectingPoint num="4" id="690" />
+<TGConnectingPoint num="5" id="691" />
+<TGConnectingPoint num="6" id="692" />
+<TGConnectingPoint num="7" id="693" />
+<TGConnectingPoint num="8" id="694" />
+<TGConnectingPoint num="9" id="695" />
+<TGConnectingPoint num="10" id="696" />
+<TGConnectingPoint num="11" id="697" />
</COMPONENT>
-<COMPONENT type="5301" id="675" uid="20367f57-662b-4c60-b7ad-d993ad0f3506" >
+<COMPONENT type="5301" id="719" uid="20367f57-662b-4c60-b7ad-d993ad0f3506" >
<cdparam x="546" y="285" />
<sizeparam width="60" height="100" minWidth="50" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="TGComponent" value="<<LS>>" />
-<TGConnectingPoint num="0" id="655" />
-<TGConnectingPoint num="1" id="656" />
-<TGConnectingPoint num="2" id="657" />
-<TGConnectingPoint num="3" id="658" />
-<TGConnectingPoint num="4" id="659" />
-<TGConnectingPoint num="5" id="660" />
-<TGConnectingPoint num="6" id="661" />
-<TGConnectingPoint num="7" id="662" />
-<TGConnectingPoint num="8" id="663" />
-<TGConnectingPoint num="9" id="664" />
-<TGConnectingPoint num="10" id="665" />
-<TGConnectingPoint num="11" id="666" />
-<TGConnectingPoint num="12" id="667" />
-<TGConnectingPoint num="13" id="668" />
-<TGConnectingPoint num="14" id="669" />
-<TGConnectingPoint num="15" id="670" />
-<TGConnectingPoint num="16" id="671" />
-<TGConnectingPoint num="17" id="672" />
-<TGConnectingPoint num="18" id="673" />
-<TGConnectingPoint num="19" id="674" />
+<TGConnectingPoint num="0" id="699" />
+<TGConnectingPoint num="1" id="700" />
+<TGConnectingPoint num="2" id="701" />
+<TGConnectingPoint num="3" id="702" />
+<TGConnectingPoint num="4" id="703" />
+<TGConnectingPoint num="5" id="704" />
+<TGConnectingPoint num="6" id="705" />
+<TGConnectingPoint num="7" id="706" />
+<TGConnectingPoint num="8" id="707" />
+<TGConnectingPoint num="9" id="708" />
+<TGConnectingPoint num="10" id="709" />
+<TGConnectingPoint num="11" id="710" />
+<TGConnectingPoint num="12" id="711" />
+<TGConnectingPoint num="13" id="712" />
+<TGConnectingPoint num="14" id="713" />
+<TGConnectingPoint num="15" id="714" />
+<TGConnectingPoint num="16" id="715" />
+<TGConnectingPoint num="17" id="716" />
+<TGConnectingPoint num="18" id="717" />
+<TGConnectingPoint num="19" id="718" />
</COMPONENT>
-<COMPONENT type="5309" id="688" uid="a08e3068-5afc-4fca-aea0-878f850371cb" >
+<COMPONENT type="5309" id="732" uid="a08e3068-5afc-4fca-aea0-878f850371cb" >
<cdparam x="597" y="498" />
<sizeparam width="80" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="TGComponent" value="<=>" />
-<TGConnectingPoint num="0" id="676" />
-<TGConnectingPoint num="1" id="677" />
-<TGConnectingPoint num="2" id="678" />
-<TGConnectingPoint num="3" id="679" />
-<TGConnectingPoint num="4" id="680" />
-<TGConnectingPoint num="5" id="681" />
-<TGConnectingPoint num="6" id="682" />
-<TGConnectingPoint num="7" id="683" />
-<TGConnectingPoint num="8" id="684" />
-<TGConnectingPoint num="9" id="685" />
-<TGConnectingPoint num="10" id="686" />
-<TGConnectingPoint num="11" id="687" />
+<TGConnectingPoint num="0" id="720" />
+<TGConnectingPoint num="1" id="721" />
+<TGConnectingPoint num="2" id="722" />
+<TGConnectingPoint num="3" id="723" />
+<TGConnectingPoint num="4" id="724" />
+<TGConnectingPoint num="5" id="725" />
+<TGConnectingPoint num="6" id="726" />
+<TGConnectingPoint num="7" id="727" />
+<TGConnectingPoint num="8" id="728" />
+<TGConnectingPoint num="9" id="729" />
+<TGConnectingPoint num="10" id="730" />
+<TGConnectingPoint num="11" id="731" />
</COMPONENT>
-<COMPONENT type="5308" id="693" uid="8d6a7e09-e3ac-432f-8a63-334e2bc2acd4" >
+<COMPONENT type="5308" id="737" uid="8d6a7e09-e3ac-432f-8a63-334e2bc2acd4" >
<cdparam x="527" y="416" />
<sizeparam width="100" height="55" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="TGComponent" value="prop02" />
-<TGConnectingPoint num="0" id="689" />
-<TGConnectingPoint num="1" id="690" />
-<TGConnectingPoint num="2" id="691" />
-<TGConnectingPoint num="3" id="692" />
+<TGConnectingPoint num="0" id="733" />
+<TGConnectingPoint num="1" id="734" />
+<TGConnectingPoint num="2" id="735" />
+<TGConnectingPoint num="3" id="736" />
<extraparam>
<liveness data="1" />
<not data="false" />
@@ -1342,16 +1343,16 @@
<MainCode value="}"/>
<Optimized value="true" />
<considerTimingOperators value="true" />
-<Validated value="" />
+<Validated value="Wallet;CoffeeMachine;CoffeeButton;TeaButton;" />
<Ignored value="" />
-<CONNECTOR type="5002" id="695" >
+<CONNECTOR type="5002" id="739" >
<cdparam x="256" y="452" />
<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="694" />
-<P1 x="446" y="279" id="773" />
-<P2 x="447" y="301" id="806" />
+<TGConnectingPoint num="0" id="738" />
+<P1 x="446" y="279" id="792" />
+<P2 x="447" y="301" id="850" />
<AutomaticDrawing data="true" />
<extraparam>
<isd value="in pushCoffeeButton()" />
@@ -1359,13 +1360,13 @@
<FIFOType asynchronous="false" synchronousCH="true" size="1024" blocking="false" private="true" broadcast="false" lossy="false" ams="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="5002" id="697" >
+<CONNECTOR type="5002" id="741" >
<cdparam x="220" y="90" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="800" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Block0 to Block0" value="" />
-<TGConnectingPoint num="0" id="696" />
-<P1 x="243" y="86" id="728" />
-<P2 x="355" y="86" id="802" />
+<TGConnectingPoint num="0" id="740" />
+<P1 x="243" y="86" id="772" />
+<P2 x="355" y="86" id="846" />
<AutomaticDrawing data="true" />
<extraparam>
<iso value="in getCoin(int nbOfCoins)" />
@@ -1375,13 +1376,13 @@
<FIFOType asynchronous="false" synchronousCH="true" size="1024" blocking="false" private="true" broadcast="false" lossy="false" ams="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="5002" id="699" >
+<CONNECTOR type="5002" id="743" >
<cdparam x="497" y="451" />
<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="698" />
-<P1 x="631" y="278" id="748" />
-<P2 x="631" y="301" id="807" />
+<TGConnectingPoint num="0" id="742" />
+<P1 x="631" y="278" id="817" />
+<P2 x="631" y="301" id="851" />
<AutomaticDrawing data="true" />
<extraparam>
<isd value="in pushTeaButton()" />
@@ -1389,7 +1390,7 @@
<FIFOType asynchronous="false" synchronousCH="true" size="1024" blocking="false" private="true" broadcast="false" lossy="false" ams="false" />
</extraparam>
</CONNECTOR>
-<COMPONENT type="303" id="716" uid="5f1b10fb-a1c2-4046-aad5-8b2f240adbd6" >
+<COMPONENT type="303" id="760" uid="5f1b10fb-a1c2-4046-aad5-8b2f240adbd6" >
<cdparam x="12" y="340" />
<sizeparam width="562" height="181" minWidth="27" minHeight="3" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -1412,22 +1413,22 @@ CoffeeMachine.WaitingForFirstCoin --> CoffeeMachine.EjectState || CoffeeMachi
CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
" />
-<TGConnectingPoint num="0" id="700" />
-<TGConnectingPoint num="1" id="701" />
-<TGConnectingPoint num="2" id="702" />
-<TGConnectingPoint num="3" id="703" />
-<TGConnectingPoint num="4" id="704" />
-<TGConnectingPoint num="5" id="705" />
-<TGConnectingPoint num="6" id="706" />
-<TGConnectingPoint num="7" id="707" />
-<TGConnectingPoint num="8" id="708" />
-<TGConnectingPoint num="9" id="709" />
-<TGConnectingPoint num="10" id="710" />
-<TGConnectingPoint num="11" id="711" />
-<TGConnectingPoint num="12" id="712" />
-<TGConnectingPoint num="13" id="713" />
-<TGConnectingPoint num="14" id="714" />
-<TGConnectingPoint num="15" id="715" />
+<TGConnectingPoint num="0" id="744" />
+<TGConnectingPoint num="1" id="745" />
+<TGConnectingPoint num="2" id="746" />
+<TGConnectingPoint num="3" id="747" />
+<TGConnectingPoint num="4" id="748" />
+<TGConnectingPoint num="5" id="749" />
+<TGConnectingPoint num="6" id="750" />
+<TGConnectingPoint num="7" id="751" />
+<TGConnectingPoint num="8" id="752" />
+<TGConnectingPoint num="9" id="753" />
+<TGConnectingPoint num="10" id="754" />
+<TGConnectingPoint num="11" id="755" />
+<TGConnectingPoint num="12" id="756" />
+<TGConnectingPoint num="13" id="757" />
+<TGConnectingPoint num="14" id="758" />
+<TGConnectingPoint num="15" id="759" />
<extraparam>
<Line value="A[] CoffeeMachine.nbOfCoins<=2" />
<Line value="T E<> CoffeeMachine.nbOfCoins>0" />
@@ -1449,36 +1450,36 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
</extraparam>
</COMPONENT>
-<COMPONENT type="5000" id="741" uid="bfe1f65b-e947-4455-a4f9-e84d772ca5b5" >
+<COMPONENT type="5000" id="785" uid="bfe1f65b-e947-4455-a4f9-e84d772ca5b5" >
<cdparam x="83" y="43" />
<sizeparam width="160" height="173" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="9" maxX="1399" minY="9" maxY="1524" />
<infoparam name="Block0" value="Wallet" />
-<TGConnectingPoint num="0" id="717" />
-<TGConnectingPoint num="1" id="718" />
-<TGConnectingPoint num="2" id="719" />
-<TGConnectingPoint num="3" id="720" />
-<TGConnectingPoint num="4" id="721" />
-<TGConnectingPoint num="5" id="722" />
-<TGConnectingPoint num="6" id="723" />
-<TGConnectingPoint num="7" id="724" />
-<TGConnectingPoint num="8" id="725" />
-<TGConnectingPoint num="9" id="726" />
-<TGConnectingPoint num="10" id="727" />
-<TGConnectingPoint num="11" id="728" />
-<TGConnectingPoint num="12" id="729" />
-<TGConnectingPoint num="13" id="730" />
-<TGConnectingPoint num="14" id="731" />
-<TGConnectingPoint num="15" id="732" />
-<TGConnectingPoint num="16" id="733" />
-<TGConnectingPoint num="17" id="734" />
-<TGConnectingPoint num="18" id="735" />
-<TGConnectingPoint num="19" id="736" />
-<TGConnectingPoint num="20" id="737" />
-<TGConnectingPoint num="21" id="738" />
-<TGConnectingPoint num="22" id="739" />
-<TGConnectingPoint num="23" id="740" />
+<TGConnectingPoint num="0" id="761" />
+<TGConnectingPoint num="1" id="762" />
+<TGConnectingPoint num="2" id="763" />
+<TGConnectingPoint num="3" id="764" />
+<TGConnectingPoint num="4" id="765" />
+<TGConnectingPoint num="5" id="766" />
+<TGConnectingPoint num="6" id="767" />
+<TGConnectingPoint num="7" id="768" />
+<TGConnectingPoint num="8" id="769" />
+<TGConnectingPoint num="9" id="770" />
+<TGConnectingPoint num="10" id="771" />
+<TGConnectingPoint num="11" id="772" />
+<TGConnectingPoint num="12" id="773" />
+<TGConnectingPoint num="13" id="774" />
+<TGConnectingPoint num="14" id="775" />
+<TGConnectingPoint num="15" id="776" />
+<TGConnectingPoint num="16" id="777" />
+<TGConnectingPoint num="17" id="778" />
+<TGConnectingPoint num="18" id="779" />
+<TGConnectingPoint num="19" id="780" />
+<TGConnectingPoint num="20" id="781" />
+<TGConnectingPoint num="21" id="782" />
+<TGConnectingPoint num="22" id="783" />
+<TGConnectingPoint num="23" id="784" />
<extraparam>
<blockType data="block" color="-4072719" />
<CryptoBlock value="false" />
@@ -1492,36 +1493,36 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
</extraparam>
</COMPONENT>
-<COMPONENT type="5000" id="816" uid="c413ffec-f29b-466c-b400-87bd699b9ee9" >
+<COMPONENT type="5000" id="860" uid="c413ffec-f29b-466c-b400-87bd699b9ee9" >
<cdparam x="355" y="15" />
<sizeparam width="368" height="286" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="9" maxX="1399" minY="9" maxY="1524" />
<infoparam name="Block0" value="CoffeeMachine" />
-<TGConnectingPoint num="0" id="792" />
-<TGConnectingPoint num="1" id="793" />
-<TGConnectingPoint num="2" id="794" />
-<TGConnectingPoint num="3" id="795" />
-<TGConnectingPoint num="4" id="796" />
-<TGConnectingPoint num="5" id="797" />
-<TGConnectingPoint num="6" id="798" />
-<TGConnectingPoint num="7" id="799" />
-<TGConnectingPoint num="8" id="800" />
-<TGConnectingPoint num="9" id="801" />
-<TGConnectingPoint num="10" id="802" />
-<TGConnectingPoint num="11" id="803" />
-<TGConnectingPoint num="12" id="804" />
-<TGConnectingPoint num="13" id="805" />
-<TGConnectingPoint num="14" id="806" />
-<TGConnectingPoint num="15" id="807" />
-<TGConnectingPoint num="16" id="808" />
-<TGConnectingPoint num="17" id="809" />
-<TGConnectingPoint num="18" id="810" />
-<TGConnectingPoint num="19" id="811" />
-<TGConnectingPoint num="20" id="812" />
-<TGConnectingPoint num="21" id="813" />
-<TGConnectingPoint num="22" id="814" />
-<TGConnectingPoint num="23" id="815" />
+<TGConnectingPoint num="0" id="836" />
+<TGConnectingPoint num="1" id="837" />
+<TGConnectingPoint num="2" id="838" />
+<TGConnectingPoint num="3" id="839" />
+<TGConnectingPoint num="4" id="840" />
+<TGConnectingPoint num="5" id="841" />
+<TGConnectingPoint num="6" id="842" />
+<TGConnectingPoint num="7" id="843" />
+<TGConnectingPoint num="8" id="844" />
+<TGConnectingPoint num="9" id="845" />
+<TGConnectingPoint num="10" id="846" />
+<TGConnectingPoint num="11" id="847" />
+<TGConnectingPoint num="12" id="848" />
+<TGConnectingPoint num="13" id="849" />
+<TGConnectingPoint num="14" id="850" />
+<TGConnectingPoint num="15" id="851" />
+<TGConnectingPoint num="16" id="852" />
+<TGConnectingPoint num="17" id="853" />
+<TGConnectingPoint num="18" id="854" />
+<TGConnectingPoint num="19" id="855" />
+<TGConnectingPoint num="20" id="856" />
+<TGConnectingPoint num="21" id="857" />
+<TGConnectingPoint num="22" id="858" />
+<TGConnectingPoint num="23" id="859" />
<extraparam>
<blockType data="block" color="-4072719" />
<CryptoBlock value="false" />
@@ -1539,37 +1540,37 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
<Signal value="out ejectCoin(int nbOfCoins)" attached="true" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="5000" id="766" uid="a5114e80-03e3-4820-b57a-bfcefd90a9c8" >
-<father id="816" num="0" />
-<cdparam x="556" y="197" />
-<sizeparam width="150" height="81" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="5000" id="810" uid="7a21d6ab-e515-4a9c-b908-bcb26c800cfb" >
+<father id="860" num="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" />
-<TGConnectingPoint num="0" id="742" />
-<TGConnectingPoint num="1" id="743" />
-<TGConnectingPoint num="2" id="744" />
-<TGConnectingPoint num="3" id="745" />
-<TGConnectingPoint num="4" id="746" />
-<TGConnectingPoint num="5" id="747" />
-<TGConnectingPoint num="6" id="748" />
-<TGConnectingPoint num="7" id="749" />
-<TGConnectingPoint num="8" id="750" />
-<TGConnectingPoint num="9" id="751" />
-<TGConnectingPoint num="10" id="752" />
-<TGConnectingPoint num="11" id="753" />
-<TGConnectingPoint num="12" id="754" />
-<TGConnectingPoint num="13" id="755" />
-<TGConnectingPoint num="14" id="756" />
-<TGConnectingPoint num="15" id="757" />
-<TGConnectingPoint num="16" id="758" />
-<TGConnectingPoint num="17" id="759" />
-<TGConnectingPoint num="18" id="760" />
-<TGConnectingPoint num="19" id="761" />
-<TGConnectingPoint num="20" id="762" />
-<TGConnectingPoint num="21" id="763" />
-<TGConnectingPoint num="22" id="764" />
-<TGConnectingPoint num="23" id="765" />
+<cdrectangleparam minX="0" maxX="217" minY="0" maxY="205" />
+<infoparam name="Block1" value="CoffeeButton" />
+<TGConnectingPoint num="0" id="786" />
+<TGConnectingPoint num="1" id="787" />
+<TGConnectingPoint num="2" id="788" />
+<TGConnectingPoint num="3" id="789" />
+<TGConnectingPoint num="4" id="790" />
+<TGConnectingPoint num="5" id="791" />
+<TGConnectingPoint num="6" id="792" />
+<TGConnectingPoint num="7" id="793" />
+<TGConnectingPoint num="8" id="794" />
+<TGConnectingPoint num="9" id="795" />
+<TGConnectingPoint num="10" id="796" />
+<TGConnectingPoint num="11" id="797" />
+<TGConnectingPoint num="12" id="798" />
+<TGConnectingPoint num="13" id="799" />
+<TGConnectingPoint num="14" id="800" />
+<TGConnectingPoint num="15" id="801" />
+<TGConnectingPoint num="16" id="802" />
+<TGConnectingPoint num="17" id="803" />
+<TGConnectingPoint num="18" id="804" />
+<TGConnectingPoint num="19" id="805" />
+<TGConnectingPoint num="20" id="806" />
+<TGConnectingPoint num="21" id="807" />
+<TGConnectingPoint num="22" id="808" />
+<TGConnectingPoint num="23" id="809" />
<extraparam>
<blockType data="block" color="-4072719" />
<CryptoBlock value="false" />
@@ -1577,37 +1578,37 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
<Signal value="out push()" attached="true" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="5000" id="791" uid="7a21d6ab-e515-4a9c-b908-bcb26c800cfb" >
-<father id="816" num="1" />
-<cdparam x="371" y="198" />
-<sizeparam width="151" height="81" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="5000" id="835" uid="a5114e80-03e3-4820-b57a-bfcefd90a9c8" >
+<father id="860" num="1" />
+<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" />
-<TGConnectingPoint num="0" id="767" />
-<TGConnectingPoint num="1" id="768" />
-<TGConnectingPoint num="2" id="769" />
-<TGConnectingPoint num="3" id="770" />
-<TGConnectingPoint num="4" id="771" />
-<TGConnectingPoint num="5" id="772" />
-<TGConnectingPoint num="6" id="773" />
-<TGConnectingPoint num="7" id="774" />
-<TGConnectingPoint num="8" id="775" />
-<TGConnectingPoint num="9" id="776" />
-<TGConnectingPoint num="10" id="777" />
-<TGConnectingPoint num="11" id="778" />
-<TGConnectingPoint num="12" id="779" />
-<TGConnectingPoint num="13" id="780" />
-<TGConnectingPoint num="14" id="781" />
-<TGConnectingPoint num="15" id="782" />
-<TGConnectingPoint num="16" id="783" />
-<TGConnectingPoint num="17" id="784" />
-<TGConnectingPoint num="18" id="785" />
-<TGConnectingPoint num="19" id="786" />
-<TGConnectingPoint num="20" id="787" />
-<TGConnectingPoint num="21" id="788" />
-<TGConnectingPoint num="22" id="789" />
-<TGConnectingPoint num="23" id="790" />
+<cdrectangleparam minX="0" maxX="218" minY="0" maxY="205" />
+<infoparam name="Block1" value="TeaButton" />
+<TGConnectingPoint num="0" id="811" />
+<TGConnectingPoint num="1" id="812" />
+<TGConnectingPoint num="2" id="813" />
+<TGConnectingPoint num="3" id="814" />
+<TGConnectingPoint num="4" id="815" />
+<TGConnectingPoint num="5" id="816" />
+<TGConnectingPoint num="6" id="817" />
+<TGConnectingPoint num="7" id="818" />
+<TGConnectingPoint num="8" id="819" />
+<TGConnectingPoint num="9" id="820" />
+<TGConnectingPoint num="10" id="821" />
+<TGConnectingPoint num="11" id="822" />
+<TGConnectingPoint num="12" id="823" />
+<TGConnectingPoint num="13" id="824" />
+<TGConnectingPoint num="14" id="825" />
+<TGConnectingPoint num="15" id="826" />
+<TGConnectingPoint num="16" id="827" />
+<TGConnectingPoint num="17" id="828" />
+<TGConnectingPoint num="18" id="829" />
+<TGConnectingPoint num="19" id="830" />
+<TGConnectingPoint num="20" id="831" />
+<TGConnectingPoint num="21" id="832" />
+<TGConnectingPoint num="22" id="833" />
+<TGConnectingPoint num="23" id="834" />
<extraparam>
<blockType data="block" color="-4072719" />
<CryptoBlock value="false" />
@@ -1620,26 +1621,26 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
</AVATARBlockDiagramPanel>
<AVATARStateMachineDiagramPanel name="CoffeeButton" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="823" >
+<CONNECTOR type="5102" id="867" >
<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 start state to Send signal" value="null" />
-<TGConnectingPoint num="0" id="822" />
-<P1 x="340" y="233" id="993" />
-<P2 x="353" y="252" id="995" />
+<TGConnectingPoint num="0" id="866" />
+<P1 x="340" y="233" id="1048" />
+<P2 x="353" y="252" id="1037" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="821" uid="4b47f2ec-3073-4a06-b6e0-da7704454345" >
-<father id="823" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="865" uid="4b47f2ec-3073-4a06-b6e0-da7704454345" >
+<father id="867" num="0" />
<cdparam x="177" y="239" />
<sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<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="817" />
-<TGConnectingPoint num="1" id="818" />
-<TGConnectingPoint num="2" id="819" />
-<TGConnectingPoint num="3" id="820" />
+<TGConnectingPoint num="0" id="861" />
+<TGConnectingPoint num="1" id="862" />
+<TGConnectingPoint num="2" id="863" />
+<TGConnectingPoint num="3" id="864" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
@@ -1653,26 +1654,26 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="830" >
+<CONNECTOR type="5102" id="874" >
<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 start state to state0" value="null" />
-<TGConnectingPoint num="0" id="829" />
-<P1 x="322" y="69" id="991" />
-<P2 x="322" y="88" id="919" />
+<TGConnectingPoint num="0" id="873" />
+<P1 x="322" y="69" id="1035" />
+<P2 x="322" y="88" id="963" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="828" uid="59eff059-85a8-4d8f-aeb0-42e8e19675ae" >
-<father id="830" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="872" uid="59eff059-85a8-4d8f-aeb0-42e8e19675ae" >
+<father id="874" num="0" />
<cdparam x="322" y="109" />
<sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<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="824" />
-<TGConnectingPoint num="1" id="825" />
-<TGConnectingPoint num="2" id="826" />
-<TGConnectingPoint num="3" id="827" />
+<TGConnectingPoint num="0" id="868" />
+<TGConnectingPoint num="1" id="869" />
+<TGConnectingPoint num="2" id="870" />
+<TGConnectingPoint num="3" id="871" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
@@ -1686,26 +1687,26 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="837" >
+<CONNECTOR type="5102" id="881" >
<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 state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="836" />
-<P1 x="322" y="118" id="924" />
-<P2 x="356" y="174" id="1007" />
+<TGConnectingPoint num="0" id="880" />
+<P1 x="322" y="118" id="968" />
+<P2 x="356" y="174" id="1051" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="835" uid="304fd2b1-277e-48d2-a345-7e4b73c1e0d7" >
-<father id="837" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="879" uid="304fd2b1-277e-48d2-a345-7e4b73c1e0d7" >
+<father id="881" num="0" />
<cdparam x="377" y="184" />
<sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<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="831" />
-<TGConnectingPoint num="1" id="832" />
-<TGConnectingPoint num="2" id="833" />
-<TGConnectingPoint num="3" id="834" />
+<TGConnectingPoint num="0" id="875" />
+<TGConnectingPoint num="1" id="876" />
+<TGConnectingPoint num="2" id="877" />
+<TGConnectingPoint num="3" id="878" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
@@ -1719,26 +1720,26 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="844" >
+<CONNECTOR type="5102" id="888" >
<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="843" />
-<P1 x="353" y="282" id="996" />
-<P2 x="399" y="352" id="846" />
+<TGConnectingPoint num="0" id="887" />
+<P1 x="353" y="282" id="1038" />
+<P2 x="399" y="352" id="890" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="842" uid="ef1e1204-6711-4c2c-b81f-515c0e412fcb" >
-<father id="844" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="886" uid="ef1e1204-6711-4c2c-b81f-515c0e412fcb" >
+<father id="888" num="0" />
<cdparam x="417" y="335" />
<sizeparam width="145" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<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="838" />
-<TGConnectingPoint num="1" id="839" />
-<TGConnectingPoint num="2" id="840" />
-<TGConnectingPoint num="3" id="841" />
+<TGConnectingPoint num="0" id="882" />
+<TGConnectingPoint num="1" id="883" />
+<TGConnectingPoint num="2" id="884" />
+<TGConnectingPoint num="3" id="885" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="mechanicalDelay" enabled="true"/>
@@ -1752,316 +1753,316 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="5106" id="917" uid="a8480980-aa52-45ec-b0bf-a5a376e0c5c6" >
+<COMPONENT type="5106" id="961" uid="a8480980-aa52-45ec-b0bf-a5a376e0c5c6" >
<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" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="state0" value="main" />
-<TGConnectingPoint num="0" id="845" />
-<TGConnectingPoint num="1" id="846" />
-<TGConnectingPoint num="2" id="847" />
-<TGConnectingPoint num="3" id="848" />
-<TGConnectingPoint num="4" id="849" />
-<TGConnectingPoint num="5" id="850" />
-<TGConnectingPoint num="6" id="851" />
-<TGConnectingPoint num="7" id="852" />
-<TGConnectingPoint num="8" id="853" />
-<TGConnectingPoint num="9" id="854" />
-<TGConnectingPoint num="10" id="855" />
-<TGConnectingPoint num="11" id="856" />
-<TGConnectingPoint num="12" id="857" />
-<TGConnectingPoint num="13" id="858" />
-<TGConnectingPoint num="14" id="859" />
-<TGConnectingPoint num="15" id="860" />
-<TGConnectingPoint num="16" id="861" />
-<TGConnectingPoint num="17" id="862" />
-<TGConnectingPoint num="18" id="863" />
-<TGConnectingPoint num="19" id="864" />
-<TGConnectingPoint num="20" id="865" />
-<TGConnectingPoint num="21" id="866" />
-<TGConnectingPoint num="22" id="867" />
-<TGConnectingPoint num="23" id="868" />
-<TGConnectingPoint num="24" id="869" />
-<TGConnectingPoint num="25" id="870" />
-<TGConnectingPoint num="26" id="871" />
-<TGConnectingPoint num="27" id="872" />
-<TGConnectingPoint num="28" id="873" />
-<TGConnectingPoint num="29" id="874" />
-<TGConnectingPoint num="30" id="875" />
-<TGConnectingPoint num="31" id="876" />
-<TGConnectingPoint num="32" id="877" />
-<TGConnectingPoint num="33" id="878" />
-<TGConnectingPoint num="34" id="879" />
-<TGConnectingPoint num="35" id="880" />
-<TGConnectingPoint num="36" id="881" />
-<TGConnectingPoint num="37" id="882" />
-<TGConnectingPoint num="38" id="883" />
-<TGConnectingPoint num="39" id="884" />
-<TGConnectingPoint num="40" id="885" />
-<TGConnectingPoint num="41" id="886" />
-<TGConnectingPoint num="42" id="887" />
-<TGConnectingPoint num="43" id="888" />
-<TGConnectingPoint num="44" id="889" />
-<TGConnectingPoint num="45" id="890" />
-<TGConnectingPoint num="46" id="891" />
-<TGConnectingPoint num="47" id="892" />
-<TGConnectingPoint num="48" id="893" />
-<TGConnectingPoint num="49" id="894" />
-<TGConnectingPoint num="50" id="895" />
-<TGConnectingPoint num="51" id="896" />
-<TGConnectingPoint num="52" id="897" />
-<TGConnectingPoint num="53" id="898" />
-<TGConnectingPoint num="54" id="899" />
-<TGConnectingPoint num="55" id="900" />
-<TGConnectingPoint num="56" id="901" />
-<TGConnectingPoint num="57" id="902" />
-<TGConnectingPoint num="58" id="903" />
-<TGConnectingPoint num="59" id="904" />
-<TGConnectingPoint num="60" id="905" />
-<TGConnectingPoint num="61" id="906" />
-<TGConnectingPoint num="62" id="907" />
-<TGConnectingPoint num="63" id="908" />
-<TGConnectingPoint num="64" id="909" />
-<TGConnectingPoint num="65" id="910" />
-<TGConnectingPoint num="66" id="911" />
-<TGConnectingPoint num="67" id="912" />
-<TGConnectingPoint num="68" id="913" />
-<TGConnectingPoint num="69" id="914" />
-<TGConnectingPoint num="70" id="915" />
-<TGConnectingPoint num="71" id="916" />
+<TGConnectingPoint num="0" id="889" />
+<TGConnectingPoint num="1" id="890" />
+<TGConnectingPoint num="2" id="891" />
+<TGConnectingPoint num="3" id="892" />
+<TGConnectingPoint num="4" id="893" />
+<TGConnectingPoint num="5" id="894" />
+<TGConnectingPoint num="6" id="895" />
+<TGConnectingPoint num="7" id="896" />
+<TGConnectingPoint num="8" id="897" />
+<TGConnectingPoint num="9" id="898" />
+<TGConnectingPoint num="10" id="899" />
+<TGConnectingPoint num="11" id="900" />
+<TGConnectingPoint num="12" id="901" />
+<TGConnectingPoint num="13" id="902" />
+<TGConnectingPoint num="14" id="903" />
+<TGConnectingPoint num="15" id="904" />
+<TGConnectingPoint num="16" id="905" />
+<TGConnectingPoint num="17" id="906" />
+<TGConnectingPoint num="18" id="907" />
+<TGConnectingPoint num="19" id="908" />
+<TGConnectingPoint num="20" id="909" />
+<TGConnectingPoint num="21" id="910" />
+<TGConnectingPoint num="22" id="911" />
+<TGConnectingPoint num="23" id="912" />
+<TGConnectingPoint num="24" id="913" />
+<TGConnectingPoint num="25" id="914" />
+<TGConnectingPoint num="26" id="915" />
+<TGConnectingPoint num="27" id="916" />
+<TGConnectingPoint num="28" id="917" />
+<TGConnectingPoint num="29" id="918" />
+<TGConnectingPoint num="30" id="919" />
+<TGConnectingPoint num="31" id="920" />
+<TGConnectingPoint num="32" id="921" />
+<TGConnectingPoint num="33" id="922" />
+<TGConnectingPoint num="34" id="923" />
+<TGConnectingPoint num="35" id="924" />
+<TGConnectingPoint num="36" id="925" />
+<TGConnectingPoint num="37" id="926" />
+<TGConnectingPoint num="38" id="927" />
+<TGConnectingPoint num="39" id="928" />
+<TGConnectingPoint num="40" id="929" />
+<TGConnectingPoint num="41" id="930" />
+<TGConnectingPoint num="42" id="931" />
+<TGConnectingPoint num="43" id="932" />
+<TGConnectingPoint num="44" id="933" />
+<TGConnectingPoint num="45" id="934" />
+<TGConnectingPoint num="46" id="935" />
+<TGConnectingPoint num="47" id="936" />
+<TGConnectingPoint num="48" id="937" />
+<TGConnectingPoint num="49" id="938" />
+<TGConnectingPoint num="50" id="939" />
+<TGConnectingPoint num="51" id="940" />
+<TGConnectingPoint num="52" id="941" />
+<TGConnectingPoint num="53" id="942" />
+<TGConnectingPoint num="54" id="943" />
+<TGConnectingPoint num="55" id="944" />
+<TGConnectingPoint num="56" id="945" />
+<TGConnectingPoint num="57" id="946" />
+<TGConnectingPoint num="58" id="947" />
+<TGConnectingPoint num="59" id="948" />
+<TGConnectingPoint num="60" id="949" />
+<TGConnectingPoint num="61" id="950" />
+<TGConnectingPoint num="62" id="951" />
+<TGConnectingPoint num="63" id="952" />
+<TGConnectingPoint num="64" id="953" />
+<TGConnectingPoint num="65" id="954" />
+<TGConnectingPoint num="66" id="955" />
+<TGConnectingPoint num="67" id="956" />
+<TGConnectingPoint num="68" id="957" />
+<TGConnectingPoint num="69" id="958" />
+<TGConnectingPoint num="70" id="959" />
+<TGConnectingPoint num="71" id="960" />
<extraparam>
</extraparam>
</COMPONENT>
-<COMPONENT type="5106" id="990" uid="bdf4e5e9-759e-4940-891e-d3b20cbd9b7b" >
+<COMPONENT type="5106" id="1034" uid="bdf4e5e9-759e-4940-891e-d3b20cbd9b7b" >
<cdparam x="297" y="88" />
<sizeparam width="50" height="30" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="state0" value="main" />
-<TGConnectingPoint num="0" id="918" />
-<TGConnectingPoint num="1" id="919" />
-<TGConnectingPoint num="2" id="920" />
-<TGConnectingPoint num="3" id="921" />
-<TGConnectingPoint num="4" id="922" />
-<TGConnectingPoint num="5" id="923" />
-<TGConnectingPoint num="6" id="924" />
-<TGConnectingPoint num="7" id="925" />
-<TGConnectingPoint num="8" id="926" />
-<TGConnectingPoint num="9" id="927" />
-<TGConnectingPoint num="10" id="928" />
-<TGConnectingPoint num="11" id="929" />
-<TGConnectingPoint num="12" id="930" />
-<TGConnectingPoint num="13" id="931" />
-<TGConnectingPoint num="14" id="932" />
-<TGConnectingPoint num="15" id="933" />
-<TGConnectingPoint num="16" id="934" />
-<TGConnectingPoint num="17" id="935" />
-<TGConnectingPoint num="18" id="936" />
-<TGConnectingPoint num="19" id="937" />
-<TGConnectingPoint num="20" id="938" />
-<TGConnectingPoint num="21" id="939" />
-<TGConnectingPoint num="22" id="940" />
-<TGConnectingPoint num="23" id="941" />
-<TGConnectingPoint num="24" id="942" />
-<TGConnectingPoint num="25" id="943" />
-<TGConnectingPoint num="26" id="944" />
-<TGConnectingPoint num="27" id="945" />
-<TGConnectingPoint num="28" id="946" />
-<TGConnectingPoint num="29" id="947" />
-<TGConnectingPoint num="30" id="948" />
-<TGConnectingPoint num="31" id="949" />
-<TGConnectingPoint num="32" id="950" />
-<TGConnectingPoint num="33" id="951" />
-<TGConnectingPoint num="34" id="952" />
-<TGConnectingPoint num="35" id="953" />
-<TGConnectingPoint num="36" id="954" />
-<TGConnectingPoint num="37" id="955" />
-<TGConnectingPoint num="38" id="956" />
-<TGConnectingPoint num="39" id="957" />
-<TGConnectingPoint num="40" id="958" />
-<TGConnectingPoint num="41" id="959" />
-<TGConnectingPoint num="42" id="960" />
-<TGConnectingPoint num="43" id="961" />
-<TGConnectingPoint num="44" id="962" />
-<TGConnectingPoint num="45" id="963" />
-<TGConnectingPoint num="46" id="964" />
-<TGConnectingPoint num="47" id="965" />
-<TGConnectingPoint num="48" id="966" />
-<TGConnectingPoint num="49" id="967" />
-<TGConnectingPoint num="50" id="968" />
-<TGConnectingPoint num="51" id="969" />
-<TGConnectingPoint num="52" id="970" />
-<TGConnectingPoint num="53" id="971" />
-<TGConnectingPoint num="54" id="972" />
-<TGConnectingPoint num="55" id="973" />
-<TGConnectingPoint num="56" id="974" />
-<TGConnectingPoint num="57" id="975" />
-<TGConnectingPoint num="58" id="976" />
-<TGConnectingPoint num="59" id="977" />
-<TGConnectingPoint num="60" id="978" />
-<TGConnectingPoint num="61" id="979" />
-<TGConnectingPoint num="62" id="980" />
-<TGConnectingPoint num="63" id="981" />
-<TGConnectingPoint num="64" id="982" />
-<TGConnectingPoint num="65" id="983" />
-<TGConnectingPoint num="66" id="984" />
-<TGConnectingPoint num="67" id="985" />
-<TGConnectingPoint num="68" id="986" />
-<TGConnectingPoint num="69" id="987" />
-<TGConnectingPoint num="70" id="988" />
-<TGConnectingPoint num="71" id="989" />
+<TGConnectingPoint num="0" id="962" />
+<TGConnectingPoint num="1" id="963" />
+<TGConnectingPoint num="2" id="964" />
+<TGConnectingPoint num="3" id="965" />
+<TGConnectingPoint num="4" id="966" />
+<TGConnectingPoint num="5" id="967" />
+<TGConnectingPoint num="6" id="968" />
+<TGConnectingPoint num="7" id="969" />
+<TGConnectingPoint num="8" id="970" />
+<TGConnectingPoint num="9" id="971" />
+<TGConnectingPoint num="10" id="972" />
+<TGConnectingPoint num="11" id="973" />
+<TGConnectingPoint num="12" id="974" />
+<TGConnectingPoint num="13" id="975" />
+<TGConnectingPoint num="14" id="976" />
+<TGConnectingPoint num="15" id="977" />
+<TGConnectingPoint num="16" id="978" />
+<TGConnectingPoint num="17" id="979" />
+<TGConnectingPoint num="18" id="980" />
+<TGConnectingPoint num="19" id="981" />
+<TGConnectingPoint num="20" id="982" />
+<TGConnectingPoint num="21" id="983" />
+<TGConnectingPoint num="22" id="984" />
+<TGConnectingPoint num="23" id="985" />
+<TGConnectingPoint num="24" id="986" />
+<TGConnectingPoint num="25" id="987" />
+<TGConnectingPoint num="26" id="988" />
+<TGConnectingPoint num="27" id="989" />
+<TGConnectingPoint num="28" id="990" />
+<TGConnectingPoint num="29" id="991" />
+<TGConnectingPoint num="30" id="992" />
+<TGConnectingPoint num="31" id="993" />
+<TGConnectingPoint num="32" id="994" />
+<TGConnectingPoint num="33" id="995" />
+<TGConnectingPoint num="34" id="996" />
+<TGConnectingPoint num="35" id="997" />
+<TGConnectingPoint num="36" id="998" />
+<TGConnectingPoint num="37" id="999" />
+<TGConnectingPoint num="38" id="1000" />
+<TGConnectingPoint num="39" id="1001" />
+<TGConnectingPoint num="40" id="1002" />
+<TGConnectingPoint num="41" id="1003" />
+<TGConnectingPoint num="42" id="1004" />
+<TGConnectingPoint num="43" id="1005" />
+<TGConnectingPoint num="44" id="1006" />
+<TGConnectingPoint num="45" id="1007" />
+<TGConnectingPoint num="46" id="1008" />
+<TGConnectingPoint num="47" id="1009" />
+<TGConnectingPoint num="48" id="1010" />
+<TGConnectingPoint num="49" id="1011" />
+<TGConnectingPoint num="50" id="1012" />
+<TGConnectingPoint num="51" id="1013" />
+<TGConnectingPoint num="52" id="1014" />
+<TGConnectingPoint num="53" id="1015" />
+<TGConnectingPoint num="54" id="1016" />
+<TGConnectingPoint num="55" id="1017" />
+<TGConnectingPoint num="56" id="1018" />
+<TGConnectingPoint num="57" id="1019" />
+<TGConnectingPoint num="58" id="1020" />
+<TGConnectingPoint num="59" id="1021" />
+<TGConnectingPoint num="60" id="1022" />
+<TGConnectingPoint num="61" id="1023" />
+<TGConnectingPoint num="62" id="1024" />
+<TGConnectingPoint num="63" id="1025" />
+<TGConnectingPoint num="64" id="1026" />
+<TGConnectingPoint num="65" id="1027" />
+<TGConnectingPoint num="66" id="1028" />
+<TGConnectingPoint num="67" id="1029" />
+<TGConnectingPoint num="68" id="1030" />
+<TGConnectingPoint num="69" id="1031" />
+<TGConnectingPoint num="70" id="1032" />
+<TGConnectingPoint num="71" id="1033" />
<extraparam>
</extraparam>
</COMPONENT>
-<COMPONENT type="5100" id="992" uid="8a5f524c-e9d9-43ed-8bb2-62d6981ea781" >
+<COMPONENT type="5100" id="1036" uid="8a5f524c-e9d9-43ed-8bb2-62d6981ea781" >
<cdparam x="315" y="49" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" 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="991" />
+<TGConnectingPoint num="0" id="1035" />
</COMPONENT>
-<COMPONENT type="5106" id="1078" uid="0351de1d-1a78-41a0-9a44-227ba3d1a1f8" >
+<COMPONENT type="5106" id="1122" uid="0351de1d-1a78-41a0-9a44-227ba3d1a1f8" >
<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" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="state0" value="state0" />
-<TGConnectingPoint num="0" id="1006" />
-<TGConnectingPoint num="1" id="1007" />
-<TGConnectingPoint num="2" id="1008" />
-<TGConnectingPoint num="3" id="1009" />
-<TGConnectingPoint num="4" id="1010" />
-<TGConnectingPoint num="5" id="1011" />
-<TGConnectingPoint num="6" id="1012" />
-<TGConnectingPoint num="7" id="1013" />
-<TGConnectingPoint num="8" id="1014" />
-<TGConnectingPoint num="9" id="1015" />
-<TGConnectingPoint num="10" id="1016" />
-<TGConnectingPoint num="11" id="1017" />
-<TGConnectingPoint num="12" id="1018" />
-<TGConnectingPoint num="13" id="1019" />
-<TGConnectingPoint num="14" id="1020" />
-<TGConnectingPoint num="15" id="1021" />
-<TGConnectingPoint num="16" id="1022" />
-<TGConnectingPoint num="17" id="1023" />
-<TGConnectingPoint num="18" id="1024" />
-<TGConnectingPoint num="19" id="1025" />
-<TGConnectingPoint num="20" id="1026" />
-<TGConnectingPoint num="21" id="1027" />
-<TGConnectingPoint num="22" id="1028" />
-<TGConnectingPoint num="23" id="1029" />
-<TGConnectingPoint num="24" id="1030" />
-<TGConnectingPoint num="25" id="1031" />
-<TGConnectingPoint num="26" id="1032" />
-<TGConnectingPoint num="27" id="1033" />
-<TGConnectingPoint num="28" id="1034" />
-<TGConnectingPoint num="29" id="1035" />
-<TGConnectingPoint num="30" id="1036" />
-<TGConnectingPoint num="31" id="1037" />
-<TGConnectingPoint num="32" id="1038" />
-<TGConnectingPoint num="33" id="1039" />
-<TGConnectingPoint num="34" id="1040" />
-<TGConnectingPoint num="35" id="1041" />
-<TGConnectingPoint num="36" id="1042" />
-<TGConnectingPoint num="37" id="1043" />
-<TGConnectingPoint num="38" id="1044" />
-<TGConnectingPoint num="39" id="1045" />
-<TGConnectingPoint num="40" id="1046" />
-<TGConnectingPoint num="41" id="1047" />
-<TGConnectingPoint num="42" id="1048" />
-<TGConnectingPoint num="43" id="1049" />
-<TGConnectingPoint num="44" id="1050" />
-<TGConnectingPoint num="45" id="1051" />
-<TGConnectingPoint num="46" id="1052" />
-<TGConnectingPoint num="47" id="1053" />
-<TGConnectingPoint num="48" id="1054" />
-<TGConnectingPoint num="49" id="1055" />
-<TGConnectingPoint num="50" id="1056" />
-<TGConnectingPoint num="51" id="1057" />
-<TGConnectingPoint num="52" id="1058" />
-<TGConnectingPoint num="53" id="1059" />
-<TGConnectingPoint num="54" id="1060" />
-<TGConnectingPoint num="55" id="1061" />
-<TGConnectingPoint num="56" id="1062" />
-<TGConnectingPoint num="57" id="1063" />
-<TGConnectingPoint num="58" id="1064" />
-<TGConnectingPoint num="59" id="1065" />
-<TGConnectingPoint num="60" id="1066" />
-<TGConnectingPoint num="61" id="1067" />
-<TGConnectingPoint num="62" id="1068" />
-<TGConnectingPoint num="63" id="1069" />
-<TGConnectingPoint num="64" id="1070" />
-<TGConnectingPoint num="65" id="1071" />
-<TGConnectingPoint num="66" id="1072" />
-<TGConnectingPoint num="67" id="1073" />
-<TGConnectingPoint num="68" id="1074" />
-<TGConnectingPoint num="69" id="1075" />
-<TGConnectingPoint num="70" id="1076" />
-<TGConnectingPoint num="71" id="1077" />
+<TGConnectingPoint num="0" id="1050" />
+<TGConnectingPoint num="1" id="1051" />
+<TGConnectingPoint num="2" id="1052" />
+<TGConnectingPoint num="3" id="1053" />
+<TGConnectingPoint num="4" id="1054" />
+<TGConnectingPoint num="5" id="1055" />
+<TGConnectingPoint num="6" id="1056" />
+<TGConnectingPoint num="7" id="1057" />
+<TGConnectingPoint num="8" id="1058" />
+<TGConnectingPoint num="9" id="1059" />
+<TGConnectingPoint num="10" id="1060" />
+<TGConnectingPoint num="11" id="1061" />
+<TGConnectingPoint num="12" id="1062" />
+<TGConnectingPoint num="13" id="1063" />
+<TGConnectingPoint num="14" id="1064" />
+<TGConnectingPoint num="15" id="1065" />
+<TGConnectingPoint num="16" id="1066" />
+<TGConnectingPoint num="17" id="1067" />
+<TGConnectingPoint num="18" id="1068" />
+<TGConnectingPoint num="19" id="1069" />
+<TGConnectingPoint num="20" id="1070" />
+<TGConnectingPoint num="21" id="1071" />
+<TGConnectingPoint num="22" id="1072" />
+<TGConnectingPoint num="23" id="1073" />
+<TGConnectingPoint num="24" id="1074" />
+<TGConnectingPoint num="25" id="1075" />
+<TGConnectingPoint num="26" id="1076" />
+<TGConnectingPoint num="27" id="1077" />
+<TGConnectingPoint num="28" id="1078" />
+<TGConnectingPoint num="29" id="1079" />
+<TGConnectingPoint num="30" id="1080" />
+<TGConnectingPoint num="31" id="1081" />
+<TGConnectingPoint num="32" id="1082" />
+<TGConnectingPoint num="33" id="1083" />
+<TGConnectingPoint num="34" id="1084" />
+<TGConnectingPoint num="35" id="1085" />
+<TGConnectingPoint num="36" id="1086" />
+<TGConnectingPoint num="37" id="1087" />
+<TGConnectingPoint num="38" id="1088" />
+<TGConnectingPoint num="39" id="1089" />
+<TGConnectingPoint num="40" id="1090" />
+<TGConnectingPoint num="41" id="1091" />
+<TGConnectingPoint num="42" id="1092" />
+<TGConnectingPoint num="43" id="1093" />
+<TGConnectingPoint num="44" id="1094" />
+<TGConnectingPoint num="45" id="1095" />
+<TGConnectingPoint num="46" id="1096" />
+<TGConnectingPoint num="47" id="1097" />
+<TGConnectingPoint num="48" id="1098" />
+<TGConnectingPoint num="49" id="1099" />
+<TGConnectingPoint num="50" id="1100" />
+<TGConnectingPoint num="51" id="1101" />
+<TGConnectingPoint num="52" id="1102" />
+<TGConnectingPoint num="53" id="1103" />
+<TGConnectingPoint num="54" id="1104" />
+<TGConnectingPoint num="55" id="1105" />
+<TGConnectingPoint num="56" id="1106" />
+<TGConnectingPoint num="57" id="1107" />
+<TGConnectingPoint num="58" id="1108" />
+<TGConnectingPoint num="59" id="1109" />
+<TGConnectingPoint num="60" id="1110" />
+<TGConnectingPoint num="61" id="1111" />
+<TGConnectingPoint num="62" id="1112" />
+<TGConnectingPoint num="63" id="1113" />
+<TGConnectingPoint num="64" id="1114" />
+<TGConnectingPoint num="65" id="1115" />
+<TGConnectingPoint num="66" id="1116" />
+<TGConnectingPoint num="67" id="1117" />
+<TGConnectingPoint num="68" id="1118" />
+<TGConnectingPoint num="69" id="1119" />
+<TGConnectingPoint num="70" id="1120" />
+<TGConnectingPoint num="71" id="1121" />
<extraparam>
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="5100" id="994" uid="4ea28494-de50-4f99-8981-3ef7a87d7d34" >
-<father id="1078" 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="993" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="5103" id="1005" uid="71f14636-3c96-4e4e-8d0e-c1cd11e52641" >
-<father id="1078" num="1" />
+<SUBCOMPONENT type="5103" id="1047" uid="71f14636-3c96-4e4e-8d0e-c1cd11e52641" >
+<father id="1122" num="0" />
<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="995" />
-<TGConnectingPoint num="1" id="996" />
-<TGConnectingPoint num="2" id="997" />
-<TGConnectingPoint num="3" id="998" />
-<TGConnectingPoint num="4" id="999" />
-<TGConnectingPoint num="5" id="1000" />
-<TGConnectingPoint num="6" id="1001" />
-<TGConnectingPoint num="7" id="1002" />
-<TGConnectingPoint num="8" id="1003" />
-<TGConnectingPoint num="9" id="1004" />
+<TGConnectingPoint num="0" id="1037" />
+<TGConnectingPoint num="1" id="1038" />
+<TGConnectingPoint num="2" id="1039" />
+<TGConnectingPoint num="3" id="1040" />
+<TGConnectingPoint num="4" id="1041" />
+<TGConnectingPoint num="5" id="1042" />
+<TGConnectingPoint num="6" id="1043" />
+<TGConnectingPoint num="7" id="1044" />
+<TGConnectingPoint num="8" id="1045" />
+<TGConnectingPoint num="9" id="1046" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="5100" id="1049" uid="4ea28494-de50-4f99-8981-3ef7a87d7d34" >
+<father id="1122" 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="1048" />
</SUBCOMPONENT>
</AVATARStateMachineDiagramPanel>
<AVATARStateMachineDiagramPanel name="TeaButton" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="1085" >
+<CONNECTOR type="5102" id="1129" >
<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 Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="1084" />
-<P1 x="363" y="204" id="1101" />
-<P2 x="362" y="257" id="1112" />
+<TGConnectingPoint num="0" id="1128" />
+<P1 x="363" y="204" id="1145" />
+<P2 x="362" y="257" id="1156" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1083" uid="4eff576d-2797-4cd7-8b4a-9f8d3eedbfa3" >
-<father id="1085" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1127" uid="4eff576d-2797-4cd7-8b4a-9f8d3eedbfa3" >
+<father id="1129" num="0" />
<cdparam x="380" y="228" />
<sizeparam width="145" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<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="1079" />
-<TGConnectingPoint num="1" id="1080" />
-<TGConnectingPoint num="2" id="1081" />
-<TGConnectingPoint num="3" id="1082" />
+<TGConnectingPoint num="0" id="1123" />
+<TGConnectingPoint num="1" id="1124" />
+<TGConnectingPoint num="2" id="1125" />
+<TGConnectingPoint num="3" id="1126" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="mechanicalDelay" enabled="true"/>
@@ -2075,26 +2076,26 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1092" >
+<CONNECTOR type="5102" id="1136" >
<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 state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="1091" />
-<P1 x="363" y="150" id="1190" />
-<P2 x="363" y="174" id="1100" />
+<TGConnectingPoint num="0" id="1135" />
+<P1 x="363" y="150" id="1234" />
+<P2 x="363" y="174" id="1144" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1090" uid="dc0ebe3b-67a8-4563-ae0c-619e1c188dbf" >
-<father id="1092" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1134" uid="dc0ebe3b-67a8-4563-ae0c-619e1c188dbf" >
+<father id="1136" num="0" />
<cdparam x="363" y="190" />
<sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<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="1086" />
-<TGConnectingPoint num="1" id="1087" />
-<TGConnectingPoint num="2" id="1088" />
-<TGConnectingPoint num="3" id="1089" />
+<TGConnectingPoint num="0" id="1130" />
+<TGConnectingPoint num="1" id="1131" />
+<TGConnectingPoint num="2" id="1132" />
+<TGConnectingPoint num="3" id="1133" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
@@ -2108,26 +2109,26 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1099" >
+<CONNECTOR type="5102" id="1143" >
<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 start state to state0" value="null" />
-<TGConnectingPoint num="0" id="1098" />
-<P1 x="362" y="101" id="1257" />
-<P2 x="363" y="120" id="1185" />
+<TGConnectingPoint num="0" id="1142" />
+<P1 x="362" y="101" id="1301" />
+<P2 x="363" y="120" id="1229" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1097" uid="b71cbbe8-7a22-4871-8547-0b76c0af9a17" >
-<father id="1099" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1141" uid="b71cbbe8-7a22-4871-8547-0b76c0af9a17" >
+<father id="1143" num="0" />
<cdparam x="362" y="141" />
<sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<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="1093" />
-<TGConnectingPoint num="1" id="1094" />
-<TGConnectingPoint num="2" id="1095" />
-<TGConnectingPoint num="3" id="1096" />
+<TGConnectingPoint num="0" id="1137" />
+<TGConnectingPoint num="1" id="1138" />
+<TGConnectingPoint num="2" id="1139" />
+<TGConnectingPoint num="3" id="1140" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
@@ -2141,225 +2142,225 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="5103" id="1110" uid="d4a9c558-0141-43d3-a937-04cd022daa47" >
+<COMPONENT type="5103" id="1154" uid="d4a9c558-0141-43d3-a937-04cd022daa47" >
<cdparam x="340" y="179" />
<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="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="Send signal" value="push()" />
-<TGConnectingPoint num="0" id="1100" />
-<TGConnectingPoint num="1" id="1101" />
-<TGConnectingPoint num="2" id="1102" />
-<TGConnectingPoint num="3" id="1103" />
-<TGConnectingPoint num="4" id="1104" />
-<TGConnectingPoint num="5" id="1105" />
-<TGConnectingPoint num="6" id="1106" />
-<TGConnectingPoint num="7" id="1107" />
-<TGConnectingPoint num="8" id="1108" />
-<TGConnectingPoint num="9" id="1109" />
+<TGConnectingPoint num="0" id="1144" />
+<TGConnectingPoint num="1" id="1145" />
+<TGConnectingPoint num="2" id="1146" />
+<TGConnectingPoint num="3" id="1147" />
+<TGConnectingPoint num="4" id="1148" />
+<TGConnectingPoint num="5" id="1149" />
+<TGConnectingPoint num="6" id="1150" />
+<TGConnectingPoint num="7" id="1151" />
+<TGConnectingPoint num="8" id="1152" />
+<TGConnectingPoint num="9" id="1153" />
</COMPONENT>
-<COMPONENT type="5106" id="1183" uid="6ce54c55-bad8-48d1-8f26-da8a04e9aa63" >
+<COMPONENT type="5106" id="1227" uid="6ce54c55-bad8-48d1-8f26-da8a04e9aa63" >
<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" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="state0" value="main" />
-<TGConnectingPoint num="0" id="1111" />
-<TGConnectingPoint num="1" id="1112" />
-<TGConnectingPoint num="2" id="1113" />
-<TGConnectingPoint num="3" id="1114" />
-<TGConnectingPoint num="4" id="1115" />
-<TGConnectingPoint num="5" id="1116" />
-<TGConnectingPoint num="6" id="1117" />
-<TGConnectingPoint num="7" id="1118" />
-<TGConnectingPoint num="8" id="1119" />
-<TGConnectingPoint num="9" id="1120" />
-<TGConnectingPoint num="10" id="1121" />
-<TGConnectingPoint num="11" id="1122" />
-<TGConnectingPoint num="12" id="1123" />
-<TGConnectingPoint num="13" id="1124" />
-<TGConnectingPoint num="14" id="1125" />
-<TGConnectingPoint num="15" id="1126" />
-<TGConnectingPoint num="16" id="1127" />
-<TGConnectingPoint num="17" id="1128" />
-<TGConnectingPoint num="18" id="1129" />
-<TGConnectingPoint num="19" id="1130" />
-<TGConnectingPoint num="20" id="1131" />
-<TGConnectingPoint num="21" id="1132" />
-<TGConnectingPoint num="22" id="1133" />
-<TGConnectingPoint num="23" id="1134" />
-<TGConnectingPoint num="24" id="1135" />
-<TGConnectingPoint num="25" id="1136" />
-<TGConnectingPoint num="26" id="1137" />
-<TGConnectingPoint num="27" id="1138" />
-<TGConnectingPoint num="28" id="1139" />
-<TGConnectingPoint num="29" id="1140" />
-<TGConnectingPoint num="30" id="1141" />
-<TGConnectingPoint num="31" id="1142" />
-<TGConnectingPoint num="32" id="1143" />
-<TGConnectingPoint num="33" id="1144" />
-<TGConnectingPoint num="34" id="1145" />
-<TGConnectingPoint num="35" id="1146" />
-<TGConnectingPoint num="36" id="1147" />
-<TGConnectingPoint num="37" id="1148" />
-<TGConnectingPoint num="38" id="1149" />
-<TGConnectingPoint num="39" id="1150" />
-<TGConnectingPoint num="40" id="1151" />
-<TGConnectingPoint num="41" id="1152" />
-<TGConnectingPoint num="42" id="1153" />
-<TGConnectingPoint num="43" id="1154" />
-<TGConnectingPoint num="44" id="1155" />
-<TGConnectingPoint num="45" id="1156" />
-<TGConnectingPoint num="46" id="1157" />
-<TGConnectingPoint num="47" id="1158" />
-<TGConnectingPoint num="48" id="1159" />
-<TGConnectingPoint num="49" id="1160" />
-<TGConnectingPoint num="50" id="1161" />
-<TGConnectingPoint num="51" id="1162" />
-<TGConnectingPoint num="52" id="1163" />
-<TGConnectingPoint num="53" id="1164" />
-<TGConnectingPoint num="54" id="1165" />
-<TGConnectingPoint num="55" id="1166" />
-<TGConnectingPoint num="56" id="1167" />
-<TGConnectingPoint num="57" id="1168" />
-<TGConnectingPoint num="58" id="1169" />
-<TGConnectingPoint num="59" id="1170" />
-<TGConnectingPoint num="60" id="1171" />
-<TGConnectingPoint num="61" id="1172" />
-<TGConnectingPoint num="62" id="1173" />
-<TGConnectingPoint num="63" id="1174" />
-<TGConnectingPoint num="64" id="1175" />
-<TGConnectingPoint num="65" id="1176" />
-<TGConnectingPoint num="66" id="1177" />
-<TGConnectingPoint num="67" id="1178" />
-<TGConnectingPoint num="68" id="1179" />
-<TGConnectingPoint num="69" id="1180" />
-<TGConnectingPoint num="70" id="1181" />
-<TGConnectingPoint num="71" id="1182" />
+<TGConnectingPoint num="0" id="1155" />
+<TGConnectingPoint num="1" id="1156" />
+<TGConnectingPoint num="2" id="1157" />
+<TGConnectingPoint num="3" id="1158" />
+<TGConnectingPoint num="4" id="1159" />
+<TGConnectingPoint num="5" id="1160" />
+<TGConnectingPoint num="6" id="1161" />
+<TGConnectingPoint num="7" id="1162" />
+<TGConnectingPoint num="8" id="1163" />
+<TGConnectingPoint num="9" id="1164" />
+<TGConnectingPoint num="10" id="1165" />
+<TGConnectingPoint num="11" id="1166" />
+<TGConnectingPoint num="12" id="1167" />
+<TGConnectingPoint num="13" id="1168" />
+<TGConnectingPoint num="14" id="1169" />
+<TGConnectingPoint num="15" id="1170" />
+<TGConnectingPoint num="16" id="1171" />
+<TGConnectingPoint num="17" id="1172" />
+<TGConnectingPoint num="18" id="1173" />
+<TGConnectingPoint num="19" id="1174" />
+<TGConnectingPoint num="20" id="1175" />
+<TGConnectingPoint num="21" id="1176" />
+<TGConnectingPoint num="22" id="1177" />
+<TGConnectingPoint num="23" id="1178" />
+<TGConnectingPoint num="24" id="1179" />
+<TGConnectingPoint num="25" id="1180" />
+<TGConnectingPoint num="26" id="1181" />
+<TGConnectingPoint num="27" id="1182" />
+<TGConnectingPoint num="28" id="1183" />
+<TGConnectingPoint num="29" id="1184" />
+<TGConnectingPoint num="30" id="1185" />
+<TGConnectingPoint num="31" id="1186" />
+<TGConnectingPoint num="32" id="1187" />
+<TGConnectingPoint num="33" id="1188" />
+<TGConnectingPoint num="34" id="1189" />
+<TGConnectingPoint num="35" id="1190" />
+<TGConnectingPoint num="36" id="1191" />
+<TGConnectingPoint num="37" id="1192" />
+<TGConnectingPoint num="38" id="1193" />
+<TGConnectingPoint num="39" id="1194" />
+<TGConnectingPoint num="40" id="1195" />
+<TGConnectingPoint num="41" id="1196" />
+<TGConnectingPoint num="42" id="1197" />
+<TGConnectingPoint num="43" id="1198" />
+<TGConnectingPoint num="44" id="1199" />
+<TGConnectingPoint num="45" id="1200" />
+<TGConnectingPoint num="46" id="1201" />
+<TGConnectingPoint num="47" id="1202" />
+<TGConnectingPoint num="48" id="1203" />
+<TGConnectingPoint num="49" id="1204" />
+<TGConnectingPoint num="50" id="1205" />
+<TGConnectingPoint num="51" id="1206" />
+<TGConnectingPoint num="52" id="1207" />
+<TGConnectingPoint num="53" id="1208" />
+<TGConnectingPoint num="54" id="1209" />
+<TGConnectingPoint num="55" id="1210" />
+<TGConnectingPoint num="56" id="1211" />
+<TGConnectingPoint num="57" id="1212" />
+<TGConnectingPoint num="58" id="1213" />
+<TGConnectingPoint num="59" id="1214" />
+<TGConnectingPoint num="60" id="1215" />
+<TGConnectingPoint num="61" id="1216" />
+<TGConnectingPoint num="62" id="1217" />
+<TGConnectingPoint num="63" id="1218" />
+<TGConnectingPoint num="64" id="1219" />
+<TGConnectingPoint num="65" id="1220" />
+<TGConnectingPoint num="66" id="1221" />
+<TGConnectingPoint num="67" id="1222" />
+<TGConnectingPoint num="68" id="1223" />
+<TGConnectingPoint num="69" id="1224" />
+<TGConnectingPoint num="70" id="1225" />
+<TGConnectingPoint num="71" id="1226" />
<extraparam>
</extraparam>
</COMPONENT>
-<COMPONENT type="5106" id="1256" uid="922672f4-2b7f-4eec-8310-397ed6e8ae02" >
+<COMPONENT type="5106" id="1300" uid="922672f4-2b7f-4eec-8310-397ed6e8ae02" >
<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" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="state0" value="main" />
-<TGConnectingPoint num="0" id="1184" />
-<TGConnectingPoint num="1" id="1185" />
-<TGConnectingPoint num="2" id="1186" />
-<TGConnectingPoint num="3" id="1187" />
-<TGConnectingPoint num="4" id="1188" />
-<TGConnectingPoint num="5" id="1189" />
-<TGConnectingPoint num="6" id="1190" />
-<TGConnectingPoint num="7" id="1191" />
-<TGConnectingPoint num="8" id="1192" />
-<TGConnectingPoint num="9" id="1193" />
-<TGConnectingPoint num="10" id="1194" />
-<TGConnectingPoint num="11" id="1195" />
-<TGConnectingPoint num="12" id="1196" />
-<TGConnectingPoint num="13" id="1197" />
-<TGConnectingPoint num="14" id="1198" />
-<TGConnectingPoint num="15" id="1199" />
-<TGConnectingPoint num="16" id="1200" />
-<TGConnectingPoint num="17" id="1201" />
-<TGConnectingPoint num="18" id="1202" />
-<TGConnectingPoint num="19" id="1203" />
-<TGConnectingPoint num="20" id="1204" />
-<TGConnectingPoint num="21" id="1205" />
-<TGConnectingPoint num="22" id="1206" />
-<TGConnectingPoint num="23" id="1207" />
-<TGConnectingPoint num="24" id="1208" />
-<TGConnectingPoint num="25" id="1209" />
-<TGConnectingPoint num="26" id="1210" />
-<TGConnectingPoint num="27" id="1211" />
-<TGConnectingPoint num="28" id="1212" />
-<TGConnectingPoint num="29" id="1213" />
-<TGConnectingPoint num="30" id="1214" />
-<TGConnectingPoint num="31" id="1215" />
-<TGConnectingPoint num="32" id="1216" />
-<TGConnectingPoint num="33" id="1217" />
-<TGConnectingPoint num="34" id="1218" />
-<TGConnectingPoint num="35" id="1219" />
-<TGConnectingPoint num="36" id="1220" />
-<TGConnectingPoint num="37" id="1221" />
-<TGConnectingPoint num="38" id="1222" />
-<TGConnectingPoint num="39" id="1223" />
-<TGConnectingPoint num="40" id="1224" />
-<TGConnectingPoint num="41" id="1225" />
-<TGConnectingPoint num="42" id="1226" />
-<TGConnectingPoint num="43" id="1227" />
-<TGConnectingPoint num="44" id="1228" />
-<TGConnectingPoint num="45" id="1229" />
-<TGConnectingPoint num="46" id="1230" />
-<TGConnectingPoint num="47" id="1231" />
-<TGConnectingPoint num="48" id="1232" />
-<TGConnectingPoint num="49" id="1233" />
-<TGConnectingPoint num="50" id="1234" />
-<TGConnectingPoint num="51" id="1235" />
-<TGConnectingPoint num="52" id="1236" />
-<TGConnectingPoint num="53" id="1237" />
-<TGConnectingPoint num="54" id="1238" />
-<TGConnectingPoint num="55" id="1239" />
-<TGConnectingPoint num="56" id="1240" />
-<TGConnectingPoint num="57" id="1241" />
-<TGConnectingPoint num="58" id="1242" />
-<TGConnectingPoint num="59" id="1243" />
-<TGConnectingPoint num="60" id="1244" />
-<TGConnectingPoint num="61" id="1245" />
-<TGConnectingPoint num="62" id="1246" />
-<TGConnectingPoint num="63" id="1247" />
-<TGConnectingPoint num="64" id="1248" />
-<TGConnectingPoint num="65" id="1249" />
-<TGConnectingPoint num="66" id="1250" />
-<TGConnectingPoint num="67" id="1251" />
-<TGConnectingPoint num="68" id="1252" />
-<TGConnectingPoint num="69" id="1253" />
-<TGConnectingPoint num="70" id="1254" />
-<TGConnectingPoint num="71" id="1255" />
+<TGConnectingPoint num="0" id="1228" />
+<TGConnectingPoint num="1" id="1229" />
+<TGConnectingPoint num="2" id="1230" />
+<TGConnectingPoint num="3" id="1231" />
+<TGConnectingPoint num="4" id="1232" />
+<TGConnectingPoint num="5" id="1233" />
+<TGConnectingPoint num="6" id="1234" />
+<TGConnectingPoint num="7" id="1235" />
+<TGConnectingPoint num="8" id="1236" />
+<TGConnectingPoint num="9" id="1237" />
+<TGConnectingPoint num="10" id="1238" />
+<TGConnectingPoint num="11" id="1239" />
+<TGConnectingPoint num="12" id="1240" />
+<TGConnectingPoint num="13" id="1241" />
+<TGConnectingPoint num="14" id="1242" />
+<TGConnectingPoint num="15" id="1243" />
+<TGConnectingPoint num="16" id="1244" />
+<TGConnectingPoint num="17" id="1245" />
+<TGConnectingPoint num="18" id="1246" />
+<TGConnectingPoint num="19" id="1247" />
+<TGConnectingPoint num="20" id="1248" />
+<TGConnectingPoint num="21" id="1249" />
+<TGConnectingPoint num="22" id="1250" />
+<TGConnectingPoint num="23" id="1251" />
+<TGConnectingPoint num="24" id="1252" />
+<TGConnectingPoint num="25" id="1253" />
+<TGConnectingPoint num="26" id="1254" />
+<TGConnectingPoint num="27" id="1255" />
+<TGConnectingPoint num="28" id="1256" />
+<TGConnectingPoint num="29" id="1257" />
+<TGConnectingPoint num="30" id="1258" />
+<TGConnectingPoint num="31" id="1259" />
+<TGConnectingPoint num="32" id="1260" />
+<TGConnectingPoint num="33" id="1261" />
+<TGConnectingPoint num="34" id="1262" />
+<TGConnectingPoint num="35" id="1263" />
+<TGConnectingPoint num="36" id="1264" />
+<TGConnectingPoint num="37" id="1265" />
+<TGConnectingPoint num="38" id="1266" />
+<TGConnectingPoint num="39" id="1267" />
+<TGConnectingPoint num="40" id="1268" />
+<TGConnectingPoint num="41" id="1269" />
+<TGConnectingPoint num="42" id="1270" />
+<TGConnectingPoint num="43" id="1271" />
+<TGConnectingPoint num="44" id="1272" />
+<TGConnectingPoint num="45" id="1273" />
+<TGConnectingPoint num="46" id="1274" />
+<TGConnectingPoint num="47" id="1275" />
+<TGConnectingPoint num="48" id="1276" />
+<TGConnectingPoint num="49" id="1277" />
+<TGConnectingPoint num="50" id="1278" />
+<TGConnectingPoint num="51" id="1279" />
+<TGConnectingPoint num="52" id="1280" />
+<TGConnectingPoint num="53" id="1281" />
+<TGConnectingPoint num="54" id="1282" />
+<TGConnectingPoint num="55" id="1283" />
+<TGConnectingPoint num="56" id="1284" />
+<TGConnectingPoint num="57" id="1285" />
+<TGConnectingPoint num="58" id="1286" />
+<TGConnectingPoint num="59" id="1287" />
+<TGConnectingPoint num="60" id="1288" />
+<TGConnectingPoint num="61" id="1289" />
+<TGConnectingPoint num="62" id="1290" />
+<TGConnectingPoint num="63" id="1291" />
+<TGConnectingPoint num="64" id="1292" />
+<TGConnectingPoint num="65" id="1293" />
+<TGConnectingPoint num="66" id="1294" />
+<TGConnectingPoint num="67" id="1295" />
+<TGConnectingPoint num="68" id="1296" />
+<TGConnectingPoint num="69" id="1297" />
+<TGConnectingPoint num="70" id="1298" />
+<TGConnectingPoint num="71" id="1299" />
<extraparam>
</extraparam>
<color value="-3342490" />
</COMPONENT>
-<COMPONENT type="5100" id="1258" uid="4dd96fd3-bb7e-4733-8f80-c8025d0affae" >
+<COMPONENT type="5100" id="1302" uid="4dd96fd3-bb7e-4733-8f80-c8025d0affae" >
<cdparam x="355" y="81" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" 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="1257" />
+<TGConnectingPoint num="0" id="1301" />
</COMPONENT>
</AVATARStateMachineDiagramPanel>
<AVATARStateMachineDiagramPanel name="CoffeeMachine" minX="10" maxX="1400" minY="10" maxY="1400" >
-<CONNECTOR type="5102" id="1265" >
+<CONNECTOR type="5102" id="1309" >
<cdparam x="296" y="699" />
<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="1264" />
-<P1 x="296" y="699" id="1804" />
-<P2 x="289" y="748" id="1653" />
+<TGConnectingPoint num="0" id="1308" />
+<P1 x="296" y="699" id="1848" />
+<P2 x="289" y="748" id="1697" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1263" uid="4429f9b6-d417-4a3a-a891-fe7728ba5e2d" >
-<father id="1265" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1307" uid="4429f9b6-d417-4a3a-a891-fe7728ba5e2d" >
+<father id="1309" num="0" />
<cdparam x="292" y="723" />
<sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1259" />
-<TGConnectingPoint num="1" id="1260" />
-<TGConnectingPoint num="2" id="1261" />
-<TGConnectingPoint num="3" id="1262" />
+<TGConnectingPoint num="0" id="1303" />
+<TGConnectingPoint num="1" id="1304" />
+<TGConnectingPoint num="2" id="1305" />
+<TGConnectingPoint num="3" id="1306" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
@@ -2373,26 +2374,26 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1272" >
+<CONNECTOR type="5102" id="1316" >
<cdparam x="303" y="40" />
<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="1271" />
-<P1 x="303" y="40" id="1577" />
-<P2 x="302" y="62" id="1580" />
+<TGConnectingPoint num="0" id="1315" />
+<P1 x="303" y="40" id="1621" />
+<P2 x="302" y="62" id="1624" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1270" uid="1125c964-453f-4528-bc32-c8ee4c2ea64e" >
-<father id="1272" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1314" uid="1125c964-453f-4528-bc32-c8ee4c2ea64e" >
+<father id="1316" num="0" />
<cdparam x="303" y="80" />
<sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<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="1266" />
-<TGConnectingPoint num="1" id="1267" />
-<TGConnectingPoint num="2" id="1268" />
-<TGConnectingPoint num="3" id="1269" />
+<TGConnectingPoint num="0" id="1310" />
+<TGConnectingPoint num="1" id="1311" />
+<TGConnectingPoint num="2" id="1312" />
+<TGConnectingPoint num="3" id="1313" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
@@ -2406,26 +2407,26 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1279" >
+<CONNECTOR type="5102" id="1323" >
<cdparam x="303" y="103" />
<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="1278" />
-<P1 x="302" y="102" id="1585" />
-<P2 x="306" y="136" id="1398" />
+<TGConnectingPoint num="0" id="1322" />
+<P1 x="302" y="102" id="1629" />
+<P2 x="306" y="136" id="1442" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1277" uid="0603efd4-6d7d-47a2-9caa-b415cabc5de3" >
-<father id="1279" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1321" uid="0603efd4-6d7d-47a2-9caa-b415cabc5de3" >
+<father id="1323" num="0" />
<cdparam x="303" y="143" />
<sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<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="1273" />
-<TGConnectingPoint num="1" id="1274" />
-<TGConnectingPoint num="2" id="1275" />
-<TGConnectingPoint num="3" id="1276" />
+<TGConnectingPoint num="0" id="1317" />
+<TGConnectingPoint num="1" id="1318" />
+<TGConnectingPoint num="2" id="1319" />
+<TGConnectingPoint num="3" id="1320" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
@@ -2439,26 +2440,26 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1286" >
+<CONNECTOR type="5102" id="1330" >
<cdparam x="309" y="160" />
<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="1285" />
-<P1 x="306" y="166" id="1399" />
-<P2 x="309" y="188" id="1505" />
+<TGConnectingPoint num="0" id="1329" />
+<P1 x="306" y="166" id="1443" />
+<P2 x="309" y="188" id="1549" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1284" uid="b559eedf-0c1b-4649-af86-002b18b6cec0" >
-<father id="1286" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1328" uid="b559eedf-0c1b-4649-af86-002b18b6cec0" >
+<father id="1330" num="0" />
<cdparam x="328" y="178" />
<sizeparam width="168" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<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="1280" />
-<TGConnectingPoint num="1" id="1281" />
-<TGConnectingPoint num="2" id="1282" />
-<TGConnectingPoint num="3" id="1283" />
+<TGConnectingPoint num="0" id="1324" />
+<TGConnectingPoint num="1" id="1325" />
+<TGConnectingPoint num="2" id="1326" />
+<TGConnectingPoint num="3" id="1327" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
@@ -2473,26 +2474,26 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1293" >
+<CONNECTOR type="5102" id="1337" >
<cdparam x="270" y="224" />
<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="1292" />
-<P1 x="270" y="228" id="1518" />
-<P2 x="277" y="275" id="1420" />
+<TGConnectingPoint num="0" id="1336" />
+<P1 x="270" y="228" id="1562" />
+<P2 x="277" y="275" id="1464" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1291" uid="95f680e7-c6de-4b21-9cc3-240c458f5232" >
-<father id="1293" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1335" uid="95f680e7-c6de-4b21-9cc3-240c458f5232" >
+<father id="1337" num="0" />
<cdparam x="270" y="264" />
<sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<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="1287" />
-<TGConnectingPoint num="1" id="1288" />
-<TGConnectingPoint num="2" id="1289" />
-<TGConnectingPoint num="3" id="1290" />
+<TGConnectingPoint num="0" id="1331" />
+<TGConnectingPoint num="1" id="1332" />
+<TGConnectingPoint num="2" id="1333" />
+<TGConnectingPoint num="3" id="1334" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
@@ -2506,26 +2507,26 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1300" >
+<CONNECTOR type="5102" id="1344" >
<cdparam x="243" y="319" />
<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="1299" />
-<P1 x="277" y="305" id="1421" />
-<P2 x="311" y="372" id="2053" />
+<TGConnectingPoint num="0" id="1343" />
+<P1 x="277" y="305" id="1465" />
+<P2 x="311" y="372" id="2097" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1298" uid="26605bc0-b58e-4341-8d3a-ed61576c60e7" >
-<father id="1300" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1342" uid="26605bc0-b58e-4341-8d3a-ed61576c60e7" >
+<father id="1344" num="0" />
<cdparam x="291" y="348" />
<sizeparam width="85" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<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="1294" />
-<TGConnectingPoint num="1" id="1295" />
-<TGConnectingPoint num="2" id="1296" />
-<TGConnectingPoint num="3" id="1297" />
+<TGConnectingPoint num="0" id="1338" />
+<TGConnectingPoint num="1" id="1339" />
+<TGConnectingPoint num="2" id="1340" />
+<TGConnectingPoint num="3" id="1341" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
@@ -2540,26 +2541,26 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1307" >
+<CONNECTOR type="5102" id="1351" >
<cdparam x="348" y="228" />
<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="1306" />
-<P1 x="388" y="208" id="1508" />
-<P2 x="649" y="264" id="1434" />
+<TGConnectingPoint num="0" id="1350" />
+<P1 x="388" y="208" id="1552" />
+<P2 x="649" y="264" id="1478" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1305" uid="6da8ef68-bfcd-4555-a437-382dba9ed0fa" >
-<father id="1307" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1349" uid="6da8ef68-bfcd-4555-a437-382dba9ed0fa" >
+<father id="1351" num="0" />
<cdparam x="411" y="206" />
<sizeparam width="100" height="30" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<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="1301" />
-<TGConnectingPoint num="1" id="1302" />
-<TGConnectingPoint num="2" id="1303" />
-<TGConnectingPoint num="3" id="1304" />
+<TGConnectingPoint num="0" id="1345" />
+<TGConnectingPoint num="1" id="1346" />
+<TGConnectingPoint num="2" id="1347" />
+<TGConnectingPoint num="3" id="1348" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="coinDelay" enabled="true"/>
@@ -2573,26 +2574,26 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1314" >
+<CONNECTOR type="5102" id="1358" >
<cdparam x="667" y="346" />
<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="1313" />
-<P1 x="699" y="346" id="1410" />
-<P2 x="699" y="381" id="1726" />
+<TGConnectingPoint num="0" id="1357" />
+<P1 x="699" y="346" id="1454" />
+<P2 x="699" y="381" id="1770" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1312" uid="c78ca8fa-a504-4c17-b0fd-1b441e700bc9" >
-<father id="1314" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1356" uid="c78ca8fa-a504-4c17-b0fd-1b441e700bc9" >
+<father id="1358" num="0" />
<cdparam x="707" y="368" />
<sizeparam width="89" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<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="1308" />
-<TGConnectingPoint num="1" id="1309" />
-<TGConnectingPoint num="2" id="1310" />
-<TGConnectingPoint num="3" id="1311" />
+<TGConnectingPoint num="0" id="1352" />
+<TGConnectingPoint num="1" id="1353" />
+<TGConnectingPoint num="2" id="1354" />
+<TGConnectingPoint num="3" id="1355" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
@@ -2607,26 +2608,26 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1321" >
+<CONNECTOR type="5102" id="1365" >
<cdparam x="280" y="420" />
<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="1320" />
-<P1 x="261" y="421" id="1966" />
-<P2 x="260" y="437" id="1969" />
+<TGConnectingPoint num="0" id="1364" />
+<P1 x="261" y="421" id="1999" />
+<P2 x="260" y="437" id="1927" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1319" uid="a28ea541-81ef-4713-8ea6-c7f5ba166daa" >
-<father id="1321" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1363" uid="a28ea541-81ef-4713-8ea6-c7f5ba166daa" >
+<father id="1365" num="0" />
<cdparam x="280" y="460" />
<sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<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="1315" />
-<TGConnectingPoint num="1" id="1316" />
-<TGConnectingPoint num="2" id="1317" />
-<TGConnectingPoint num="3" id="1318" />
+<TGConnectingPoint num="0" id="1359" />
+<TGConnectingPoint num="1" id="1360" />
+<TGConnectingPoint num="2" id="1361" />
+<TGConnectingPoint num="3" id="1362" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
@@ -2640,26 +2641,26 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1328" >
+<CONNECTOR type="5102" id="1372" >
<cdparam x="229" y="465" />
<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="1327" />
-<P1 x="227" y="477" id="1982" />
-<P2 x="126" y="524" id="1955" />
+<TGConnectingPoint num="0" id="1371" />
+<P1 x="227" y="477" id="1940" />
+<P2 x="126" y="524" id="2001" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1326" uid="2484893a-3443-40dc-8f74-e1443edc2bde" >
-<father id="1328" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1370" uid="2484893a-3443-40dc-8f74-e1443edc2bde" >
+<father id="1372" num="0" />
<cdparam x="229" y="505" />
<sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<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="1322" />
-<TGConnectingPoint num="1" id="1323" />
-<TGConnectingPoint num="2" id="1324" />
-<TGConnectingPoint num="3" id="1325" />
+<TGConnectingPoint num="0" id="1366" />
+<TGConnectingPoint num="1" id="1367" />
+<TGConnectingPoint num="2" id="1368" />
+<TGConnectingPoint num="3" id="1369" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
@@ -2673,26 +2674,26 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1335" >
+<CONNECTOR type="5102" id="1379" >
<cdparam x="148" y="549" />
<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="1334" />
-<P1 x="126" y="554" id="1956" />
-<P2 x="126" y="653" id="1872" />
+<TGConnectingPoint num="0" id="1378" />
+<P1 x="126" y="554" id="2002" />
+<P2 x="126" y="653" id="2024" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1333" uid="6f6c6e3e-0702-4e99-b1e6-da999207526e" >
-<father id="1335" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1377" uid="6f6c6e3e-0702-4e99-b1e6-da999207526e" >
+<father id="1379" num="0" />
<cdparam x="32" y="587" />
<sizeparam width="288" height="45" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<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="1329" />
-<TGConnectingPoint num="1" id="1330" />
-<TGConnectingPoint num="2" id="1331" />
-<TGConnectingPoint num="3" id="1332" />
+<TGConnectingPoint num="0" id="1373" />
+<TGConnectingPoint num="1" id="1374" />
+<TGConnectingPoint num="2" id="1375" />
+<TGConnectingPoint num="3" id="1376" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
@@ -2708,26 +2709,26 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1342" >
+<CONNECTOR type="5102" id="1386" >
<cdparam x="295" y="465" />
<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="1341" />
-<P1 x="293" y="477" id="1983" />
-<P2 x="298" y="524" id="2041" />
+<TGConnectingPoint num="0" id="1385" />
+<P1 x="293" y="477" id="1941" />
+<P2 x="298" y="524" id="1915" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1340" uid="18f77c23-d770-43b2-a9ca-161802d8a987" >
-<father id="1342" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1384" uid="18f77c23-d770-43b2-a9ca-161802d8a987" >
+<father id="1386" num="0" />
<cdparam x="295" y="505" />
<sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<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="1336" />
-<TGConnectingPoint num="1" id="1337" />
-<TGConnectingPoint num="2" id="1338" />
-<TGConnectingPoint num="3" id="1339" />
+<TGConnectingPoint num="0" id="1380" />
+<TGConnectingPoint num="1" id="1381" />
+<TGConnectingPoint num="2" id="1382" />
+<TGConnectingPoint num="3" id="1383" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
@@ -2741,26 +2742,26 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1349" >
+<CONNECTOR type="5102" id="1393" >
<cdparam x="355" y="545" />
<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="1348" />
-<P1 x="298" y="554" id="2042" />
-<P2 x="296" y="650" id="1799" />
+<TGConnectingPoint num="0" id="1392" />
+<P1 x="298" y="554" id="1916" />
+<P2 x="296" y="650" id="1843" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1347" uid="a2a44349-5c04-4880-b1fb-76fa61d0f788" >
-<father id="1349" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1391" uid="a2a44349-5c04-4880-b1fb-76fa61d0f788" >
+<father id="1393" num="0" />
<cdparam x="213" y="607" />
<sizeparam width="252" height="45" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<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="1343" />
-<TGConnectingPoint num="1" id="1344" />
-<TGConnectingPoint num="2" id="1345" />
-<TGConnectingPoint num="3" id="1346" />
+<TGConnectingPoint num="0" id="1387" />
+<TGConnectingPoint num="1" id="1388" />
+<TGConnectingPoint num="2" id="1389" />
+<TGConnectingPoint num="3" id="1390" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
@@ -2776,26 +2777,26 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1356" >
+<CONNECTOR type="5102" id="1400" >
<cdparam x="555" y="559" />
<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="1355" />
-<P1 x="326" y="457" id="1972" />
-<P2 x="442" y="497" id="1944" />
+<TGConnectingPoint num="0" id="1399" />
+<P1 x="326" y="457" id="1930" />
+<P2 x="442" y="497" id="2012" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1354" uid="1286b08f-20a2-44ff-9ae2-d3d09cf02647" >
-<father id="1356" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1398" uid="1286b08f-20a2-44ff-9ae2-d3d09cf02647" >
+<father id="1400" num="0" />
<cdparam x="395" y="448" />
<sizeparam width="100" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1350" />
-<TGConnectingPoint num="1" id="1351" />
-<TGConnectingPoint num="2" id="1352" />
-<TGConnectingPoint num="3" id="1353" />
+<TGConnectingPoint num="0" id="1394" />
+<TGConnectingPoint num="1" id="1395" />
+<TGConnectingPoint num="2" id="1396" />
+<TGConnectingPoint num="3" id="1397" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="coinDelay" enabled="true"/>
@@ -2809,36 +2810,36 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1365" >
+<CONNECTOR type="5102" id="1409" >
<cdparam x="481" y="501" />
<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="1363" />
-<TGConnectingPoint num="1" id="1364" />
-<P1 x="442" y="527" id="1945" />
-<P2 x="323" y="748" id="1661" />
+<TGConnectingPoint num="0" id="1407" />
+<TGConnectingPoint num="1" id="1408" />
+<P1 x="442" y="527" id="2013" />
+<P2 x="323" y="748" id="1705" />
<Point x="442" y="737" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1357" uid="97f05691-fdba-4c23-8f17-efc594de748a" >
-<father id="1365" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1401" uid="97f05691-fdba-4c23-8f17-efc594de748a" >
+<father id="1409" num="0" />
<cdparam x="442" y="737" />
<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="point " value="null" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="1362" uid="89079180-d69e-4fbf-9f0d-538fe96f80b6" >
-<father id="1365" num="1" />
+<SUBCOMPONENT type="-1" id="1406" uid="89079180-d69e-4fbf-9f0d-538fe96f80b6" >
+<father id="1409" num="1" />
<cdparam x="420" y="552" />
<sizeparam width="89" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1358" />
-<TGConnectingPoint num="1" id="1359" />
-<TGConnectingPoint num="2" id="1360" />
-<TGConnectingPoint num="3" id="1361" />
+<TGConnectingPoint num="0" id="1402" />
+<TGConnectingPoint num="1" id="1403" />
+<TGConnectingPoint num="2" id="1404" />
+<TGConnectingPoint num="3" id="1405" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
@@ -2853,26 +2854,26 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1372" >
+<CONNECTOR type="5102" id="1416" >
<cdparam x="691" y="288" />
<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="1371" />
-<P1 x="704" y="289" id="1437" />
-<P2 x="699" y="316" id="1409" />
+<TGConnectingPoint num="0" id="1415" />
+<P1 x="704" y="289" id="1481" />
+<P2 x="699" y="316" id="1453" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1370" uid="bfad4a28-4646-4532-b3dc-40f159448f2a" >
-<father id="1372" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1414" uid="bfad4a28-4646-4532-b3dc-40f159448f2a" >
+<father id="1416" num="0" />
<cdparam x="691" y="328" />
<sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1366" />
-<TGConnectingPoint num="1" id="1367" />
-<TGConnectingPoint num="2" id="1368" />
-<TGConnectingPoint num="3" id="1369" />
+<TGConnectingPoint num="0" id="1410" />
+<TGConnectingPoint num="1" id="1411" />
+<TGConnectingPoint num="2" id="1412" />
+<TGConnectingPoint num="3" id="1413" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
@@ -2886,34 +2887,34 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="118" id="1373" >
+<CONNECTOR type="118" id="1417" >
<cdparam x="372" y="83" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="412" y="82" id="1615" />
-<P2 x="472" y="82" id="1384" />
+<P1 x="412" y="82" id="1659" />
+<P2 x="472" y="82" id="1428" />
<AutomaticDrawing data="false" />
</CONNECTOR>
-<CONNECTOR type="5102" id="1380" >
+<CONNECTOR type="5102" id="1424" >
<cdparam x="126" y="702" />
<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="1379" />
-<P1 x="126" y="702" id="1877" />
-<P2 x="221" y="758" id="1662" />
+<TGConnectingPoint num="0" id="1423" />
+<P1 x="126" y="702" id="2029" />
+<P2 x="221" y="758" id="1706" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1378" uid="96753e12-f1ba-45d7-9fc5-e71fe53eb22b" >
-<father id="1380" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1422" uid="96753e12-f1ba-45d7-9fc5-e71fe53eb22b" >
+<father id="1424" num="0" />
<cdparam x="173" y="730" />
<sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1374" />
-<TGConnectingPoint num="1" id="1375" />
-<TGConnectingPoint num="2" id="1376" />
-<TGConnectingPoint num="3" id="1377" />
+<TGConnectingPoint num="0" id="1418" />
+<TGConnectingPoint num="1" id="1419" />
+<TGConnectingPoint num="2" id="1420" />
+<TGConnectingPoint num="3" id="1421" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
@@ -2927,943 +2928,943 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="301" id="1397" uid="0fc38199-404b-4919-af36-91d94e67bd82" >
+<COMPONENT type="301" id="1441" uid="0fc38199-404b-4919-af36-91d94e67bd82" >
<cdparam x="472" y="75" />
<sizeparam width="100" height="15" minWidth="20" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="UML Note" value="Activity1.docx
" />
-<TGConnectingPoint num="0" id="1381" />
-<TGConnectingPoint num="1" id="1382" />
-<TGConnectingPoint num="2" id="1383" />
-<TGConnectingPoint num="3" id="1384" />
-<TGConnectingPoint num="4" id="1385" />
-<TGConnectingPoint num="5" id="1386" />
-<TGConnectingPoint num="6" id="1387" />
-<TGConnectingPoint num="7" id="1388" />
-<TGConnectingPoint num="8" id="1389" />
-<TGConnectingPoint num="9" id="1390" />
-<TGConnectingPoint num="10" id="1391" />
-<TGConnectingPoint num="11" id="1392" />
-<TGConnectingPoint num="12" id="1393" />
-<TGConnectingPoint num="13" id="1394" />
-<TGConnectingPoint num="14" id="1395" />
-<TGConnectingPoint num="15" id="1396" />
+<TGConnectingPoint num="0" id="1425" />
+<TGConnectingPoint num="1" id="1426" />
+<TGConnectingPoint num="2" id="1427" />
+<TGConnectingPoint num="3" id="1428" />
+<TGConnectingPoint num="4" id="1429" />
+<TGConnectingPoint num="5" id="1430" />
+<TGConnectingPoint num="6" id="1431" />
+<TGConnectingPoint num="7" id="1432" />
+<TGConnectingPoint num="8" id="1433" />
+<TGConnectingPoint num="9" id="1434" />
+<TGConnectingPoint num="10" id="1435" />
+<TGConnectingPoint num="11" id="1436" />
+<TGConnectingPoint num="12" id="1437" />
+<TGConnectingPoint num="13" id="1438" />
+<TGConnectingPoint num="14" id="1439" />
+<TGConnectingPoint num="15" id="1440" />
<extraparam>
<Line value="Activity1.docx" />
</extraparam>
</COMPONENT>
-<COMPONENT type="5104" id="1408" uid="d83a71f6-2c21-4d03-a0df-a3cd72c20ffa" >
+<COMPONENT type="5104" id="1452" uid="d83a71f6-2c21-4d03-a0df-a3cd72c20ffa" >
<cdparam x="268" y="141" />
<sizeparam width="76" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="Receive signal" value="getCoin(x)" />
-<TGConnectingPoint num="0" id="1398" />
-<TGConnectingPoint num="1" id="1399" />
-<TGConnectingPoint num="2" id="1400" />
-<TGConnectingPoint num="3" id="1401" />
-<TGConnectingPoint num="4" id="1402" />
-<TGConnectingPoint num="5" id="1403" />
-<TGConnectingPoint num="6" id="1404" />
-<TGConnectingPoint num="7" id="1405" />
-<TGConnectingPoint num="8" id="1406" />
-<TGConnectingPoint num="9" id="1407" />
+<TGConnectingPoint num="0" id="1442" />
+<TGConnectingPoint num="1" id="1443" />
+<TGConnectingPoint num="2" id="1444" />
+<TGConnectingPoint num="3" id="1445" />
+<TGConnectingPoint num="4" id="1446" />
+<TGConnectingPoint num="5" id="1447" />
+<TGConnectingPoint num="6" id="1448" />
+<TGConnectingPoint num="7" id="1449" />
+<TGConnectingPoint num="8" id="1450" />
+<TGConnectingPoint num="9" id="1451" />
</COMPONENT>
-<COMPONENT type="5103" id="1419" uid="d69a1f8e-85ca-49cd-9f8c-a853348e5be5" >
+<COMPONENT type="5103" id="1463" uid="d69a1f8e-85ca-49cd-9f8c-a853348e5be5" >
<cdparam x="634" y="321" />
<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="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="Send signal" value="ejectCoin(nbOfCoins)" />
-<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="0" id="1453" />
+<TGConnectingPoint num="1" id="1454" />
+<TGConnectingPoint num="2" id="1455" />
+<TGConnectingPoint num="3" id="1456" />
+<TGConnectingPoint num="4" id="1457" />
+<TGConnectingPoint num="5" id="1458" />
+<TGConnectingPoint num="6" id="1459" />
+<TGConnectingPoint num="7" id="1460" />
+<TGConnectingPoint num="8" id="1461" />
+<TGConnectingPoint num="9" id="1462" />
</COMPONENT>
-<COMPONENT type="5104" id="1430" uid="90146507-882f-4b3d-b9ac-1db93cca92c4" >
+<COMPONENT type="5104" id="1474" uid="90146507-882f-4b3d-b9ac-1db93cca92c4" >
<cdparam x="239" y="280" />
<sizeparam width="76" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="Receive signal" value="getCoin(x)" />
-<TGConnectingPoint num="0" id="1420" />
-<TGConnectingPoint num="1" id="1421" />
-<TGConnectingPoint num="2" id="1422" />
-<TGConnectingPoint num="3" id="1423" />
-<TGConnectingPoint num="4" id="1424" />
-<TGConnectingPoint num="5" id="1425" />
-<TGConnectingPoint num="6" id="1426" />
-<TGConnectingPoint num="7" id="1427" />
-<TGConnectingPoint num="8" id="1428" />
-<TGConnectingPoint num="9" id="1429" />
+<TGConnectingPoint num="0" id="1464" />
+<TGConnectingPoint num="1" id="1465" />
+<TGConnectingPoint num="2" id="1466" />
+<TGConnectingPoint num="3" id="1467" />
+<TGConnectingPoint num="4" id="1468" />
+<TGConnectingPoint num="5" id="1469" />
+<TGConnectingPoint num="6" id="1470" />
+<TGConnectingPoint num="7" id="1471" />
+<TGConnectingPoint num="8" id="1472" />
+<TGConnectingPoint num="9" id="1473" />
<accessibility />
</COMPONENT>
-<COMPONENT type="5106" id="1503" uid="f7f6cc4e-efaa-4ffe-aeef-5e22694d971c" >
+<COMPONENT type="5106" id="1547" uid="f7f6cc4e-efaa-4ffe-aeef-5e22694d971c" >
<cdparam x="649" y="239" />
<sizeparam width="110" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="state0" value="EjectState" />
-<TGConnectingPoint num="0" id="1431" />
-<TGConnectingPoint num="1" id="1432" />
-<TGConnectingPoint num="2" id="1433" />
-<TGConnectingPoint num="3" id="1434" />
-<TGConnectingPoint num="4" id="1435" />
-<TGConnectingPoint num="5" id="1436" />
-<TGConnectingPoint num="6" id="1437" />
-<TGConnectingPoint num="7" id="1438" />
-<TGConnectingPoint num="8" id="1439" />
-<TGConnectingPoint num="9" id="1440" />
-<TGConnectingPoint num="10" id="1441" />
-<TGConnectingPoint num="11" id="1442" />
-<TGConnectingPoint num="12" id="1443" />
-<TGConnectingPoint num="13" id="1444" />
-<TGConnectingPoint num="14" id="1445" />
-<TGConnectingPoint num="15" id="1446" />
-<TGConnectingPoint num="16" id="1447" />
-<TGConnectingPoint num="17" id="1448" />
-<TGConnectingPoint num="18" id="1449" />
-<TGConnectingPoint num="19" id="1450" />
-<TGConnectingPoint num="20" id="1451" />
-<TGConnectingPoint num="21" id="1452" />
-<TGConnectingPoint num="22" id="1453" />
-<TGConnectingPoint num="23" id="1454" />
-<TGConnectingPoint num="24" id="1455" />
-<TGConnectingPoint num="25" id="1456" />
-<TGConnectingPoint num="26" id="1457" />
-<TGConnectingPoint num="27" id="1458" />
-<TGConnectingPoint num="28" id="1459" />
-<TGConnectingPoint num="29" id="1460" />
-<TGConnectingPoint num="30" id="1461" />
-<TGConnectingPoint num="31" id="1462" />
-<TGConnectingPoint num="32" id="1463" />
-<TGConnectingPoint num="33" id="1464" />
-<TGConnectingPoint num="34" id="1465" />
-<TGConnectingPoint num="35" id="1466" />
-<TGConnectingPoint num="36" id="1467" />
-<TGConnectingPoint num="37" id="1468" />
-<TGConnectingPoint num="38" id="1469" />
-<TGConnectingPoint num="39" id="1470" />
-<TGConnectingPoint num="40" id="1471" />
-<TGConnectingPoint num="41" id="1472" />
-<TGConnectingPoint num="42" id="1473" />
-<TGConnectingPoint num="43" id="1474" />
-<TGConnectingPoint num="44" id="1475" />
-<TGConnectingPoint num="45" id="1476" />
-<TGConnectingPoint num="46" id="1477" />
-<TGConnectingPoint num="47" id="1478" />
-<TGConnectingPoint num="48" id="1479" />
-<TGConnectingPoint num="49" id="1480" />
-<TGConnectingPoint num="50" id="1481" />
-<TGConnectingPoint num="51" id="1482" />
-<TGConnectingPoint num="52" id="1483" />
-<TGConnectingPoint num="53" id="1484" />
-<TGConnectingPoint num="54" id="1485" />
-<TGConnectingPoint num="55" id="1486" />
-<TGConnectingPoint num="56" id="1487" />
-<TGConnectingPoint num="57" id="1488" />
-<TGConnectingPoint num="58" id="1489" />
-<TGConnectingPoint num="59" id="1490" />
-<TGConnectingPoint num="60" id="1491" />
-<TGConnectingPoint num="61" id="1492" />
-<TGConnectingPoint num="62" id="1493" />
-<TGConnectingPoint num="63" id="1494" />
-<TGConnectingPoint num="64" id="1495" />
-<TGConnectingPoint num="65" id="1496" />
-<TGConnectingPoint num="66" id="1497" />
-<TGConnectingPoint num="67" id="1498" />
-<TGConnectingPoint num="68" id="1499" />
-<TGConnectingPoint num="69" id="1500" />
-<TGConnectingPoint num="70" id="1501" />
-<TGConnectingPoint num="71" id="1502" />
+<TGConnectingPoint num="0" id="1475" />
+<TGConnectingPoint num="1" id="1476" />
+<TGConnectingPoint num="2" id="1477" />
+<TGConnectingPoint num="3" id="1478" />
+<TGConnectingPoint num="4" id="1479" />
+<TGConnectingPoint num="5" id="1480" />
+<TGConnectingPoint num="6" id="1481" />
+<TGConnectingPoint num="7" id="1482" />
+<TGConnectingPoint num="8" id="1483" />
+<TGConnectingPoint num="9" id="1484" />
+<TGConnectingPoint num="10" id="1485" />
+<TGConnectingPoint num="11" id="1486" />
+<TGConnectingPoint num="12" id="1487" />
+<TGConnectingPoint num="13" id="1488" />
+<TGConnectingPoint num="14" id="1489" />
+<TGConnectingPoint num="15" id="1490" />
+<TGConnectingPoint num="16" id="1491" />
+<TGConnectingPoint num="17" id="1492" />
+<TGConnectingPoint num="18" id="1493" />
+<TGConnectingPoint num="19" id="1494" />
+<TGConnectingPoint num="20" id="1495" />
+<TGConnectingPoint num="21" id="1496" />
+<TGConnectingPoint num="22" id="1497" />
+<TGConnectingPoint num="23" id="1498" />
+<TGConnectingPoint num="24" id="1499" />
+<TGConnectingPoint num="25" id="1500" />
+<TGConnectingPoint num="26" id="1501" />
+<TGConnectingPoint num="27" id="1502" />
+<TGConnectingPoint num="28" id="1503" />
+<TGConnectingPoint num="29" id="1504" />
+<TGConnectingPoint num="30" id="1505" />
+<TGConnectingPoint num="31" id="1506" />
+<TGConnectingPoint num="32" id="1507" />
+<TGConnectingPoint num="33" id="1508" />
+<TGConnectingPoint num="34" id="1509" />
+<TGConnectingPoint num="35" id="1510" />
+<TGConnectingPoint num="36" id="1511" />
+<TGConnectingPoint num="37" id="1512" />
+<TGConnectingPoint num="38" id="1513" />
+<TGConnectingPoint num="39" id="1514" />
+<TGConnectingPoint num="40" id="1515" />
+<TGConnectingPoint num="41" id="1516" />
+<TGConnectingPoint num="42" id="1517" />
+<TGConnectingPoint num="43" id="1518" />
+<TGConnectingPoint num="44" id="1519" />
+<TGConnectingPoint num="45" id="1520" />
+<TGConnectingPoint num="46" id="1521" />
+<TGConnectingPoint num="47" id="1522" />
+<TGConnectingPoint num="48" id="1523" />
+<TGConnectingPoint num="49" id="1524" />
+<TGConnectingPoint num="50" id="1525" />
+<TGConnectingPoint num="51" id="1526" />
+<TGConnectingPoint num="52" id="1527" />
+<TGConnectingPoint num="53" id="1528" />
+<TGConnectingPoint num="54" id="1529" />
+<TGConnectingPoint num="55" id="1530" />
+<TGConnectingPoint num="56" id="1531" />
+<TGConnectingPoint num="57" id="1532" />
+<TGConnectingPoint num="58" id="1533" />
+<TGConnectingPoint num="59" id="1534" />
+<TGConnectingPoint num="60" id="1535" />
+<TGConnectingPoint num="61" id="1536" />
+<TGConnectingPoint num="62" id="1537" />
+<TGConnectingPoint num="63" id="1538" />
+<TGConnectingPoint num="64" id="1539" />
+<TGConnectingPoint num="65" id="1540" />
+<TGConnectingPoint num="66" id="1541" />
+<TGConnectingPoint num="67" id="1542" />
+<TGConnectingPoint num="68" id="1543" />
+<TGConnectingPoint num="69" id="1544" />
+<TGConnectingPoint num="70" id="1545" />
+<TGConnectingPoint num="71" id="1546" />
<extraparam>
</extraparam>
</COMPONENT>
-<COMPONENT type="5106" id="1576" uid="0e66f92f-ee5c-400a-9368-9ec8b591b9ac" >
+<COMPONENT type="5106" id="1620" uid="0e66f92f-ee5c-400a-9368-9ec8b591b9ac" >
<cdparam x="231" y="188" />
<sizeparam width="157" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="state0" value="WaitingForSecondCoin" />
-<TGConnectingPoint num="0" id="1504" />
-<TGConnectingPoint num="1" id="1505" />
-<TGConnectingPoint num="2" id="1506" />
-<TGConnectingPoint num="3" id="1507" />
-<TGConnectingPoint num="4" id="1508" />
-<TGConnectingPoint num="5" id="1509" />
-<TGConnectingPoint num="6" id="1510" />
-<TGConnectingPoint num="7" id="1511" />
-<TGConnectingPoint num="8" id="1512" />
-<TGConnectingPoint num="9" id="1513" />
-<TGConnectingPoint num="10" id="1514" />
-<TGConnectingPoint num="11" id="1515" />
-<TGConnectingPoint num="12" id="1516" />
-<TGConnectingPoint num="13" id="1517" />
-<TGConnectingPoint num="14" id="1518" />
-<TGConnectingPoint num="15" id="1519" />
-<TGConnectingPoint num="16" id="1520" />
-<TGConnectingPoint num="17" id="1521" />
-<TGConnectingPoint num="18" id="1522" />
-<TGConnectingPoint num="19" id="1523" />
-<TGConnectingPoint num="20" id="1524" />
-<TGConnectingPoint num="21" id="1525" />
-<TGConnectingPoint num="22" id="1526" />
-<TGConnectingPoint num="23" id="1527" />
-<TGConnectingPoint num="24" id="1528" />
-<TGConnectingPoint num="25" id="1529" />
-<TGConnectingPoint num="26" id="1530" />
-<TGConnectingPoint num="27" id="1531" />
-<TGConnectingPoint num="28" id="1532" />
-<TGConnectingPoint num="29" id="1533" />
-<TGConnectingPoint num="30" id="1534" />
-<TGConnectingPoint num="31" id="1535" />
-<TGConnectingPoint num="32" id="1536" />
-<TGConnectingPoint num="33" id="1537" />
-<TGConnectingPoint num="34" id="1538" />
-<TGConnectingPoint num="35" id="1539" />
-<TGConnectingPoint num="36" id="1540" />
-<TGConnectingPoint num="37" id="1541" />
-<TGConnectingPoint num="38" id="1542" />
-<TGConnectingPoint num="39" id="1543" />
-<TGConnectingPoint num="40" id="1544" />
-<TGConnectingPoint num="41" id="1545" />
-<TGConnectingPoint num="42" id="1546" />
-<TGConnectingPoint num="43" id="1547" />
-<TGConnectingPoint num="44" id="1548" />
-<TGConnectingPoint num="45" id="1549" />
-<TGConnectingPoint num="46" id="1550" />
-<TGConnectingPoint num="47" id="1551" />
-<TGConnectingPoint num="48" id="1552" />
-<TGConnectingPoint num="49" id="1553" />
-<TGConnectingPoint num="50" id="1554" />
-<TGConnectingPoint num="51" id="1555" />
-<TGConnectingPoint num="52" id="1556" />
-<TGConnectingPoint num="53" id="1557" />
-<TGConnectingPoint num="54" id="1558" />
-<TGConnectingPoint num="55" id="1559" />
-<TGConnectingPoint num="56" id="1560" />
-<TGConnectingPoint num="57" id="1561" />
-<TGConnectingPoint num="58" id="1562" />
-<TGConnectingPoint num="59" id="1563" />
-<TGConnectingPoint num="60" id="1564" />
-<TGConnectingPoint num="61" id="1565" />
-<TGConnectingPoint num="62" id="1566" />
-<TGConnectingPoint num="63" id="1567" />
-<TGConnectingPoint num="64" id="1568" />
-<TGConnectingPoint num="65" id="1569" />
-<TGConnectingPoint num="66" id="1570" />
-<TGConnectingPoint num="67" id="1571" />
-<TGConnectingPoint num="68" id="1572" />
-<TGConnectingPoint num="69" id="1573" />
-<TGConnectingPoint num="70" id="1574" />
-<TGConnectingPoint num="71" id="1575" />
+<TGConnectingPoint num="0" id="1548" />
+<TGConnectingPoint num="1" id="1549" />
+<TGConnectingPoint num="2" id="1550" />
+<TGConnectingPoint num="3" id="1551" />
+<TGConnectingPoint num="4" id="1552" />
+<TGConnectingPoint num="5" id="1553" />
+<TGConnectingPoint num="6" id="1554" />
+<TGConnectingPoint num="7" id="1555" />
+<TGConnectingPoint num="8" id="1556" />
+<TGConnectingPoint num="9" id="1557" />
+<TGConnectingPoint num="10" id="1558" />
+<TGConnectingPoint num="11" id="1559" />
+<TGConnectingPoint num="12" id="1560" />
+<TGConnectingPoint num="13" id="1561" />
+<TGConnectingPoint num="14" id="1562" />
+<TGConnectingPoint num="15" id="1563" />
+<TGConnectingPoint num="16" id="1564" />
+<TGConnectingPoint num="17" id="1565" />
+<TGConnectingPoint num="18" id="1566" />
+<TGConnectingPoint num="19" id="1567" />
+<TGConnectingPoint num="20" id="1568" />
+<TGConnectingPoint num="21" id="1569" />
+<TGConnectingPoint num="22" id="1570" />
+<TGConnectingPoint num="23" id="1571" />
+<TGConnectingPoint num="24" id="1572" />
+<TGConnectingPoint num="25" id="1573" />
+<TGConnectingPoint num="26" id="1574" />
+<TGConnectingPoint num="27" id="1575" />
+<TGConnectingPoint num="28" id="1576" />
+<TGConnectingPoint num="29" id="1577" />
+<TGConnectingPoint num="30" id="1578" />
+<TGConnectingPoint num="31" id="1579" />
+<TGConnectingPoint num="32" id="1580" />
+<TGConnectingPoint num="33" id="1581" />
+<TGConnectingPoint num="34" id="1582" />
+<TGConnectingPoint num="35" id="1583" />
+<TGConnectingPoint num="36" id="1584" />
+<TGConnectingPoint num="37" id="1585" />
+<TGConnectingPoint num="38" id="1586" />
+<TGConnectingPoint num="39" id="1587" />
+<TGConnectingPoint num="40" id="1588" />
+<TGConnectingPoint num="41" id="1589" />
+<TGConnectingPoint num="42" id="1590" />
+<TGConnectingPoint num="43" id="1591" />
+<TGConnectingPoint num="44" id="1592" />
+<TGConnectingPoint num="45" id="1593" />
+<TGConnectingPoint num="46" id="1594" />
+<TGConnectingPoint num="47" id="1595" />
+<TGConnectingPoint num="48" id="1596" />
+<TGConnectingPoint num="49" id="1597" />
+<TGConnectingPoint num="50" id="1598" />
+<TGConnectingPoint num="51" id="1599" />
+<TGConnectingPoint num="52" id="1600" />
+<TGConnectingPoint num="53" id="1601" />
+<TGConnectingPoint num="54" id="1602" />
+<TGConnectingPoint num="55" id="1603" />
+<TGConnectingPoint num="56" id="1604" />
+<TGConnectingPoint num="57" id="1605" />
+<TGConnectingPoint num="58" id="1606" />
+<TGConnectingPoint num="59" id="1607" />
+<TGConnectingPoint num="60" id="1608" />
+<TGConnectingPoint num="61" id="1609" />
+<TGConnectingPoint num="62" id="1610" />
+<TGConnectingPoint num="63" id="1611" />
+<TGConnectingPoint num="64" id="1612" />
+<TGConnectingPoint num="65" id="1613" />
+<TGConnectingPoint num="66" id="1614" />
+<TGConnectingPoint num="67" id="1615" />
+<TGConnectingPoint num="68" id="1616" />
+<TGConnectingPoint num="69" id="1617" />
+<TGConnectingPoint num="70" id="1618" />
+<TGConnectingPoint num="71" id="1619" />
<extraparam>
</extraparam>
</COMPONENT>
-<COMPONENT type="5100" id="1578" uid="cd96e981-7ab7-4452-93eb-43b6ba735715" >
+<COMPONENT type="5100" id="1622" uid="cd96e981-7ab7-4452-93eb-43b6ba735715" >
<cdparam x="296" y="20" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="1577" />
+<TGConnectingPoint num="0" id="1621" />
</COMPONENT>
-<COMPONENT type="5106" id="1651" uid="eeabd234-3d25-4fee-b660-71f9833d42c0" >
+<COMPONENT type="5106" id="1695" uid="eeabd234-3d25-4fee-b660-71f9833d42c0" >
<cdparam x="192" y="62" />
<sizeparam width="220" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="state0" value="WaitingForFirstCoin" />
-<TGConnectingPoint num="0" id="1579" />
-<TGConnectingPoint num="1" id="1580" />
-<TGConnectingPoint num="2" id="1581" />
-<TGConnectingPoint num="3" id="1582" />
-<TGConnectingPoint num="4" id="1583" />
-<TGConnectingPoint num="5" id="1584" />
-<TGConnectingPoint num="6" id="1585" />
-<TGConnectingPoint num="7" id="1586" />
-<TGConnectingPoint num="8" id="1587" />
-<TGConnectingPoint num="9" id="1588" />
-<TGConnectingPoint num="10" id="1589" />
-<TGConnectingPoint num="11" id="1590" />
-<TGConnectingPoint num="12" id="1591" />
-<TGConnectingPoint num="13" id="1592" />
-<TGConnectingPoint num="14" id="1593" />
-<TGConnectingPoint num="15" id="1594" />
-<TGConnectingPoint num="16" id="1595" />
-<TGConnectingPoint num="17" id="1596" />
-<TGConnectingPoint num="18" id="1597" />
-<TGConnectingPoint num="19" id="1598" />
-<TGConnectingPoint num="20" id="1599" />
-<TGConnectingPoint num="21" id="1600" />
-<TGConnectingPoint num="22" id="1601" />
-<TGConnectingPoint num="23" id="1602" />
-<TGConnectingPoint num="24" id="1603" />
-<TGConnectingPoint num="25" id="1604" />
-<TGConnectingPoint num="26" id="1605" />
-<TGConnectingPoint num="27" id="1606" />
-<TGConnectingPoint num="28" id="1607" />
-<TGConnectingPoint num="29" id="1608" />
-<TGConnectingPoint num="30" id="1609" />
-<TGConnectingPoint num="31" id="1610" />
-<TGConnectingPoint num="32" id="1611" />
-<TGConnectingPoint num="33" id="1612" />
-<TGConnectingPoint num="34" id="1613" />
-<TGConnectingPoint num="35" id="1614" />
-<TGConnectingPoint num="36" id="1615" />
-<TGConnectingPoint num="37" id="1616" />
-<TGConnectingPoint num="38" id="1617" />
-<TGConnectingPoint num="39" id="1618" />
-<TGConnectingPoint num="40" id="1619" />
-<TGConnectingPoint num="41" id="1620" />
-<TGConnectingPoint num="42" id="1621" />
-<TGConnectingPoint num="43" id="1622" />
-<TGConnectingPoint num="44" id="1623" />
-<TGConnectingPoint num="45" id="1624" />
-<TGConnectingPoint num="46" id="1625" />
-<TGConnectingPoint num="47" id="1626" />
-<TGConnectingPoint num="48" id="1627" />
-<TGConnectingPoint num="49" id="1628" />
-<TGConnectingPoint num="50" id="1629" />
-<TGConnectingPoint num="51" id="1630" />
-<TGConnectingPoint num="52" id="1631" />
-<TGConnectingPoint num="53" id="1632" />
-<TGConnectingPoint num="54" id="1633" />
-<TGConnectingPoint num="55" id="1634" />
-<TGConnectingPoint num="56" id="1635" />
-<TGConnectingPoint num="57" id="1636" />
-<TGConnectingPoint num="58" id="1637" />
-<TGConnectingPoint num="59" id="1638" />
-<TGConnectingPoint num="60" id="1639" />
-<TGConnectingPoint num="61" id="1640" />
-<TGConnectingPoint num="62" id="1641" />
-<TGConnectingPoint num="63" id="1642" />
-<TGConnectingPoint num="64" id="1643" />
-<TGConnectingPoint num="65" id="1644" />
-<TGConnectingPoint num="66" id="1645" />
-<TGConnectingPoint num="67" id="1646" />
-<TGConnectingPoint num="68" id="1647" />
-<TGConnectingPoint num="69" id="1648" />
-<TGConnectingPoint num="70" id="1649" />
-<TGConnectingPoint num="71" id="1650" />
+<TGConnectingPoint num="0" id="1623" />
+<TGConnectingPoint num="1" id="1624" />
+<TGConnectingPoint num="2" id="1625" />
+<TGConnectingPoint num="3" id="1626" />
+<TGConnectingPoint num="4" id="1627" />
+<TGConnectingPoint num="5" id="1628" />
+<TGConnectingPoint num="6" id="1629" />
+<TGConnectingPoint num="7" id="1630" />
+<TGConnectingPoint num="8" id="1631" />
+<TGConnectingPoint num="9" id="1632" />
+<TGConnectingPoint num="10" id="1633" />
+<TGConnectingPoint num="11" id="1634" />
+<TGConnectingPoint num="12" id="1635" />
+<TGConnectingPoint num="13" id="1636" />
+<TGConnectingPoint num="14" id="1637" />
+<TGConnectingPoint num="15" id="1638" />
+<TGConnectingPoint num="16" id="1639" />
+<TGConnectingPoint num="17" id="1640" />
+<TGConnectingPoint num="18" id="1641" />
+<TGConnectingPoint num="19" id="1642" />
+<TGConnectingPoint num="20" id="1643" />
+<TGConnectingPoint num="21" id="1644" />
+<TGConnectingPoint num="22" id="1645" />
+<TGConnectingPoint num="23" id="1646" />
+<TGConnectingPoint num="24" id="1647" />
+<TGConnectingPoint num="25" id="1648" />
+<TGConnectingPoint num="26" id="1649" />
+<TGConnectingPoint num="27" id="1650" />
+<TGConnectingPoint num="28" id="1651" />
+<TGConnectingPoint num="29" id="1652" />
+<TGConnectingPoint num="30" id="1653" />
+<TGConnectingPoint num="31" id="1654" />
+<TGConnectingPoint num="32" id="1655" />
+<TGConnectingPoint num="33" id="1656" />
+<TGConnectingPoint num="34" id="1657" />
+<TGConnectingPoint num="35" id="1658" />
+<TGConnectingPoint num="36" id="1659" />
+<TGConnectingPoint num="37" id="1660" />
+<TGConnectingPoint num="38" id="1661" />
+<TGConnectingPoint num="39" id="1662" />
+<TGConnectingPoint num="40" id="1663" />
+<TGConnectingPoint num="41" id="1664" />
+<TGConnectingPoint num="42" id="1665" />
+<TGConnectingPoint num="43" id="1666" />
+<TGConnectingPoint num="44" id="1667" />
+<TGConnectingPoint num="45" id="1668" />
+<TGConnectingPoint num="46" id="1669" />
+<TGConnectingPoint num="47" id="1670" />
+<TGConnectingPoint num="48" id="1671" />
+<TGConnectingPoint num="49" id="1672" />
+<TGConnectingPoint num="50" id="1673" />
+<TGConnectingPoint num="51" id="1674" />
+<TGConnectingPoint num="52" id="1675" />
+<TGConnectingPoint num="53" id="1676" />
+<TGConnectingPoint num="54" id="1677" />
+<TGConnectingPoint num="55" id="1678" />
+<TGConnectingPoint num="56" id="1679" />
+<TGConnectingPoint num="57" id="1680" />
+<TGConnectingPoint num="58" id="1681" />
+<TGConnectingPoint num="59" id="1682" />
+<TGConnectingPoint num="60" id="1683" />
+<TGConnectingPoint num="61" id="1684" />
+<TGConnectingPoint num="62" id="1685" />
+<TGConnectingPoint num="63" id="1686" />
+<TGConnectingPoint num="64" id="1687" />
+<TGConnectingPoint num="65" id="1688" />
+<TGConnectingPoint num="66" id="1689" />
+<TGConnectingPoint num="67" id="1690" />
+<TGConnectingPoint num="68" id="1691" />
+<TGConnectingPoint num="69" id="1692" />
+<TGConnectingPoint num="70" id="1693" />
+<TGConnectingPoint num="71" id="1694" />
<latencyCheck />
<extraparam>
</extraparam>
</COMPONENT>
-<COMPONENT type="5106" id="1724" uid="75872e55-4480-49da-9868-b01b1830387d" >
+<COMPONENT type="5106" id="1768" uid="75872e55-4480-49da-9868-b01b1830387d" >
<cdparam x="221" y="748" />
<sizeparam width="137" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="state0" value="WaitingForFirstCoin" />
-<TGConnectingPoint num="0" id="1652" />
-<TGConnectingPoint num="1" id="1653" />
-<TGConnectingPoint num="2" id="1654" />
-<TGConnectingPoint num="3" id="1655" />
-<TGConnectingPoint num="4" id="1656" />
-<TGConnectingPoint num="5" id="1657" />
-<TGConnectingPoint num="6" id="1658" />
-<TGConnectingPoint num="7" id="1659" />
-<TGConnectingPoint num="8" id="1660" />
-<TGConnectingPoint num="9" id="1661" />
-<TGConnectingPoint num="10" id="1662" />
-<TGConnectingPoint num="11" id="1663" />
-<TGConnectingPoint num="12" id="1664" />
-<TGConnectingPoint num="13" id="1665" />
-<TGConnectingPoint num="14" id="1666" />
-<TGConnectingPoint num="15" id="1667" />
-<TGConnectingPoint num="16" id="1668" />
-<TGConnectingPoint num="17" id="1669" />
-<TGConnectingPoint num="18" id="1670" />
-<TGConnectingPoint num="19" id="1671" />
-<TGConnectingPoint num="20" id="1672" />
-<TGConnectingPoint num="21" id="1673" />
-<TGConnectingPoint num="22" id="1674" />
-<TGConnectingPoint num="23" id="1675" />
-<TGConnectingPoint num="24" id="1676" />
-<TGConnectingPoint num="25" id="1677" />
-<TGConnectingPoint num="26" id="1678" />
-<TGConnectingPoint num="27" id="1679" />
-<TGConnectingPoint num="28" id="1680" />
-<TGConnectingPoint num="29" id="1681" />
-<TGConnectingPoint num="30" id="1682" />
-<TGConnectingPoint num="31" id="1683" />
-<TGConnectingPoint num="32" id="1684" />
-<TGConnectingPoint num="33" id="1685" />
-<TGConnectingPoint num="34" id="1686" />
-<TGConnectingPoint num="35" id="1687" />
-<TGConnectingPoint num="36" id="1688" />
-<TGConnectingPoint num="37" id="1689" />
-<TGConnectingPoint num="38" id="1690" />
-<TGConnectingPoint num="39" id="1691" />
-<TGConnectingPoint num="40" id="1692" />
-<TGConnectingPoint num="41" id="1693" />
-<TGConnectingPoint num="42" id="1694" />
-<TGConnectingPoint num="43" id="1695" />
-<TGConnectingPoint num="44" id="1696" />
-<TGConnectingPoint num="45" id="1697" />
-<TGConnectingPoint num="46" id="1698" />
-<TGConnectingPoint num="47" id="1699" />
-<TGConnectingPoint num="48" id="1700" />
-<TGConnectingPoint num="49" id="1701" />
-<TGConnectingPoint num="50" id="1702" />
-<TGConnectingPoint num="51" id="1703" />
-<TGConnectingPoint num="52" id="1704" />
-<TGConnectingPoint num="53" id="1705" />
-<TGConnectingPoint num="54" id="1706" />
-<TGConnectingPoint num="55" id="1707" />
-<TGConnectingPoint num="56" id="1708" />
-<TGConnectingPoint num="57" id="1709" />
-<TGConnectingPoint num="58" id="1710" />
-<TGConnectingPoint num="59" id="1711" />
-<TGConnectingPoint num="60" id="1712" />
-<TGConnectingPoint num="61" id="1713" />
-<TGConnectingPoint num="62" id="1714" />
-<TGConnectingPoint num="63" id="1715" />
-<TGConnectingPoint num="64" id="1716" />
-<TGConnectingPoint num="65" id="1717" />
-<TGConnectingPoint num="66" id="1718" />
-<TGConnectingPoint num="67" id="1719" />
-<TGConnectingPoint num="68" id="1720" />
-<TGConnectingPoint num="69" id="1721" />
-<TGConnectingPoint num="70" id="1722" />
-<TGConnectingPoint num="71" id="1723" />
+<TGConnectingPoint num="0" id="1696" />
+<TGConnectingPoint num="1" id="1697" />
+<TGConnectingPoint num="2" id="1698" />
+<TGConnectingPoint num="3" id="1699" />
+<TGConnectingPoint num="4" id="1700" />
+<TGConnectingPoint num="5" id="1701" />
+<TGConnectingPoint num="6" id="1702" />
+<TGConnectingPoint num="7" id="1703" />
+<TGConnectingPoint num="8" id="1704" />
+<TGConnectingPoint num="9" id="1705" />
+<TGConnectingPoint num="10" id="1706" />
+<TGConnectingPoint num="11" id="1707" />
+<TGConnectingPoint num="12" id="1708" />
+<TGConnectingPoint num="13" id="1709" />
+<TGConnectingPoint num="14" id="1710" />
+<TGConnectingPoint num="15" id="1711" />
+<TGConnectingPoint num="16" id="1712" />
+<TGConnectingPoint num="17" id="1713" />
+<TGConnectingPoint num="18" id="1714" />
+<TGConnectingPoint num="19" id="1715" />
+<TGConnectingPoint num="20" id="1716" />
+<TGConnectingPoint num="21" id="1717" />
+<TGConnectingPoint num="22" id="1718" />
+<TGConnectingPoint num="23" id="1719" />
+<TGConnectingPoint num="24" id="1720" />
+<TGConnectingPoint num="25" id="1721" />
+<TGConnectingPoint num="26" id="1722" />
+<TGConnectingPoint num="27" id="1723" />
+<TGConnectingPoint num="28" id="1724" />
+<TGConnectingPoint num="29" id="1725" />
+<TGConnectingPoint num="30" id="1726" />
+<TGConnectingPoint num="31" id="1727" />
+<TGConnectingPoint num="32" id="1728" />
+<TGConnectingPoint num="33" id="1729" />
+<TGConnectingPoint num="34" id="1730" />
+<TGConnectingPoint num="35" id="1731" />
+<TGConnectingPoint num="36" id="1732" />
+<TGConnectingPoint num="37" id="1733" />
+<TGConnectingPoint num="38" id="1734" />
+<TGConnectingPoint num="39" id="1735" />
+<TGConnectingPoint num="40" id="1736" />
+<TGConnectingPoint num="41" id="1737" />
+<TGConnectingPoint num="42" id="1738" />
+<TGConnectingPoint num="43" id="1739" />
+<TGConnectingPoint num="44" id="1740" />
+<TGConnectingPoint num="45" id="1741" />
+<TGConnectingPoint num="46" id="1742" />
+<TGConnectingPoint num="47" id="1743" />
+<TGConnectingPoint num="48" id="1744" />
+<TGConnectingPoint num="49" id="1745" />
+<TGConnectingPoint num="50" id="1746" />
+<TGConnectingPoint num="51" id="1747" />
+<TGConnectingPoint num="52" id="1748" />
+<TGConnectingPoint num="53" id="1749" />
+<TGConnectingPoint num="54" id="1750" />
+<TGConnectingPoint num="55" id="1751" />
+<TGConnectingPoint num="56" id="1752" />
+<TGConnectingPoint num="57" id="1753" />
+<TGConnectingPoint num="58" id="1754" />
+<TGConnectingPoint num="59" id="1755" />
+<TGConnectingPoint num="60" id="1756" />
+<TGConnectingPoint num="61" id="1757" />
+<TGConnectingPoint num="62" id="1758" />
+<TGConnectingPoint num="63" id="1759" />
+<TGConnectingPoint num="64" id="1760" />
+<TGConnectingPoint num="65" id="1761" />
+<TGConnectingPoint num="66" id="1762" />
+<TGConnectingPoint num="67" id="1763" />
+<TGConnectingPoint num="68" id="1764" />
+<TGConnectingPoint num="69" id="1765" />
+<TGConnectingPoint num="70" id="1766" />
+<TGConnectingPoint num="71" id="1767" />
<extraparam>
</extraparam>
</COMPONENT>
-<COMPONENT type="5106" id="1797" uid="8f37bad1-cd33-4f8f-9321-d72e5e6d32eb" >
+<COMPONENT type="5106" id="1841" uid="8f37bad1-cd33-4f8f-9321-d72e5e6d32eb" >
<cdparam x="631" y="381" />
<sizeparam width="137" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="state0" value="WaitingForFirstCoin" />
-<TGConnectingPoint num="0" id="1725" />
-<TGConnectingPoint num="1" id="1726" />
-<TGConnectingPoint num="2" id="1727" />
-<TGConnectingPoint num="3" id="1728" />
-<TGConnectingPoint num="4" id="1729" />
-<TGConnectingPoint num="5" id="1730" />
-<TGConnectingPoint num="6" id="1731" />
-<TGConnectingPoint num="7" id="1732" />
-<TGConnectingPoint num="8" id="1733" />
-<TGConnectingPoint num="9" id="1734" />
-<TGConnectingPoint num="10" id="1735" />
-<TGConnectingPoint num="11" id="1736" />
-<TGConnectingPoint num="12" id="1737" />
-<TGConnectingPoint num="13" id="1738" />
-<TGConnectingPoint num="14" id="1739" />
-<TGConnectingPoint num="15" id="1740" />
-<TGConnectingPoint num="16" id="1741" />
-<TGConnectingPoint num="17" id="1742" />
-<TGConnectingPoint num="18" id="1743" />
-<TGConnectingPoint num="19" id="1744" />
-<TGConnectingPoint num="20" id="1745" />
-<TGConnectingPoint num="21" id="1746" />
-<TGConnectingPoint num="22" id="1747" />
-<TGConnectingPoint num="23" id="1748" />
-<TGConnectingPoint num="24" id="1749" />
-<TGConnectingPoint num="25" id="1750" />
-<TGConnectingPoint num="26" id="1751" />
-<TGConnectingPoint num="27" id="1752" />
-<TGConnectingPoint num="28" id="1753" />
-<TGConnectingPoint num="29" id="1754" />
-<TGConnectingPoint num="30" id="1755" />
-<TGConnectingPoint num="31" id="1756" />
-<TGConnectingPoint num="32" id="1757" />
-<TGConnectingPoint num="33" id="1758" />
-<TGConnectingPoint num="34" id="1759" />
-<TGConnectingPoint num="35" id="1760" />
-<TGConnectingPoint num="36" id="1761" />
-<TGConnectingPoint num="37" id="1762" />
-<TGConnectingPoint num="38" id="1763" />
-<TGConnectingPoint num="39" id="1764" />
-<TGConnectingPoint num="40" id="1765" />
-<TGConnectingPoint num="41" id="1766" />
-<TGConnectingPoint num="42" id="1767" />
-<TGConnectingPoint num="43" id="1768" />
-<TGConnectingPoint num="44" id="1769" />
-<TGConnectingPoint num="45" id="1770" />
-<TGConnectingPoint num="46" id="1771" />
-<TGConnectingPoint num="47" id="1772" />
-<TGConnectingPoint num="48" id="1773" />
-<TGConnectingPoint num="49" id="1774" />
-<TGConnectingPoint num="50" id="1775" />
-<TGConnectingPoint num="51" id="1776" />
-<TGConnectingPoint num="52" id="1777" />
-<TGConnectingPoint num="53" id="1778" />
-<TGConnectingPoint num="54" id="1779" />
-<TGConnectingPoint num="55" id="1780" />
-<TGConnectingPoint num="56" id="1781" />
-<TGConnectingPoint num="57" id="1782" />
-<TGConnectingPoint num="58" id="1783" />
-<TGConnectingPoint num="59" id="1784" />
-<TGConnectingPoint num="60" id="1785" />
-<TGConnectingPoint num="61" id="1786" />
-<TGConnectingPoint num="62" id="1787" />
-<TGConnectingPoint num="63" id="1788" />
-<TGConnectingPoint num="64" id="1789" />
-<TGConnectingPoint num="65" id="1790" />
-<TGConnectingPoint num="66" id="1791" />
-<TGConnectingPoint num="67" id="1792" />
-<TGConnectingPoint num="68" id="1793" />
-<TGConnectingPoint num="69" id="1794" />
-<TGConnectingPoint num="70" id="1795" />
-<TGConnectingPoint num="71" id="1796" />
+<TGConnectingPoint num="0" id="1769" />
+<TGConnectingPoint num="1" id="1770" />
+<TGConnectingPoint num="2" id="1771" />
+<TGConnectingPoint num="3" id="1772" />
+<TGConnectingPoint num="4" id="1773" />
+<TGConnectingPoint num="5" id="1774" />
+<TGConnectingPoint num="6" id="1775" />
+<TGConnectingPoint num="7" id="1776" />
+<TGConnectingPoint num="8" id="1777" />
+<TGConnectingPoint num="9" id="1778" />
+<TGConnectingPoint num="10" id="1779" />
+<TGConnectingPoint num="11" id="1780" />
+<TGConnectingPoint num="12" id="1781" />
+<TGConnectingPoint num="13" id="1782" />
+<TGConnectingPoint num="14" id="1783" />
+<TGConnectingPoint num="15" id="1784" />
+<TGConnectingPoint num="16" id="1785" />
+<TGConnectingPoint num="17" id="1786" />
+<TGConnectingPoint num="18" id="1787" />
+<TGConnectingPoint num="19" id="1788" />
+<TGConnectingPoint num="20" id="1789" />
+<TGConnectingPoint num="21" id="1790" />
+<TGConnectingPoint num="22" id="1791" />
+<TGConnectingPoint num="23" id="1792" />
+<TGConnectingPoint num="24" id="1793" />
+<TGConnectingPoint num="25" id="1794" />
+<TGConnectingPoint num="26" id="1795" />
+<TGConnectingPoint num="27" id="1796" />
+<TGConnectingPoint num="28" id="1797" />
+<TGConnectingPoint num="29" id="1798" />
+<TGConnectingPoint num="30" id="1799" />
+<TGConnectingPoint num="31" id="1800" />
+<TGConnectingPoint num="32" id="1801" />
+<TGConnectingPoint num="33" id="1802" />
+<TGConnectingPoint num="34" id="1803" />
+<TGConnectingPoint num="35" id="1804" />
+<TGConnectingPoint num="36" id="1805" />
+<TGConnectingPoint num="37" id="1806" />
+<TGConnectingPoint num="38" id="1807" />
+<TGConnectingPoint num="39" id="1808" />
+<TGConnectingPoint num="40" id="1809" />
+<TGConnectingPoint num="41" id="1810" />
+<TGConnectingPoint num="42" id="1811" />
+<TGConnectingPoint num="43" id="1812" />
+<TGConnectingPoint num="44" id="1813" />
+<TGConnectingPoint num="45" id="1814" />
+<TGConnectingPoint num="46" id="1815" />
+<TGConnectingPoint num="47" id="1816" />
+<TGConnectingPoint num="48" id="1817" />
+<TGConnectingPoint num="49" id="1818" />
+<TGConnectingPoint num="50" id="1819" />
+<TGConnectingPoint num="51" id="1820" />
+<TGConnectingPoint num="52" id="1821" />
+<TGConnectingPoint num="53" id="1822" />
+<TGConnectingPoint num="54" id="1823" />
+<TGConnectingPoint num="55" id="1824" />
+<TGConnectingPoint num="56" id="1825" />
+<TGConnectingPoint num="57" id="1826" />
+<TGConnectingPoint num="58" id="1827" />
+<TGConnectingPoint num="59" id="1828" />
+<TGConnectingPoint num="60" id="1829" />
+<TGConnectingPoint num="61" id="1830" />
+<TGConnectingPoint num="62" id="1831" />
+<TGConnectingPoint num="63" id="1832" />
+<TGConnectingPoint num="64" id="1833" />
+<TGConnectingPoint num="65" id="1834" />
+<TGConnectingPoint num="66" id="1835" />
+<TGConnectingPoint num="67" id="1836" />
+<TGConnectingPoint num="68" id="1837" />
+<TGConnectingPoint num="69" id="1838" />
+<TGConnectingPoint num="70" id="1839" />
+<TGConnectingPoint num="71" id="1840" />
<extraparam>
</extraparam>
</COMPONENT>
-<COMPONENT type="5106" id="1870" uid="4e9ff4f4-63c9-4878-88c3-6ca78d7d9fb3" >
+<COMPONENT type="5106" id="1914" uid="4e9ff4f4-63c9-4878-88c3-6ca78d7d9fb3" >
<cdparam x="223" y="650" />
<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="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="state0" value="TeaDelivered" />
-<TGConnectingPoint num="0" id="1798" />
-<TGConnectingPoint num="1" id="1799" />
-<TGConnectingPoint num="2" id="1800" />
-<TGConnectingPoint num="3" id="1801" />
-<TGConnectingPoint num="4" id="1802" />
-<TGConnectingPoint num="5" id="1803" />
-<TGConnectingPoint num="6" id="1804" />
-<TGConnectingPoint num="7" id="1805" />
-<TGConnectingPoint num="8" id="1806" />
-<TGConnectingPoint num="9" id="1807" />
-<TGConnectingPoint num="10" id="1808" />
-<TGConnectingPoint num="11" id="1809" />
-<TGConnectingPoint num="12" id="1810" />
-<TGConnectingPoint num="13" id="1811" />
-<TGConnectingPoint num="14" id="1812" />
-<TGConnectingPoint num="15" id="1813" />
-<TGConnectingPoint num="16" id="1814" />
-<TGConnectingPoint num="17" id="1815" />
-<TGConnectingPoint num="18" id="1816" />
-<TGConnectingPoint num="19" id="1817" />
-<TGConnectingPoint num="20" id="1818" />
-<TGConnectingPoint num="21" id="1819" />
-<TGConnectingPoint num="22" id="1820" />
-<TGConnectingPoint num="23" id="1821" />
-<TGConnectingPoint num="24" id="1822" />
-<TGConnectingPoint num="25" id="1823" />
-<TGConnectingPoint num="26" id="1824" />
-<TGConnectingPoint num="27" id="1825" />
-<TGConnectingPoint num="28" id="1826" />
-<TGConnectingPoint num="29" id="1827" />
-<TGConnectingPoint num="30" id="1828" />
-<TGConnectingPoint num="31" id="1829" />
-<TGConnectingPoint num="32" id="1830" />
-<TGConnectingPoint num="33" id="1831" />
-<TGConnectingPoint num="34" id="1832" />
-<TGConnectingPoint num="35" id="1833" />
-<TGConnectingPoint num="36" id="1834" />
-<TGConnectingPoint num="37" id="1835" />
-<TGConnectingPoint num="38" id="1836" />
-<TGConnectingPoint num="39" id="1837" />
-<TGConnectingPoint num="40" id="1838" />
-<TGConnectingPoint num="41" id="1839" />
-<TGConnectingPoint num="42" id="1840" />
-<TGConnectingPoint num="43" id="1841" />
-<TGConnectingPoint num="44" id="1842" />
-<TGConnectingPoint num="45" id="1843" />
-<TGConnectingPoint num="46" id="1844" />
-<TGConnectingPoint num="47" id="1845" />
-<TGConnectingPoint num="48" id="1846" />
-<TGConnectingPoint num="49" id="1847" />
-<TGConnectingPoint num="50" id="1848" />
-<TGConnectingPoint num="51" id="1849" />
-<TGConnectingPoint num="52" id="1850" />
-<TGConnectingPoint num="53" id="1851" />
-<TGConnectingPoint num="54" id="1852" />
-<TGConnectingPoint num="55" id="1853" />
-<TGConnectingPoint num="56" id="1854" />
-<TGConnectingPoint num="57" id="1855" />
-<TGConnectingPoint num="58" id="1856" />
-<TGConnectingPoint num="59" id="1857" />
-<TGConnectingPoint num="60" id="1858" />
-<TGConnectingPoint num="61" id="1859" />
-<TGConnectingPoint num="62" id="1860" />
-<TGConnectingPoint num="63" id="1861" />
-<TGConnectingPoint num="64" id="1862" />
-<TGConnectingPoint num="65" id="1863" />
-<TGConnectingPoint num="66" id="1864" />
-<TGConnectingPoint num="67" id="1865" />
-<TGConnectingPoint num="68" id="1866" />
-<TGConnectingPoint num="69" id="1867" />
-<TGConnectingPoint num="70" id="1868" />
-<TGConnectingPoint num="71" id="1869" />
+<TGConnectingPoint num="0" id="1842" />
+<TGConnectingPoint num="1" id="1843" />
+<TGConnectingPoint num="2" id="1844" />
+<TGConnectingPoint num="3" id="1845" />
+<TGConnectingPoint num="4" id="1846" />
+<TGConnectingPoint num="5" id="1847" />
+<TGConnectingPoint num="6" id="1848" />
+<TGConnectingPoint num="7" id="1849" />
+<TGConnectingPoint num="8" id="1850" />
+<TGConnectingPoint num="9" id="1851" />
+<TGConnectingPoint num="10" id="1852" />
+<TGConnectingPoint num="11" id="1853" />
+<TGConnectingPoint num="12" id="1854" />
+<TGConnectingPoint num="13" id="1855" />
+<TGConnectingPoint num="14" id="1856" />
+<TGConnectingPoint num="15" id="1857" />
+<TGConnectingPoint num="16" id="1858" />
+<TGConnectingPoint num="17" id="1859" />
+<TGConnectingPoint num="18" id="1860" />
+<TGConnectingPoint num="19" id="1861" />
+<TGConnectingPoint num="20" id="1862" />
+<TGConnectingPoint num="21" id="1863" />
+<TGConnectingPoint num="22" id="1864" />
+<TGConnectingPoint num="23" id="1865" />
+<TGConnectingPoint num="24" id="1866" />
+<TGConnectingPoint num="25" id="1867" />
+<TGConnectingPoint num="26" id="1868" />
+<TGConnectingPoint num="27" id="1869" />
+<TGConnectingPoint num="28" id="1870" />
+<TGConnectingPoint num="29" id="1871" />
+<TGConnectingPoint num="30" id="1872" />
+<TGConnectingPoint num="31" id="1873" />
+<TGConnectingPoint num="32" id="1874" />
+<TGConnectingPoint num="33" id="1875" />
+<TGConnectingPoint num="34" id="1876" />
+<TGConnectingPoint num="35" id="1877" />
+<TGConnectingPoint num="36" id="1878" />
+<TGConnectingPoint num="37" id="1879" />
+<TGConnectingPoint num="38" id="1880" />
+<TGConnectingPoint num="39" id="1881" />
+<TGConnectingPoint num="40" id="1882" />
+<TGConnectingPoint num="41" id="1883" />
+<TGConnectingPoint num="42" id="1884" />
+<TGConnectingPoint num="43" id="1885" />
+<TGConnectingPoint num="44" id="1886" />
+<TGConnectingPoint num="45" id="1887" />
+<TGConnectingPoint num="46" id="1888" />
+<TGConnectingPoint num="47" id="1889" />
+<TGConnectingPoint num="48" id="1890" />
+<TGConnectingPoint num="49" id="1891" />
+<TGConnectingPoint num="50" id="1892" />
+<TGConnectingPoint num="51" id="1893" />
+<TGConnectingPoint num="52" id="1894" />
+<TGConnectingPoint num="53" id="1895" />
+<TGConnectingPoint num="54" id="1896" />
+<TGConnectingPoint num="55" id="1897" />
+<TGConnectingPoint num="56" id="1898" />
+<TGConnectingPoint num="57" id="1899" />
+<TGConnectingPoint num="58" id="1900" />
+<TGConnectingPoint num="59" id="1901" />
+<TGConnectingPoint num="60" id="1902" />
+<TGConnectingPoint num="61" id="1903" />
+<TGConnectingPoint num="62" id="1904" />
+<TGConnectingPoint num="63" id="1905" />
+<TGConnectingPoint num="64" id="1906" />
+<TGConnectingPoint num="65" id="1907" />
+<TGConnectingPoint num="66" id="1908" />
+<TGConnectingPoint num="67" id="1909" />
+<TGConnectingPoint num="68" id="1910" />
+<TGConnectingPoint num="69" id="1911" />
+<TGConnectingPoint num="70" id="1912" />
+<TGConnectingPoint num="71" id="1913" />
<extraparam>
</extraparam>
</COMPONENT>
-<COMPONENT type="5106" id="2124" uid="4cd4f614-9c4a-4b57-b765-feef76122aeb" >
+<COMPONENT type="5106" id="2168" uid="4cd4f614-9c4a-4b57-b765-feef76122aeb" >
<cdparam x="23" y="372" />
<sizeparam width="577" height="354" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="state0" value="Beverage" />
-<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="10" id="2062" />
-<TGConnectingPoint num="11" id="2063" />
-<TGConnectingPoint num="12" id="2064" />
-<TGConnectingPoint num="13" id="2065" />
-<TGConnectingPoint num="14" id="2066" />
-<TGConnectingPoint num="15" id="2067" />
-<TGConnectingPoint num="16" id="2068" />
-<TGConnectingPoint num="17" id="2069" />
-<TGConnectingPoint num="18" id="2070" />
-<TGConnectingPoint num="19" id="2071" />
-<TGConnectingPoint num="20" id="2072" />
-<TGConnectingPoint num="21" id="2073" />
-<TGConnectingPoint num="22" id="2074" />
-<TGConnectingPoint num="23" id="2075" />
-<TGConnectingPoint num="24" id="2076" />
-<TGConnectingPoint num="25" id="2077" />
-<TGConnectingPoint num="26" id="2078" />
-<TGConnectingPoint num="27" id="2079" />
-<TGConnectingPoint num="28" id="2080" />
-<TGConnectingPoint num="29" id="2081" />
-<TGConnectingPoint num="30" id="2082" />
-<TGConnectingPoint num="31" id="2083" />
-<TGConnectingPoint num="32" id="2084" />
-<TGConnectingPoint num="33" id="2085" />
-<TGConnectingPoint num="34" id="2086" />
-<TGConnectingPoint num="35" id="2087" />
-<TGConnectingPoint num="36" id="2088" />
-<TGConnectingPoint num="37" id="2089" />
-<TGConnectingPoint num="38" id="2090" />
-<TGConnectingPoint num="39" id="2091" />
-<TGConnectingPoint num="40" id="2092" />
-<TGConnectingPoint num="41" id="2093" />
-<TGConnectingPoint num="42" id="2094" />
-<TGConnectingPoint num="43" id="2095" />
-<TGConnectingPoint num="44" id="2096" />
-<TGConnectingPoint num="45" id="2097" />
-<TGConnectingPoint num="46" id="2098" />
-<TGConnectingPoint num="47" id="2099" />
-<TGConnectingPoint num="48" id="2100" />
-<TGConnectingPoint num="49" id="2101" />
-<TGConnectingPoint num="50" id="2102" />
-<TGConnectingPoint num="51" id="2103" />
-<TGConnectingPoint num="52" id="2104" />
-<TGConnectingPoint num="53" id="2105" />
-<TGConnectingPoint num="54" id="2106" />
-<TGConnectingPoint num="55" id="2107" />
-<TGConnectingPoint num="56" id="2108" />
-<TGConnectingPoint num="57" id="2109" />
-<TGConnectingPoint num="58" id="2110" />
-<TGConnectingPoint num="59" id="2111" />
-<TGConnectingPoint num="60" id="2112" />
-<TGConnectingPoint num="61" id="2113" />
-<TGConnectingPoint num="62" id="2114" />
-<TGConnectingPoint num="63" id="2115" />
-<TGConnectingPoint num="64" id="2116" />
-<TGConnectingPoint num="65" id="2117" />
-<TGConnectingPoint num="66" id="2118" />
-<TGConnectingPoint num="67" id="2119" />
-<TGConnectingPoint num="68" id="2120" />
-<TGConnectingPoint num="69" id="2121" />
-<TGConnectingPoint num="70" id="2122" />
-<TGConnectingPoint num="71" id="2123" />
+<TGConnectingPoint num="0" id="2096" />
+<TGConnectingPoint num="1" id="2097" />
+<TGConnectingPoint num="2" id="2098" />
+<TGConnectingPoint num="3" id="2099" />
+<TGConnectingPoint num="4" id="2100" />
+<TGConnectingPoint num="5" id="2101" />
+<TGConnectingPoint num="6" id="2102" />
+<TGConnectingPoint num="7" id="2103" />
+<TGConnectingPoint num="8" id="2104" />
+<TGConnectingPoint num="9" id="2105" />
+<TGConnectingPoint num="10" id="2106" />
+<TGConnectingPoint num="11" id="2107" />
+<TGConnectingPoint num="12" id="2108" />
+<TGConnectingPoint num="13" id="2109" />
+<TGConnectingPoint num="14" id="2110" />
+<TGConnectingPoint num="15" id="2111" />
+<TGConnectingPoint num="16" id="2112" />
+<TGConnectingPoint num="17" id="2113" />
+<TGConnectingPoint num="18" id="2114" />
+<TGConnectingPoint num="19" id="2115" />
+<TGConnectingPoint num="20" id="2116" />
+<TGConnectingPoint num="21" id="2117" />
+<TGConnectingPoint num="22" id="2118" />
+<TGConnectingPoint num="23" id="2119" />
+<TGConnectingPoint num="24" id="2120" />
+<TGConnectingPoint num="25" id="2121" />
+<TGConnectingPoint num="26" id="2122" />
+<TGConnectingPoint num="27" id="2123" />
+<TGConnectingPoint num="28" id="2124" />
+<TGConnectingPoint num="29" id="2125" />
+<TGConnectingPoint num="30" id="2126" />
+<TGConnectingPoint num="31" id="2127" />
+<TGConnectingPoint num="32" id="2128" />
+<TGConnectingPoint num="33" id="2129" />
+<TGConnectingPoint num="34" id="2130" />
+<TGConnectingPoint num="35" id="2131" />
+<TGConnectingPoint num="36" id="2132" />
+<TGConnectingPoint num="37" id="2133" />
+<TGConnectingPoint num="38" id="2134" />
+<TGConnectingPoint num="39" id="2135" />
+<TGConnectingPoint num="40" id="2136" />
+<TGConnectingPoint num="41" id="2137" />
+<TGConnectingPoint num="42" id="2138" />
+<TGConnectingPoint num="43" id="2139" />
+<TGConnectingPoint num="44" id="2140" />
+<TGConnectingPoint num="45" id="2141" />
+<TGConnectingPoint num="46" id="2142" />
+<TGConnectingPoint num="47" id="2143" />
+<TGConnectingPoint num="48" id="2144" />
+<TGConnectingPoint num="49" id="2145" />
+<TGConnectingPoint num="50" id="2146" />
+<TGConnectingPoint num="51" id="2147" />
+<TGConnectingPoint num="52" id="2148" />
+<TGConnectingPoint num="53" id="2149" />
+<TGConnectingPoint num="54" id="2150" />
+<TGConnectingPoint num="55" id="2151" />
+<TGConnectingPoint num="56" id="2152" />
+<TGConnectingPoint num="57" id="2153" />
+<TGConnectingPoint num="58" id="2154" />
+<TGConnectingPoint num="59" id="2155" />
+<TGConnectingPoint num="60" id="2156" />
+<TGConnectingPoint num="61" id="2157" />
+<TGConnectingPoint num="62" id="2158" />
+<TGConnectingPoint num="63" id="2159" />
+<TGConnectingPoint num="64" id="2160" />
+<TGConnectingPoint num="65" id="2161" />
+<TGConnectingPoint num="66" id="2162" />
+<TGConnectingPoint num="67" id="2163" />
+<TGConnectingPoint num="68" id="2164" />
+<TGConnectingPoint num="69" id="2165" />
+<TGConnectingPoint num="70" id="2166" />
+<TGConnectingPoint num="71" id="2167" />
<extraparam>
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="5106" id="1943" uid="52044bb2-8b01-4108-a1ac-b5e7886ea624" >
-<father id="2124" num="0" />
-<cdparam x="53" y="653" />
-<sizeparam width="146" height="49" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="5104" id="1925" uid="8718a1dd-4942-43e5-b6ce-b5f78b82a355" >
+<father id="2168" num="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="1871" />
-<TGConnectingPoint num="1" id="1872" />
-<TGConnectingPoint num="2" id="1873" />
-<TGConnectingPoint num="3" id="1874" />
-<TGConnectingPoint num="4" id="1875" />
-<TGConnectingPoint num="5" id="1876" />
-<TGConnectingPoint num="6" id="1877" />
-<TGConnectingPoint num="7" id="1878" />
-<TGConnectingPoint num="8" id="1879" />
-<TGConnectingPoint num="9" id="1880" />
-<TGConnectingPoint num="10" id="1881" />
-<TGConnectingPoint num="11" id="1882" />
-<TGConnectingPoint num="12" id="1883" />
-<TGConnectingPoint num="13" id="1884" />
-<TGConnectingPoint num="14" id="1885" />
-<TGConnectingPoint num="15" id="1886" />
-<TGConnectingPoint num="16" id="1887" />
-<TGConnectingPoint num="17" id="1888" />
-<TGConnectingPoint num="18" id="1889" />
-<TGConnectingPoint num="19" id="1890" />
-<TGConnectingPoint num="20" id="1891" />
-<TGConnectingPoint num="21" id="1892" />
-<TGConnectingPoint num="22" id="1893" />
-<TGConnectingPoint num="23" id="1894" />
-<TGConnectingPoint num="24" id="1895" />
-<TGConnectingPoint num="25" id="1896" />
-<TGConnectingPoint num="26" id="1897" />
-<TGConnectingPoint num="27" id="1898" />
-<TGConnectingPoint num="28" id="1899" />
-<TGConnectingPoint num="29" id="1900" />
-<TGConnectingPoint num="30" id="1901" />
-<TGConnectingPoint num="31" id="1902" />
-<TGConnectingPoint num="32" id="1903" />
-<TGConnectingPoint num="33" id="1904" />
-<TGConnectingPoint num="34" id="1905" />
-<TGConnectingPoint num="35" id="1906" />
-<TGConnectingPoint num="36" id="1907" />
-<TGConnectingPoint num="37" id="1908" />
-<TGConnectingPoint num="38" id="1909" />
-<TGConnectingPoint num="39" id="1910" />
-<TGConnectingPoint num="40" id="1911" />
-<TGConnectingPoint num="41" id="1912" />
-<TGConnectingPoint num="42" id="1913" />
-<TGConnectingPoint num="43" id="1914" />
-<TGConnectingPoint num="44" id="1915" />
-<TGConnectingPoint num="45" id="1916" />
-<TGConnectingPoint num="46" id="1917" />
-<TGConnectingPoint num="47" id="1918" />
-<TGConnectingPoint num="48" id="1919" />
-<TGConnectingPoint num="49" id="1920" />
-<TGConnectingPoint num="50" id="1921" />
-<TGConnectingPoint num="51" id="1922" />
-<TGConnectingPoint num="52" id="1923" />
-<TGConnectingPoint num="53" id="1924" />
-<TGConnectingPoint num="54" id="1925" />
-<TGConnectingPoint num="55" id="1926" />
-<TGConnectingPoint num="56" id="1927" />
-<TGConnectingPoint num="57" id="1928" />
-<TGConnectingPoint num="58" id="1929" />
-<TGConnectingPoint num="59" id="1930" />
-<TGConnectingPoint num="60" id="1931" />
-<TGConnectingPoint num="61" id="1932" />
-<TGConnectingPoint num="62" id="1933" />
-<TGConnectingPoint num="63" id="1934" />
-<TGConnectingPoint num="64" id="1935" />
-<TGConnectingPoint num="65" id="1936" />
-<TGConnectingPoint num="66" id="1937" />
-<TGConnectingPoint num="67" id="1938" />
-<TGConnectingPoint num="68" id="1939" />
-<TGConnectingPoint num="69" id="1940" />
-<TGConnectingPoint num="70" id="1941" />
-<TGConnectingPoint num="71" id="1942" />
+<cdrectangleparam minX="0" maxX="465" minY="0" maxY="334" />
+<infoparam name="Send signal" value="pushTeaButton()" />
+<TGConnectingPoint num="0" id="1915" />
+<TGConnectingPoint num="1" id="1916" />
+<TGConnectingPoint num="2" id="1917" />
+<TGConnectingPoint num="3" id="1918" />
+<TGConnectingPoint num="4" id="1919" />
+<TGConnectingPoint num="5" id="1920" />
+<TGConnectingPoint num="6" id="1921" />
+<TGConnectingPoint num="7" id="1922" />
+<TGConnectingPoint num="8" id="1923" />
+<TGConnectingPoint num="9" id="1924" />
+<accessibility />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="5106" id="1998" uid="542c0583-8080-46a1-9ae2-775c6446817c" >
+<father id="2168" num="1" />
+<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="445" minY="0" maxY="314" />
+<infoparam name="state0" value="WaitingForSelection" />
+<TGConnectingPoint num="0" id="1926" />
+<TGConnectingPoint num="1" id="1927" />
+<TGConnectingPoint num="2" id="1928" />
+<TGConnectingPoint num="3" id="1929" />
+<TGConnectingPoint num="4" id="1930" />
+<TGConnectingPoint num="5" id="1931" />
+<TGConnectingPoint num="6" id="1932" />
+<TGConnectingPoint num="7" id="1933" />
+<TGConnectingPoint num="8" id="1934" />
+<TGConnectingPoint num="9" id="1935" />
+<TGConnectingPoint num="10" id="1936" />
+<TGConnectingPoint num="11" id="1937" />
+<TGConnectingPoint num="12" id="1938" />
+<TGConnectingPoint num="13" id="1939" />
+<TGConnectingPoint num="14" id="1940" />
+<TGConnectingPoint num="15" id="1941" />
+<TGConnectingPoint num="16" id="1942" />
+<TGConnectingPoint num="17" id="1943" />
+<TGConnectingPoint num="18" id="1944" />
+<TGConnectingPoint num="19" id="1945" />
+<TGConnectingPoint num="20" id="1946" />
+<TGConnectingPoint num="21" id="1947" />
+<TGConnectingPoint num="22" id="1948" />
+<TGConnectingPoint num="23" id="1949" />
+<TGConnectingPoint num="24" id="1950" />
+<TGConnectingPoint num="25" id="1951" />
+<TGConnectingPoint num="26" id="1952" />
+<TGConnectingPoint num="27" id="1953" />
+<TGConnectingPoint num="28" id="1954" />
+<TGConnectingPoint num="29" id="1955" />
+<TGConnectingPoint num="30" id="1956" />
+<TGConnectingPoint num="31" id="1957" />
+<TGConnectingPoint num="32" id="1958" />
+<TGConnectingPoint num="33" id="1959" />
+<TGConnectingPoint num="34" id="1960" />
+<TGConnectingPoint num="35" id="1961" />
+<TGConnectingPoint num="36" id="1962" />
+<TGConnectingPoint num="37" id="1963" />
+<TGConnectingPoint num="38" id="1964" />
+<TGConnectingPoint num="39" id="1965" />
+<TGConnectingPoint num="40" id="1966" />
+<TGConnectingPoint num="41" id="1967" />
+<TGConnectingPoint num="42" id="1968" />
+<TGConnectingPoint num="43" id="1969" />
+<TGConnectingPoint num="44" id="1970" />
+<TGConnectingPoint num="45" id="1971" />
+<TGConnectingPoint num="46" id="1972" />
+<TGConnectingPoint num="47" id="1973" />
+<TGConnectingPoint num="48" id="1974" />
+<TGConnectingPoint num="49" id="1975" />
+<TGConnectingPoint num="50" id="1976" />
+<TGConnectingPoint num="51" id="1977" />
+<TGConnectingPoint num="52" id="1978" />
+<TGConnectingPoint num="53" id="1979" />
+<TGConnectingPoint num="54" id="1980" />
+<TGConnectingPoint num="55" id="1981" />
+<TGConnectingPoint num="56" id="1982" />
+<TGConnectingPoint num="57" id="1983" />
+<TGConnectingPoint num="58" id="1984" />
+<TGConnectingPoint num="59" id="1985" />
+<TGConnectingPoint num="60" id="1986" />
+<TGConnectingPoint num="61" id="1987" />
+<TGConnectingPoint num="62" id="1988" />
+<TGConnectingPoint num="63" id="1989" />
+<TGConnectingPoint num="64" id="1990" />
+<TGConnectingPoint num="65" id="1991" />
+<TGConnectingPoint num="66" id="1992" />
+<TGConnectingPoint num="67" id="1993" />
+<TGConnectingPoint num="68" id="1994" />
+<TGConnectingPoint num="69" id="1995" />
+<TGConnectingPoint num="70" id="1996" />
+<TGConnectingPoint num="71" id="1997" />
+<latencyCheck />
<extraparam>
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="5103" id="1954" uid="9c813d39-192a-47ff-98b2-607e27617acf" >
-<father id="2124" num="1" />
-<cdparam x="377" y="502" />
-<sizeparam width="130" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="5100" id="2000" uid="d60fd6d2-14be-4b25-b424-35a9ae5e3ba3" >
+<father id="2168" 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" />
-<enabled value="true" />
-<cdrectangleparam minX="0" maxX="447" minY="0" maxY="334" />
-<infoparam name="Send signal" value="ejectCoin(nbOfCoins)" />
-<TGConnectingPoint num="0" id="1944" />
-<TGConnectingPoint num="1" id="1945" />
-<TGConnectingPoint num="2" id="1946" />
-<TGConnectingPoint num="3" id="1947" />
-<TGConnectingPoint num="4" id="1948" />
-<TGConnectingPoint num="5" id="1949" />
-<TGConnectingPoint num="6" id="1950" />
-<TGConnectingPoint num="7" id="1951" />
-<TGConnectingPoint num="8" id="1952" />
-<TGConnectingPoint num="9" id="1953" />
-<accessibility />
+<cdrectangleparam minX="0" maxX="562" minY="0" maxY="339" />
+<infoparam name="start state" value="null" />
+<TGConnectingPoint num="0" id="1999" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="5104" id="1965" uid="f73b994e-357b-446d-a13d-97a66d7a4653" >
-<father id="2124" num="2" />
+<SUBCOMPONENT type="5104" id="2011" uid="f73b994e-357b-446d-a13d-97a66d7a4653" >
+<father id="2168" 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="1955" />
-<TGConnectingPoint num="1" id="1956" />
-<TGConnectingPoint num="2" id="1957" />
-<TGConnectingPoint num="3" id="1958" />
-<TGConnectingPoint num="4" id="1959" />
-<TGConnectingPoint num="5" id="1960" />
-<TGConnectingPoint num="6" id="1961" />
-<TGConnectingPoint num="7" id="1962" />
-<TGConnectingPoint num="8" id="1963" />
-<TGConnectingPoint num="9" id="1964" />
+<TGConnectingPoint num="0" id="2001" />
+<TGConnectingPoint num="1" id="2002" />
+<TGConnectingPoint num="2" id="2003" />
+<TGConnectingPoint num="3" id="2004" />
+<TGConnectingPoint num="4" id="2005" />
+<TGConnectingPoint num="5" id="2006" />
+<TGConnectingPoint num="6" id="2007" />
+<TGConnectingPoint num="7" id="2008" />
+<TGConnectingPoint num="8" id="2009" />
+<TGConnectingPoint num="9" id="2010" />
<accessibility />
</SUBCOMPONENT>
-<SUBCOMPONENT type="5100" id="1967" uid="d60fd6d2-14be-4b25-b424-35a9ae5e3ba3" >
-<father id="2124" num="3" />
-<cdparam x="254" y="401" />
-<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="5103" id="2022" uid="9c813d39-192a-47ff-98b2-607e27617acf" >
+<father id="2168" num="4" />
+<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" />
-<cdrectangleparam minX="0" maxX="562" minY="0" maxY="339" />
-<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="1966" />
+<enabled value="true" />
+<cdrectangleparam minX="0" maxX="447" minY="0" maxY="334" />
+<infoparam name="Send signal" value="ejectCoin(nbOfCoins)" />
+<TGConnectingPoint num="0" id="2012" />
+<TGConnectingPoint num="1" id="2013" />
+<TGConnectingPoint num="2" id="2014" />
+<TGConnectingPoint num="3" id="2015" />
+<TGConnectingPoint num="4" id="2016" />
+<TGConnectingPoint num="5" id="2017" />
+<TGConnectingPoint num="6" id="2018" />
+<TGConnectingPoint num="7" id="2019" />
+<TGConnectingPoint num="8" id="2020" />
+<TGConnectingPoint num="9" id="2021" />
+<accessibility />
</SUBCOMPONENT>
-<SUBCOMPONENT type="5106" id="2040" uid="542c0583-8080-46a1-9ae2-775c6446817c" >
-<father id="2124" num="4" />
-<cdparam x="194" y="437" />
-<sizeparam width="132" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="5106" id="2095" uid="52044bb2-8b01-4108-a1ac-b5e7886ea624" >
+<father id="2168" num="5" />
+<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="445" minY="0" maxY="314" />
-<infoparam name="state0" value="WaitingForSelection" />
-<TGConnectingPoint num="0" id="1968" />
-<TGConnectingPoint num="1" id="1969" />
-<TGConnectingPoint num="2" id="1970" />
-<TGConnectingPoint num="3" id="1971" />
-<TGConnectingPoint num="4" id="1972" />
-<TGConnectingPoint num="5" id="1973" />
-<TGConnectingPoint num="6" id="1974" />
-<TGConnectingPoint num="7" id="1975" />
-<TGConnectingPoint num="8" id="1976" />
-<TGConnectingPoint num="9" id="1977" />
-<TGConnectingPoint num="10" id="1978" />
-<TGConnectingPoint num="11" id="1979" />
-<TGConnectingPoint num="12" id="1980" />
-<TGConnectingPoint num="13" id="1981" />
-<TGConnectingPoint num="14" id="1982" />
-<TGConnectingPoint num="15" id="1983" />
-<TGConnectingPoint num="16" id="1984" />
-<TGConnectingPoint num="17" id="1985" />
-<TGConnectingPoint num="18" id="1986" />
-<TGConnectingPoint num="19" id="1987" />
-<TGConnectingPoint num="20" id="1988" />
-<TGConnectingPoint num="21" id="1989" />
-<TGConnectingPoint num="22" id="1990" />
-<TGConnectingPoint num="23" id="1991" />
-<TGConnectingPoint num="24" id="1992" />
-<TGConnectingPoint num="25" id="1993" />
-<TGConnectingPoint num="26" id="1994" />
-<TGConnectingPoint num="27" id="1995" />
-<TGConnectingPoint num="28" id="1996" />
-<TGConnectingPoint num="29" id="1997" />
-<TGConnectingPoint num="30" id="1998" />
-<TGConnectingPoint num="31" id="1999" />
-<TGConnectingPoint num="32" id="2000" />
-<TGConnectingPoint num="33" id="2001" />
-<TGConnectingPoint num="34" id="2002" />
-<TGConnectingPoint num="35" id="2003" />
-<TGConnectingPoint num="36" id="2004" />
-<TGConnectingPoint num="37" id="2005" />
-<TGConnectingPoint num="38" id="2006" />
-<TGConnectingPoint num="39" id="2007" />
-<TGConnectingPoint num="40" id="2008" />
-<TGConnectingPoint num="41" id="2009" />
-<TGConnectingPoint num="42" id="2010" />
-<TGConnectingPoint num="43" id="2011" />
-<TGConnectingPoint num="44" id="2012" />
-<TGConnectingPoint num="45" id="2013" />
-<TGConnectingPoint num="46" id="2014" />
-<TGConnectingPoint num="47" id="2015" />
-<TGConnectingPoint num="48" id="2016" />
-<TGConnectingPoint num="49" id="2017" />
-<TGConnectingPoint num="50" id="2018" />
-<TGConnectingPoint num="51" id="2019" />
-<TGConnectingPoint num="52" id="2020" />
-<TGConnectingPoint num="53" id="2021" />
-<TGConnectingPoint num="54" id="2022" />
-<TGConnectingPoint num="55" id="2023" />
-<TGConnectingPoint num="56" id="2024" />
-<TGConnectingPoint num="57" id="2025" />
-<TGConnectingPoint num="58" id="2026" />
-<TGConnectingPoint num="59" id="2027" />
-<TGConnectingPoint num="60" id="2028" />
-<TGConnectingPoint num="61" id="2029" />
-<TGConnectingPoint num="62" id="2030" />
-<TGConnectingPoint num="63" id="2031" />
-<TGConnectingPoint num="64" id="2032" />
-<TGConnectingPoint num="65" id="2033" />
-<TGConnectingPoint num="66" id="2034" />
-<TGConnectingPoint num="67" id="2035" />
-<TGConnectingPoint num="68" id="2036" />
-<TGConnectingPoint num="69" id="2037" />
-<TGConnectingPoint num="70" id="2038" />
-<TGConnectingPoint num="71" id="2039" />
-<latencyCheck />
+<cdrectangleparam minX="0" maxX="431" minY="0" maxY="305" />
+<infoparam name="state0" value="CoffeeDelivered" />
+<TGConnectingPoint num="0" id="2023" />
+<TGConnectingPoint num="1" id="2024" />
+<TGConnectingPoint num="2" id="2025" />
+<TGConnectingPoint num="3" id="2026" />
+<TGConnectingPoint num="4" id="2027" />
+<TGConnectingPoint num="5" id="2028" />
+<TGConnectingPoint num="6" id="2029" />
+<TGConnectingPoint num="7" id="2030" />
+<TGConnectingPoint num="8" id="2031" />
+<TGConnectingPoint num="9" id="2032" />
+<TGConnectingPoint num="10" id="2033" />
+<TGConnectingPoint num="11" id="2034" />
+<TGConnectingPoint num="12" id="2035" />
+<TGConnectingPoint num="13" id="2036" />
+<TGConnectingPoint num="14" id="2037" />
+<TGConnectingPoint num="15" id="2038" />
+<TGConnectingPoint num="16" id="2039" />
+<TGConnectingPoint num="17" id="2040" />
+<TGConnectingPoint num="18" id="2041" />
+<TGConnectingPoint num="19" id="2042" />
+<TGConnectingPoint num="20" id="2043" />
+<TGConnectingPoint num="21" id="2044" />
+<TGConnectingPoint num="22" id="2045" />
+<TGConnectingPoint num="23" id="2046" />
+<TGConnectingPoint num="24" id="2047" />
+<TGConnectingPoint num="25" id="2048" />
+<TGConnectingPoint num="26" id="2049" />
+<TGConnectingPoint num="27" id="2050" />
+<TGConnectingPoint num="28" id="2051" />
+<TGConnectingPoint num="29" id="2052" />
+<TGConnectingPoint num="30" id="2053" />
+<TGConnectingPoint num="31" id="2054" />
+<TGConnectingPoint num="32" id="2055" />
+<TGConnectingPoint num="33" id="2056" />
+<TGConnectingPoint num="34" id="2057" />
+<TGConnectingPoint num="35" id="2058" />
+<TGConnectingPoint num="36" id="2059" />
+<TGConnectingPoint num="37" id="2060" />
+<TGConnectingPoint num="38" id="2061" />
+<TGConnectingPoint num="39" id="2062" />
+<TGConnectingPoint num="40" id="2063" />
+<TGConnectingPoint num="41" id="2064" />
+<TGConnectingPoint num="42" id="2065" />
+<TGConnectingPoint num="43" id="2066" />
+<TGConnectingPoint num="44" id="2067" />
+<TGConnectingPoint num="45" id="2068" />
+<TGConnectingPoint num="46" id="2069" />
+<TGConnectingPoint num="47" id="2070" />
+<TGConnectingPoint num="48" id="2071" />
+<TGConnectingPoint num="49" id="2072" />
+<TGConnectingPoint num="50" id="2073" />
+<TGConnectingPoint num="51" id="2074" />
+<TGConnectingPoint num="52" id="2075" />
+<TGConnectingPoint num="53" id="2076" />
+<TGConnectingPoint num="54" id="2077" />
+<TGConnectingPoint num="55" id="2078" />
+<TGConnectingPoint num="56" id="2079" />
+<TGConnectingPoint num="57" id="2080" />
+<TGConnectingPoint num="58" id="2081" />
+<TGConnectingPoint num="59" id="2082" />
+<TGConnectingPoint num="60" id="2083" />
+<TGConnectingPoint num="61" id="2084" />
+<TGConnectingPoint num="62" id="2085" />
+<TGConnectingPoint num="63" id="2086" />
+<TGConnectingPoint num="64" id="2087" />
+<TGConnectingPoint num="65" id="2088" />
+<TGConnectingPoint num="66" id="2089" />
+<TGConnectingPoint num="67" id="2090" />
+<TGConnectingPoint num="68" id="2091" />
+<TGConnectingPoint num="69" id="2092" />
+<TGConnectingPoint num="70" id="2093" />
+<TGConnectingPoint num="71" id="2094" />
<extraparam>
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="5104" id="2051" uid="8718a1dd-4942-43e5-b6ce-b5f78b82a355" >
-<father id="2124" num="5" />
-<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="465" minY="0" maxY="334" />
-<infoparam name="Send signal" value="pushTeaButton()" />
-<TGConnectingPoint num="0" id="2041" />
-<TGConnectingPoint num="1" id="2042" />
-<TGConnectingPoint num="2" id="2043" />
-<TGConnectingPoint num="3" id="2044" />
-<TGConnectingPoint num="4" id="2045" />
-<TGConnectingPoint num="5" id="2046" />
-<TGConnectingPoint num="6" id="2047" />
-<TGConnectingPoint num="7" id="2048" />
-<TGConnectingPoint num="8" id="2049" />
-<TGConnectingPoint num="9" id="2050" />
-<accessibility />
-</SUBCOMPONENT>
</AVATARStateMachineDiagramPanel>
<AVATARStateMachineDiagramPanel name="Wallet" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="2131" >
+<CONNECTOR type="5102" id="2175" >
<cdparam x="516" y="264" />
<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="2130" />
-<P1 x="485" y="219" id="2172" />
-<P2 x="485" y="275" id="2183" />
+<TGConnectingPoint num="0" id="2174" />
+<P1 x="485" y="219" id="2216" />
+<P2 x="485" y="275" id="2227" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2129" uid="ef977ae6-5b41-474a-8ad1-ffa74018c3f6" >
-<father id="2131" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2173" uid="ef977ae6-5b41-474a-8ad1-ffa74018c3f6" >
+<father id="2175" num="0" />
<cdparam x="493" y="251" />
<sizeparam width="173" height="30" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<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="2125" />
-<TGConnectingPoint num="1" id="2126" />
-<TGConnectingPoint num="2" id="2127" />
-<TGConnectingPoint num="3" id="2128" />
+<TGConnectingPoint num="0" id="2169" />
+<TGConnectingPoint num="1" id="2170" />
+<TGConnectingPoint num="2" id="2171" />
+<TGConnectingPoint num="3" id="2172" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
@@ -3879,26 +3880,26 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="2138" >
+<CONNECTOR type="5102" id="2182" >
<cdparam x="382" y="165" />
<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="2137" />
-<P1 x="382" y="165" id="2343" />
-<P2 x="485" y="189" id="2171" />
+<TGConnectingPoint num="0" id="2181" />
+<P1 x="382" y="165" id="2387" />
+<P2 x="485" y="189" id="2215" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2136" uid="c4a6003f-c191-4f16-812f-88460fc99537" >
-<father id="2138" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2180" uid="c4a6003f-c191-4f16-812f-88460fc99537" >
+<father id="2182" num="0" />
<cdparam x="419" y="170" />
<sizeparam width="20" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<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="2132" />
-<TGConnectingPoint num="1" id="2133" />
-<TGConnectingPoint num="2" id="2134" />
-<TGConnectingPoint num="3" id="2135" />
+<TGConnectingPoint num="0" id="2176" />
+<TGConnectingPoint num="1" id="2177" />
+<TGConnectingPoint num="2" id="2178" />
+<TGConnectingPoint num="3" id="2179" />
<extraparam>
<guard value="[]" enabled="true"/>
<afterMin value="" enabled="true"/>
@@ -3912,26 +3913,26 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="2145" >
+<CONNECTOR type="5102" id="2189" >
<cdparam x="223" y="260" />
<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="2144" />
-<P1 x="251" y="231" id="2161" />
-<P2 x="251" y="300" id="2256" />
+<TGConnectingPoint num="0" id="2188" />
+<P1 x="251" y="231" id="2205" />
+<P2 x="251" y="300" id="2300" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2143" uid="a9ba3ee4-2310-452a-ac15-378273520860" >
-<father id="2145" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2187" uid="a9ba3ee4-2310-452a-ac15-378273520860" >
+<father id="2189" num="0" />
<cdparam x="175" y="246" />
<sizeparam width="225" height="60" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<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="2139" />
-<TGConnectingPoint num="1" id="2140" />
-<TGConnectingPoint num="2" id="2141" />
-<TGConnectingPoint num="3" id="2142" />
+<TGConnectingPoint num="0" id="2183" />
+<TGConnectingPoint num="1" id="2184" />
+<TGConnectingPoint num="2" id="2185" />
+<TGConnectingPoint num="3" id="2186" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="minUserDelay" enabled="true"/>
@@ -3947,26 +3948,26 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="2152" >
+<CONNECTOR type="5102" id="2196" >
<cdparam x="357" y="165" />
<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="2151" />
-<P1 x="357" y="165" id="2342" />
-<P2 x="251" y="201" id="2160" />
+<TGConnectingPoint num="0" id="2195" />
+<P1 x="357" y="165" id="2386" />
+<P2 x="251" y="201" id="2204" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2150" uid="51361a43-5f1e-4e05-834c-38e957e74dbc" >
-<father id="2152" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2194" uid="51361a43-5f1e-4e05-834c-38e957e74dbc" >
+<father id="2196" num="0" />
<cdparam x="220" y="174" />
<sizeparam width="99" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<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="2146" />
-<TGConnectingPoint num="1" id="2147" />
-<TGConnectingPoint num="2" id="2148" />
-<TGConnectingPoint num="3" id="2149" />
+<TGConnectingPoint num="0" id="2190" />
+<TGConnectingPoint num="1" id="2191" />
+<TGConnectingPoint num="2" id="2192" />
+<TGConnectingPoint num="3" id="2193" />
<extraparam>
<guard value="[nbOfCoins > 0]" enabled="true"/>
<afterMin value="" enabled="true"/>
@@ -3980,26 +3981,26 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="2159" >
+<CONNECTOR type="5102" id="2203" >
<cdparam x="369" y="115" />
<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="2158" />
-<P1 x="370" y="64" id="2401" />
-<P2 x="370" y="135" id="2329" />
+<TGConnectingPoint num="0" id="2202" />
+<P1 x="370" y="64" id="2445" />
+<P2 x="370" y="135" id="2373" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2157" uid="67af2caf-f2db-4b34-b537-438d7b0e3fcc" >
-<father id="2159" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2201" uid="67af2caf-f2db-4b34-b537-438d7b0e3fcc" >
+<father id="2203" num="0" />
<cdparam x="376" y="105" />
<sizeparam width="173" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<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="2153" />
-<TGConnectingPoint num="1" id="2154" />
-<TGConnectingPoint num="2" id="2155" />
-<TGConnectingPoint num="3" id="2156" />
+<TGConnectingPoint num="0" id="2197" />
+<TGConnectingPoint num="1" id="2198" />
+<TGConnectingPoint num="2" id="2199" />
+<TGConnectingPoint num="3" id="2200" />
<extraparam>
<guard value="[ ]" enabled="true"/>
<afterMin value="" enabled="true"/>
@@ -4014,300 +4015,300 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="5103" id="2170" uid="1bbf332d-b36f-4992-82c7-f06006cdb1c1" >
+<COMPONENT type="5103" id="2214" uid="1bbf332d-b36f-4992-82c7-f06006cdb1c1" >
<cdparam x="217" y="206" />
<sizeparam width="69" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="Send signal" value="putCoin(x)" />
-<TGConnectingPoint num="0" id="2160" />
-<TGConnectingPoint num="1" id="2161" />
-<TGConnectingPoint num="2" id="2162" />
-<TGConnectingPoint num="3" id="2163" />
-<TGConnectingPoint num="4" id="2164" />
-<TGConnectingPoint num="5" id="2165" />
-<TGConnectingPoint num="6" id="2166" />
-<TGConnectingPoint num="7" id="2167" />
-<TGConnectingPoint num="8" id="2168" />
-<TGConnectingPoint num="9" id="2169" />
+<TGConnectingPoint num="0" id="2204" />
+<TGConnectingPoint num="1" id="2205" />
+<TGConnectingPoint num="2" id="2206" />
+<TGConnectingPoint num="3" id="2207" />
+<TGConnectingPoint num="4" id="2208" />
+<TGConnectingPoint num="5" id="2209" />
+<TGConnectingPoint num="6" id="2210" />
+<TGConnectingPoint num="7" id="2211" />
+<TGConnectingPoint num="8" id="2212" />
+<TGConnectingPoint num="9" id="2213" />
</COMPONENT>
-<COMPONENT type="5104" id="2181" uid="27a771a1-8452-4bd5-965d-690218370079" >
+<COMPONENT type="5104" id="2225" uid="27a771a1-8452-4bd5-965d-690218370079" >
<cdparam x="447" y="194" />
<sizeparam width="76" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="Receive signal" value="getCoin(x)" />
-<TGConnectingPoint num="0" id="2171" />
-<TGConnectingPoint num="1" id="2172" />
-<TGConnectingPoint num="2" id="2173" />
-<TGConnectingPoint num="3" id="2174" />
-<TGConnectingPoint num="4" id="2175" />
-<TGConnectingPoint num="5" id="2176" />
-<TGConnectingPoint num="6" id="2177" />
-<TGConnectingPoint num="7" id="2178" />
-<TGConnectingPoint num="8" id="2179" />
-<TGConnectingPoint num="9" id="2180" />
+<TGConnectingPoint num="0" id="2215" />
+<TGConnectingPoint num="1" id="2216" />
+<TGConnectingPoint num="2" id="2217" />
+<TGConnectingPoint num="3" id="2218" />
+<TGConnectingPoint num="4" id="2219" />
+<TGConnectingPoint num="5" id="2220" />
+<TGConnectingPoint num="6" id="2221" />
+<TGConnectingPoint num="7" id="2222" />
+<TGConnectingPoint num="8" id="2223" />
+<TGConnectingPoint num="9" id="2224" />
</COMPONENT>
-<COMPONENT type="5106" id="2254" uid="dff82f3a-8689-42a4-9a5a-e1083a596f96" >
+<COMPONENT type="5106" id="2298" uid="dff82f3a-8689-42a4-9a5a-e1083a596f96" >
<cdparam x="460" y="275" />
<sizeparam width="50" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="state0" value="main" />
-<TGConnectingPoint num="0" id="2182" />
-<TGConnectingPoint num="1" id="2183" />
-<TGConnectingPoint num="2" id="2184" />
-<TGConnectingPoint num="3" id="2185" />
-<TGConnectingPoint num="4" id="2186" />
-<TGConnectingPoint num="5" id="2187" />
-<TGConnectingPoint num="6" id="2188" />
-<TGConnectingPoint num="7" id="2189" />
-<TGConnectingPoint num="8" id="2190" />
-<TGConnectingPoint num="9" id="2191" />
-<TGConnectingPoint num="10" id="2192" />
-<TGConnectingPoint num="11" id="2193" />
-<TGConnectingPoint num="12" id="2194" />
-<TGConnectingPoint num="13" id="2195" />
-<TGConnectingPoint num="14" id="2196" />
-<TGConnectingPoint num="15" id="2197" />
-<TGConnectingPoint num="16" id="2198" />
-<TGConnectingPoint num="17" id="2199" />
-<TGConnectingPoint num="18" id="2200" />
-<TGConnectingPoint num="19" id="2201" />
-<TGConnectingPoint num="20" id="2202" />
-<TGConnectingPoint num="21" id="2203" />
-<TGConnectingPoint num="22" id="2204" />
-<TGConnectingPoint num="23" id="2205" />
-<TGConnectingPoint num="24" id="2206" />
-<TGConnectingPoint num="25" id="2207" />
-<TGConnectingPoint num="26" id="2208" />
-<TGConnectingPoint num="27" id="2209" />
-<TGConnectingPoint num="28" id="2210" />
-<TGConnectingPoint num="29" id="2211" />
-<TGConnectingPoint num="30" id="2212" />
-<TGConnectingPoint num="31" id="2213" />
-<TGConnectingPoint num="32" id="2214" />
-<TGConnectingPoint num="33" id="2215" />
-<TGConnectingPoint num="34" id="2216" />
-<TGConnectingPoint num="35" id="2217" />
-<TGConnectingPoint num="36" id="2218" />
-<TGConnectingPoint num="37" id="2219" />
-<TGConnectingPoint num="38" id="2220" />
-<TGConnectingPoint num="39" id="2221" />
-<TGConnectingPoint num="40" id="2222" />
-<TGConnectingPoint num="41" id="2223" />
-<TGConnectingPoint num="42" id="2224" />
-<TGConnectingPoint num="43" id="2225" />
-<TGConnectingPoint num="44" id="2226" />
-<TGConnectingPoint num="45" id="2227" />
-<TGConnectingPoint num="46" id="2228" />
-<TGConnectingPoint num="47" id="2229" />
-<TGConnectingPoint num="48" id="2230" />
-<TGConnectingPoint num="49" id="2231" />
-<TGConnectingPoint num="50" id="2232" />
-<TGConnectingPoint num="51" id="2233" />
-<TGConnectingPoint num="52" id="2234" />
-<TGConnectingPoint num="53" id="2235" />
-<TGConnectingPoint num="54" id="2236" />
-<TGConnectingPoint num="55" id="2237" />
-<TGConnectingPoint num="56" id="2238" />
-<TGConnectingPoint num="57" id="2239" />
-<TGConnectingPoint num="58" id="2240" />
-<TGConnectingPoint num="59" id="2241" />
-<TGConnectingPoint num="60" id="2242" />
-<TGConnectingPoint num="61" id="2243" />
-<TGConnectingPoint num="62" id="2244" />
-<TGConnectingPoint num="63" id="2245" />
-<TGConnectingPoint num="64" id="2246" />
-<TGConnectingPoint num="65" id="2247" />
-<TGConnectingPoint num="66" id="2248" />
-<TGConnectingPoint num="67" id="2249" />
-<TGConnectingPoint num="68" id="2250" />
-<TGConnectingPoint num="69" id="2251" />
-<TGConnectingPoint num="70" id="2252" />
-<TGConnectingPoint num="71" id="2253" />
+<TGConnectingPoint num="0" id="2226" />
+<TGConnectingPoint num="1" id="2227" />
+<TGConnectingPoint num="2" id="2228" />
+<TGConnectingPoint num="3" id="2229" />
+<TGConnectingPoint num="4" id="2230" />
+<TGConnectingPoint num="5" id="2231" />
+<TGConnectingPoint num="6" id="2232" />
+<TGConnectingPoint num="7" id="2233" />
+<TGConnectingPoint num="8" id="2234" />
+<TGConnectingPoint num="9" id="2235" />
+<TGConnectingPoint num="10" id="2236" />
+<TGConnectingPoint num="11" id="2237" />
+<TGConnectingPoint num="12" id="2238" />
+<TGConnectingPoint num="13" id="2239" />
+<TGConnectingPoint num="14" id="2240" />
+<TGConnectingPoint num="15" id="2241" />
+<TGConnectingPoint num="16" id="2242" />
+<TGConnectingPoint num="17" id="2243" />
+<TGConnectingPoint num="18" id="2244" />
+<TGConnectingPoint num="19" id="2245" />
+<TGConnectingPoint num="20" id="2246" />
+<TGConnectingPoint num="21" id="2247" />
+<TGConnectingPoint num="22" id="2248" />
+<TGConnectingPoint num="23" id="2249" />
+<TGConnectingPoint num="24" id="2250" />
+<TGConnectingPoint num="25" id="2251" />
+<TGConnectingPoint num="26" id="2252" />
+<TGConnectingPoint num="27" id="2253" />
+<TGConnectingPoint num="28" id="2254" />
+<TGConnectingPoint num="29" id="2255" />
+<TGConnectingPoint num="30" id="2256" />
+<TGConnectingPoint num="31" id="2257" />
+<TGConnectingPoint num="32" id="2258" />
+<TGConnectingPoint num="33" id="2259" />
+<TGConnectingPoint num="34" id="2260" />
+<TGConnectingPoint num="35" id="2261" />
+<TGConnectingPoint num="36" id="2262" />
+<TGConnectingPoint num="37" id="2263" />
+<TGConnectingPoint num="38" id="2264" />
+<TGConnectingPoint num="39" id="2265" />
+<TGConnectingPoint num="40" id="2266" />
+<TGConnectingPoint num="41" id="2267" />
+<TGConnectingPoint num="42" id="2268" />
+<TGConnectingPoint num="43" id="2269" />
+<TGConnectingPoint num="44" id="2270" />
+<TGConnectingPoint num="45" id="2271" />
+<TGConnectingPoint num="46" id="2272" />
+<TGConnectingPoint num="47" id="2273" />
+<TGConnectingPoint num="48" id="2274" />
+<TGConnectingPoint num="49" id="2275" />
+<TGConnectingPoint num="50" id="2276" />
+<TGConnectingPoint num="51" id="2277" />
+<TGConnectingPoint num="52" id="2278" />
+<TGConnectingPoint num="53" id="2279" />
+<TGConnectingPoint num="54" id="2280" />
+<TGConnectingPoint num="55" id="2281" />
+<TGConnectingPoint num="56" id="2282" />
+<TGConnectingPoint num="57" id="2283" />
+<TGConnectingPoint num="58" id="2284" />
+<TGConnectingPoint num="59" id="2285" />
+<TGConnectingPoint num="60" id="2286" />
+<TGConnectingPoint num="61" id="2287" />
+<TGConnectingPoint num="62" id="2288" />
+<TGConnectingPoint num="63" id="2289" />
+<TGConnectingPoint num="64" id="2290" />
+<TGConnectingPoint num="65" id="2291" />
+<TGConnectingPoint num="66" id="2292" />
+<TGConnectingPoint num="67" id="2293" />
+<TGConnectingPoint num="68" id="2294" />
+<TGConnectingPoint num="69" id="2295" />
+<TGConnectingPoint num="70" id="2296" />
+<TGConnectingPoint num="71" id="2297" />
<extraparam>
</extraparam>
</COMPONENT>
-<COMPONENT type="5106" id="2327" uid="d8e0235a-a7a6-4c1f-ae66-2d51d55f91c4" >
+<COMPONENT type="5106" id="2371" uid="d8e0235a-a7a6-4c1f-ae66-2d51d55f91c4" >
<cdparam x="226" y="300" />
<sizeparam width="50" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="state0" value="main" />
-<TGConnectingPoint num="0" id="2255" />
-<TGConnectingPoint num="1" id="2256" />
-<TGConnectingPoint num="2" id="2257" />
-<TGConnectingPoint num="3" id="2258" />
-<TGConnectingPoint num="4" id="2259" />
-<TGConnectingPoint num="5" id="2260" />
-<TGConnectingPoint num="6" id="2261" />
-<TGConnectingPoint num="7" id="2262" />
-<TGConnectingPoint num="8" id="2263" />
-<TGConnectingPoint num="9" id="2264" />
-<TGConnectingPoint num="10" id="2265" />
-<TGConnectingPoint num="11" id="2266" />
-<TGConnectingPoint num="12" id="2267" />
-<TGConnectingPoint num="13" id="2268" />
-<TGConnectingPoint num="14" id="2269" />
-<TGConnectingPoint num="15" id="2270" />
-<TGConnectingPoint num="16" id="2271" />
-<TGConnectingPoint num="17" id="2272" />
-<TGConnectingPoint num="18" id="2273" />
-<TGConnectingPoint num="19" id="2274" />
-<TGConnectingPoint num="20" id="2275" />
-<TGConnectingPoint num="21" id="2276" />
-<TGConnectingPoint num="22" id="2277" />
-<TGConnectingPoint num="23" id="2278" />
-<TGConnectingPoint num="24" id="2279" />
-<TGConnectingPoint num="25" id="2280" />
-<TGConnectingPoint num="26" id="2281" />
-<TGConnectingPoint num="27" id="2282" />
-<TGConnectingPoint num="28" id="2283" />
-<TGConnectingPoint num="29" id="2284" />
-<TGConnectingPoint num="30" id="2285" />
-<TGConnectingPoint num="31" id="2286" />
-<TGConnectingPoint num="32" id="2287" />
-<TGConnectingPoint num="33" id="2288" />
-<TGConnectingPoint num="34" id="2289" />
-<TGConnectingPoint num="35" id="2290" />
-<TGConnectingPoint num="36" id="2291" />
-<TGConnectingPoint num="37" id="2292" />
-<TGConnectingPoint num="38" id="2293" />
-<TGConnectingPoint num="39" id="2294" />
-<TGConnectingPoint num="40" id="2295" />
-<TGConnectingPoint num="41" id="2296" />
-<TGConnectingPoint num="42" id="2297" />
-<TGConnectingPoint num="43" id="2298" />
-<TGConnectingPoint num="44" id="2299" />
-<TGConnectingPoint num="45" id="2300" />
-<TGConnectingPoint num="46" id="2301" />
-<TGConnectingPoint num="47" id="2302" />
-<TGConnectingPoint num="48" id="2303" />
-<TGConnectingPoint num="49" id="2304" />
-<TGConnectingPoint num="50" id="2305" />
-<TGConnectingPoint num="51" id="2306" />
-<TGConnectingPoint num="52" id="2307" />
-<TGConnectingPoint num="53" id="2308" />
-<TGConnectingPoint num="54" id="2309" />
-<TGConnectingPoint num="55" id="2310" />
-<TGConnectingPoint num="56" id="2311" />
-<TGConnectingPoint num="57" id="2312" />
-<TGConnectingPoint num="58" id="2313" />
-<TGConnectingPoint num="59" id="2314" />
-<TGConnectingPoint num="60" id="2315" />
-<TGConnectingPoint num="61" id="2316" />
-<TGConnectingPoint num="62" id="2317" />
-<TGConnectingPoint num="63" id="2318" />
-<TGConnectingPoint num="64" id="2319" />
-<TGConnectingPoint num="65" id="2320" />
-<TGConnectingPoint num="66" id="2321" />
-<TGConnectingPoint num="67" id="2322" />
-<TGConnectingPoint num="68" id="2323" />
-<TGConnectingPoint num="69" id="2324" />
-<TGConnectingPoint num="70" id="2325" />
-<TGConnectingPoint num="71" id="2326" />
+<TGConnectingPoint num="0" id="2299" />
+<TGConnectingPoint num="1" id="2300" />
+<TGConnectingPoint num="2" id="2301" />
+<TGConnectingPoint num="3" id="2302" />
+<TGConnectingPoint num="4" id="2303" />
+<TGConnectingPoint num="5" id="2304" />
+<TGConnectingPoint num="6" id="2305" />
+<TGConnectingPoint num="7" id="2306" />
+<TGConnectingPoint num="8" id="2307" />
+<TGConnectingPoint num="9" id="2308" />
+<TGConnectingPoint num="10" id="2309" />
+<TGConnectingPoint num="11" id="2310" />
+<TGConnectingPoint num="12" id="2311" />
+<TGConnectingPoint num="13" id="2312" />
+<TGConnectingPoint num="14" id="2313" />
+<TGConnectingPoint num="15" id="2314" />
+<TGConnectingPoint num="16" id="2315" />
+<TGConnectingPoint num="17" id="2316" />
+<TGConnectingPoint num="18" id="2317" />
+<TGConnectingPoint num="19" id="2318" />
+<TGConnectingPoint num="20" id="2319" />
+<TGConnectingPoint num="21" id="2320" />
+<TGConnectingPoint num="22" id="2321" />
+<TGConnectingPoint num="23" id="2322" />
+<TGConnectingPoint num="24" id="2323" />
+<TGConnectingPoint num="25" id="2324" />
+<TGConnectingPoint num="26" id="2325" />
+<TGConnectingPoint num="27" id="2326" />
+<TGConnectingPoint num="28" id="2327" />
+<TGConnectingPoint num="29" id="2328" />
+<TGConnectingPoint num="30" id="2329" />
+<TGConnectingPoint num="31" id="2330" />
+<TGConnectingPoint num="32" id="2331" />
+<TGConnectingPoint num="33" id="2332" />
+<TGConnectingPoint num="34" id="2333" />
+<TGConnectingPoint num="35" id="2334" />
+<TGConnectingPoint num="36" id="2335" />
+<TGConnectingPoint num="37" id="2336" />
+<TGConnectingPoint num="38" id="2337" />
+<TGConnectingPoint num="39" id="2338" />
+<TGConnectingPoint num="40" id="2339" />
+<TGConnectingPoint num="41" id="2340" />
+<TGConnectingPoint num="42" id="2341" />
+<TGConnectingPoint num="43" id="2342" />
+<TGConnectingPoint num="44" id="2343" />
+<TGConnectingPoint num="45" id="2344" />
+<TGConnectingPoint num="46" id="2345" />
+<TGConnectingPoint num="47" id="2346" />
+<TGConnectingPoint num="48" id="2347" />
+<TGConnectingPoint num="49" id="2348" />
+<TGConnectingPoint num="50" id="2349" />
+<TGConnectingPoint num="51" id="2350" />
+<TGConnectingPoint num="52" id="2351" />
+<TGConnectingPoint num="53" id="2352" />
+<TGConnectingPoint num="54" id="2353" />
+<TGConnectingPoint num="55" id="2354" />
+<TGConnectingPoint num="56" id="2355" />
+<TGConnectingPoint num="57" id="2356" />
+<TGConnectingPoint num="58" id="2357" />
+<TGConnectingPoint num="59" id="2358" />
+<TGConnectingPoint num="60" id="2359" />
+<TGConnectingPoint num="61" id="2360" />
+<TGConnectingPoint num="62" id="2361" />
+<TGConnectingPoint num="63" id="2362" />
+<TGConnectingPoint num="64" id="2363" />
+<TGConnectingPoint num="65" id="2364" />
+<TGConnectingPoint num="66" id="2365" />
+<TGConnectingPoint num="67" id="2366" />
+<TGConnectingPoint num="68" id="2367" />
+<TGConnectingPoint num="69" id="2368" />
+<TGConnectingPoint num="70" id="2369" />
+<TGConnectingPoint num="71" id="2370" />
<extraparam>
</extraparam>
</COMPONENT>
-<COMPONENT type="5106" id="2400" uid="7800bef7-c428-4182-a94c-9832c7e71ad9" >
+<COMPONENT type="5106" id="2444" uid="7800bef7-c428-4182-a94c-9832c7e71ad9" >
<cdparam x="345" y="135" />
<sizeparam width="50" height="30" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="state0" value="main" />
-<TGConnectingPoint num="0" id="2328" />
-<TGConnectingPoint num="1" id="2329" />
-<TGConnectingPoint num="2" id="2330" />
-<TGConnectingPoint num="3" id="2331" />
-<TGConnectingPoint num="4" id="2332" />
-<TGConnectingPoint num="5" id="2333" />
-<TGConnectingPoint num="6" id="2334" />
-<TGConnectingPoint num="7" id="2335" />
-<TGConnectingPoint num="8" id="2336" />
-<TGConnectingPoint num="9" id="2337" />
-<TGConnectingPoint num="10" id="2338" />
-<TGConnectingPoint num="11" id="2339" />
-<TGConnectingPoint num="12" id="2340" />
-<TGConnectingPoint num="13" id="2341" />
-<TGConnectingPoint num="14" id="2342" />
-<TGConnectingPoint num="15" id="2343" />
-<TGConnectingPoint num="16" id="2344" />
-<TGConnectingPoint num="17" id="2345" />
-<TGConnectingPoint num="18" id="2346" />
-<TGConnectingPoint num="19" id="2347" />
-<TGConnectingPoint num="20" id="2348" />
-<TGConnectingPoint num="21" id="2349" />
-<TGConnectingPoint num="22" id="2350" />
-<TGConnectingPoint num="23" id="2351" />
-<TGConnectingPoint num="24" id="2352" />
-<TGConnectingPoint num="25" id="2353" />
-<TGConnectingPoint num="26" id="2354" />
-<TGConnectingPoint num="27" id="2355" />
-<TGConnectingPoint num="28" id="2356" />
-<TGConnectingPoint num="29" id="2357" />
-<TGConnectingPoint num="30" id="2358" />
-<TGConnectingPoint num="31" id="2359" />
-<TGConnectingPoint num="32" id="2360" />
-<TGConnectingPoint num="33" id="2361" />
-<TGConnectingPoint num="34" id="2362" />
-<TGConnectingPoint num="35" id="2363" />
-<TGConnectingPoint num="36" id="2364" />
-<TGConnectingPoint num="37" id="2365" />
-<TGConnectingPoint num="38" id="2366" />
-<TGConnectingPoint num="39" id="2367" />
-<TGConnectingPoint num="40" id="2368" />
-<TGConnectingPoint num="41" id="2369" />
-<TGConnectingPoint num="42" id="2370" />
-<TGConnectingPoint num="43" id="2371" />
-<TGConnectingPoint num="44" id="2372" />
-<TGConnectingPoint num="45" id="2373" />
-<TGConnectingPoint num="46" id="2374" />
-<TGConnectingPoint num="47" id="2375" />
-<TGConnectingPoint num="48" id="2376" />
-<TGConnectingPoint num="49" id="2377" />
-<TGConnectingPoint num="50" id="2378" />
-<TGConnectingPoint num="51" id="2379" />
-<TGConnectingPoint num="52" id="2380" />
-<TGConnectingPoint num="53" id="2381" />
-<TGConnectingPoint num="54" id="2382" />
-<TGConnectingPoint num="55" id="2383" />
-<TGConnectingPoint num="56" id="2384" />
-<TGConnectingPoint num="57" id="2385" />
-<TGConnectingPoint num="58" id="2386" />
-<TGConnectingPoint num="59" id="2387" />
-<TGConnectingPoint num="60" id="2388" />
-<TGConnectingPoint num="61" id="2389" />
-<TGConnectingPoint num="62" id="2390" />
-<TGConnectingPoint num="63" id="2391" />
-<TGConnectingPoint num="64" id="2392" />
-<TGConnectingPoint num="65" id="2393" />
-<TGConnectingPoint num="66" id="2394" />
-<TGConnectingPoint num="67" id="2395" />
-<TGConnectingPoint num="68" id="2396" />
-<TGConnectingPoint num="69" id="2397" />
-<TGConnectingPoint num="70" id="2398" />
-<TGConnectingPoint num="71" id="2399" />
+<TGConnectingPoint num="0" id="2372" />
+<TGConnectingPoint num="1" id="2373" />
+<TGConnectingPoint num="2" id="2374" />
+<TGConnectingPoint num="3" id="2375" />
+<TGConnectingPoint num="4" id="2376" />
+<TGConnectingPoint num="5" id="2377" />
+<TGConnectingPoint num="6" id="2378" />
+<TGConnectingPoint num="7" id="2379" />
+<TGConnectingPoint num="8" id="2380" />
+<TGConnectingPoint num="9" id="2381" />
+<TGConnectingPoint num="10" id="2382" />
+<TGConnectingPoint num="11" id="2383" />
+<TGConnectingPoint num="12" id="2384" />
+<TGConnectingPoint num="13" id="2385" />
+<TGConnectingPoint num="14" id="2386" />
+<TGConnectingPoint num="15" id="2387" />
+<TGConnectingPoint num="16" id="2388" />
+<TGConnectingPoint num="17" id="2389" />
+<TGConnectingPoint num="18" id="2390" />
+<TGConnectingPoint num="19" id="2391" />
+<TGConnectingPoint num="20" id="2392" />
+<TGConnectingPoint num="21" id="2393" />
+<TGConnectingPoint num="22" id="2394" />
+<TGConnectingPoint num="23" id="2395" />
+<TGConnectingPoint num="24" id="2396" />
+<TGConnectingPoint num="25" id="2397" />
+<TGConnectingPoint num="26" id="2398" />
+<TGConnectingPoint num="27" id="2399" />
+<TGConnectingPoint num="28" id="2400" />
+<TGConnectingPoint num="29" id="2401" />
+<TGConnectingPoint num="30" id="2402" />
+<TGConnectingPoint num="31" id="2403" />
+<TGConnectingPoint num="32" id="2404" />
+<TGConnectingPoint num="33" id="2405" />
+<TGConnectingPoint num="34" id="2406" />
+<TGConnectingPoint num="35" id="2407" />
+<TGConnectingPoint num="36" id="2408" />
+<TGConnectingPoint num="37" id="2409" />
+<TGConnectingPoint num="38" id="2410" />
+<TGConnectingPoint num="39" id="2411" />
+<TGConnectingPoint num="40" id="2412" />
+<TGConnectingPoint num="41" id="2413" />
+<TGConnectingPoint num="42" id="2414" />
+<TGConnectingPoint num="43" id="2415" />
+<TGConnectingPoint num="44" id="2416" />
+<TGConnectingPoint num="45" id="2417" />
+<TGConnectingPoint num="46" id="2418" />
+<TGConnectingPoint num="47" id="2419" />
+<TGConnectingPoint num="48" id="2420" />
+<TGConnectingPoint num="49" id="2421" />
+<TGConnectingPoint num="50" id="2422" />
+<TGConnectingPoint num="51" id="2423" />
+<TGConnectingPoint num="52" id="2424" />
+<TGConnectingPoint num="53" id="2425" />
+<TGConnectingPoint num="54" id="2426" />
+<TGConnectingPoint num="55" id="2427" />
+<TGConnectingPoint num="56" id="2428" />
+<TGConnectingPoint num="57" id="2429" />
+<TGConnectingPoint num="58" id="2430" />
+<TGConnectingPoint num="59" id="2431" />
+<TGConnectingPoint num="60" id="2432" />
+<TGConnectingPoint num="61" id="2433" />
+<TGConnectingPoint num="62" id="2434" />
+<TGConnectingPoint num="63" id="2435" />
+<TGConnectingPoint num="64" id="2436" />
+<TGConnectingPoint num="65" id="2437" />
+<TGConnectingPoint num="66" id="2438" />
+<TGConnectingPoint num="67" id="2439" />
+<TGConnectingPoint num="68" id="2440" />
+<TGConnectingPoint num="69" id="2441" />
+<TGConnectingPoint num="70" id="2442" />
+<TGConnectingPoint num="71" id="2443" />
<extraparam>
</extraparam>
</COMPONENT>
-<COMPONENT type="5100" id="2402" uid="e7196c4b-f0b1-4487-b81c-4db89e85366e" >
+<COMPONENT type="5100" id="2446" uid="e7196c4b-f0b1-4487-b81c-4db89e85366e" >
<cdparam x="363" y="44" />
<sizeparam width="15" height="15" minWidth="1" minHeight="1" 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="2401" />
+<TGConnectingPoint num="0" id="2445" />
</COMPONENT>
diff --git a/modeling/scripts/clipt.exe b/modeling/scripts/clipt.exe
new file mode 100755
index 0000000000000000000000000000000000000000..b50573a317d150da645dfb35424a66805dc08dcb
--- /dev/null
+++ b/modeling/scripts/clipt.exe
@@ -0,0 +1 @@
+cd ~/TTool/bin&&java -Xmx2048m -jar ttool-cli.jar -show -debug ../modeling/scripts/scriptpt
diff --git a/modeling/scripts/scriptpt b/modeling/scripts/scriptpt
new file mode 100644
index 0000000000000000000000000000000000000000..0e9ffb7542237e2c2ea5a1b4c99f5800a5de9d12
--- /dev/null
+++ b/modeling/scripts/scriptpt
@@ -0,0 +1,13 @@
+# Playing simulation trace
+set model ./../modeling/AVATAR/CoffeeMachine_avatar.xml
+#print The model to be opened is: $model
+action start
+wait 2
+action open $model
+wait 4
+action check-syntax
+wait 2
+action avatar-simulation-open-window
+wait 2
+action asst ./../graphs/tracecmpartial.csv
+wait 2
\ No newline at end of file
diff --git a/src/main/java/avatartranslator/directsimulation/AvatarSimulationPendingTransaction.java b/src/main/java/avatartranslator/directsimulation/AvatarSimulationPendingTransaction.java
index 54225e37baa793ce589874fb55e51493c66b40a4..d68a770a6ab271806774f6f8bd2ed1fcffe2c75e 100644
--- a/src/main/java/avatartranslator/directsimulation/AvatarSimulationPendingTransaction.java
+++ b/src/main/java/avatartranslator/directsimulation/AvatarSimulationPendingTransaction.java
@@ -46,6 +46,7 @@ import myutil.MyMath;
import myutil.TraceManager;
import java.awt.*;
+import java.util.UUID;
import java.util.Vector;
@@ -184,7 +185,7 @@ public class AvatarSimulationPendingTransaction {
TraceManager.addDev("Null element to execute");
}
- res = res + elementToExecute.getNiceName() + "/ID=" + elementToExecute.getID();
+ res = res + elementToExecute.getNiceName() + "/ID=" + elementToExecute.getID() + "/UUID=" + elementToExecute.getUUID();
if (hasClock) {
if (myMinDuration == maxDuration) {
res += " [Delay: " + myMinDuration + "]";
@@ -194,7 +195,7 @@ public class AvatarSimulationPendingTransaction {
}
} else {
- res += "[SYNCHRO]" + elementToExecute.getNiceName() + "/ID=" + elementToExecute.getID();
+ res += "[SYNCHRO]" + elementToExecute.getNiceName() + "/ID=" + elementToExecute.getID() + "/UUID=" + elementToExecute.getUUID();
res += " | " + linkedTransaction.toString();
}
@@ -207,7 +208,7 @@ public class AvatarSimulationPendingTransaction {
} else {
res += " ";
}
- res += aspt.elementToExecute.getID();
+ res += aspt.elementToExecute.getID() + "/" + aspt.elementToExecute.getUUID();
}
res += "]";
}
@@ -305,5 +306,14 @@ public class AvatarSimulationPendingTransaction {
}
}
+ public UUID getUUID() {
+ if (elementToExecute == null) {
+ return null;
+ }
+
+ return elementToExecute.getUUID();
+
+ }
+
}
diff --git a/src/main/java/avatartranslator/directsimulation/AvatarSpecificationSimulation.java b/src/main/java/avatartranslator/directsimulation/AvatarSpecificationSimulation.java
index fc34360bcee5314ada42d96e22ba39f8f892d728..e6a40c4e68dfeb53861139ac2163b628983f0f4a 100644
--- a/src/main/java/avatartranslator/directsimulation/AvatarSpecificationSimulation.java
+++ b/src/main/java/avatartranslator/directsimulation/AvatarSpecificationSimulation.java
@@ -40,12 +40,11 @@
package avatartranslator.directsimulation;
import avatartranslator.*;
-import myutil.IntExpressionEvaluator;
+import myutil.CSVObject;
import myutil.TraceManager;
import java.awt.*;
import java.util.ArrayList;
-import java.util.HashSet;
import java.util.UUID;
import java.util.Vector;
@@ -61,6 +60,8 @@ import java.util.Vector;
public class AvatarSpecificationSimulation {
public final static String COMMA = ", ";
+ public final static int INDEX_UUID = 3;
+
public static int MAX_TRANSACTION_IN_A_ROW = 1000;
@@ -97,6 +98,8 @@ public class AvatarSpecificationSimulation {
private long bunchid;
private boolean nbOfCommandsActivated = false;
+ private CSVObject traceToPlay = null;
+ private int idInTrace = 1;
private int nbOfCommands = -1; // means: until it blocks
private int indexSelectedTransaction = -1;
@@ -180,7 +183,14 @@ public class AvatarSpecificationSimulation {
//TraceManager.addDev("-------Spec:" + avspec.toString() + "--------");
}
+ public void resetTrace() {
+ TraceManager.addDev("resetTrace()");
+ traceToPlay = null;
+ idInTrace = 1;
+ }
+
public void reset() {
+ TraceManager.addDev("Reset simulation");
// Reinit clock
clockValue = 0;
@@ -190,6 +200,7 @@ public class AvatarSpecificationSimulation {
// Stop the first transaction
unsetNbOfCommands();
+
stopped = true;
// Reinit simulation
@@ -342,7 +353,18 @@ public class AvatarSpecificationSimulation {
case EXECUTE:
//TraceManager.addDev("-> -> EXECUTE");
silentTransactionExecuted = false;
- selectedTransactions = selectTransactions(pendingTransactions);
+
+ if (traceToPlay == null) {
+ TraceManager.addDev("Null trace");
+ }
+
+ if ((traceToPlay != null) && (idInTrace > 0)){
+ TraceManager.addDev("Selecting transaction from trace");
+ selectedTransactions = selectTransactionsFromTrace(pendingTransactions);
+ } else {
+ TraceManager.addDev("Selecting transaction randomly");
+ selectedTransactions = selectTransactions(pendingTransactions);
+ }
if (selectedTransactions.size() == 0) {
setState(TERMINATED);
@@ -506,6 +528,11 @@ public class AvatarSpecificationSimulation {
nbOfCommandsActivated = false;
}
+ public void setTraceToPlay(CSVObject _traceToPlay) {
+ traceToPlay = _traceToPlay;
+ idInTrace = 1;
+ }
+
// External control functions
public synchronized void killSimulation() {
killed = true;
@@ -952,6 +979,47 @@ public class AvatarSpecificationSimulation {
return cpt;
}
+ public Vector<AvatarSimulationPendingTransaction> selectTransactionsFromTrace(Vector<AvatarSimulationPendingTransaction> _pendingTransactions) {
+ Vector<AvatarSimulationPendingTransaction> ll = new Vector<AvatarSimulationPendingTransaction>();
+
+ TraceManager.addDev("Selecting transaction from trace");
+
+ // Silent transition ?
+ AvatarSimulationPendingTransaction tr = getRandomSilentTransactionToExecute(_pendingTransactions);
+ if (tr != null) {
+ ll.add(tr);
+ indexSelectedTransaction = -1;
+ silentTransactionExecuted = true;
+ return ll;
+ }
+
+ // Find the corresponding elements of the trace. If cannot be found, then stop with the trace
+ for (AvatarSimulationPendingTransaction pt: _pendingTransactions) {
+ // check the current UUID and the one of the pendingTransaction
+ UUID currentUUID = traceToPlay.getUUID(idInTrace, INDEX_UUID);
+ if (currentUUID != null) {
+ UUID toExecuteUUID = pt.getUUID();
+ if (toExecuteUUID == currentUUID) {
+ // Select this one
+ ll.add(pt);
+ indexSelectedTransaction = -1;
+ TraceManager.addDev("Trace execution ok at ID = " + idInTrace);
+ idInTrace ++;
+ if (idInTrace >= traceToPlay.getNbOfLines()) {
+ resetTrace();
+ TraceManager.addDev("Stopping simulation");
+ stopSimulation();
+ }
+ return ll;
+ }
+ }
+
+ }
+
+ // None were found!
+ TraceManager.addDev("Trace execution failed at ID = " + idInTrace);
+ return ll;
+ }
public Vector<AvatarSimulationPendingTransaction> selectTransactions(Vector<AvatarSimulationPendingTransaction> _pendingTransactions) {
Vector<AvatarSimulationPendingTransaction> ll = new Vector<AvatarSimulationPendingTransaction>();
@@ -966,7 +1034,7 @@ public class AvatarSpecificationSimulation {
}
// Put in ll the first possible logical transaction which is met
- // Random select the first index if none has been selected
+ // Randomly select the first index if none has been selected
if (indexSelectedTransaction == -1) {
//TraceManager.addDev("No transition selected");
// Consider probabilities
diff --git a/src/main/java/cli/Action.java b/src/main/java/cli/Action.java
index 9a59a56bcec8ffabacc347c7541ff9b2e6f330ed..c42ab8a70af2226845e98d3d5a4eca08c834d9c7 100644
--- a/src/main/java/cli/Action.java
+++ b/src/main/java/cli/Action.java
@@ -56,9 +56,13 @@ import myutil.TraceManager;
import tmltranslator.TMLMapping;
import tmltranslator.TMLModeling;
import ui.MainGUI;
+import ui.avatarinteractivesimulation.AvatarInteractiveSimulationActions;
+import ui.avatarinteractivesimulation.JFrameAvatarInteractiveSimulation;
import ui.util.IconManager;
import ui.window.JDialogSystemCGeneration;
import ui.*;
+
+import javax.swing.*;
import java.awt.*;
import java.io.File;
import java.text.DateFormat;
@@ -104,11 +108,14 @@ public class Action extends Command {
private final static String SELECT_PANEL = "select-panel";
- private final static String NAVIGATE_LEFT_PANEL = "navigate-left-panel";
+
private final static String AVATAR_RG_GENERATION = "avatar-rg";
private final static String AVATAR_UPPAAL_VALIDATE = "avatar-rg-validate";
private final static String AVATAR_SIMULATION_TO_BRK = "avatar-simulation-to-brk";
+ private final static String AVATAR_SIMULATION_SELECT_TRACE = "avatar-simulation-select-trace";
+ private final static String AVATAR_SIMULATION_OPEN_WINDOW = "avatar-simulation-open-window";
+ private final static String AVATAR_SIMULATION_GENERIC = "avatar-simulation-generic";
@@ -1311,24 +1318,139 @@ public class Action extends Command {
ass = new AvatarSpecificationSimulation(as, null);
ass.runSimulationToCompletion();
- /*Thread t = new Thread() {
- public void run() {
- ass.runSimulation();
+
+ TraceManager.addUser("Simulation terminated. End time=" + ass.getClockValue());
+
+
+ return null;
+ }
+ };
+
+ // AVATAR
+ Command avatarSimulationSelectTrace = new Command() {
+ public String getCommand() {
+ return AVATAR_SIMULATION_SELECT_TRACE;
+ }
+
+ public String getShortCommand() {
+ return "asst";
+ }
+
+ public String getDescription() {
+ return "Simulate a trace to be simulated";
+ }
+
+ public String getUsage() {
+ return "avatar-simulation-select-trace [PATH_TO_TRACE]";
+ }
+
+ public String executeCommand(String command, Interpreter interpreter) {
+ if (!interpreter.isTToolStarted()) {
+ return Interpreter.TTOOL_NOT_STARTED;
+ }
+
+ String[] commands = command.split(" ");
+ if (commands.length < 1) {
+ return Interpreter.BAD;
+ }
+
+ String [] st = interpreter.mgui.loadSimulationTraceCSVFile(new File(commands[0]));
+ if (st == null) {
+ return Interpreter.BAD_FILE_NAME;
+ }
+
+ SimulationTrace sim = new SimulationTrace(st[0], SimulationTrace.CSV_AVATAR, st[1]);
+ sim.setContent(st[2]);
+ interpreter.mgui.addSimulationTrace(sim);
+ interpreter.mgui.setSimulationTraceSelected(sim);
+
+
+ return null;
+ }
+ };
+
+ // AVATAR
+ Command avatarSimulationOpenWindow = new Command() {
+ public String getCommand() {
+ return AVATAR_SIMULATION_OPEN_WINDOW;
+ }
+
+ public String getShortCommand() {
+ return "asow";
+ }
+
+ public String getDescription() {
+ return "Show / hide Avatar simulation window";
+ }
+
+ public String getUsage() {
+ return "avatar-simulation-open-window";
+ }
+
+ public String executeCommand(String command, Interpreter interpreter) {
+ if (!interpreter.isTToolStarted()) {
+ return Interpreter.TTOOL_NOT_STARTED;
+ }
+
+ SwingUtilities.invokeLater(()->{
+ interpreter.mgui.openCloseAvatarSimulationWindow();
+ });
+
+
+ return null;
+ }
+ };
+
+ // AVATAR
+ Command avatarSimulationGeneric = new Command() {
+ public String getCommand() {
+ return AVATAR_SIMULATION_GENERIC;
+ }
+
+ public String getShortCommand() {
+ return "asg";
+ }
+
+ public String getDescription() {
+ return "Execute a generic action in the Avatar simulation";
+ }
+
+ public String getUsage() {
+ String usage = "avatar-simulation-generic <generic-command>\n" +
+ "<generic command> are :";
+ if (AvatarInteractiveSimulationActions.actions != null) {
+ for (TAction action : AvatarInteractiveSimulationActions.actions) {
+ if (action != null) {
+ usage += "\n\t" + action.ACTION_COMMAND_KEY;
+ } else {
+ usage += "Actions can be listed only once the simulation window has been started";
+ break;
+ }
}
- };
+ } else {
+ usage += "Actions can be listed only once the simulation window has been started";
+ }
+ return usage;
- t.start();
- ass.goSimulation();
- try {
- while(ass.getState() != ass.TERMINATED) {
- Thread.currentThread().sleep(25);
- //TraceManager.addDev("Waiting for termination");
- };
- ass.killSimulation();
- t.join();
- } catch (InterruptedException ie) {}*/
+ }
- TraceManager.addUser("Simulation terminated. End time=" + ass.getClockValue());
+ public String executeCommand(String command, Interpreter interpreter) {
+ if (!interpreter.isTToolStarted()) {
+ return Interpreter.TTOOL_NOT_STARTED;
+ }
+
+ String[] commands = command.split(" ");
+ if (commands.length < 1) {
+ return Interpreter.BAD;
+ }
+
+ JFrameAvatarInteractiveSimulation jfais = interpreter.mgui.getJFrameAvatarInteractiveSimulation();
+
+ if (jfais == null) {
+ return interpreter.NO_WINDOW;
+ }
+
+ jfais.actionPerformed(commands[0], null);
return null;
@@ -1368,6 +1490,10 @@ public class Action extends Command {
addAndSortSubcommand(selectPanel);
addAndSortSubcommand(compareUppaal);
addAndSortSubcommand(avatarSimulationToBrk);
+ addAndSortSubcommand(avatarSimulationSelectTrace);
+ addAndSortSubcommand(avatarSimulationOpenWindow);
+ addAndSortSubcommand(avatarSimulationGeneric);
+
addAndSortSubcommand(generic);
}
diff --git a/src/main/java/cli/Interpreter.java b/src/main/java/cli/Interpreter.java
index e2d001f208d0a50126fe482dac9bf4bde6b2caaa..e05d3c2b86cb954177612ee382693a97911ae089 100644
--- a/src/main/java/cli/Interpreter.java
+++ b/src/main/java/cli/Interpreter.java
@@ -75,6 +75,7 @@ public class Interpreter implements Runnable, TerminalProviderInterface {
public final static String BAD_FILE_NAME = "Unvalid file identifier";
public final static String BAD_FILE = "Badly formatted file";
public final static String AVATAR_NO_SPEC = "No Avatar specification";
+ public final static String NO_WINDOW = "The targeted window does not exist";
private String script;
diff --git a/src/main/java/myutil/CSVObject.java b/src/main/java/myutil/CSVObject.java
index 2b4d0e4b654690edc77ae9aeee347520ffc40910..0424853c504e1d759358bc4ce46e3c48fa5c879f 100644
--- a/src/main/java/myutil/CSVObject.java
+++ b/src/main/java/myutil/CSVObject.java
@@ -110,6 +110,7 @@ public class CSVObject {
}
}
+
public int getNbOfLines() {
if (lines == null) {
return -1;
diff --git a/src/main/java/myutil/GraphicLib.java b/src/main/java/myutil/GraphicLib.java
index 12c0165d06e802b6d8e8d6b6830f72234bb1b976..04e99cefb60372faff8f26162d84f02b2ad74dac 100644
--- a/src/main/java/myutil/GraphicLib.java
+++ b/src/main/java/myutil/GraphicLib.java
@@ -536,7 +536,7 @@ public final class GraphicLib {
Window parent = w.getOwner();
if (parent == null) {
- //TraceManager.addDev("Centering on screen");
+ //TraceManager.addDev("Null parent, centering on screen");
centerOnScreen(w);
return;
}
diff --git a/src/main/java/ui/MainGUI.java b/src/main/java/ui/MainGUI.java
index b8bfbdde26397aad8b8c615caa6e5f4f7b7c9ac7..9f8c5660beece1aa23b21b76128521fd87b4689f 100644
--- a/src/main/java/ui/MainGUI.java
+++ b/src/main/java/ui/MainGUI.java
@@ -827,6 +827,11 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per
return gtm.getSimulationTraces();
}
+ // Getting the avatar simulation window
+ public JFrameAvatarInteractiveSimulation getJFrameAvatarInteractiveSimulation() {
+ return jfais;
+ }
+
public void addSimulationTrace(SimulationTrace _newSimulationTrace) {
gtm.addSimulationTrace(_newSimulationTrace);
expandToSimulationTraces();
@@ -2605,6 +2610,10 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per
}
file = jfctgraph.getSelectedFile();
+ return loadSimulationTraceCSVFile(file);
+ }
+
+ public String[] loadSimulationTraceCSVFile(File file) {
file = FileUtils.addFileExtensionIfMissing(file, CSVFileFilter.getExtension());
String spec = loadFile(file);
@@ -4920,6 +4929,16 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per
// jfais.setSize(900, 600);
GraphicLib.centerOnParent(jfais, 900, 600);
jfais.setVisible(true);
+ //jfais.repaint();
+ }
+
+ public void openCloseAvatarSimulationWindow() {
+ if (jfais == null) {
+ avatarSimulation();
+ } else {
+ jfais.setVisible(false);
+ jfais = null;
+ }
}
public void setSimulationTraceSelected(SimulationTrace _st) {
diff --git a/src/main/java/ui/avatarinteractivesimulation/AvatarInteractiveSimulationActions.java b/src/main/java/ui/avatarinteractivesimulation/AvatarInteractiveSimulationActions.java
index b915488f93a1f0941cb462cf4e9205e3ead3e3a0..068e9aca3ec450866cf59e63403656dd2e9d93df 100755
--- a/src/main/java/ui/avatarinteractivesimulation/AvatarInteractiveSimulationActions.java
+++ b/src/main/java/ui/avatarinteractivesimulation/AvatarInteractiveSimulationActions.java
@@ -61,57 +61,43 @@ public class AvatarInteractiveSimulationActions extends AbstractAction {
public static final int ACT_RUN_SIMU = 0;
public static final int ACT_STOP_SIMU = 1;
public static final int ACT_RESET_SIMU = 2;
- public static final int ACT_RUN_X_TIME_UNITS = 6;
- public static final int ACT_RUN_TO_TIME = 7;
- public static final int ACT_RUN_X_TRANSACTIONS = 8;
- public static final int ACT_RUN_X_COMMANDS = 9;
- public static final int ACT_RUN_SIMU_MAX_TRANS = 38;
- public static final int ACT_RUN_TRACE = 39;
- public static final int ACT_RUN_EXPLORATION = 20;
- public static final int ACT_RUN_TO_NEXT_BUS_TRANSFER = 21;
- public static final int ACT_BACK_ONE = 22;
- public static final int ACT_RUN_UNTIL_TASK_EXECUTES = 23;
- public static final int ACT_RUN_UNTIL_MEMORY_ACCESS = 24;
- public static final int ACT_RUN_UNTIL_CHANNEL_ACCESS = 25;
+ public static final int ACT_RUN_X_COMMANDS = 3;
+ public static final int ACT_RUN_SIMU_MAX_TRANS = 4;
+ public static final int ACT_RUN_TRACE = 5;
- public static final int ACT_SAVE_SD_PNG = 10;
- public static final int ACT_SAVE_SVG = 11;
- public static final int ACT_SAVE_TXT = 12;
- public static final int ACT_SAVE_CSV = 37;
- public static final int ACT_PRINT_BENCHMARK = 26;
- public static final int ACT_SAVE_BENCHMARK = 27;
+ public static final int ACT_BACK_ONE = 6;
- public static final int ACT_SAVE_STATE = 13;
- public static final int ACT_RESTORE_STATE = 14;
- public static final int ACT_START_ALL = 3;
- public static final int ACT_STOP_ALL = 4;
- public static final int ACT_STOP_AND_CLOSE_ALL = 5;
+ public static final int ACT_SAVE_SD_PNG = 7;
+ public static final int ACT_SAVE_SVG = 8;
+ public static final int ACT_SAVE_TXT = 9;
+ public static final int ACT_SAVE_CSV = 10;
- public static final int ACT_UPDATE_VARIABLES = 15;
- public static final int ACT_UPDATE_CPUS = 16;
- public static final int ACT_UPDATE_MEMS = 17;
- public static final int ACT_UPDATE_BUS = 18;
- public static final int ACT_UPDATE_TASKS = 19;
- public static final int ACT_PRINT_CPUS = 28;
- public static final int ACT_PRINT_BUS = 29;
- public static final int ACT_ZOOM_IN = 30;
- public static final int ACT_ZOOM_OUT = 31;
- public static final int ACT_DELETE_ASYNC_MSG = 32;
- public static final int ACT_UP_ASYNC_MSG = 33;
- public static final int ACT_DOWN_ASYNC_MSG = 34;
- public static final int ACT_ADD_LATENCY = 35;
- public static final int ACT_REMOVE_ALL_TRANS = 36;
- public static final int NB_ACTION = 40;
+ public static final int ACT_ZOOM_IN = 12;
+ public static final int ACT_ZOOM_OUT = 13;
+ public static final int ACT_DELETE_ASYNC_MSG = 14;
+ public static final int ACT_UP_ASYNC_MSG = 15;
+ public static final int ACT_DOWN_ASYNC_MSG = 16;
+ public static final int ACT_ADD_LATENCY = 17;
+ public static final int ACT_REMOVE_ALL_TRANS = 18;
- private static final TAction[] actions = new TAction[NB_ACTION];
+ public static final int ACT_STOP_AND_CLOSE_ALL = 19;
+
+ public static final int ACT_PRINT_BENCHMARK = 20;
+
+ public static final int ACT_SAVE_BENCHMARK = 11;
+
+ public static final int NB_ACTION = 21;
+
+
+ public static final TAction[] actions = new TAction[NB_ACTION];
private EventListenerList listeners;
@@ -147,55 +133,39 @@ public class AvatarInteractiveSimulationActions extends AbstractAction {
}
public void init() {
- actions[ACT_RUN_SIMU] = new TAction("run-simu", "Run simulation", IconManager.imgic1302, IconManager.imgic1302, "Run simulation", "Run simulation until next breakpoint. Works only if the simulator is \"ready\"", 'R');
- actions[ACT_RUN_SIMU_MAX_TRANS] = new TAction("run-simu-max-trans", "Run simulation to next breakpoint or max number of trans", IconManager.imgic1302, IconManager.imgic1302, "Run simulation to next breakpoint or max number of trans", "Run simulation until next breakpoint or max transactions are executed. Works only if the simulator is \"ready\"", 'R');
- actions[ACT_STOP_SIMU] = new TAction("stop-simu", "Stop simulation", IconManager.imgic55, IconManager.imgic55, "Stop simulation", "Stop simulation. Works only if the simulator is \"busy\"", 'S');
- actions[ACT_RESET_SIMU] = new TAction("reset-simu", "Reset simulation", IconManager.imgic45, IconManager.imgic45, "Reset simulation", "Reset simulation", 'T');
- actions[ACT_RUN_X_TIME_UNITS] = new TAction("run-x-time-units", "Run x time units", IconManager.imgic1300, IconManager.imgic1300, "Run x time units", "Run simulation for x units of time. Works only if the simulator is \"ready\"", 'R');
- actions[ACT_RUN_TO_TIME] = new TAction("run-to-time", "Run to time x", IconManager.imgic1304, IconManager.imgic1304, "Run to time x", "Run simulation until time x is reached. Works only if the simulator is \"ready\"", 'R');
- actions[ACT_RUN_X_TRANSACTIONS] = new TAction("run-x-transactions", "Run x transactions", IconManager.imgic1306, IconManager.imgic1306, "Run x transactions", "Run simulation for x transactions. Works only if the simulator is \"ready\"", 'R');
- actions[ACT_RUN_X_COMMANDS] = new TAction("run-x-commands", "x Step-by-Step", IconManager.imgic1330, IconManager.imgic1330, "x Step-by-Step", "Run simulation for x commands. Works only if the simulator is \"ready\"", 'R');
+ actions[ACT_RUN_SIMU] = new TAction("run-simu", "Run simulation", IconManager.imgic1302, IconManager.imgic1302, "Run simulation", "Run " +
+ "simulation until next breakpoint. Works only if the simulator is \"ready\"", 'R');
+
+ actions[ACT_RUN_SIMU_MAX_TRANS] = new TAction("run-simu-max-trans", "Run simulation to next breakpoint or max number of trans",
+ IconManager.imgic1302, IconManager.imgic1302, "Run simulation to next breakpoint or max number of trans", "Run simulation until next breakpoint or max transactions are executed. Works only if the simulator is \"ready\"", 'R');
+ actions[ACT_STOP_SIMU] = new TAction("stop-simu", "Stop simulation", IconManager.imgic55, IconManager.imgic55, "Stop simulation", "Stop " +
+ "simulation. Works only if the simulator is \"busy\"", 'S');
+ actions[ACT_RESET_SIMU] = new TAction("reset-simu", "Reset simulation", IconManager.imgic45, IconManager.imgic45, "Reset simulation",
+ "Reset simulation", 'T');
+ actions[ACT_RUN_X_COMMANDS] = new TAction("run-x-commands", "x Step-by-Step", IconManager.imgic1330, IconManager.imgic1330, "x Step-by" +
+ "-Step", "Run simulation for x commands. Works only if the simulator is \"ready\"", 'R');
actions[ACT_RUN_TRACE] = new TAction("run-trace", "Play trace", IconManager.imgic1336, IconManager.imgic1336, "Play trace",
"Plays a formerly saved and selected simulation trace. Works only if the simulator is \"ready\"", 'R');
- actions[ACT_REMOVE_ALL_TRANS] = new TAction("remove-all-trans","Remove all transactions",IconManager.imgic337, IconManager.imgic337,"Remove all transactions", "Remove all the transactions stored in transaction list", 'R');
-
- actions[ACT_BACK_ONE] = new TAction("back-one", "Back one transaction", IconManager.imgic47, IconManager.imgic47, "Back one transaction", "Go one transaction backward", 'B');
+ actions[ACT_REMOVE_ALL_TRANS] = new TAction("remove-all-trans", "Remove all transactions", IconManager.imgic337, IconManager.imgic337,
+ "Remove all transactions", "Remove all the transactions stored in transaction list", 'R');
+ actions[ACT_BACK_ONE] = new TAction("back-one", "Back one transaction", IconManager.imgic47, IconManager.imgic47, "Back one transaction",
+ "Go one transaction backward", 'B');
- actions[ACT_RUN_EXPLORATION] = new TAction("run-exploration", "Run exploration", IconManager.imgic1326, IconManager.imgic1326, "Run exploration", "Explore branches of the simulation", 'R');
- actions[ACT_RUN_TO_NEXT_BUS_TRANSFER] = new TAction("run-until-bus-transfer", "Run until bus transfer", IconManager.imgic1316, IconManager.imgic1316, "Run until transfer on bus", "Run until a transfer on the indicated bus is performed. Works only if the simulator is \"ready\"", 'R');
- actions[ACT_RUN_UNTIL_TASK_EXECUTES] = new TAction("run-to-task", "Run until a task executes", IconManager.imgic1318, IconManager.imgic1318, "Run until a task executes", "Run until a task executes. Works only if the simulator is \"ready\"", 'R');
- actions[ACT_RUN_UNTIL_MEMORY_ACCESS] = new TAction("run-to-memory-accessd", "Run until a memory access is performed", IconManager.imgic1322, IconManager.imgic1322, "Run until a memory access is performed", "Run simulation until a memory access is performed on selected memory. Works only if the simulator is \"ready\"", 'R');
- actions[ACT_RUN_UNTIL_CHANNEL_ACCESS] = new TAction("run--to-channel-access", "Run until a channel is accessed", IconManager.imgic1324, IconManager.imgic1324, "Run until a channel is accessed", "Run until a channel is accessed. Works only if the simulator is \"ready\"", 'R');
-
- actions[ACT_SAVE_SD_PNG] = new TAction("save-sd-png", "Save SD trace in PNG format", IconManager.imgic5104, IconManager.imgic5104, "Save SD trace in PNG format", "Save SD trace in PNG format", '0');
- actions[ACT_SAVE_SVG] = new TAction("save-svg", "Save trace in SVG format", IconManager.imgic1328, IconManager.imgic1328, "Save trace in SVG format", "Save trace in SVG format", 'R');
- actions[ACT_SAVE_TXT] = new TAction("save-txt", "Save trace in TXT format", IconManager.imgic1314, IconManager.imgic1314, "Save trace in TXT format", "Save trace in TXT format", 'R');
+ actions[ACT_SAVE_SD_PNG] = new TAction("save-sd-png", "Save SD trace in PNG format", IconManager.imgic5104, IconManager.imgic5104, "Save " +
+ "SD trace in PNG format", "Save SD trace in PNG format", '0');
+ actions[ACT_SAVE_SVG] = new TAction("save-svg", "Save trace in SVG format", IconManager.imgic1328, IconManager.imgic1328, "Save trace in " +
+ "SVG format", "Save trace in SVG format", 'R');
+ actions[ACT_SAVE_TXT] = new TAction("save-txt", "Save trace in TXT format", IconManager.imgic1314, IconManager.imgic1314, "Save trace in " +
+ "TXT format", "Save trace in TXT format", 'R');
actions[ACT_SAVE_CSV] = new TAction("save-csv", "Save trace in CSV format", IconManager.imgic1334, IconManager.imgic1334, "Save trace in " +
"CSV " +
"format", "Save trace in CSV format", 'V');
- actions[ACT_SAVE_STATE] = new TAction("save-state", "Save simulation state in File", IconManager.imgic341, IconManager.imgic341, "Save simulation state in File", "Save simulation state in File", 'R');
- actions[ACT_RESTORE_STATE] = new TAction("restore-state", "Restore simulation state from File", IconManager.imgic339, IconManager.imgic339, "Restore simulation state from File", "Restore simulation state from File", 'R');
-
- actions[ACT_START_ALL] = new TAction("start-all", "Connect to simulator", IconManager.imgic53, IconManager.imgic53, "Connect", "Start the server - if it is not yet running - and connect to it", 'C');
- actions[ACT_STOP_ALL] = new TAction("stop-all", "Quit simulation window", IconManager.imgic27, IconManager.imgic27, "Quit simulation window", "Quit the simulation window without terminating the simulation", 'Q');
- actions[ACT_STOP_AND_CLOSE_ALL] = new TAction("stop-and-close-all", "Terminate simulation and quit", IconManager.imgic27, IconManager.imgic27, "Terminate simulation and quit", "Terminate the simulation and quit the simulation window", 'T');
-
- actions[ACT_UPDATE_VARIABLES] = new TAction("update-variables", "Update variables", IconManager.imgic75, IconManager.imgic75, "Update variables", "Update variables", 'R');
- actions[ACT_UPDATE_CPUS] = new TAction("update-cpus", "Update CPU info", IconManager.imgic75, IconManager.imgic75, "Update CPU information", "Update information on CPUs", 'R');
- actions[ACT_UPDATE_MEMS] = new TAction("update-mems", "Update Memories information", IconManager.imgic75, IconManager.imgic75, "Update Memories information", "Update information on Memories", 'R');
- actions[ACT_UPDATE_BUS] = new TAction("update-bus", "Update bus info", IconManager.imgic75, IconManager.imgic75, "Update bus information", "Update information on busses", 'R');
- actions[ACT_UPDATE_TASKS] = new TAction("update-tasks", "Update task information", IconManager.imgic75, IconManager.imgic75, "Update task information", "Update information on tasks", 'R');
-
- actions[ACT_PRINT_CPUS] = new TAction("print-cpus", "Print CPU info", IconManager.imgic75, IconManager.imgic75, "Print CPU information", "Print information on CPUs", 'R');
- actions[ACT_PRINT_BUS] = new TAction("print-bus", "Print Bus info", IconManager.imgic75, IconManager.imgic75, "Print Bus information", "Print information on Busses", 'R');
-
- actions[ACT_PRINT_BENCHMARK] = new TAction("print-benchmark", "Print benchmark", IconManager.imgic29, IconManager.imgic29, "Print benchmark", "Print benchmark at simulator side", 'R');
- actions[ACT_SAVE_BENCHMARK] = new TAction("save-benchmark", "Save benchmark", IconManager.imgic25, IconManager.imgic25, "Save benchmark", "Save benchmark at simulator side", 'R');
+ actions[ACT_STOP_AND_CLOSE_ALL] = new TAction("stop-all", "Quit simulation window", IconManager.imgic27, IconManager.imgic27, "Quit simulation window", "Quit the simulation window without terminating the simulation", 'Q');
actions[ACT_ZOOM_IN] = new TAction("zoommore-command", "Zoom +", IconManager.imgic317, IconManager.imgic317, "Zoom +", "Zoom +", '0');
actions[ACT_ZOOM_OUT] = new TAction("zoomless-command", "Zoom -", IconManager.imgic315, IconManager.imgic315, "Zoom -", "Zoom -", '0');
@@ -203,7 +173,11 @@ public class AvatarInteractiveSimulationActions extends AbstractAction {
actions[ACT_DELETE_ASYNC_MSG] = new TAction("delete-async-command", "Delete", IconManager.imgic336, IconManager.imgic336, "Delete msg +", "Delete the selected message", '0');
actions[ACT_UP_ASYNC_MSG] = new TAction("up-async-command", "Up", IconManager.imgic78, IconManager.imgic78, "Up msg", "Put a async msg closer to the FIFO exit", '0');
actions[ACT_DOWN_ASYNC_MSG] = new TAction("up-async-command", "Down", IconManager.imgic79, IconManager.imgic79, "Down msg", "Put a async msg further from the FIFO exit", '0');
- actions[ACT_ADD_LATENCY] = new TAction("add-latency-command", "Add latency", IconManager.imgic75, IconManager.imgic75, "Add latency", "Add latency checkpoint", '0');
+ actions[ACT_ADD_LATENCY] = new TAction("add-latency-command", "Add latency", IconManager.imgic75, IconManager.imgic75, "Add latency",
+ "Add latency checkpoint", '0');
+
+ actions[ACT_PRINT_BENCHMARK] = new TAction("print-benchmark", "Print benchmark", IconManager.imgic29, IconManager.imgic29, "Print benchmark", "Print benchmark at simulator side", 'R');
+ actions[ACT_SAVE_BENCHMARK] = new TAction("save-benchmark", "Save benchmark", IconManager.imgic25, IconManager.imgic25, "Save benchmark", "Save benchmark at simulator side", 'R');
}
public String getActionCommand() {
diff --git a/src/main/java/ui/avatarinteractivesimulation/JFrameAvatarInteractiveSimulation.java b/src/main/java/ui/avatarinteractivesimulation/JFrameAvatarInteractiveSimulation.java
index 7f2b315d54651cd4462b25c99d7bd6c0f07f8cd9..147ab51fc827b73a387ace0e6c212daeb553ad6b 100755
--- a/src/main/java/ui/avatarinteractivesimulation/JFrameAvatarInteractiveSimulation.java
+++ b/src/main/java/ui/avatarinteractivesimulation/JFrameAvatarInteractiveSimulation.java
@@ -292,6 +292,8 @@ public class JFrameAvatarInteractiveSimulation extends JFrame implements AvatarS
}
makeComponents();
setComponents();
+ TraceManager.addDev("Components done");
+
}
private void initSimulation() {
@@ -513,6 +515,7 @@ public class JFrameAvatarInteractiveSimulation extends JFrame implements AvatarS
jp02.add(new JLabel("Selected trace: "), c01);
c01.gridwidth = GridBagConstraints.REMAINDER; //end row
nameOfTrace = new JLabel();
+ setTraceName();
jp02.add(nameOfTrace, c01);
// list of pending transactions
@@ -1139,6 +1142,7 @@ public class JFrameAvatarInteractiveSimulation extends JFrame implements AvatarS
}
public void runSimulation() {
+ ass.resetTrace();
previousTime = System.currentTimeMillis();
if (ass != null) {
ass.setNbOfCommands(AvatarSpecificationSimulation.MAX_TRANSACTION_IN_A_ROW);
@@ -1148,6 +1152,7 @@ public class JFrameAvatarInteractiveSimulation extends JFrame implements AvatarS
}
public void runXCommands() {
+ ass.resetTrace();
String txt = paramMainCommand.getText();
int nb;
try {
@@ -1164,24 +1169,37 @@ public class JFrameAvatarInteractiveSimulation extends JFrame implements AvatarS
public void runTrace() {
+ TraceManager.addDev("Running trace");
+
if (SELECTED_SIMULATION_TRACE == null) {
return;
}
selectedTrace = SELECTED_SIMULATION_TRACE;
- if (selectedTrace.hasContent()) {
+ TraceManager.addDev("Testing content");
+
+ if (!selectedTrace.hasContent()) {
return;
}
+ TraceManager.addDev("Content ok");
+
// Transform String into a CSV object
traceObject = new CSVObject(selectedTrace.getContent());
-
-
-
-
- // Implement CSV object running;
+ // Start the trace execution
+ TraceManager.addDev("Reset simulation");
+ resetSimulation();
+ ass.setNbOfCommands(AvatarSpecificationSimulation.MAX_TRANSACTION_IN_A_ROW);
+ ass.setTraceToPlay(traceObject);
+ TraceManager.addDev("Going to play the trace");
+ previousTime = System.currentTimeMillis();
+ if (ass != null) {
+ ass.setNbOfCommands(AvatarSpecificationSimulation.MAX_TRANSACTION_IN_A_ROW);
+ ass.goSimulation();
+ //ass.backOneTransactionBunch();
+ }
}
public void stopSimulation() {
@@ -1197,6 +1215,7 @@ public class JFrameAvatarInteractiveSimulation extends JFrame implements AvatarS
if (ass != null) {
resetMetElements();
ass.resetSimulation();
+ ass.resetTrace();
//ass.backOneTransactionBunch();
}
// latencies.clear();
@@ -1281,10 +1300,12 @@ public class JFrameAvatarInteractiveSimulation extends JFrame implements AvatarS
}
private void setTraceName() {
- if (SELECTED_SIMULATION_TRACE.hasContent()) {
- nameOfTrace.setText(SELECTED_SIMULATION_TRACE.getName());
- } else {
- nameOfTrace.setText("No selected trace");
+ if (SELECTED_SIMULATION_TRACE != null) {
+ if (SELECTED_SIMULATION_TRACE.hasContent()) {
+ nameOfTrace.setText(SELECTED_SIMULATION_TRACE.getName());
+ } else {
+ nameOfTrace.setText("No selected trace");
+ }
}
}
@@ -1948,8 +1969,9 @@ public class JFrameAvatarInteractiveSimulation extends JFrame implements AvatarS
}
+ String data = ass.toCSV();
try {
- FileUtils.saveFile(fileName, ass.toCSV());
+ FileUtils.saveFile(fileName, data);
} catch (Exception e) {
JOptionPane.showMessageDialog(this,
@@ -1965,6 +1987,7 @@ public class JFrameAvatarInteractiveSimulation extends JFrame implements AvatarS
File f = new File(fileName);
shortFileName = f.getName();
SimulationTrace st = new SimulationTrace(shortFileName, SimulationTrace.CSV_AVATAR, fileName);
+ st.setContent(data);
mgui.addSimulationTrace(st);
//ass.printExecutedTransactions();
@@ -2218,6 +2241,10 @@ public class JFrameAvatarInteractiveSimulation extends JFrame implements AvatarS
public void actionPerformed(ActionEvent evt) {
String command = evt.getActionCommand();
+ actionPerformed(command, evt);
+ }
+
+ public void actionPerformed(String command, ActionEvent evt) {
//TraceManager.addDev("Command:" + command);
if (command.equals(actions[AvatarInteractiveSimulationActions.ACT_RUN_SIMU].getActionCommand())) {
@@ -2275,7 +2302,13 @@ public class JFrameAvatarInteractiveSimulation extends JFrame implements AvatarS
} else if (command.equals(actions[AvatarInteractiveSimulationActions.ACT_ADD_LATENCY].getActionCommand())) {
addLatency();
return;
- } else if (evt.getSource() == displayedTransactionsText) {
+ }
+
+ if (evt == null) {
+ return;
+ }
+
+ if (evt.getSource() == displayedTransactionsText) {
TraceManager.addDev("Entered text:" + displayedTransactionsText.getText());
} else if ((evt.getSource() == imposeRandom) || (evt.getSource() == updateRandom)) {
diff --git a/src/main/java/ui/tree/JDiagramTree.java b/src/main/java/ui/tree/JDiagramTree.java
index cf77e9323770fd13e669a6e8c92bc030acd8969a..a883fb59c6ef48cdd6d5da3a0135a6c56e552c62 100755
--- a/src/main/java/ui/tree/JDiagramTree.java
+++ b/src/main/java/ui/tree/JDiagramTree.java
@@ -580,6 +580,7 @@ public class JDiagramTree extends javax.swing.JTree implements ActionListener, M
String[] st = mgui.loadSimulationTraceCSV();
if (st != null) {
SimulationTrace sim = new SimulationTrace(st[0], SimulationTrace.CSV_AVATAR, st[1]);
+ //TraceManager.addDev("Content=" + st[2]);
sim.setContent(st[2]);
mgui.addSimulationTrace(sim);
}