diff --git a/modeling/DIPLODOCUS/SmartCardProtocol.xml b/modeling/DIPLODOCUS/SmartCardProtocol.xml
index ff2cb796c66bb8c528be83c984b489227ead2a0d..05a580bb9e528da3e14343a94e5f459a7f0b3af8 100755
--- a/modeling/DIPLODOCUS/SmartCardProtocol.xml
+++ b/modeling/DIPLODOCUS/SmartCardProtocol.xml
@@ -1330,8 +1330,8 @@
</SUBCOMPONENT>
<COMPONENT type="1010" id="245" >
-<cdparam x="479" y="129" />
-<sizeparam width="66" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="476" y="129" />
+<sizeparam width="72" 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" />
@@ -1344,8 +1344,8 @@
</COMPONENT>
<COMPONENT type="1008" id="248" >
-<cdparam x="449" y="192" />
-<sizeparam width="125" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="442" y="192" />
+<sizeparam width="139" 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" />
@@ -1371,7 +1371,7 @@
<SUBCOMPONENT type="-1" id="249" >
<father id="256" num="0" />
<cdparam x="470" y="524" />
-<sizeparam width="12" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="14" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
<infoparam name="guard 1" value="[ ]" />
@@ -1379,7 +1379,7 @@
<SUBCOMPONENT type="-1" id="250" >
<father id="256" num="1" />
<cdparam x="530" y="524" />
-<sizeparam width="12" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="14" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
<infoparam name="guard 2" value="[ ]" />
@@ -1387,7 +1387,7 @@
<SUBCOMPONENT type="-1" id="251" >
<father id="256" num="2" />
<cdparam x="515" y="559" />
-<sizeparam width="12" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="14" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
<infoparam name="guard 3" value="[ ]" />
@@ -1403,8 +1403,8 @@
</COMPONENT>
<COMPONENT type="1008" id="261" >
-<cdparam x="482" y="71" />
-<sizeparam width="47" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="479" y="71" />
+<sizeparam width="52" 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" />
@@ -1417,8 +1417,8 @@
</COMPONENT>
<COMPONENT type="1006" id="264" >
-<cdparam x="469" y="353" />
-<sizeparam width="80" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="467" y="353" />
+<sizeparam width="84" 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" />
@@ -1431,8 +1431,8 @@
</COMPONENT>
<COMPONENT type="1008" id="267" >
-<cdparam x="471" y="399" />
-<sizeparam width="75" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="468" y="399" />
+<sizeparam width="80" 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" />
@@ -1455,8 +1455,8 @@
</COMPONENT>
<COMPONENT type="1008" id="272" >
-<cdparam x="563" y="589" />
-<sizeparam width="49" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="560" y="589" />
+<sizeparam width="54" 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" />
@@ -1469,8 +1469,8 @@
</COMPONENT>
<COMPONENT type="1008" id="275" >
-<cdparam x="410" y="597" />
-<sizeparam width="47" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="407" y="597" />
+<sizeparam width="53" 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" />
@@ -1596,7 +1596,7 @@
<SUBCOMPONENT type="-1" id="289" >
<father id="292" num="0" />
<cdparam x="1021" y="663" />
-<sizeparam width="33" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="35" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
<infoparam name="value of the time interval" value="[b, b]" />
@@ -1606,8 +1606,8 @@
</SUBCOMPONENT>
<COMPONENT type="1008" id="295" >
-<cdparam x="159" y="424" />
-<sizeparam width="62" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="156" y="424" />
+<sizeparam width="68" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
@@ -1633,7 +1633,7 @@
<SUBCOMPONENT type="-1" id="296" >
<father id="303" num="0" />
<cdparam x="2061" y="1388" />
-<sizeparam width="12" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="14" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
<infoparam name="guard 1" value="[ ]" />
@@ -1641,7 +1641,7 @@
<SUBCOMPONENT type="-1" id="297" >
<father id="303" num="1" />
<cdparam x="2121" y="1388" />
-<sizeparam width="39" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="44" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
@@ -1650,7 +1650,7 @@
<SUBCOMPONENT type="-1" id="298" >
<father id="303" num="2" />
<cdparam x="2106" y="1426" />
-<sizeparam width="124" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="135" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
@@ -1671,7 +1671,7 @@
<SUBCOMPONENT type="-1" id="304" >
<father id="311" num="0" />
<cdparam x="2212" y="961" />
-<sizeparam width="116" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="127" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
@@ -1680,7 +1680,7 @@
<SUBCOMPONENT type="-1" id="305" >
<father id="311" num="1" />
<cdparam x="2301" y="975" />
-<sizeparam width="116" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="127" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
@@ -1689,7 +1689,7 @@
<SUBCOMPONENT type="-1" id="306" >
<father id="311" num="2" />
<cdparam x="2282" y="996" />
-<sizeparam width="39" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="44" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
@@ -1710,7 +1710,7 @@
<SUBCOMPONENT type="-1" id="312" >
<father id="319" num="0" />
<cdparam x="1934" y="1356" />
-<sizeparam width="116" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="127" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
@@ -1719,7 +1719,7 @@
<SUBCOMPONENT type="-1" id="313" >
<father id="319" num="1" />
<cdparam x="2016" y="1356" />
-<sizeparam width="39" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="44" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
@@ -1728,7 +1728,7 @@
<SUBCOMPONENT type="-1" id="314" >
<father id="319" num="2" />
<cdparam x="2001" y="1391" />
-<sizeparam width="120" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="131" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
@@ -1749,7 +1749,7 @@
<SUBCOMPONENT type="-1" id="320" >
<father id="327" num="0" />
<cdparam x="1762" y="1279" />
-<sizeparam width="116" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="127" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
@@ -1758,7 +1758,7 @@
<SUBCOMPONENT type="-1" id="321" >
<father id="327" num="1" />
<cdparam x="1846" y="1279" />
-<sizeparam width="39" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="44" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
@@ -1767,7 +1767,7 @@
<SUBCOMPONENT type="-1" id="322" >
<father id="327" num="2" />
<cdparam x="1831" y="1314" />
-<sizeparam width="116" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="127" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
@@ -1788,7 +1788,7 @@
<SUBCOMPONENT type="-1" id="328" >
<father id="335" num="0" />
<cdparam x="1688" y="1151" />
-<sizeparam width="12" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="14" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
<infoparam name="guard 1" value="[ ]" />
@@ -1796,7 +1796,7 @@
<SUBCOMPONENT type="-1" id="329" >
<father id="335" num="1" />
<cdparam x="1748" y="1151" />
-<sizeparam width="12" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="14" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
<infoparam name="guard 2" value="[ ]" />
@@ -1804,7 +1804,7 @@
<SUBCOMPONENT type="-1" id="330" >
<father id="335" num="2" />
<cdparam x="1733" y="1186" />
-<sizeparam width="12" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="14" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
<infoparam name="guard 3" value="[ ]" />
@@ -1823,7 +1823,7 @@
<SUBCOMPONENT type="-1" id="336" >
<father id="339" num="0" />
<cdparam x="1539" y="1274" />
-<sizeparam width="10" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
<infoparam name="value of the delay" value="b" />
@@ -1842,7 +1842,7 @@
<SUBCOMPONENT type="-1" id="340" >
<father id="343" num="0" />
<cdparam x="1538" y="1088" />
-<sizeparam width="10" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
<infoparam name="value of the delay" value="b" />
@@ -1862,7 +1862,7 @@
<SUBCOMPONENT type="-1" id="344" >
<father id="351" num="0" />
<cdparam x="1542" y="1016" />
-<sizeparam width="124" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="135" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
@@ -1871,7 +1871,7 @@
<SUBCOMPONENT type="-1" id="345" >
<father id="351" num="1" />
<cdparam x="1627" y="1016" />
-<sizeparam width="39" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="44" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
@@ -1880,7 +1880,7 @@
<SUBCOMPONENT type="-1" id="346" >
<father id="351" num="2" />
<cdparam x="1612" y="1051" />
-<sizeparam width="12" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="14" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
<infoparam name="guard 3" value="[ ]" />
@@ -1900,7 +1900,7 @@
<SUBCOMPONENT type="-1" id="352" >
<father id="359" num="0" />
<cdparam x="1688" y="885" />
-<sizeparam width="12" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="14" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
<infoparam name="guard 1" value="[ ]" />
@@ -1908,7 +1908,7 @@
<SUBCOMPONENT type="-1" id="353" >
<father id="359" num="1" />
<cdparam x="1748" y="885" />
-<sizeparam width="12" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="14" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
<infoparam name="guard 2" value="[ ]" />
@@ -1916,7 +1916,7 @@
<SUBCOMPONENT type="-1" id="354" >
<father id="359" num="2" />
<cdparam x="1733" y="920" />
-<sizeparam width="12" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="14" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
<infoparam name="guard 3" value="[ ]" />
@@ -1935,7 +1935,7 @@
<SUBCOMPONENT type="-1" id="360" >
<father id="363" num="0" />
<cdparam x="1655" y="1254" />
-<sizeparam width="10" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
<infoparam name="value of the delay" value="b" />
@@ -1954,7 +1954,7 @@
<SUBCOMPONENT type="-1" id="364" >
<father id="367" num="0" />
<cdparam x="2219" y="1083" />
-<sizeparam width="10" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
<infoparam name="value of the delay" value="b" />
@@ -1973,7 +1973,7 @@
<SUBCOMPONENT type="-1" id="368" >
<father id="371" num="0" />
<cdparam x="2288" y="1044" />
-<sizeparam width="10" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
<infoparam name="value of the delay" value="b" />
@@ -1993,7 +1993,7 @@
<SUBCOMPONENT type="-1" id="372" >
<father id="379" num="0" />
<cdparam x="1168" y="1030" />
-<sizeparam width="12" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="14" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
<infoparam name="guard 1" value="[ ]" />
@@ -2001,7 +2001,7 @@
<SUBCOMPONENT type="-1" id="373" >
<father id="379" num="1" />
<cdparam x="1228" y="1030" />
-<sizeparam width="39" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="44" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
@@ -2010,7 +2010,7 @@
<SUBCOMPONENT type="-1" id="374" >
<father id="379" num="2" />
<cdparam x="1213" y="1065" />
-<sizeparam width="116" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="127" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
@@ -2030,7 +2030,7 @@
<SUBCOMPONENT type="-1" id="380" >
<father id="383" num="0" />
<cdparam x="1218" y="1127" />
-<sizeparam width="10" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
<infoparam name="value of the delay" value="b" />
@@ -2050,7 +2050,7 @@
<SUBCOMPONENT type="-1" id="384" >
<father id="391" num="0" />
<cdparam x="482" y="747" />
-<sizeparam width="120" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="131" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
@@ -2059,7 +2059,7 @@
<SUBCOMPONENT type="-1" id="385" >
<father id="391" num="1" />
<cdparam x="592" y="722" />
-<sizeparam width="39" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="44" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
@@ -2068,7 +2068,7 @@
<SUBCOMPONENT type="-1" id="386" >
<father id="391" num="2" />
<cdparam x="577" y="757" />
-<sizeparam width="12" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="14" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
<infoparam name="guard 3" value="[ ]" />
@@ -2087,7 +2087,7 @@
<SUBCOMPONENT type="-1" id="392" >
<father id="395" num="0" />
<cdparam x="732" y="714" />
-<sizeparam width="10" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
<infoparam name="value of the delay" value="b" />
@@ -2106,7 +2106,7 @@
<SUBCOMPONENT type="-1" id="396" >
<father id="399" num="0" />
<cdparam x="953" y="1045" />
-<sizeparam width="10" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
<infoparam name="value of the delay" value="b" />
@@ -2126,7 +2126,7 @@
<SUBCOMPONENT type="-1" id="400" >
<father id="407" num="0" />
<cdparam x="959" y="974" />
-<sizeparam width="116" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="127" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
@@ -2135,7 +2135,7 @@
<SUBCOMPONENT type="-1" id="401" >
<father id="407" num="1" />
<cdparam x="1070" y="949" />
-<sizeparam width="39" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="44" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
@@ -2144,7 +2144,7 @@
<SUBCOMPONENT type="-1" id="402" >
<father id="407" num="2" />
<cdparam x="1054" y="984" />
-<sizeparam width="116" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="127" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
@@ -2164,7 +2164,7 @@
<SUBCOMPONENT type="-1" id="408" >
<father id="411" num="0" />
<cdparam x="818" y="1031" />
-<sizeparam width="10" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
<infoparam name="value of the delay" value="b" />
@@ -2184,7 +2184,7 @@
<SUBCOMPONENT type="-1" id="412" >
<father id="419" num="0" />
<cdparam x="753" y="885" />
-<sizeparam width="116" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="127" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
@@ -2193,7 +2193,7 @@
<SUBCOMPONENT type="-1" id="413" >
<father id="419" num="1" />
<cdparam x="863" y="879" />
-<sizeparam width="39" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="44" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
@@ -2202,7 +2202,7 @@
<SUBCOMPONENT type="-1" id="414" >
<father id="419" num="2" />
<cdparam x="848" y="914" />
-<sizeparam width="112" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="123" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
@@ -2222,7 +2222,7 @@
<SUBCOMPONENT type="-1" id="420" >
<father id="423" num="0" />
<cdparam x="354" y="785" />
-<sizeparam width="10" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
<infoparam name="value of the delay" value="b" />
@@ -2241,7 +2241,7 @@
<SUBCOMPONENT type="-1" id="424" >
<father id="427" num="0" />
<cdparam x="146" y="818" />
-<sizeparam width="10" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
<infoparam name="value of the delay" value="b" />
@@ -2261,7 +2261,7 @@
<SUBCOMPONENT type="-1" id="428" >
<father id="435" num="0" />
<cdparam x="949" y="793" />
-<sizeparam width="12" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="14" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
<infoparam name="guard 1" value="[ ]" />
@@ -2269,7 +2269,7 @@
<SUBCOMPONENT type="-1" id="429" >
<father id="435" num="1" />
<cdparam x="1028" y="790" />
-<sizeparam width="12" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="14" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
<infoparam name="guard 2" value="[ ]" />
@@ -2277,7 +2277,7 @@
<SUBCOMPONENT type="-1" id="430" >
<father id="435" num="2" />
<cdparam x="1013" y="825" />
-<sizeparam width="12" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="14" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
<infoparam name="guard 3" value="[ ]" />
@@ -2296,7 +2296,7 @@
<SUBCOMPONENT type="-1" id="436" >
<father id="439" num="0" />
<cdparam x="474" y="802" />
-<sizeparam width="10" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
<infoparam name="value of the delay" value="b" />
@@ -2315,7 +2315,7 @@
<SUBCOMPONENT type="-1" id="440" >
<father id="443" num="0" />
<cdparam x="245" y="885" />
-<sizeparam width="10" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
<infoparam name="value of the delay" value="b" />
@@ -2334,7 +2334,7 @@
<SUBCOMPONENT type="-1" id="444" >
<father id="447" num="0" />
<cdparam x="1059" y="1077" />
-<sizeparam width="10" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
<infoparam name="value of the delay" value="b" />
@@ -2354,7 +2354,7 @@
<SUBCOMPONENT type="-1" id="448" >
<father id="455" num="0" />
<cdparam x="98" y="521" />
-<sizeparam width="112" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="123" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
@@ -2363,7 +2363,7 @@
<SUBCOMPONENT type="-1" id="449" >
<father id="455" num="1" />
<cdparam x="208" y="496" />
-<sizeparam width="39" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="44" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
@@ -2372,7 +2372,7 @@
<SUBCOMPONENT type="-1" id="450" >
<father id="455" num="2" />
<cdparam x="193" y="531" />
-<sizeparam width="12" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="14" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
<infoparam name="guard 3" value="[ ]" />
@@ -2392,7 +2392,7 @@
<SUBCOMPONENT type="-1" id="456" >
<father id="463" num="0" />
<cdparam x="317" y="202" />
-<sizeparam width="81" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="88" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
@@ -2401,7 +2401,7 @@
<SUBCOMPONENT type="-1" id="457" >
<father id="463" num="1" />
<cdparam x="394" y="202" />
-<sizeparam width="91" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="98" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
@@ -2410,7 +2410,7 @@
<SUBCOMPONENT type="-1" id="458" >
<father id="463" num="2" />
<cdparam x="379" y="237" />
-<sizeparam width="12" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="14" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
<infoparam name="guard 3" value="[ ]" />
@@ -2430,7 +2430,7 @@
<SUBCOMPONENT type="-1" id="464" >
<father id="471" num="0" />
<cdparam x="404" y="592" />
-<sizeparam width="116" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="127" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
@@ -2439,7 +2439,7 @@
<SUBCOMPONENT type="-1" id="465" >
<father id="471" num="1" />
<cdparam x="500" y="599" />
-<sizeparam width="39" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="44" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
@@ -2448,7 +2448,7 @@
<SUBCOMPONENT type="-1" id="466" >
<father id="471" num="2" />
<cdparam x="469" y="627" />
-<sizeparam width="252" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="277" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
@@ -2469,7 +2469,7 @@
<SUBCOMPONENT type="-1" id="472" >
<father id="479" num="0" />
<cdparam x="228" y="574" />
-<sizeparam width="116" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="127" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
@@ -2478,7 +2478,7 @@
<SUBCOMPONENT type="-1" id="473" >
<father id="479" num="1" />
<cdparam x="317" y="584" />
-<sizeparam width="39" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="44" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
@@ -2487,7 +2487,7 @@
<SUBCOMPONENT type="-1" id="474" >
<father id="479" num="2" />
<cdparam x="306" y="616" />
-<sizeparam width="116" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="127" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
@@ -2505,7 +2505,7 @@
<COMPONENT type="301" id="498" >
<cdparam x="10" y="30" />
-<sizeparam width="92" height="135" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="98" height="135" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="UML Note" value="0: closed
@@ -2552,8 +2552,8 @@
</COMPONENT>
<COMPONENT type="1011" id="501" >
-<cdparam x="98" y="549" />
-<sizeparam width="100" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="94" y="549" />
+<sizeparam width="109" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
@@ -2572,8 +2572,8 @@
</COMPONENT>
<COMPONENT type="1009" id="506" >
-<cdparam x="967" y="585" />
-<sizeparam width="83" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="964" y="585" />
+<sizeparam width="88" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
@@ -2586,8 +2586,8 @@
</COMPONENT>
<COMPONENT type="1014" id="510" >
-<cdparam x="150" y="85" />
-<sizeparam width="170" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="145" y="85" />
+<sizeparam width="180" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
@@ -2610,8 +2610,8 @@
</COMPONENT>
<COMPONENT type="1011" id="515" >
-<cdparam x="187" y="144" />
-<sizeparam width="96" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="183" y="144" />
+<sizeparam width="105" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
@@ -2621,8 +2621,8 @@
</COMPONENT>
<COMPONENT type="1017" id="518" >
-<cdparam x="316" y="133" />
-<sizeparam width="116" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="311" y="133" />
+<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="10" maxX="2900" minY="10" maxY="1900" />
@@ -2635,8 +2635,8 @@
</COMPONENT>
<COMPONENT type="1009" id="521" >
-<cdparam x="692" y="589" />
-<sizeparam width="60" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="690" y="589" />
+<sizeparam width="64" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
@@ -2649,8 +2649,8 @@
</COMPONENT>
<COMPONENT type="1010" id="524" >
-<cdparam x="689" y="534" />
-<sizeparam width="67" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="686" y="534" />
+<sizeparam width="73" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
@@ -2663,8 +2663,8 @@
</COMPONENT>
<COMPONENT type="1010" id="527" >
-<cdparam x="977" y="528" />
-<sizeparam width="63" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="974" y="528" />
+<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="2900" minY="10" maxY="1900" />
@@ -2677,8 +2677,8 @@
</COMPONENT>
<COMPONENT type="1010" id="530" >
-<cdparam x="439" y="492" />
-<sizeparam width="51" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="436" y="492" />
+<sizeparam width="57" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
@@ -2691,8 +2691,8 @@
</COMPONENT>
<COMPONENT type="1010" id="533" >
-<cdparam x="250" y="468" />
-<sizeparam width="79" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="247" y="468" />
+<sizeparam width="84" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
@@ -2705,8 +2705,8 @@
</COMPONENT>
<COMPONENT type="1010" id="536" >
-<cdparam x="163" y="383" />
-<sizeparam width="51" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="160" y="383" />
+<sizeparam width="56" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
@@ -2757,8 +2757,8 @@
</COMPONENT>
<COMPONENT type="1010" id="554" >
-<cdparam x="275" y="228" />
-<sizeparam width="53" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="272" y="228" />
+<sizeparam width="58" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
@@ -2781,7 +2781,7 @@
<COMPONENT type="301" id="573" >
<cdparam x="602" y="86" />
-<sizeparam width="360" height="51" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="393" height="51" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="UML Note" value="b est le nombre d'instructions necessaires pour paquetiser
@@ -2814,8 +2814,8 @@ On prend b=1 comme exemple
</COMPONENT>
<COMPONENT type="1009" id="576" >
-<cdparam x="188" y="808" />
-<sizeparam width="84" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="186" y="808" />
+<sizeparam width="88" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
@@ -2828,8 +2828,8 @@ On prend b=1 comme exemple
</COMPONENT>
<COMPONENT type="1006" id="579" >
-<cdparam x="191" y="1002" />
-<sizeparam width="79" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="188" y="1002" />
+<sizeparam width="84" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
@@ -2851,8 +2851,8 @@ On prend b=1 comme exemple
</COMPONENT>
<COMPONENT type="1011" id="584" >
-<cdparam x="414" y="1032" />
-<sizeparam width="100" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="410" y="1032" />
+<sizeparam width="109" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
@@ -2871,8 +2871,8 @@ On prend b=1 comme exemple
</COMPONENT>
<COMPONENT type="1011" id="589" >
-<cdparam x="84" y="1041" />
-<sizeparam width="96" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="80" y="1041" />
+<sizeparam width="105" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
@@ -2882,8 +2882,8 @@ On prend b=1 comme exemple
</COMPONENT>
<COMPONENT type="1006" id="592" >
-<cdparam x="93" y="938" />
-<sizeparam width="79" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="90" y="938" />
+<sizeparam width="84" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
@@ -2896,8 +2896,8 @@ On prend b=1 comme exemple
</COMPONENT>
<COMPONENT type="1011" id="595" >
-<cdparam x="292" y="1026" />
-<sizeparam width="108" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="288" y="1026" />
+<sizeparam width="117" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
@@ -2916,8 +2916,8 @@ On prend b=1 comme exemple
</COMPONENT>
<COMPONENT type="1006" id="600" >
-<cdparam x="425" y="941" />
-<sizeparam width="79" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="422" y="941" />
+<sizeparam width="84" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
@@ -2930,8 +2930,8 @@ On prend b=1 comme exemple
</COMPONENT>
<COMPONENT type="1006" id="603" >
-<cdparam x="307" y="900" />
-<sizeparam width="79" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="304" y="900" />
+<sizeparam width="84" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
@@ -2954,7 +2954,7 @@ On prend b=1 comme exemple
<COMPONENT type="301" id="622" >
<cdparam x="998" y="850" />
-<sizeparam width="50" height="20" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="50" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="UML Note" value="Final
@@ -2981,8 +2981,8 @@ On prend b=1 comme exemple
</COMPONENT>
<COMPONENT type="1011" id="625" >
-<cdparam x="678" y="965" />
-<sizeparam width="100" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="674" y="965" />
+<sizeparam width="109" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
@@ -3001,8 +3001,8 @@ On prend b=1 comme exemple
</COMPONENT>
<COMPONENT type="1006" id="630" >
-<cdparam x="761" y="1086" />
-<sizeparam width="79" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="758" y="1086" />
+<sizeparam width="84" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
@@ -3016,7 +3016,7 @@ On prend b=1 comme exemple
<COMPONENT type="301" id="647" >
<cdparam x="781" y="950" />
-<sizeparam width="89" height="20" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="94" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="UML Note" value="Active Open
@@ -3044,7 +3044,7 @@ On prend b=1 comme exemple
<COMPONENT type="301" id="664" >
<cdparam x="715" y="907" />
-<sizeparam width="97" height="20" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="104" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="UML Note" value="Passive Open
@@ -3071,8 +3071,8 @@ On prend b=1 comme exemple
</COMPONENT>
<COMPONENT type="1011" id="667" >
-<cdparam x="750" y="1193" />
-<sizeparam width="100" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="746" y="1193" />
+<sizeparam width="109" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
@@ -3082,8 +3082,8 @@ On prend b=1 comme exemple
</COMPONENT>
<COMPONENT type="1011" id="670" >
-<cdparam x="446" y="768" />
-<sizeparam width="100" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="442" y="768" />
+<sizeparam width="109" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
@@ -3102,8 +3102,8 @@ On prend b=1 comme exemple
</COMPONENT>
<COMPONENT type="1006" id="675" >
-<cdparam x="904" y="1123" />
-<sizeparam width="79" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="901" y="1123" />
+<sizeparam width="84" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
@@ -3117,7 +3117,7 @@ On prend b=1 comme exemple
<COMPONENT type="301" id="692" >
<cdparam x="884" y="1068" />
-<sizeparam width="108" height="20" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="115" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="UML Note" value="send Ack of Fin
@@ -3144,8 +3144,8 @@ On prend b=1 comme exemple
</COMPONENT>
<COMPONENT type="1011" id="695" >
-<cdparam x="893" y="1234" />
-<sizeparam width="100" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="889" y="1234" />
+<sizeparam width="109" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
@@ -3164,8 +3164,8 @@ On prend b=1 comme exemple
</COMPONENT>
<COMPONENT type="1006" id="700" >
-<cdparam x="1010" y="1155" />
-<sizeparam width="79" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1007" y="1155" />
+<sizeparam width="84" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
@@ -3179,7 +3179,7 @@ On prend b=1 comme exemple
<COMPONENT type="301" id="717" >
<cdparam x="1000" y="1094" />
-<sizeparam width="108" height="20" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="115" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="UML Note" value="send Ack of Fin
@@ -3206,8 +3206,8 @@ On prend b=1 comme exemple
</COMPONENT>
<COMPONENT type="1011" id="720" >
-<cdparam x="999" y="1266" />
-<sizeparam width="100" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="995" y="1266" />
+<sizeparam width="109" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
@@ -3226,8 +3226,8 @@ On prend b=1 comme exemple
</COMPONENT>
<COMPONENT type="1006" id="725" >
-<cdparam x="683" y="758" />
-<sizeparam width="79" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="680" y="758" />
+<sizeparam width="84" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
@@ -3249,8 +3249,8 @@ On prend b=1 comme exemple
</COMPONENT>
<COMPONENT type="1007" id="730" >
-<cdparam x="93" y="1100" />
-<sizeparam width="78" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="92" y="1100" />
+<sizeparam width="81" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
@@ -3263,8 +3263,8 @@ On prend b=1 comme exemple
</COMPONENT>
<COMPONENT type="1006" id="733" >
-<cdparam x="104" y="1167" />
-<sizeparam width="56" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="102" y="1167" />
+<sizeparam width="60" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
@@ -3286,8 +3286,8 @@ On prend b=1 comme exemple
</COMPONENT>
<COMPONENT type="1007" id="738" >
-<cdparam x="191" y="1102" />
-<sizeparam width="78" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="190" y="1102" />
+<sizeparam width="81" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
@@ -3300,8 +3300,8 @@ On prend b=1 comme exemple
</COMPONENT>
<COMPONENT type="1006" id="741" >
-<cdparam x="202" y="1169" />
-<sizeparam width="56" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="200" y="1169" />
+<sizeparam width="60" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
@@ -3314,8 +3314,8 @@ On prend b=1 comme exemple
</COMPONENT>
<COMPONENT type="1007" id="744" >
-<cdparam x="307" y="1106" />
-<sizeparam width="78" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="306" y="1106" />
+<sizeparam width="81" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
@@ -3328,8 +3328,8 @@ On prend b=1 comme exemple
</COMPONENT>
<COMPONENT type="1006" id="747" >
-<cdparam x="318" y="1173" />
-<sizeparam width="56" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="316" y="1173" />
+<sizeparam width="60" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
@@ -3342,8 +3342,8 @@ On prend b=1 comme exemple
</COMPONENT>
<COMPONENT type="1007" id="750" >
-<cdparam x="425" y="1090" />
-<sizeparam width="78" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="424" y="1090" />
+<sizeparam width="81" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
@@ -3356,8 +3356,8 @@ On prend b=1 comme exemple
</COMPONENT>
<COMPONENT type="1006" id="753" >
-<cdparam x="436" y="1159" />
-<sizeparam width="56" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="434" y="1159" />
+<sizeparam width="60" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
@@ -3370,8 +3370,8 @@ On prend b=1 comme exemple
</COMPONENT>
<COMPONENT type="1011" id="756" >
-<cdparam x="56" y="861" />
-<sizeparam width="153" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="52" y="861" />
+<sizeparam width="160" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
@@ -3381,8 +3381,8 @@ On prend b=1 comme exemple
</COMPONENT>
<COMPONENT type="1011" id="759" >
-<cdparam x="154" y="940" />
-<sizeparam width="153" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="150" y="940" />
+<sizeparam width="160" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
@@ -3392,8 +3392,8 @@ On prend b=1 comme exemple
</COMPONENT>
<COMPONENT type="1011" id="762" >
-<cdparam x="388" y="865" />
-<sizeparam width="153" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="384" y="865" />
+<sizeparam width="160" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
@@ -3403,8 +3403,8 @@ On prend b=1 comme exemple
</COMPONENT>
<COMPONENT type="1011" id="765" >
-<cdparam x="270" y="831" />
-<sizeparam width="153" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="266" y="831" />
+<sizeparam width="160" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
@@ -3414,8 +3414,8 @@ On prend b=1 comme exemple
</COMPONENT>
<COMPONENT type="1008" id="768" >
-<cdparam x="207" y="1052" />
-<sizeparam width="46" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="205" y="1052" />
+<sizeparam width="51" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
@@ -3428,8 +3428,8 @@ On prend b=1 comme exemple
</COMPONENT>
<COMPONENT type="1008" id="771" >
-<cdparam x="323" y="962" />
-<sizeparam width="46" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="321" y="962" />
+<sizeparam width="51" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
@@ -3442,8 +3442,8 @@ On prend b=1 comme exemple
</COMPONENT>
<COMPONENT type="1008" id="774" >
-<cdparam x="441" y="983" />
-<sizeparam width="46" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="439" y="983" />
+<sizeparam width="51" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
@@ -3456,8 +3456,8 @@ On prend b=1 comme exemple
</COMPONENT>
<COMPONENT type="1008" id="777" >
-<cdparam x="109" y="986" />
-<sizeparam width="46" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="107" y="986" />
+<sizeparam width="51" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
@@ -3470,8 +3470,8 @@ On prend b=1 comme exemple
</COMPONENT>
<COMPONENT type="1008" id="780" >
-<cdparam x="699" y="813" />
-<sizeparam width="46" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="697" y="813" />
+<sizeparam width="51" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
@@ -3484,8 +3484,8 @@ On prend b=1 comme exemple
</COMPONENT>
<COMPONENT type="1008" id="783" >
-<cdparam x="777" y="1141" />
-<sizeparam width="46" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="775" y="1141" />
+<sizeparam width="51" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
@@ -3498,8 +3498,8 @@ On prend b=1 comme exemple
</COMPONENT>
<COMPONENT type="1008" id="786" >
-<cdparam x="920" y="1178" />
-<sizeparam width="46" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="918" y="1178" />
+<sizeparam width="51" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
@@ -3512,8 +3512,8 @@ On prend b=1 comme exemple
</COMPONENT>
<COMPONENT type="1008" id="789" >
-<cdparam x="1026" y="1211" />
-<sizeparam width="46" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1024" y="1211" />
+<sizeparam width="51" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
@@ -3544,8 +3544,8 @@ On prend b=1 comme exemple
</COMPONENT>
<COMPONENT type="1006" id="796" >
-<cdparam x="1169" y="1214" />
-<sizeparam width="79" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1166" y="1214" />
+<sizeparam width="84" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
@@ -3559,7 +3559,7 @@ On prend b=1 comme exemple
<COMPONENT type="301" id="813" >
<cdparam x="1159" y="1153" />
-<sizeparam width="108" height="20" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="115" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="UML Note" value="send Ack of Fin
@@ -3586,8 +3586,8 @@ On prend b=1 comme exemple
</COMPONENT>
<COMPONENT type="1011" id="816" >
-<cdparam x="1158" y="1295" />
-<sizeparam width="100" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1154" y="1295" />
+<sizeparam width="109" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
@@ -3606,8 +3606,8 @@ On prend b=1 comme exemple
</COMPONENT>
<COMPONENT type="1011" id="821" >
-<cdparam x="1158" y="1402" />
-<sizeparam width="100" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1154" y="1402" />
+<sizeparam width="109" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
@@ -3617,8 +3617,8 @@ On prend b=1 comme exemple
</COMPONENT>
<COMPONENT type="1008" id="824" >
-<cdparam x="1185" y="1351" />
-<sizeparam width="46" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1183" y="1351" />
+<sizeparam width="51" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
@@ -3649,8 +3649,8 @@ On prend b=1 comme exemple
</COMPONENT>
<COMPONENT type="1006" id="831" >
-<cdparam x="1489" y="1132" />
-<sizeparam width="80" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1487" y="1132" />
+<sizeparam width="84" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
@@ -3663,8 +3663,8 @@ On prend b=1 comme exemple
</COMPONENT>
<COMPONENT type="1006" id="834" >
-<cdparam x="1490" y="1348" />
-<sizeparam width="79" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1487" y="1348" />
+<sizeparam width="84" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
@@ -3677,8 +3677,8 @@ On prend b=1 comme exemple
</COMPONENT>
<COMPONENT type="1008" id="837" >
-<cdparam x="1707" y="1026" />
-<sizeparam width="43" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1704" y="1026" />
+<sizeparam width="48" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
@@ -3692,7 +3692,7 @@ On prend b=1 comme exemple
<COMPONENT type="301" id="854" >
<cdparam x="1759" y="1192" />
-<sizeparam width="86" height="20" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="92" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="UML Note" value="Correct ack
@@ -3720,7 +3720,7 @@ On prend b=1 comme exemple
<COMPONENT type="301" id="871" >
<cdparam x="1635" y="1168" />
-<sizeparam width="71" height="20" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="76" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="UML Note" value="false ack
@@ -3747,8 +3747,8 @@ On prend b=1 comme exemple
</COMPONENT>
<COMPONENT type="1006" id="874" >
-<cdparam x="1602" y="1299" />
-<sizeparam width="79" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1599" y="1299" />
+<sizeparam width="84" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
@@ -3771,7 +3771,7 @@ On prend b=1 comme exemple
<COMPONENT type="301" id="893" >
<cdparam x="1469" y="1295" />
-<sizeparam width="127" height="20" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="137" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="UML Note" value="return acknowldge
@@ -3799,7 +3799,7 @@ On prend b=1 comme exemple
<COMPONENT type="301" id="910" >
<cdparam x="1620" y="927" />
-<sizeparam width="50" height="20" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="50" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="UML Note" value="data
@@ -3826,8 +3826,8 @@ On prend b=1 comme exemple
</COMPONENT>
<COMPONENT type="1008" id="913" >
-<cdparam x="1506" y="1405" />
-<sizeparam width="46" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1504" y="1405" />
+<sizeparam width="51" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
@@ -3840,8 +3840,8 @@ On prend b=1 comme exemple
</COMPONENT>
<COMPONENT type="1008" id="916" >
-<cdparam x="1618" y="1348" />
-<sizeparam width="46" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1616" y="1348" />
+<sizeparam width="51" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
@@ -3854,8 +3854,8 @@ On prend b=1 comme exemple
</COMPONENT>
<COMPONENT type="1006" id="919" >
-<cdparam x="1613" y="1404" />
-<sizeparam width="56" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1611" y="1404" />
+<sizeparam width="60" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
@@ -3877,8 +3877,8 @@ On prend b=1 comme exemple
</COMPONENT>
<COMPONENT type="1011" id="924" >
-<cdparam x="1776" y="1349" />
-<sizeparam width="100" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1772" y="1349" />
+<sizeparam width="109" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
@@ -3897,8 +3897,8 @@ On prend b=1 comme exemple
</COMPONENT>
<COMPONENT type="1011" id="929" >
-<cdparam x="1870" y="1411" />
-<sizeparam width="100" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1866" y="1411" />
+<sizeparam width="109" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
@@ -3926,8 +3926,8 @@ On prend b=1 comme exemple
</COMPONENT>
<COMPONENT type="1011" id="936" >
-<cdparam x="2051" y="1466" />
-<sizeparam width="100" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="2047" y="1466" />
+<sizeparam width="109" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
@@ -3946,8 +3946,8 @@ On prend b=1 comme exemple
</COMPONENT>
<COMPONENT type="1011" id="941" >
-<cdparam x="1946" y="1493" />
-<sizeparam width="100" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1942" y="1493" />
+<sizeparam width="109" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
@@ -3957,8 +3957,8 @@ On prend b=1 comme exemple
</COMPONENT>
<COMPONENT type="1011" id="944" >
-<cdparam x="1946" y="1434" />
-<sizeparam width="100" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1942" y="1434" />
+<sizeparam width="109" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
@@ -3969,7 +3969,7 @@ On prend b=1 comme exemple
<COMPONENT type="301" id="961" >
<cdparam x="1825" y="889" />
-<sizeparam width="50" height="20" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="50" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="UML Note" value="Syn
@@ -3997,7 +3997,7 @@ On prend b=1 comme exemple
<COMPONENT type="301" id="978" >
<cdparam x="1707" y="945" />
-<sizeparam width="50" height="20" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="50" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="UML Note" value="ack
@@ -4024,8 +4024,8 @@ On prend b=1 comme exemple
</COMPONENT>
<COMPONENT type="1006" id="981" >
-<cdparam x="2198" y="1198" />
-<sizeparam width="79" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="2195" y="1198" />
+<sizeparam width="84" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
@@ -4047,8 +4047,8 @@ On prend b=1 comme exemple
</COMPONENT>
<COMPONENT type="1007" id="986" >
-<cdparam x="2198" y="1298" />
-<sizeparam width="78" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="2197" y="1298" />
+<sizeparam width="81" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
@@ -4061,8 +4061,8 @@ On prend b=1 comme exemple
</COMPONENT>
<COMPONENT type="1006" id="989" >
-<cdparam x="2209" y="1365" />
-<sizeparam width="56" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="2207" y="1365" />
+<sizeparam width="60" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
@@ -4075,8 +4075,8 @@ On prend b=1 comme exemple
</COMPONENT>
<COMPONENT type="1011" id="992" >
-<cdparam x="2161" y="1136" />
-<sizeparam width="153" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="2157" y="1136" />
+<sizeparam width="160" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
@@ -4086,8 +4086,8 @@ On prend b=1 comme exemple
</COMPONENT>
<COMPONENT type="1008" id="995" >
-<cdparam x="2214" y="1248" />
-<sizeparam width="46" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="2212" y="1248" />
+<sizeparam width="51" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
@@ -4100,8 +4100,8 @@ On prend b=1 comme exemple
</COMPONENT>
<COMPONENT type="1011" id="998" >
-<cdparam x="2187" y="1424" />
-<sizeparam width="100" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="2183" y="1424" />
+<sizeparam width="109" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
@@ -4111,8 +4111,8 @@ On prend b=1 comme exemple
</COMPONENT>
<COMPONENT type="1006" id="1001" >
-<cdparam x="2278" y="1122" />
-<sizeparam width="79" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="2275" y="1122" />
+<sizeparam width="84" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
@@ -4126,7 +4126,7 @@ On prend b=1 comme exemple
<COMPONENT type="301" id="1018" >
<cdparam x="2283" y="1065" />
-<sizeparam width="114" height="20" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="121" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
<infoparam name="UML Note" value="send Ack of SYN
@@ -4153,8 +4153,8 @@ On prend b=1 comme exemple
</COMPONENT>
<COMPONENT type="1011" id="1021" >
-<cdparam x="2267" y="1267" />
-<sizeparam width="100" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="2263" y="1267" />
+<sizeparam width="109" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
@@ -4173,8 +4173,8 @@ On prend b=1 comme exemple
</COMPONENT>
<COMPONENT type="1008" id="1026" >
-<cdparam x="2294" y="1199" />
-<sizeparam width="46" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="2292" y="1199" />
+<sizeparam width="51" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
@@ -4214,8 +4214,8 @@ On prend b=1 comme exemple
</COMPONENT>
<COMPONENT type="1008" id="1035" >
-<cdparam x="1465" y="1192" />
-<sizeparam width="129" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1459" y="1192" />
+<sizeparam width="140" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
@@ -4228,8 +4228,8 @@ On prend b=1 comme exemple
</COMPONENT>
<COMPONENT type="1009" id="1038" >
-<cdparam x="1698" y="1086" />
-<sizeparam width="60" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1696" y="1086" />
+<sizeparam width="64" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
@@ -4317,7 +4317,7 @@ On prend b=1 comme exemple
<cdparam x="371" y="93" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from for loop to notified event" value="null" />
-<P1 x="320" y="99" id="508" />
+<P1 x="325" y="99" id="508" />
<P2 x="374" y="128" id="516" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -5379,7 +5379,7 @@ On prend b=1 comme exemple
<SUBCOMPONENT type="-1" id="1179" >
<father id="1186" num="0" />
<cdparam x="464" y="232" />
-<sizeparam width="51" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="52" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
@@ -5388,7 +5388,7 @@ On prend b=1 comme exemple
<SUBCOMPONENT type="-1" id="1180" >
<father id="1186" num="1" />
<cdparam x="544" y="234" />
-<sizeparam width="41" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="42" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
@@ -5397,7 +5397,7 @@ On prend b=1 comme exemple
<SUBCOMPONENT type="-1" id="1181" >
<father id="1186" num="2" />
<cdparam x="529" y="267" />
-<sizeparam width="12" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="14" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
<infoparam name="guard 3" value="[ ]" />
@@ -5422,8 +5422,8 @@ On prend b=1 comme exemple
</COMPONENT>
<COMPONENT type="1008" id="1193" >
-<cdparam x="396" y="339" />
-<sizeparam width="63" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="393" y="339" />
+<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" />
@@ -5437,8 +5437,8 @@ On prend b=1 comme exemple
</COMPONENT>
<COMPONENT type="1010" id="1196" >
-<cdparam x="599" y="300" />
-<sizeparam width="47" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="596" y="300" />
+<sizeparam width="52" 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" />
@@ -5461,8 +5461,8 @@ On prend b=1 comme exemple
</COMPONENT>
<COMPONENT type="1017" id="1201" >
-<cdparam x="491" y="157" />
-<sizeparam width="70" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="489" y="157" />
+<sizeparam width="75" 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" />
@@ -6043,8 +6043,8 @@ On prend b=1 comme exemple
</COMPONENT>
<COMPONENT type="1010" id="1314" >
-<cdparam x="418" y="364" />
-<sizeparam width="44" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="416" y="364" />
+<sizeparam width="48" 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" />
@@ -6057,8 +6057,8 @@ On prend b=1 comme exemple
</COMPONENT>
<COMPONENT type="1010" id="1317" >
-<cdparam x="238" y="201" />
-<sizeparam width="129" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="231" y="201" />
+<sizeparam width="143" 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" />
@@ -6081,8 +6081,8 @@ On prend b=1 comme exemple
</COMPONENT>
<COMPONENT type="1010" id="1322" >
-<cdparam x="141" y="129" />
-<sizeparam width="51" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="138" y="129" />
+<sizeparam width="57" 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" />
@@ -6096,8 +6096,8 @@ On prend b=1 comme exemple
</COMPONENT>
<COMPONENT type="1008" id="1325" >
-<cdparam x="113" y="182" />
-<sizeparam width="106" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="108" y="182" />
+<sizeparam width="116" 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" />
@@ -6111,8 +6111,8 @@ On prend b=1 comme exemple
</COMPONENT>
<COMPONENT type="1010" id="1328" >
-<cdparam x="144" y="237" />
-<sizeparam width="44" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="143" y="237" />
+<sizeparam width="47" 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" />
@@ -6126,8 +6126,8 @@ On prend b=1 comme exemple
</COMPONENT>
<COMPONENT type="1008" id="1331" >
-<cdparam x="124" y="308" />
-<sizeparam width="85" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="121" y="308" />
+<sizeparam width="90" 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" />
@@ -6141,7 +6141,7 @@ On prend b=1 comme exemple
<COMPONENT type="301" id="1348" >
<cdparam x="376" y="98" />
-<sizeparam width="233" height="39" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="249" height="39" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="UML Note" value="The first two layers of the OSI model
@@ -6172,8 +6172,8 @@ the smart card and the terminal
</COMPONENT>
<COMPONENT type="1007" id="1351" >
-<cdparam x="254" y="97" />
-<sizeparam width="89" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="250" y="97" />
+<sizeparam width="96" 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" />
@@ -6186,8 +6186,8 @@ the smart card and the terminal
</COMPONENT>
<COMPONENT type="1007" id="1354" >
-<cdparam x="241" y="148" />
-<sizeparam width="114" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="236" y="148" />
+<sizeparam width="125" 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" />
@@ -6210,8 +6210,8 @@ the smart card and the terminal
</COMPONENT>
<COMPONENT type="1008" id="1359" >
-<cdparam x="240" y="471" />
-<sizeparam width="106" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="236" y="471" />
+<sizeparam width="115" 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" />
@@ -6233,8 +6233,8 @@ the smart card and the terminal
</COMPONENT>
<COMPONENT type="1009" id="1364" >
-<cdparam x="252" y="429" />
-<sizeparam width="83" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="249" y="429" />
+<sizeparam width="88" 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" />
@@ -6247,8 +6247,8 @@ the smart card and the terminal
</COMPONENT>
<COMPONENT type="1010" id="1367" >
-<cdparam x="268" y="385" />
-<sizeparam width="50" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="266" y="385" />
+<sizeparam width="55" 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" />
@@ -6261,8 +6261,8 @@ the smart card and the terminal
</COMPONENT>
<COMPONENT type="1006" id="1370" >
-<cdparam x="250" y="513" />
-<sizeparam width="87" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="246" y="513" />
+<sizeparam width="94" 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" />
@@ -6275,8 +6275,8 @@ the smart card and the terminal
</COMPONENT>
<COMPONENT type="1008" id="1373" >
-<cdparam x="562" y="472" />
-<sizeparam width="59" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="559" y="472" />
+<sizeparam width="65" 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" />
@@ -6289,8 +6289,8 @@ the smart card and the terminal
</COMPONENT>
<COMPONENT type="1009" id="1376" >
-<cdparam x="546" y="433" />
-<sizeparam width="91" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="542" y="433" />
+<sizeparam width="98" 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" />
@@ -6303,8 +6303,8 @@ the smart card and the terminal
</COMPONENT>
<COMPONENT type="1006" id="1379" >
-<cdparam x="552" y="509" />
-<sizeparam width="79" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="549" y="509" />
+<sizeparam width="84" 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" />
@@ -6317,8 +6317,8 @@ the smart card and the terminal
</COMPONENT>
<COMPONENT type="1010" id="1382" >
-<cdparam x="536" y="390" />
-<sizeparam width="110" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="532" y="390" />
+<sizeparam width="118" 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" />
@@ -6335,7 +6335,7 @@ the smart card and the terminal
<COMPONENT type="1014" id="1386" >
<cdparam x="236" y="261" />
-<sizeparam width="125" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="124" 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" />
@@ -6551,7 +6551,7 @@ the smart card and the terminal
<cdparam x="391" y="341" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from for loop to select" value="null" />
-<P1 x="361" y="275" id="1384" />
+<P1 x="360" y="275" id="1384" />
<P2 x="439" y="275" id="1389" />
<AutomaticDrawing data="true" />
</CONNECTOR>
diff --git a/simulators/c++2/src_simulator/arch/FPGA.cpp b/simulators/c++2/src_simulator/arch/FPGA.cpp
index 519b925f7953e8ac0265db0d2cc7873ea5cba56c..4888dc79840f861efe8306681421e5a340368c40 100644
--- a/simulators/c++2/src_simulator/arch/FPGA.cpp
+++ b/simulators/c++2/src_simulator/arch/FPGA.cpp
@@ -48,21 +48,27 @@
FPGA::FPGA( ID iID,
- std::string iName,
+ std::string iName,
WorkloadSource* iScheduler,
+ TMLTime iTimePerCycle,
TMLTime iReconfigTime,
unsigned int iChangeIdleModeCycles,
unsigned int iCyclesBeforeIdle,
unsigned int iCyclesPerExeci,
unsigned int iCyclesPerExecc ) : SchedulableDevice(iID, iName, iScheduler)
+ ,_timePerCycle(iTimePerCycle)
,_reconfigTime(iReconfigTime)
,_lastTransaction(0)
- ,_changeIdleModeCycles(iChangeIdleModeCycles)
- ,_cyclesBeforeIdle(iCyclesBeforeIdle)
- ,_cyclesPerExeci(iCyclesPerExeci)
- ,_cyclesPerExecc(iCyclesPerExecc)
- ,_transNumber(0)
-
+#ifdef PENALTIES_ENABLED
+ ,_changeIdleModeCycles(iChangeIdleModeCycles), _cyclesBeforeIdle(iCyclesBeforeIdle)
+#endif
+#ifdef PENALTIES_ENABLED
+ , _timePerExeci(_cyclesPerExeci * _timePerCycle /100.0)
+ , _timeBeforeIdle(_cyclesBeforeIdle*_timePerCycle)
+ , _changeIdleModeTime(_changeIdleModeCycles*_timePerCycle)
+#else
+ , _timePerExeci(_cyclesPerExeci*_timePerCycle)
+#endif
{}
FPGA::~FPGA(){}
@@ -72,8 +78,8 @@ void FPGA::streamBenchmarks(std::ostream& s) const{
std::cout<<"test fpga stramBenchmarks"<<std::endl;
s << TAG_FPGAo << " id=\"" << _ID << "\" name=\"" << _name << "\">" << std::endl;
if (_simulatedTime!=0) s << TAG_UTILo << (static_cast<float>(_busyCycles)/static_cast<float>(_simulatedTime)) << TAG_UTILc;
- s << TAG_ENERGYo << ( (_simulatedTime)*_static_consumPerCycle) + ((_busyCycles)*_dynamic_consumPerCycle) << TAG_ENERGYc;
- std::cout<< "power consumption "<< ((_simulatedTime)*_static_consumPerCycle) + ((_busyCycles)*_dynamic_consumPerCycle)<< std::endl;
+ s << TAG_ENERGYo << ( (_simulatedTime/_timePerCycle)*_static_consumPerCycle) + ((_busyCycles/_timePerCycle)*_dynamic_consumPerCycle) << TAG_ENERGYc;
+ std::cout<< "power consumption "<< ((_simulatedTime/_timePerCycle)*_static_consumPerCycle) + ((_busyCycles/_timePerCycle)*_dynamic_consumPerCycle)<< std::endl;
for(BusMasterList::const_iterator i=_busMasterList.begin(); i != _busMasterList.end(); ++i) (*i)->streamBenchmarks(s);
s << TAG_FPGAc;
}
@@ -81,50 +87,44 @@ void FPGA::streamBenchmarks(std::ostream& s) const{
TMLTransaction* FPGA::getNextTransaction(){
- std::cout<<"fpga getNextTransaction"<<_name<<" ";
- #ifdef BUS_ENABLED
- if (_masterNextTransaction==0 || _nextTransaction==0){
- if(_masterNextTransaction == 0) std::cout<<"master is 0"<<std::endl;
- if(_nextTransaction==0) std::cout<<"nexttrans is 0"<<std::endl;
- //if(_nextTransaction) std::cout<<_nextTransaction->toString()<<std::endl;
- return _nextTransaction;
- //return 0;
- }else{
-#ifdef DEBUG_CPU
- std::cout << "CPU:getNT: " << _name << " has bus transaction on master " << _masterNextTransaction->toString() << std::endl;
-#endif
- //std::cout << "CRASH Trans:" << _nextTransaction->toString() << std::endl << "Channel: " << _nextTransaction->getChannel() << "\n";
+std::cout<<"fpga getNextTransaction"<<std::endl;
+#ifdef BUS_ENABLE
+ if(_masterNextTransaction==0 || _nextTransaction==0){
+ return _nextTransaction;
+ }
+ else{
BusMaster* aTempMaster = getMasterForBus(_nextTransaction->getChannel()->getFirstMaster(_nextTransaction));
- std::cout << "1 aTempMaster: " << aTempMaster << std::endl;
bool aResult = aTempMaster->accessGranted();
- // std::cout << "2" << std::endl;
+
while (aResult && aTempMaster!=_masterNextTransaction){
- // std::cout << "3" << std::endl;
+
aTempMaster =_nextTransaction->getChannel()->getNextMaster(_nextTransaction);
- // std::cout << "4" << std::endl;
+
aResult = aTempMaster->accessGranted();
- // std::cout << "5" << std::endl;
+
}
- if(_nextTransaction)std::cout<<"haha1"<<_nextTransaction->toString()<<std::endl;
return (aResult)?_nextTransaction:0;
}
#else
- if(_nextTransaction)std::cout<<"haha2"<<_nextTransaction->toString()<<std::endl;
-
return _nextTransaction;
#endif
}
-void FPGA::calcStartTimeLength(){
- std::cout<<"fpga calStartTimeLength "<<std::endl;
+void FPGA::calcStartTimeLength(TMLTime iTimeSlice){
+std::cout<<"fpga calStartTimeLength"<<std::endl;
#ifdef BUS_ENABLED
std::cout << "FPGA:calcSTL: scheduling decision of FPGA " << _name << ": " << _nextTransaction->toString() << std::endl;
+ std::cout << "get channel " << std::endl;
TMLChannel* aChannel=_nextTransaction->getCommand()->getChannel(0);
+ std::cout << "after get channel " << std::endl;
if (aChannel==0) {
+ std::cout<<"test111"<<std::endl;
+ //std::cout << "no channel " << std::endl;
_masterNextTransaction=0;
} else {
+ std::cout << "get bus " << std::endl;
_masterNextTransaction= getMasterForBus(aChannel->getFirstMaster(_nextTransaction));
if (_masterNextTransaction!=0){
std::cout << "before register transaction at bus " << _masterNextTransaction->toString() << std::endl;
@@ -135,18 +135,38 @@ void FPGA::calcStartTimeLength(){
}
}
#endif
+ std::cout<<"test222"<<std::endl;
//round to full cycles!!!
-
+ std::cout<<"time per cycle is "<<_timePerCycle<<std::endl;
+ std::cout<<"test333"<<std::endl;
TMLTime aStartTime = _nextTransaction->getRunnableTime();
- std::cout<<"start time !!!!!!!!!!"<<_nextTransaction->toShortString()<<"is "<<aStartTime<<std::endl;
- //or setStartTime(0)???
+ TMLTime aReminder = aStartTime % _timePerCycle;
+ if (aReminder!=0) aStartTime+=_timePerCycle - aReminder;
+ std::cout << "FPGA: set start time in FPGA=" << aStartTime << " Reminder=" << aReminder <<"\n";
+
_nextTransaction->setStartTime(aStartTime);
#ifdef BUS_ENABLED
if (_masterNextTransaction==0){
-#endif
- _nextTransaction->setLength(max(_nextTransaction->getVirtualLength(),(TMLTime)1));
+#endif
+ //calculate length of transaction
+ //if (_nextTransaction->getOperationLength()!=-1){
+ std::cout<<"at first virtual length "<<_nextTransaction->getVirtualLength()<<std::endl;
+ std::cout<<"another "<<(TMLLength)(iTimeSlice /_timePerExeci)<<std::endl;
+ if (iTimeSlice!=0){
+ _nextTransaction->setVirtualLength(max(min(_nextTransaction->getVirtualLength(), (TMLLength)(iTimeSlice /_timePerExeci)), (TMLTime)1));
+ }
+ _nextTransaction->setLength(_nextTransaction->getVirtualLength()*_timePerExeci);
+ std::cout<<"!!!!!virtual length is "<<_nextTransaction->getVirtualLength()<<std::endl;
+#ifdef BUS_ENABLED
+ }
+#endif
+#ifdef PENALTIES_ENABLED
+ //std::cout << "starttime=" << _nextTransaction->getStartTime() << "\n";
+ if ((_nextTransaction->getStartTime()-_endSchedule) >=_timeBeforeIdle){
+ _nextTransaction->setIdlePenalty(_changeIdleModeTime);
}
+#endif
}
void FPGA::truncateAndAddNextTransAt(TMLTime iTime){
@@ -155,7 +175,7 @@ std::cout<<"fpga truncateAndAddNextTransAt"<<std::endl;
//return truncateNextTransAt(iTime);
//not a problem if scheduling does not take place at time when transaction is actually truncated, tested
//std::cout << "CPU:truncateAndAddNextTransAt " << _name << "time: +++++++++++++++++++++" << iTime << "\n";
-// TMLTime aTimeSlice = _scheduler->schedule(iTime);
+ TMLTime aTimeSlice = _scheduler->schedule(iTime);
//_schedulingNeeded=false; 05/05/11
TMLTransaction* aNewTransaction =_scheduler->getNextTransaction(iTime);
//std::cout << "before if\n";
@@ -168,7 +188,7 @@ std::cout<<"fpga truncateAndAddNextTransAt"<<std::endl;
//if (_nextTransaction!=0 && truncateNextTransAt(iTime)!=0) addTransaction(); //NEW!!!!
if (_nextTransaction!=0 && _masterNextTransaction!=0) _masterNextTransaction->registerTransaction(0);
_nextTransaction = aNewTransaction;
- if (_nextTransaction!=0) calcStartTimeLength();
+ if (_nextTransaction!=0) calcStartTimeLength(aTimeSlice);
}
//std::cout << "CPU:schedule END " << _name << "+++++++++++++++++++++++++++++++++\n";
}
@@ -176,10 +196,30 @@ std::cout<<"fpga truncateAndAddNextTransAt"<<std::endl;
TMLTime FPGA::truncateNextTransAt(TMLTime iTime){
std::cout<<"fpga truncateNextTransAt"<<std::endl;
if (_masterNextTransaction==0){
+#ifdef PENALTIES_ENABLED
+
+ //std::cout << "CPU:nt.startTime: " << _nextTransaction->getStartTime() << std::endl;
+ if (iTime < _nextTransaction->getStartTime()) {
+ return 0;
+ }
+
+ TMLTime aNewDuration = iTime - _nextTransaction->getStartTime();
+ TMLTime aStaticPenalty = _nextTransaction->getIdlePenalty() + _nextTransaction->getTaskSwitchingPenalty();
+ if (aNewDuration<=aStaticPenalty){
+ _nextTransaction->setLength(_timePerExeci);
+ _nextTransaction->setVirtualLength(1);
+
+ } else{
+ aNewDuration-=aStaticPenalty;
+ _nextTransaction->setVirtualLength(max((TMLTime)(aNewDuration /_timePerExeci),(TMLTime)1));
+ _nextTransaction->setLength(_nextTransaction->getVirtualLength() *_timePerExeci);
+ }
+#else
if (iTime <= _nextTransaction->getStartTime()) return 0; //before: <=
TMLTime aNewDuration = iTime - _nextTransaction->getStartTime();
- _nextTransaction->setVirtualLength(max((TMLTime)(aNewDuration), (TMLTime)1));
- _nextTransaction->setLength(_nextTransaction->getVirtualLength());
+ _nextTransaction->setVirtualLength(max((TMLTime)(aNewDuration /_timePerExeci), (TMLTime)1));
+ _nextTransaction->setLength(_nextTransaction->getVirtualLength() *_timePerExeci);
+#endif
}
return _nextTransaction->getOverallLength();
}
@@ -195,45 +235,41 @@ std::cout<<"fpga addTransaction"<<std::endl;
}else{
BusMaster* aFollowingMaster =_nextTransaction->getChannel()->getNextMaster(_nextTransaction);
if (aFollowingMaster==0){
- //std::cout << "1\n";
+ std::cout << "1\n";
aFinish=true;
BusMaster* aTempMaster = getMasterForBus(_nextTransaction->getChannel()->getFirstMaster(_nextTransaction));
- // std::cout << "2\n";
+ std::cout << "2\n";
Slave* aTempSlave= _nextTransaction->getChannel()->getNextSlave(_nextTransaction);
- //std::cout << "3\n";
+ std::cout << "3\n";
+ aTempMaster->addBusContention(_nextTransaction->getStartTime()-max(_endSchedule,_nextTransaction->getRunnableTime()));
while (aTempMaster!=0){
- // std::cout << "3a\n";
+ std::cout << "3a\n";
aTempMaster->addTransaction(_nextTransaction);
- // std::cout << "3b\n";
+ std::cout << "3b\n";
//if (aTempSlave!=0) aTempSlave->addTransaction(_nextTransaction);
if (aTempSlave!=0) aTempSlave->addTransaction(_nextTransaction); //NEW
- //std::cout << "4\n";
+ std::cout << "4\n";
aTempMaster =_nextTransaction->getChannel()->getNextMaster(_nextTransaction);
- //std::cout << "5\n";
+ std::cout << "5\n";
aTempSlave= _nextTransaction->getChannel()->getNextSlave(_nextTransaction);
}
- // std::cout << "6\n";
+ std::cout << "6\n";
} else {
std::cout << _name << " bus transaction next round" << std::endl;
_masterNextTransaction=aFollowingMaster;
- // std::cout << "7\n";
+ std::cout << "7\n";
_masterNextTransaction->registerTransaction(_nextTransaction);
aFinish=false;
}
//std::cout << "8\n";
}
-
if (aFinish){
- //std::cout<<"I am in finish!!!"<<std::endl;
_endSchedule=0;
_simulatedTime=max(_simulatedTime,_endSchedule);
_overallTransNo++; //NEW!!!!!!!!
_overallTransSize+=_nextTransaction->getOperationLength(); //NEW!!!!!!!!
//std::cout << "lets crash execute\n";
-
- // std::cout<<_nextTransaction->toString()<<std::endl;
- if(_nextTransaction->getCommand()==0) std::cout<<"d"<<std::endl;
- _nextTransaction->getCommand()->execute(); //NEW!!!!
+ _nextTransaction->getCommand()->execute(); //NEW!!!!
//std::cout << "not crashed\n";
#ifdef TRANSLIST_ENABLED
_transactList.push_back(_nextTransaction);
@@ -243,41 +279,29 @@ std::cout<<"fpga addTransaction"<<std::endl;
#ifdef LISTENERS_ENABLED
NOTIFY_TRANS_EXECUTED(_nextTransaction);
#endif
-
_nextTransaction=0;
-
return true;
} else return false;
}
-
void FPGA::schedule(){
std::cout << "fpga:schedule BEGIN " << _name << "+++++++++++++++++++++++++++++++++\n";
- _scheduler->schedule(_endSchedule);
+
+ TMLTime aTimeSlice = _scheduler->schedule(_endSchedule);
+
TMLTransaction* aOldTransaction = _nextTransaction;
_nextTransaction=_scheduler->getNextTransaction(_endSchedule);
- /* TaskList::const_iterator iter_task=_taskList.begin();
- std::advance(iter_task,_transNumber);
- if(iter_task!=_taskList.end()){
- _nextTransaction=(*iter_task)->getNextTransaction(_endSchedule);
- if(_nextTransaction!=0 && _nextTransaction->getVirtualLength()==0){
- _nextTransaction=0;
- _transNumber=0;
- }
- else if(++iter_task==_taskList.end())
- _transNumber=0;
- else if(_nextTransaction->getCommand()->getProgress()==_nextTransaction->getLength())
- _transNumber++;
- }
- */
- if (aOldTransaction!=0 && aOldTransaction!=_nextTransaction){ //NEW
+
+ if (aOldTransaction!=0 && aOldTransaction!=_nextTransaction){ //NEW
+
if (_masterNextTransaction!=0) {
_masterNextTransaction->registerTransaction(0);
}
}
- if (_nextTransaction!=0 && aOldTransaction != _nextTransaction) calcStartTimeLength();
+
+ if (_nextTransaction!=0 && aOldTransaction != _nextTransaction) calcStartTimeLength(aTimeSlice);
std::cout << "fpga:schedule END " << _name << "+++++++++++++++++++++++++++++++++\n";
}
@@ -409,168 +433,5 @@ void FPGA::latencies2XML(std::ostringstream& glob, unsigned int id1, unsigned in
return;
}
-double FPGA::averageLoad (TMLTask* currTask) const{
- double _averageLoad=0;
- TMLTime _maxEndTime=0;
- for( TransactionList::const_iterator i = _transactList.begin(); i != _transactList.end(); ++i ) {
- if( (*i)-> getCommand()->getTask() == currTask ){
- TMLTime _endTime= (*i)->getEndTime();
- _maxEndTime=max(_maxEndTime,_endTime);
- }
- }
- for( TransactionList::const_iterator i = _transactList.begin(); i != _transactList.end(); ++i ) {
- if( (*i)-> getCommand()->getTask() == currTask ){
- _averageLoad += (*i)->getEndTime() - (*i)->getStartTime();
- }
- }
- if(_maxEndTime == 0)
- return 0;
- else {
- _averageLoad = (double)_averageLoad/_maxEndTime;
- return _averageLoad;
- }
- /*if( _maxEndTime == 0 )
- myfile << "average load is 0" << "<br>";
- else
- myfile<<" average load is "<<(double)_averageLoad/_maxEndTime<<"<br>";*/
-
-}
-
-
-void FPGA::drawPieChart(std::ofstream& myfile) const {
- std::cout<<"fpga drawpie chart"<<std::endl;
- TMLTime _maxEndTime=0;
- for(TaskList::const_iterator j =_taskList.begin(); j != _taskList.end(); ++j){
- for( TransactionList::const_iterator i = _transactList.begin(); i != _transactList.end(); ++i ) {
- if( (*i)-> getCommand()->getTask() == (*j) ){
- TMLTime _endTime= (*i)->getEndTime();
- _maxEndTime=max(_maxEndTime,_endTime);
- }
- }
- std::cout<<"max end time is "<<_maxEndTime<<std::endl;
- std::map <TMLTask*, double > transPercentage;
- for( TransactionList::const_iterator i = _transactList.begin(); i!= _transactList.end(); ++i){
- if( (*i)-> getCommand()->getTask() == (*j) ){
- transPercentage[(*i)-> getCommand()->getTask()]+=(double)((*i)->getEndTime()-(*i)->getStartTime())/_maxEndTime;
- }
- }
- std::map <TMLTask*, double>::iterator iter = transPercentage.begin();
- myfile << " var chart" << _ID << "_" << (*j)->toShortString() << "= new CanvasJS.Chart(\"chartContainer" << _ID << "_" << (*j)->toShortString() <<"\"," << std::endl;
- myfile << SCHED_HTML_JS_CONTENT2 << "Average load is " << averageLoad(*j) << SCHED_HTML_JS_CONTENT3 << std::endl;
- double idle=1;
- while( iter != transPercentage.end()){
- myfile << " { y:" << (iter->second)*100 << ", indexLabel: \"" << iter->first->toString() << "\" }," << std::endl;
- idle-=iter->second;
- ++iter;
- }
- myfile << " { y:" << idle*100 << ", indexLabel: \"idle time\"" << " }" << std::endl;
- myfile << std::endl;
- myfile << SCHED_HTML_PIE_END;
- myfile << "chart" << _ID << "_" << (*j)->toShortString() << ".render();" << std::endl;
- }
-
-}
-
-void FPGA::showPieChart(std::ofstream& myfile) const{
- myfile << SCHED_HTML_JS_DIV_ID << _ID << "_" << _htmlCurrTask->toShortString() << SCHED_HTML_JS_DIV_END << "<br>";
-}
-
-void FPGA::schedule2HTML(std::ofstream& myfile) const {
- myfile << "<h2><span>Scheduling for device: "<< _name << "</span></h2>" << std::endl;
-
- if ( _transactList.size() == 0 ) {
- myfile << "<h4>Device never activated</h4>" << std::endl;
- }
- else {
- myfile << "<table>" << std::endl << "<tr>";
-
- std::map<TMLTask*, std::string> taskCellClasses;
- unsigned int nextCellClassIndex = 0;
- TMLTime aCurrTime = 0;
-
- for( TransactionList::const_iterator i = _transactList.begin(); i != _transactList.end(); ++i ) {
- std::cout << (*i)-> getCommand()->getTask()->toString() <<std::endl;
- std::cout<< _htmlCurrTask->toString()<<std::endl;
- if( (*i)-> getCommand()->getTask() == _htmlCurrTask ){
- std::cout<<"in!!"<<_htmlCurrTask->toString()<<std::endl;
- TMLTransaction* aCurrTrans = *i;
- unsigned int aBlanks = aCurrTrans->getStartTime() - aCurrTime;
- std::cout<<"blank is "<<aBlanks<<std::endl;
- if ( aBlanks > 0 ) {
- writeHTMLColumn( myfile, aBlanks, "not", "idle time" );
- }
-
- unsigned int aLength = aCurrTrans->getOperationLength();
-
-
- // Issue #4
- TMLTask* task = aCurrTrans->getCommand()->getTask();
- std::cout<<"what is this task?"<<task->toString()<<std::endl;
- const std::string cellClass = determineHTMLCellClass( taskCellClasses, task, nextCellClassIndex );
-
- writeHTMLColumn( myfile, aLength, cellClass, aCurrTrans->toShortString() );
-
- aCurrTime = aCurrTrans->getEndTime();
- }
- }
-
-
- myfile << "</tr>" << std::endl << "<tr>";
-
- for ( unsigned int aLength = 0; aLength < aCurrTime; aLength++ ) {
- myfile << "<th></th>";
- }
-
- myfile << "</tr>" << std::endl << "<tr>";
-
- for ( unsigned int aLength = 0; aLength <= aCurrTime; aLength += 5 ) {
- std::ostringstream spanVal;
- spanVal << aLength;
- writeHTMLColumn( myfile, 5, "sc", "", spanVal.str(), false );
- //myfile << "<td colspan=\"5\" class=\"sc\">" << aLength << "</td>";
- }
-
- myfile << "</tr>" << std::endl << "</table>" << std::endl << "<table>" << std::endl << "<tr>";
-
- for( std::map<TMLTask*, std::string>::iterator taskColIt = taskCellClasses.begin(); taskColIt != taskCellClasses.end(); ++taskColIt ) {
- TMLTask* task = (*taskColIt).first;
- // Unset the default td max-width of 5px. For some reason setting the max-with on a specific t style does not work
- myfile << "<td class=\"" << taskCellClasses[ task ] << "\"></td><td style=\"max-width: unset;\">" << task->toString() << "</td><td class=\"space\"></td>";
- }
-
- myfile << "</tr>" << std::endl;
-
-#ifdef ADD_COMMENTS
- bool aMoreComments = true, aInit = true;
- Comment* aComment;
-
- while ( aMoreComments ) {
- aMoreComments = false;
- myfile << "<tr>";
-
- for( std::map<TMLTask*, std::string>::iterator taskColIt = taskCellClasses.begin(); taskColIt != taskCellClasses.end(); ++taskColIt ) {
- //for(TaskList::const_iterator j=_taskList.begin(); j != _taskList.end(); ++j){
- TMLTask* task = (*taskColIt).first;
- std::string aCommentString = task->getNextComment( aInit, aComment );
-
- if ( aComment == 0 ) {
- myfile << "<td></td><td></td><td class=\"space\"></td>";
- }
- else {
- replaceAll(aCommentString,"<","<");
- replaceAll(aCommentString,">",">");
- aMoreComments = true;
- myfile << "<td style=\"max-width: unset;\">" << aComment->_time << "</td><td><pre>" << aCommentString << "</pre></td><td class=\"space\"></td>";
- }
- }
-
- aInit = false;
- myfile << "</tr>" << std::endl;
- }
-#endif
- myfile << "</table>" << std::endl;
- }
- std::cout<<"end in!!!"<<std::endl;
-}
diff --git a/simulators/c++2/src_simulator/arch/FPGA.h b/simulators/c++2/src_simulator/arch/FPGA.h
index 26b652f550cf7b08fa070c32663562fd71c5f720..e7aa72e06db2c45d7bda7e23c44175855034460a 100644
--- a/simulators/c++2/src_simulator/arch/FPGA.h
+++ b/simulators/c++2/src_simulator/arch/FPGA.h
@@ -71,6 +71,9 @@ public:
\param iID ID of the device
\param iName Name of the device
\param iScheduler Pointer to the scheduler object
+ \param iTimePerCycle 1/Processor frequency
+ \param iMapCapacity Pointer to the overall mapping capacity ????
+ \param iMapPenalty Pointer to the mapping penalty ????
\param iReconfigTime reconfiguration time
\param iChangeIdleModeCycles Cycles needed to switch into indle mode
\param iCyclesBeforeIdle Pointer to the max consecutive cycles before idle in cycle
@@ -78,7 +81,7 @@ public:
\param iCyclesPerExecc Cycles needed to execute one EXECC unit
*/
- FPGA(ID iID, std::string iName, WorkloadSource* iScheduler, TMLTime iReconfigTime, unsigned int iChangeIdleModeCycles, unsigned int iCyclesBeforeIdle,unsigned int iCyclesPerExeci, unsigned int iCyclesPerExecc);
+ FPGA(ID iID, std::string iName, WorkloadSource* iScheduler, TMLTime iTimePerCycle, TMLTime iReconfigTime, unsigned int iChangeIdleModeCycles, unsigned int iCyclesBeforeIdle,unsigned int iCyclesPerExeci, unsigned int iCyclesPerExecc);
///Destructor
virtual ~FPGA();
///Determines the next FPGA transaction to be executed
@@ -127,18 +130,10 @@ public:
_taskList.push_back(iTask);
if (_scheduler!=0) _scheduler->addWorkloadSource(iTask);
}
- inline void setTransNumber(unsigned int num) { _transNumber=num;}
- inline unsigned int getTransNumber() { return _transNumber;}
- double averageLoad (TMLTask* currTask) const;
- void drawPieChart(std::ofstream& myfile) const;
- void showPieChart(std::ofstream& myfile) const;
- void schedule2HTML(std::ofstream& myfile) const;
- inline const TaskList& getTaskList() const{return _taskList;}
- inline void setHtmlCurrTask(TMLTask *t) { _htmlCurrTask=t;}
protected:
///List of all tasks running on the FPGA
TaskList _taskList;
- TMLTask* _htmlCurrTask;
+
/**
\param iTime Indicates at what time the transaction should be truncated
*/
@@ -147,11 +142,12 @@ protected:
/**
\param iTimeSlice FPGA Time slice granted by the scheduler
*/
- void calcStartTimeLength();
+ void calcStartTimeLength(TMLTime iTimeSlice);
+ ///1/Processor frequency
+ TMLTime _timePerCycle;
TMLTime _reconfigTime;
-
///Determines the correct bus master of this CPU connected to the same bus as bus master iDummy
/**
\param iDummy Dummy Bus Master
@@ -163,25 +159,22 @@ protected:
TMLTransaction* _lastTransaction;
///List of bus masters
BusMasterList _busMasterList;
-
-
+#ifdef PENALTIES_ENABLED
///Cycles needed to switch to idle mode
unsigned int _changeIdleModeCycles;
///Idle cycles which elapse before entering idle mode
unsigned int _cyclesBeforeIdle;
-
+#endif
///Cycles needed to execute one execi unit
unsigned int _cyclesPerExeci;
- unsigned int _cyclesPerExecc;
///Time needed to execute one execi unit
float _timePerExeci;
-
+#ifdef PENALTIES_ENABLED
///Idle time which elapses before entering idle mode
TMLTime _timeBeforeIdle;
///Time needed to switch into idle mode
TMLTime _changeIdleModeTime;
- unsigned int _transNumber;
-
+#endif
///State variable for the VCD output
vcdFPGAVisState _vcdOutputState;
};
diff --git a/simulators/c++2/src_simulator/arch/RRScheduler.cpp b/simulators/c++2/src_simulator/arch/RRScheduler.cpp
index 804ecab31baf3e6e759636ff86c9ef4311fa5326..e6a025c019ec2fd523aba1dbc3a071189ef46bd4 100644
--- a/simulators/c++2/src_simulator/arch/RRScheduler.cpp
+++ b/simulators/c++2/src_simulator/arch/RRScheduler.cpp
@@ -123,9 +123,7 @@ TMLTime RRScheduler::schedule(TMLTime iEndSchedule){
// _nextTransaction->setLength(min(_nextTransaction->getOperationLength(), _timeSlice-_elapsedTime));
//}
//std::cout << "End schedule\n" ;
-
return _timeSlice-_elapsedTime;
-
}
//TMLTransaction* RRScheduler::getNextTransaction(TMLTime iEndSchedule) const{
diff --git a/simulators/c++2/src_simulator/arch/RRScheduler.h b/simulators/c++2/src_simulator/arch/RRScheduler.h
index d80bd381b4d8fa1847df872e0d1aa6a25ea772f4..1291fd2d42f2260ed81f7d998b36c576f3c2a17b 100644
--- a/simulators/c++2/src_simulator/arch/RRScheduler.h
+++ b/simulators/c++2/src_simulator/arch/RRScheduler.h
@@ -69,7 +69,7 @@ public:
///Destructor
~RRScheduler();
TMLTime schedule(TMLTime iEndSchedule);
- inline TMLTransaction* getNextTransaction(TMLTime iEndSchedule) const {if(_nextTransaction) std::cout<<"rr next trans"<<std::endl;return _nextTransaction;}
+ inline TMLTransaction* getNextTransaction(TMLTime iEndSchedule) const {return _nextTransaction;}
void reset();
std::istream& readObject(std::istream &is);
std::ostream& writeObject(std::ostream &os);
diff --git a/simulators/c++2/src_simulator/arch/SchedulableDevice.cpp b/simulators/c++2/src_simulator/arch/SchedulableDevice.cpp
index 3e50eac625004ae13f30fa5ec84f16300c7ede59..8522156a00b19edb9a814f4ef7955f3aa7f5f3e2 100644
--- a/simulators/c++2/src_simulator/arch/SchedulableDevice.cpp
+++ b/simulators/c++2/src_simulator/arch/SchedulableDevice.cpp
@@ -191,14 +191,13 @@ std::string SchedulableDevice::determineHTMLCellClass( std::map<TMLTask*, std::
double SchedulableDevice::averageLoad() const{
- std::cout<<"average load"<<std::endl;
double _averageLoad=0;
TMLTime _maxEndTime=0;
for( TransactionList::const_iterator i = _transactList.begin(); i != _transactList.end(); ++i ) {
TMLTime _endTime= (*i)->getEndTime();
_maxEndTime=max(_maxEndTime,_endTime);
}
- // std::cout<<"max end time is "<<_maxEndTime<<std::endl;
+ std::cout<<"max end time is "<<_maxEndTime<<std::endl;
for( TransactionList::const_iterator i = _transactList.begin(); i != _transactList.end(); ++i ) {
_averageLoad += (*i)->getEndTime() - (*i)->getStartTime();
diff --git a/simulators/c++2/src_simulator/arch/SingleCoreCPU.cpp b/simulators/c++2/src_simulator/arch/SingleCoreCPU.cpp
index f36d97a4536efdc046e54b255870600e3d26c6a3..f0ada248717b0bb94dbcba478a723acb7f38cadb 100644
--- a/simulators/c++2/src_simulator/arch/SingleCoreCPU.cpp
+++ b/simulators/c++2/src_simulator/arch/SingleCoreCPU.cpp
@@ -311,14 +311,12 @@ std::cout<<"addTransaction"<<std::endl;
void SingleCoreCPU::schedule(){
//std::cout <<"Hello\n";
- // std::cout << "CPU:schedule BEGIN " << _name << "+++++++++++++++++++++++++++++++++\n";
- std::cout<<"CPU schedule"<<std::endl;
+ std::cout << "CPU:schedule BEGIN " << _name << "+++++++++++++++++++++++++++++++++\n";
TMLTime aTimeSlice = _scheduler->schedule(_endSchedule);
-
+ //_schedulingNeeded=false; 05/05/11
+ //std::cout << "1\n";
TMLTransaction* aOldTransaction = _nextTransaction;
_nextTransaction=_scheduler->getNextTransaction(_endSchedule);
- if(_nextTransaction) std::cout<<"next trans is "<<_nextTransaction->toShortString()<<std::endl;
- else std::cout<<"next trans is 0"<<std::endl;
//std::cout << "2\n";
//_scheduler->transWasScheduled(this); //NEW 05/05/11
diff --git a/simulators/c++2/src_simulator/sim/Simulator.cpp b/simulators/c++2/src_simulator/sim/Simulator.cpp
index 71ac78db506b94bced1a9e94a60375305333a74a..bb0683206c8c5f8f380ba5e219a56d7527b84f5b 100644
--- a/simulators/c++2/src_simulator/sim/Simulator.cpp
+++ b/simulators/c++2/src_simulator/sim/Simulator.cpp
@@ -46,7 +46,6 @@
#include <SimComponents.h>
#include <IndeterminismSource.h>
#include <CPU.h>
-#include <FPGA.h>
#include <TMLTask.h>
#include <TMLChannel.h>
#include <ServerIF.h>
@@ -80,8 +79,7 @@ TMLTransaction* Simulator::getTransLowestEndTime(SchedulableDevice*& oResultDevi
#endif
//for(SchedulingList::const_iterator i=_simComp->_cpuList.begin(); i != _simComp->_cpuList.end(); ++i){
//for(CPUList::const_iterator i=_simComp->getCPUIterator(false); i != _simComp->getCPUIterator(true); ++i){
- // for(CPUList::const_iterator i=_simComp->getCPUList().begin(); i != _simComp->getCPUList().end(); ++i){
- for(FPGAList::const_iterator i=_simComp->getFPGAList().begin(); i != _simComp->getFPGAList().end(); ++i){
+ for(CPUList::const_iterator i=_simComp->getCPUList().begin(); i != _simComp->getCPUList().end(); ++i){
aTempDevice=*i;
aTempTrans=aTempDevice->getNextTransaction();
if (aTempTrans!=0 && aTempTrans->getVirtualLength()>0){
@@ -89,13 +87,10 @@ TMLTransaction* Simulator::getTransLowestEndTime(SchedulableDevice*& oResultDevi
std::cout << "kernel:getTLET: transaction found on " << aTempDevice->toString() << ": " << aTempTrans->toString() << std::endl;
#endif
//tmp++;
- std::cout<<aTempTrans->toShortString()<<"getEndtime is "<<aTempTrans->getEndTime()<<std::endl;
- std::cout<<"alowest time is "<<aLowestTime<<std::endl;
if (aTempTrans->getEndTime() < aLowestTime){
- std::cout<<"in!!!"<<std::endl;
aMarker=aTempTrans;
aLowestTime=aTempTrans->getEndTime();
- oResultDevice=aTempDevice;
+ oResultDevice=aTempDevice;
}
}
//#ifdef DEBUG_KERNEL
@@ -252,8 +247,7 @@ void Simulator::schedule2TXT(std::string& iTraceFileName) const{
std::ofstream myfile(iTraceFileName.c_str());
if (myfile.is_open()){
//for(CPUList::const_iterator i=_simComp->getCPUIterator(false); i != _simComp->getCPUIterator(true); ++i){
- //for(CPUList::const_iterator i=_simComp->getCPUList().begin(); i != _simComp->getCPUList().end(); ++i){
- for(FPGAList::const_iterator i=_simComp->getFPGAList().begin(); i != _simComp->getFPGAList().end(); ++i){
+ for(CPUList::const_iterator i=_simComp->getCPUList().begin(); i != _simComp->getCPUList().end(); ++i){
(*i)->schedule2TXT(myfile);
}
//for(BusList::const_iterator j=_simComp->getBusIterator(false); j != _simComp->getBusIterator(true); ++j){
@@ -368,9 +362,6 @@ std::cout<<"schedule2HTML--------------------------------------*****************
for(CPUList::const_iterator i=_simComp->getCPUList().begin(); i != _simComp->getCPUList().end(); ++i){
(*i)->drawPieChart(myfile);
}
- for(FPGAList::const_iterator i=_simComp->getFPGAList().begin(); i != _simComp->getFPGAList().end(); ++i){
- (*i)->drawPieChart(myfile);
- }
for(BusList::const_iterator j=_simComp->getBusList().begin(); j != _simComp->getBusList().end(); ++j){
(*j)->drawPieChart(myfile);
}
@@ -396,16 +387,6 @@ std::cout<<"schedule2HTML--------------------------------------*****************
}
jsfile.close();
- for(FPGAList::const_iterator j=_simComp->getFPGAList().begin(); j != _simComp->getFPGAList().end(); ++j){
- for(TaskList::const_iterator i = (*j)->getTaskList().begin(); i != (*j)->getTaskList().end(); ++i){
- (*j)->setHtmlCurrTask(*i);
- std::cout<<"begin fpga html "<<(*j)->toShortString()<<std::endl;
- (*j)->schedule2HTML(myfile);
- std::cout<<"end fpga html "<<(*j)->toShortString()<<std::endl;
- (*j)->showPieChart(myfile);
- }
- }
-
for(BusList::const_iterator j=_simComp->getBusList().begin(); j != _simComp->getBusList().end(); ++j){
(*j)->schedule2HTML(myfile);
(*j)->showPieChart(myfile);
@@ -573,23 +554,21 @@ bool Simulator::channelImpactsCommand(TMLChannel* iCh, TMLCommand* iCmd){
}
bool Simulator::simulate(TMLTransaction*& oLastTrans){
- //TMLTransaction* depTransaction,*depCPUnextTrans,*transLET;
- //TMLCommand* commandLET,*depCommand,*depCPUnextCommand;
- TMLTransaction* depTransaction,*depFPGAnextTrans,*transLET;
- TMLCommand* commandLET,*depCommand,*depFPGAnextCommand;
+ TMLTransaction* depTransaction,*depCPUnextTrans,*transLET;
+ TMLCommand* commandLET,*depCommand,*depCPUnextCommand;
TMLTask* depTask;
- // SchedulableDevice* cpuLET;
- // CPU* depCPU;
- SchedulableDevice* fpgaLET;
- FPGA* depFPGA;
+ SchedulableDevice* cpuLET;
+ CPU* depCPU;
#ifdef DEBUG_KERNEL
std::cout << "kernel:simulate: first schedule" << std::endl;
#endif
_simComp->setStopFlag(false,"");
-
+ //std::cout << "before loop " << std::endl;
//for(TaskList::const_iterator i=_simComp->getTaskIterator(false); i!=_simComp->getTaskIterator(true);i++){
for(TaskList::const_iterator i=_simComp->getTaskList().begin(); i!=_simComp->getTaskList().end();i++){
+ //std::cout << "loop it " << (*i)->toString() << std::endl;
if ((*i)->getCurrCommand()!=0) (*i)->getCurrCommand()->prepare(true);
+ //std::cout << "loop it end" << (*i)->toString() << std::endl;
}
//std::cout << "after loop1" << std::endl;
#ifdef EBRDD_ENABLED
@@ -601,15 +580,10 @@ bool Simulator::simulate(TMLTransaction*& oLastTrans){
//for_each(_simComp->getCPUIterator(false), _simComp->getCPUIterator(true),std::mem_fun(&CPU::setRescheduleFlag));
//for_each(_simComp->getCPUIterator(false), _simComp->getCPUIterator(true),std::mem_fun(&CPU::schedule));
std::cout<<"simulate"<<std::endl;
- //for_each(_simComp->getCPUList().begin(), _simComp->getCPUList().end(),std::mem_fun(&CPU::schedule));
- for_each(_simComp->getFPGAList().begin(), _simComp->getFPGAList().end(),std::mem_fun(&FPGA::schedule));
- std::cout<<"simulate schedule end!!!"<<std::endl;
-
- //transLET=getTransLowestEndTime(cpuLET);
- std::cout<<"simulator get next transaction begin"<<std::endl;
- transLET=getTransLowestEndTime(fpgaLET);
- std::cout<<"simulator get next transaction end"<<std::endl;
-
+ for_each(_simComp->getCPUList().begin(), _simComp->getCPUList().end(),std::mem_fun(&CPU::schedule));
+ //std::cout << "after schedule" << std::endl;
+ transLET=getTransLowestEndTime(cpuLET);
+ //std::cout << "after getTLET" << std::endl;
#ifdef LISTENERS_ENABLED
if (_wasReset) NOTIFY_SIM_STARTED();
_wasReset=false;
@@ -624,14 +598,11 @@ bool Simulator::simulate(TMLTransaction*& oLastTrans){
//}
#ifdef DEBUG_KERNEL
std::cout << "kernel:simulate: BEFORE add trans " << commandLET->toString() << std::endl;
- // std::cout << "cpuLET= " << cpuLET->toString() << std::endl;
- std::cout << "fpgaLET= " << fpgaLET->toString() << std::endl;
+ std::cout << "cpuLET= " << cpuLET->toString() << std::endl;
std::cout << "kernel:simulate:cpuLET printed" << std::endl;
#endif
std::cout<<"in simulator begin addTransaction "<<std::endl;
- // bool x = cpuLET->addTransaction(0);
- std::cout << "fpgaLET= " << fpgaLET->toString() << std::endl;
- bool x = fpgaLET->addTransaction(0);
+ bool x = cpuLET->addTransaction(0);
// cpuLET->setCycleTime(0);
std::cout<<"in simulator end addTransactin "<<std::endl;
@@ -651,12 +622,10 @@ bool Simulator::simulate(TMLTransaction*& oLastTrans){
#ifdef DEBUG_KERNEL
std::cout << "kernel:simulate: dependent Task found" << std::endl;
#endif
- // depCPU=depTask->getCPU();
- depFPGA=depTask->getFPGA();
+ depCPU=depTask->getCPU();
//std::cout << "CPU this task : " << cpuLET->toString();
//if (depCPU==0) std::cout << " CPU dep task " << depTask->toString() << ": 0\n"; else std::cout << " CPU dep task: "<< depTask->toString() << " " << depCPU->toString() << std::endl;
- // if (depCPU!=cpuLET){
- if(depFPGA!=fpgaLET){
+ if (depCPU!=cpuLET){
#ifdef DEBUG_KERNEL
std::cout << "kernel:simulate: Tasks running on different CPUs" << std::endl;
#endif
@@ -681,37 +650,28 @@ bool Simulator::simulate(TMLTransaction*& oLastTrans){
continue;
}*/
//std::cout << "Let's crash!!!!!!!!\n";
- //depCPUnextTrans=depCPU->getNextTransaction();
- std::cout<<"depFpga get nexttrans begin"<<std::endl;
- depFPGAnextTrans=depFPGA->getNextTransaction();
- std::cout<<"depFpga get nexttrans end"<<std::endl;
+ depCPUnextTrans=depCPU->getNextTransaction();
//std::cout << "Not crahed!!!!!!!!\n";
- // if (depCPUnextTrans!=0){
- if(depFPGAnextTrans!=0){
+ if (depCPUnextTrans!=0){
#ifdef DEBUG_KERNEL
std::cout << "kernel:simulate: transaction scheduled on dependent CPU" << std::endl;
#endif
- //depCPUnextCommand=depCPUnextTrans->getCommand();
- depFPGAnextCommand=depFPGAnextTrans->getCommand();
- // if (depCPUnextCommand->getTask()!=depTask){
- if (depFPGAnextCommand->getTask()!=depTask){
+ depCPUnextCommand=depCPUnextTrans->getCommand();
+ if (depCPUnextCommand->getTask()!=depTask){
#ifdef DEBUG_KERNEL
std::cout << "kernel:simulate: dependent task not yet scheduled on dependent CPU" << std::endl;
#endif
- // depCPU->truncateAndAddNextTransAt(transLET->getEndTime());
- // depFPGA->truncateAndAddNextTransAt(transLET->getEndTime());
+ depCPU->truncateAndAddNextTransAt(transLET->getEndTime());
#ifdef DEBUG_KERNEL
std::cout << "kernel:simulate: dependent transaction truncated" << std::endl;
#endif
}
}else{
#ifdef DEBUG_KERNEL
- //std::cout << "kernel:simulate: schedule dependent CPU " << depCPU->toString() << std::endl;
+ std::cout << "kernel:simulate: schedule dependent CPU " << depCPU->toString() << std::endl;
#endif
- std::cout<<"depfpga schedule begin"<<std::endl;
- depFPGA->schedule();
- std::cout<<"depfpga schedule end"<<std::endl;
+ depCPU->schedule();
}
}
}
@@ -728,10 +688,7 @@ bool Simulator::simulate(TMLTransaction*& oLastTrans){
if (*i!=cpuLET) (*i)->rescheduleIfNecessary();
}
}*/
- // cpuLET->schedule();
- std::cout<<"fpgalet schedule begin"<<std::endl;
- fpgaLET->schedule();
- std::cout<<"fpgalet schedule end"<<std::endl;
+ cpuLET->schedule();
#ifdef LISTENERS_ENABLED
NOTIFY_TIME_ADVANCES(transLET->getEndTime());
#endif
@@ -739,12 +696,7 @@ bool Simulator::simulate(TMLTransaction*& oLastTrans){
oLastTrans=transLET;
//std::cout << "kernel:simulate: getTransLowestEndTime" << std::endl;
- //transLET=getTransLowestEndTime(cpuLET);
- std::cout<<"~~~~~~get next trans begin"<<std::endl;
-
- transLET=getTransLowestEndTime(fpgaLET);
-
- std::cout<<"~~~~get next trans end"<<std::endl;
+ transLET=getTransLowestEndTime(cpuLET);
//_syncInfo->_server->sendReply("Sleep once again\n");
//sleep(1);
diff --git a/simulators/c++2/src_simulator/sim/Simulator.h b/simulators/c++2/src_simulator/sim/Simulator.h
index f9674446c165c1b1c5cdd658adbf98fa5680936d..173b66cb5010ec4865bb0e85f973621832cbed7a 100644
--- a/simulators/c++2/src_simulator/sim/Simulator.h
+++ b/simulators/c++2/src_simulator/sim/Simulator.h
@@ -71,7 +71,6 @@ Ludovic Apvrille, Renaud Pacalet
#endif
class CPU;
-class FPGA;
class TMLTransaction;
class TMLCommand;
class TMLTask;