diff --git a/doc/config_linux.xml b/doc/config_linux.xml
index 41256f6989412a8ddfb9ee911cee35c0b1cda59a..22e478ab988ae5fc4a874b4afb357ba103a7b5d9 100755
--- a/doc/config_linux.xml
+++ b/doc/config_linux.xml
@@ -23,7 +23,7 @@
<SystemCCodeCompileCommand data="make" />
<SystemCCodeExecuteCommand data="../simulators/c++2/run.x -ovcd ../simulators/c++2/vcddump.vcd" />
<SystemCCodeInteractiveExecuteCommand data="../simulators/c++2/run.x -server" />
-<TMLCodeDirectory data="../tmlcode" />
+<TMLCodeDirectory data="../tmlcode/" />
<GTKWavePath data="/usr/bin/gtkwave" />
<VCDPath data="../vcd/" />
<UPPAALCodeDirectory data="../uppaal/" />
diff --git a/doc/config_macosx.xml b/doc/config_macosx.xml
index 051791d18aa106f6962f4c189af6a7501c03e1d9..f1b9ed8ca066ff0e4933958373391631c6f824d8 100755
--- a/doc/config_macosx.xml
+++ b/doc/config_macosx.xml
@@ -23,7 +23,7 @@
<SystemCCodeCompileCommand data="make" />
<SystemCCodeExecuteCommand data="../simulators/c++2/run.x -ovcd ../simulators/c++2/vcddump.vcd" />
<SystemCCodeInteractiveExecuteCommand data="../simulators/c++2/run.x -server" />
-<TMLCodeDirectory data="../tmlcode" />
+<TMLCodeDirectory data="../tmlcode/" />
<GTKWavePath data="/usr/bin/gtkwave" />
<VCDPath data="../vcd/" />
<UPPAALCodeDirectory data="../uppaal/" />
diff --git a/doc/config_windows.xml b/doc/config_windows.xml
index 5b62ce8058011c2121715ed3a09d0c253c07aa68..33da8b3b5ab6854d35b0899e8e3128ef1d9b096a 100755
--- a/doc/config_windows.xml
+++ b/doc/config_windows.xml
@@ -23,7 +23,7 @@
<SystemCCodeCompileCommand data="make" />
<SystemCCodeExecuteCommand data="../simulators/c++2/run.x -ovcd ../simulators/c++2/vcddump.vcd" />
<SystemCCodeInteractiveExecuteCommand data="../simulators/c++2/run.x -server" />
-<TMLCodeDirectory data="../tmlcode" />
+<TMLCodeDirectory data="../tmlcode/" />
<GTKWavePath data="/usr/bin/gtkwave" />
<VCDPath data="../vcd/" />
<UPPAALCodeDirectory data="../uppaal/" />
diff --git a/libs/commons-io-2.4-javadoc.jar b/libs/commons-io-2.4-javadoc.jar
deleted file mode 100644
index e388f287f903ee9777a12451b83cd4b08bc9ae5c..0000000000000000000000000000000000000000
Binary files a/libs/commons-io-2.4-javadoc.jar and /dev/null differ
diff --git a/libs/commons-io-2.5-javadoc.jar b/libs/commons-io-2.5-javadoc.jar
deleted file mode 100644
index b9575294aea25ddb56d521a106419af723a64545..0000000000000000000000000000000000000000
Binary files a/libs/commons-io-2.5-javadoc.jar and /dev/null differ
diff --git a/modeling/DIPLODOCUS/SmartCardProtocol.xml b/modeling/DIPLODOCUS/SmartCardProtocol.xml
index e3b674d599761fe7f953035f621e786f77fc27fa..8a81bb5d7aecda736d574145e7b4d524551ac170 100755
--- a/modeling/DIPLODOCUS/SmartCardProtocol.xml
+++ b/modeling/DIPLODOCUS/SmartCardProtocol.xml
@@ -6155,227 +6155,227 @@ On prend b=1 comme exemple
<Modeling type="TML Architecture" nameTab="Mapping1" >
<TMLArchiDiagramPanel name="DIPLODOCUS architecture and mapping Diagram" minX="10" maxX="1400" minY="10" maxY="900" attributes="0" masterClockFrequency="200" >
-<COMPONENT type="1102" id="1507" >
+<COMPONENT type="1102" id="1407" >
<cdparam x="612" y="448" />
<sizeparam width="250" height="50" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="Bus0" value="name" />
-<TGConnectingPoint num="0" id="1483" />
-<TGConnectingPoint num="1" id="1484" />
-<TGConnectingPoint num="2" id="1485" />
-<TGConnectingPoint num="3" id="1486" />
-<TGConnectingPoint num="4" id="1487" />
-<TGConnectingPoint num="5" id="1488" />
-<TGConnectingPoint num="6" id="1489" />
-<TGConnectingPoint num="7" id="1490" />
-<TGConnectingPoint num="8" id="1491" />
-<TGConnectingPoint num="9" id="1492" />
-<TGConnectingPoint num="10" id="1493" />
-<TGConnectingPoint num="11" id="1494" />
-<TGConnectingPoint num="12" id="1495" />
-<TGConnectingPoint num="13" id="1496" />
-<TGConnectingPoint num="14" id="1497" />
-<TGConnectingPoint num="15" id="1498" />
-<TGConnectingPoint num="16" id="1499" />
-<TGConnectingPoint num="17" id="1500" />
-<TGConnectingPoint num="18" id="1501" />
-<TGConnectingPoint num="19" id="1502" />
-<TGConnectingPoint num="20" id="1503" />
-<TGConnectingPoint num="21" id="1504" />
-<TGConnectingPoint num="22" id="1505" />
-<TGConnectingPoint num="23" id="1506" />
+<TGConnectingPoint num="0" id="1383" />
+<TGConnectingPoint num="1" id="1384" />
+<TGConnectingPoint num="2" id="1385" />
+<TGConnectingPoint num="3" id="1386" />
+<TGConnectingPoint num="4" id="1387" />
+<TGConnectingPoint num="5" id="1388" />
+<TGConnectingPoint num="6" id="1389" />
+<TGConnectingPoint num="7" id="1390" />
+<TGConnectingPoint num="8" id="1391" />
+<TGConnectingPoint num="9" id="1392" />
+<TGConnectingPoint num="10" id="1393" />
+<TGConnectingPoint num="11" id="1394" />
+<TGConnectingPoint num="12" id="1395" />
+<TGConnectingPoint num="13" id="1396" />
+<TGConnectingPoint num="14" id="1397" />
+<TGConnectingPoint num="15" id="1398" />
+<TGConnectingPoint num="16" id="1399" />
+<TGConnectingPoint num="17" id="1400" />
+<TGConnectingPoint num="18" id="1401" />
+<TGConnectingPoint num="19" id="1402" />
+<TGConnectingPoint num="20" id="1403" />
+<TGConnectingPoint num="21" id="1404" />
+<TGConnectingPoint num="22" id="1405" />
+<TGConnectingPoint num="23" id="1406" />
<extraparam>
<info stereotype="BUS-RR" nodeName="Bus0" />
<attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" clockRatio="1" privacy="0" referenceAttack="null" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1105" id="1532" >
+<COMPONENT type="1105" id="1432" >
<cdparam x="796" y="121" />
<sizeparam width="200" height="200" minWidth="100" minHeight="35" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="Memory0" value="name" />
-<TGConnectingPoint num="0" id="1508" />
-<TGConnectingPoint num="1" id="1509" />
-<TGConnectingPoint num="2" id="1510" />
-<TGConnectingPoint num="3" id="1511" />
-<TGConnectingPoint num="4" id="1512" />
-<TGConnectingPoint num="5" id="1513" />
-<TGConnectingPoint num="6" id="1514" />
-<TGConnectingPoint num="7" id="1515" />
-<TGConnectingPoint num="8" id="1516" />
-<TGConnectingPoint num="9" id="1517" />
-<TGConnectingPoint num="10" id="1518" />
-<TGConnectingPoint num="11" id="1519" />
-<TGConnectingPoint num="12" id="1520" />
-<TGConnectingPoint num="13" id="1521" />
-<TGConnectingPoint num="14" id="1522" />
-<TGConnectingPoint num="15" id="1523" />
-<TGConnectingPoint num="16" id="1524" />
-<TGConnectingPoint num="17" id="1525" />
-<TGConnectingPoint num="18" id="1526" />
-<TGConnectingPoint num="19" id="1527" />
-<TGConnectingPoint num="20" id="1528" />
-<TGConnectingPoint num="21" id="1529" />
-<TGConnectingPoint num="22" id="1530" />
-<TGConnectingPoint num="23" id="1531" />
+<TGConnectingPoint num="0" id="1408" />
+<TGConnectingPoint num="1" id="1409" />
+<TGConnectingPoint num="2" id="1410" />
+<TGConnectingPoint num="3" id="1411" />
+<TGConnectingPoint num="4" id="1412" />
+<TGConnectingPoint num="5" id="1413" />
+<TGConnectingPoint num="6" id="1414" />
+<TGConnectingPoint num="7" id="1415" />
+<TGConnectingPoint num="8" id="1416" />
+<TGConnectingPoint num="9" id="1417" />
+<TGConnectingPoint num="10" id="1418" />
+<TGConnectingPoint num="11" id="1419" />
+<TGConnectingPoint num="12" id="1420" />
+<TGConnectingPoint num="13" id="1421" />
+<TGConnectingPoint num="14" id="1422" />
+<TGConnectingPoint num="15" id="1423" />
+<TGConnectingPoint num="16" id="1424" />
+<TGConnectingPoint num="17" id="1425" />
+<TGConnectingPoint num="18" id="1426" />
+<TGConnectingPoint num="19" id="1427" />
+<TGConnectingPoint num="20" id="1428" />
+<TGConnectingPoint num="21" id="1429" />
+<TGConnectingPoint num="22" id="1430" />
+<TGConnectingPoint num="23" id="1431" />
<extraparam>
<info stereotype="MEMORY" nodeName="Memory0" />
<attributes byteDataSize="4" memorySize="1024" clockRatio="1" bufferType="0" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1100" id="1652" >
+<COMPONENT type="1100" id="1502" >
<cdparam x="51" y="90" />
<sizeparam width="459" height="321" minWidth="150" minHeight="150" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="cpu0" value="name" />
-<TGConnectingPoint num="0" id="1628" />
-<TGConnectingPoint num="1" id="1629" />
-<TGConnectingPoint num="2" id="1630" />
-<TGConnectingPoint num="3" id="1631" />
-<TGConnectingPoint num="4" id="1632" />
-<TGConnectingPoint num="5" id="1633" />
-<TGConnectingPoint num="6" id="1634" />
-<TGConnectingPoint num="7" id="1635" />
-<TGConnectingPoint num="8" id="1636" />
-<TGConnectingPoint num="9" id="1637" />
-<TGConnectingPoint num="10" id="1638" />
-<TGConnectingPoint num="11" id="1639" />
-<TGConnectingPoint num="12" id="1640" />
-<TGConnectingPoint num="13" id="1641" />
-<TGConnectingPoint num="14" id="1642" />
-<TGConnectingPoint num="15" id="1643" />
-<TGConnectingPoint num="16" id="1644" />
-<TGConnectingPoint num="17" id="1645" />
-<TGConnectingPoint num="18" id="1646" />
-<TGConnectingPoint num="19" id="1647" />
-<TGConnectingPoint num="20" id="1648" />
-<TGConnectingPoint num="21" id="1649" />
-<TGConnectingPoint num="22" id="1650" />
-<TGConnectingPoint num="23" id="1651" />
+<TGConnectingPoint num="0" id="1478" />
+<TGConnectingPoint num="1" id="1479" />
+<TGConnectingPoint num="2" id="1480" />
+<TGConnectingPoint num="3" id="1481" />
+<TGConnectingPoint num="4" id="1482" />
+<TGConnectingPoint num="5" id="1483" />
+<TGConnectingPoint num="6" id="1484" />
+<TGConnectingPoint num="7" id="1485" />
+<TGConnectingPoint num="8" id="1486" />
+<TGConnectingPoint num="9" id="1487" />
+<TGConnectingPoint num="10" id="1488" />
+<TGConnectingPoint num="11" id="1489" />
+<TGConnectingPoint num="12" id="1490" />
+<TGConnectingPoint num="13" id="1491" />
+<TGConnectingPoint num="14" id="1492" />
+<TGConnectingPoint num="15" id="1493" />
+<TGConnectingPoint num="16" id="1494" />
+<TGConnectingPoint num="17" id="1495" />
+<TGConnectingPoint num="18" id="1496" />
+<TGConnectingPoint num="19" id="1497" />
+<TGConnectingPoint num="20" id="1498" />
+<TGConnectingPoint num="21" id="1499" />
+<TGConnectingPoint num="22" id="1500" />
+<TGConnectingPoint num="23" id="1501" />
<extraparam>
<info stereotype="CPURRPB" nodeName="cpu0" />
<attributes nbOfCores="1" byteDataSize="4" schedulingPolicy="1" sliceTime="10000" goIdleTime="10" maxConsecutiveIdleCycles="10" pipelineSize="5" taskSwitchingTime="20" branchingPredictionPenalty="99" cacheMiss="5" execiTime="1" execcTime="1" clockRatio="1" MECType="0" encryption="0"/>
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1101" id="1591" >
-<father id="1652" num="0" />
+<SUBCOMPONENT type="1101" id="1441" >
+<father id="1502" num="0" />
<cdparam x="226" y="304" />
<sizeparam width="109" height="50" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="350" minY="0" maxY="271" />
<infoparam name="TGComponent" value="AppC::Timer" />
-<TGConnectingPoint num="0" id="1583" />
-<TGConnectingPoint num="1" id="1584" />
-<TGConnectingPoint num="2" id="1585" />
-<TGConnectingPoint num="3" id="1586" />
-<TGConnectingPoint num="4" id="1587" />
-<TGConnectingPoint num="5" id="1588" />
-<TGConnectingPoint num="6" id="1589" />
-<TGConnectingPoint num="7" id="1590" />
+<TGConnectingPoint num="0" id="1433" />
+<TGConnectingPoint num="1" id="1434" />
+<TGConnectingPoint num="2" id="1435" />
+<TGConnectingPoint num="3" id="1436" />
+<TGConnectingPoint num="4" id="1437" />
+<TGConnectingPoint num="5" id="1438" />
+<TGConnectingPoint num="6" id="1439" />
+<TGConnectingPoint num="7" id="1440" />
<extraparam>
<info value="AppC::Timer" taskName="Timer" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1101" id="1600" >
-<father id="1652" num="1" />
+<SUBCOMPONENT type="1101" id="1450" >
+<father id="1502" num="1" />
<cdparam x="290" y="234" />
-<sizeparam width="139" height="50" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="144" height="50" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="320" minY="0" maxY="271" />
+<cdrectangleparam minX="0" maxX="315" minY="0" maxY="271" />
<infoparam name="TGComponent" value="AppC::Application" />
-<TGConnectingPoint num="0" id="1592" />
-<TGConnectingPoint num="1" id="1593" />
-<TGConnectingPoint num="2" id="1594" />
-<TGConnectingPoint num="3" id="1595" />
-<TGConnectingPoint num="4" id="1596" />
-<TGConnectingPoint num="5" id="1597" />
-<TGConnectingPoint num="6" id="1598" />
-<TGConnectingPoint num="7" id="1599" />
+<TGConnectingPoint num="0" id="1442" />
+<TGConnectingPoint num="1" id="1443" />
+<TGConnectingPoint num="2" id="1444" />
+<TGConnectingPoint num="3" id="1445" />
+<TGConnectingPoint num="4" id="1446" />
+<TGConnectingPoint num="5" id="1447" />
+<TGConnectingPoint num="6" id="1448" />
+<TGConnectingPoint num="7" id="1449" />
<extraparam>
<info value="AppC::Application" taskName="Application" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1101" id="1609" >
-<father id="1652" num="2" />
+<SUBCOMPONENT type="1101" id="1459" >
+<father id="1502" num="2" />
<cdparam x="96" y="246" />
-<sizeparam width="108" height="50" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="109" height="50" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="351" minY="0" maxY="271" />
+<cdrectangleparam minX="0" maxX="350" minY="0" maxY="271" />
<infoparam name="TGComponent" value="AppC::TCPIP" />
-<TGConnectingPoint num="0" id="1601" />
-<TGConnectingPoint num="1" id="1602" />
-<TGConnectingPoint num="2" id="1603" />
-<TGConnectingPoint num="3" id="1604" />
-<TGConnectingPoint num="4" id="1605" />
-<TGConnectingPoint num="5" id="1606" />
-<TGConnectingPoint num="6" id="1607" />
-<TGConnectingPoint num="7" id="1608" />
+<TGConnectingPoint num="0" id="1451" />
+<TGConnectingPoint num="1" id="1452" />
+<TGConnectingPoint num="2" id="1453" />
+<TGConnectingPoint num="3" id="1454" />
+<TGConnectingPoint num="4" id="1455" />
+<TGConnectingPoint num="5" id="1456" />
+<TGConnectingPoint num="6" id="1457" />
+<TGConnectingPoint num="7" id="1458" />
<extraparam>
<info value="AppC::TCPIP" taskName="TCPIP" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1101" id="1618" >
-<father id="1652" num="3" />
+<SUBCOMPONENT type="1101" id="1468" >
+<father id="1502" num="3" />
<cdparam x="291" y="153" />
-<sizeparam width="136" height="50" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="141" height="50" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="323" minY="0" maxY="271" />
+<cdrectangleparam minX="0" maxX="318" minY="0" maxY="271" />
<infoparam name="TGComponent" value="AppC::SmartCard" />
-<TGConnectingPoint num="0" id="1610" />
-<TGConnectingPoint num="1" id="1611" />
-<TGConnectingPoint num="2" id="1612" />
-<TGConnectingPoint num="3" id="1613" />
-<TGConnectingPoint num="4" id="1614" />
-<TGConnectingPoint num="5" id="1615" />
-<TGConnectingPoint num="6" id="1616" />
-<TGConnectingPoint num="7" id="1617" />
+<TGConnectingPoint num="0" id="1460" />
+<TGConnectingPoint num="1" id="1461" />
+<TGConnectingPoint num="2" id="1462" />
+<TGConnectingPoint num="3" id="1463" />
+<TGConnectingPoint num="4" id="1464" />
+<TGConnectingPoint num="5" id="1465" />
+<TGConnectingPoint num="6" id="1466" />
+<TGConnectingPoint num="7" id="1467" />
<extraparam>
<info value="AppC::SmartCard" taskName="SmartCard" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1101" id="1627" >
-<father id="1652" num="4" />
+<SUBCOMPONENT type="1101" id="1477" >
+<father id="1502" num="4" />
<cdparam x="92" y="154" />
-<sizeparam width="163" height="50" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="172" height="50" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="296" minY="0" maxY="271" />
+<cdrectangleparam minX="0" maxX="287" minY="0" maxY="271" />
<infoparam name="TGComponent" value="AppC::InterfaceDevice" />
-<TGConnectingPoint num="0" id="1619" />
-<TGConnectingPoint num="1" id="1620" />
-<TGConnectingPoint num="2" id="1621" />
-<TGConnectingPoint num="3" id="1622" />
-<TGConnectingPoint num="4" id="1623" />
-<TGConnectingPoint num="5" id="1624" />
-<TGConnectingPoint num="6" id="1625" />
-<TGConnectingPoint num="7" id="1626" />
+<TGConnectingPoint num="0" id="1469" />
+<TGConnectingPoint num="1" id="1470" />
+<TGConnectingPoint num="2" id="1471" />
+<TGConnectingPoint num="3" id="1472" />
+<TGConnectingPoint num="4" id="1473" />
+<TGConnectingPoint num="5" id="1474" />
+<TGConnectingPoint num="6" id="1475" />
+<TGConnectingPoint num="7" id="1476" />
<extraparam>
<info value="AppC::InterfaceDevice" taskName="InterfaceDevice" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="125" id="1653" >
+<CONNECTOR type="125" id="1503" >
<cdparam x="800" y="322" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="{info}" />
-<P1 x="846" y="321" id="1522" />
-<P2 x="799" y="448" id="1492" />
+<P1 x="846" y="321" id="1422" />
+<P2 x="799" y="448" id="1392" />
<AutomaticDrawing data="true" />
<extraparam>
<info priority="0" />
<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="1654" >
+<CONNECTOR type="125" id="1504" >
<cdparam x="510" y="411" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="{info}" />
-<P1 x="510" y="411" id="1635" />
-<P2 x="612" y="460" id="1493" />
+<P1 x="510" y="411" id="1485" />
+<P2 x="612" y="460" id="1393" />
<AutomaticDrawing data="true" />
<extraparam>
<info priority="0" />
@@ -6392,323 +6392,323 @@ On prend b=1 comme exemple
<Modeling type="TML Architecture" nameTab="Mapping2" >
<TMLArchiDiagramPanel name="DIPLODOCUS architecture and mapping Diagram" minX="10" maxX="1400" minY="10" maxY="900" attributes="0" masterClockFrequency="200" >
-<COMPONENT type="1105" id="1679" >
+<COMPONENT type="1105" id="1529" >
<cdparam x="420" y="527" />
<sizeparam width="189" height="131" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="Memory0" value="name" />
-<TGConnectingPoint num="0" id="1655" />
-<TGConnectingPoint num="1" id="1656" />
-<TGConnectingPoint num="2" id="1657" />
-<TGConnectingPoint num="3" id="1658" />
-<TGConnectingPoint num="4" id="1659" />
-<TGConnectingPoint num="5" id="1660" />
-<TGConnectingPoint num="6" id="1661" />
-<TGConnectingPoint num="7" id="1662" />
-<TGConnectingPoint num="8" id="1663" />
-<TGConnectingPoint num="9" id="1664" />
-<TGConnectingPoint num="10" id="1665" />
-<TGConnectingPoint num="11" id="1666" />
-<TGConnectingPoint num="12" id="1667" />
-<TGConnectingPoint num="13" id="1668" />
-<TGConnectingPoint num="14" id="1669" />
-<TGConnectingPoint num="15" id="1670" />
-<TGConnectingPoint num="16" id="1671" />
-<TGConnectingPoint num="17" id="1672" />
-<TGConnectingPoint num="18" id="1673" />
-<TGConnectingPoint num="19" id="1674" />
-<TGConnectingPoint num="20" id="1675" />
-<TGConnectingPoint num="21" id="1676" />
-<TGConnectingPoint num="22" id="1677" />
-<TGConnectingPoint num="23" id="1678" />
+<TGConnectingPoint num="0" id="1505" />
+<TGConnectingPoint num="1" id="1506" />
+<TGConnectingPoint num="2" id="1507" />
+<TGConnectingPoint num="3" id="1508" />
+<TGConnectingPoint num="4" id="1509" />
+<TGConnectingPoint num="5" id="1510" />
+<TGConnectingPoint num="6" id="1511" />
+<TGConnectingPoint num="7" id="1512" />
+<TGConnectingPoint num="8" id="1513" />
+<TGConnectingPoint num="9" id="1514" />
+<TGConnectingPoint num="10" id="1515" />
+<TGConnectingPoint num="11" id="1516" />
+<TGConnectingPoint num="12" id="1517" />
+<TGConnectingPoint num="13" id="1518" />
+<TGConnectingPoint num="14" id="1519" />
+<TGConnectingPoint num="15" id="1520" />
+<TGConnectingPoint num="16" id="1521" />
+<TGConnectingPoint num="17" id="1522" />
+<TGConnectingPoint num="18" id="1523" />
+<TGConnectingPoint num="19" id="1524" />
+<TGConnectingPoint num="20" id="1525" />
+<TGConnectingPoint num="21" id="1526" />
+<TGConnectingPoint num="22" id="1527" />
+<TGConnectingPoint num="23" id="1528" />
<extraparam>
<info stereotype="MEMORY" nodeName="Memory0" />
<attributes byteDataSize="4" memorySize="1024" clockRatio="1" bufferType="0" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1102" id="1704" >
+<COMPONENT type="1102" id="1554" >
<cdparam x="389" y="438" />
<sizeparam width="250" height="50" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="Bus0" value="name" />
-<TGConnectingPoint num="0" id="1680" />
-<TGConnectingPoint num="1" id="1681" />
-<TGConnectingPoint num="2" id="1682" />
-<TGConnectingPoint num="3" id="1683" />
-<TGConnectingPoint num="4" id="1684" />
-<TGConnectingPoint num="5" id="1685" />
-<TGConnectingPoint num="6" id="1686" />
-<TGConnectingPoint num="7" id="1687" />
-<TGConnectingPoint num="8" id="1688" />
-<TGConnectingPoint num="9" id="1689" />
-<TGConnectingPoint num="10" id="1690" />
-<TGConnectingPoint num="11" id="1691" />
-<TGConnectingPoint num="12" id="1692" />
-<TGConnectingPoint num="13" id="1693" />
-<TGConnectingPoint num="14" id="1694" />
-<TGConnectingPoint num="15" id="1695" />
-<TGConnectingPoint num="16" id="1696" />
-<TGConnectingPoint num="17" id="1697" />
-<TGConnectingPoint num="18" id="1698" />
-<TGConnectingPoint num="19" id="1699" />
-<TGConnectingPoint num="20" id="1700" />
-<TGConnectingPoint num="21" id="1701" />
-<TGConnectingPoint num="22" id="1702" />
-<TGConnectingPoint num="23" id="1703" />
+<TGConnectingPoint num="0" id="1530" />
+<TGConnectingPoint num="1" id="1531" />
+<TGConnectingPoint num="2" id="1532" />
+<TGConnectingPoint num="3" id="1533" />
+<TGConnectingPoint num="4" id="1534" />
+<TGConnectingPoint num="5" id="1535" />
+<TGConnectingPoint num="6" id="1536" />
+<TGConnectingPoint num="7" id="1537" />
+<TGConnectingPoint num="8" id="1538" />
+<TGConnectingPoint num="9" id="1539" />
+<TGConnectingPoint num="10" id="1540" />
+<TGConnectingPoint num="11" id="1541" />
+<TGConnectingPoint num="12" id="1542" />
+<TGConnectingPoint num="13" id="1543" />
+<TGConnectingPoint num="14" id="1544" />
+<TGConnectingPoint num="15" id="1545" />
+<TGConnectingPoint num="16" id="1546" />
+<TGConnectingPoint num="17" id="1547" />
+<TGConnectingPoint num="18" id="1548" />
+<TGConnectingPoint num="19" id="1549" />
+<TGConnectingPoint num="20" id="1550" />
+<TGConnectingPoint num="21" id="1551" />
+<TGConnectingPoint num="22" id="1552" />
+<TGConnectingPoint num="23" id="1553" />
<extraparam>
<info stereotype="BUS-RR" nodeName="Bus0" />
<attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" clockRatio="5" privacy="0" referenceAttack="" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1100" id="1738" >
+<COMPONENT type="1100" id="1588" >
<cdparam x="685" y="396" />
<sizeparam width="174" height="135" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="CPU2" value="name" />
-<TGConnectingPoint num="0" id="1714" />
-<TGConnectingPoint num="1" id="1715" />
-<TGConnectingPoint num="2" id="1716" />
-<TGConnectingPoint num="3" id="1717" />
-<TGConnectingPoint num="4" id="1718" />
-<TGConnectingPoint num="5" id="1719" />
-<TGConnectingPoint num="6" id="1720" />
-<TGConnectingPoint num="7" id="1721" />
-<TGConnectingPoint num="8" id="1722" />
-<TGConnectingPoint num="9" id="1723" />
-<TGConnectingPoint num="10" id="1724" />
-<TGConnectingPoint num="11" id="1725" />
-<TGConnectingPoint num="12" id="1726" />
-<TGConnectingPoint num="13" id="1727" />
-<TGConnectingPoint num="14" id="1728" />
-<TGConnectingPoint num="15" id="1729" />
-<TGConnectingPoint num="16" id="1730" />
-<TGConnectingPoint num="17" id="1731" />
-<TGConnectingPoint num="18" id="1732" />
-<TGConnectingPoint num="19" id="1733" />
-<TGConnectingPoint num="20" id="1734" />
-<TGConnectingPoint num="21" id="1735" />
-<TGConnectingPoint num="22" id="1736" />
-<TGConnectingPoint num="23" id="1737" />
+<TGConnectingPoint num="0" id="1564" />
+<TGConnectingPoint num="1" id="1565" />
+<TGConnectingPoint num="2" id="1566" />
+<TGConnectingPoint num="3" id="1567" />
+<TGConnectingPoint num="4" id="1568" />
+<TGConnectingPoint num="5" id="1569" />
+<TGConnectingPoint num="6" id="1570" />
+<TGConnectingPoint num="7" id="1571" />
+<TGConnectingPoint num="8" id="1572" />
+<TGConnectingPoint num="9" id="1573" />
+<TGConnectingPoint num="10" id="1574" />
+<TGConnectingPoint num="11" id="1575" />
+<TGConnectingPoint num="12" id="1576" />
+<TGConnectingPoint num="13" id="1577" />
+<TGConnectingPoint num="14" id="1578" />
+<TGConnectingPoint num="15" id="1579" />
+<TGConnectingPoint num="16" id="1580" />
+<TGConnectingPoint num="17" id="1581" />
+<TGConnectingPoint num="18" id="1582" />
+<TGConnectingPoint num="19" id="1583" />
+<TGConnectingPoint num="20" id="1584" />
+<TGConnectingPoint num="21" id="1585" />
+<TGConnectingPoint num="22" id="1586" />
+<TGConnectingPoint num="23" id="1587" />
<extraparam>
<info stereotype="CPURR" nodeName="CPU2" />
<attributes nbOfCores="1" byteDataSize="4" schedulingPolicy="0" sliceTime="10000" goIdleTime="10" maxConsecutiveIdleCycles="10" pipelineSize="5" taskSwitchingTime="20" branchingPredictionPenalty="2" cacheMiss="5" execiTime="1" execcTime="1" clockRatio="4" MECType="0" encryption="0"/>
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1101" id="1713" >
-<father id="1738" num="0" />
+<SUBCOMPONENT type="1101" id="1563" >
+<father id="1588" num="0" />
<cdparam x="715" y="448" />
<sizeparam width="109" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="65" minY="0" maxY="95" />
<infoparam name="TGComponent" value="AppC::Timer" />
-<TGConnectingPoint num="0" id="1705" />
-<TGConnectingPoint num="1" id="1706" />
-<TGConnectingPoint num="2" id="1707" />
-<TGConnectingPoint num="3" id="1708" />
-<TGConnectingPoint num="4" id="1709" />
-<TGConnectingPoint num="5" id="1710" />
-<TGConnectingPoint num="6" id="1711" />
-<TGConnectingPoint num="7" id="1712" />
+<TGConnectingPoint num="0" id="1555" />
+<TGConnectingPoint num="1" id="1556" />
+<TGConnectingPoint num="2" id="1557" />
+<TGConnectingPoint num="3" id="1558" />
+<TGConnectingPoint num="4" id="1559" />
+<TGConnectingPoint num="5" id="1560" />
+<TGConnectingPoint num="6" id="1561" />
+<TGConnectingPoint num="7" id="1562" />
<extraparam>
<info value="AppC::Timer" taskName="Timer" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1100" id="1772" >
+<COMPONENT type="1100" id="1622" >
<cdparam x="167" y="400" />
<sizeparam width="165" height="126" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="CPU1" value="name" />
-<TGConnectingPoint num="0" id="1748" />
-<TGConnectingPoint num="1" id="1749" />
-<TGConnectingPoint num="2" id="1750" />
-<TGConnectingPoint num="3" id="1751" />
-<TGConnectingPoint num="4" id="1752" />
-<TGConnectingPoint num="5" id="1753" />
-<TGConnectingPoint num="6" id="1754" />
-<TGConnectingPoint num="7" id="1755" />
-<TGConnectingPoint num="8" id="1756" />
-<TGConnectingPoint num="9" id="1757" />
-<TGConnectingPoint num="10" id="1758" />
-<TGConnectingPoint num="11" id="1759" />
-<TGConnectingPoint num="12" id="1760" />
-<TGConnectingPoint num="13" id="1761" />
-<TGConnectingPoint num="14" id="1762" />
-<TGConnectingPoint num="15" id="1763" />
-<TGConnectingPoint num="16" id="1764" />
-<TGConnectingPoint num="17" id="1765" />
-<TGConnectingPoint num="18" id="1766" />
-<TGConnectingPoint num="19" id="1767" />
-<TGConnectingPoint num="20" id="1768" />
-<TGConnectingPoint num="21" id="1769" />
-<TGConnectingPoint num="22" id="1770" />
-<TGConnectingPoint num="23" id="1771" />
+<TGConnectingPoint num="0" id="1598" />
+<TGConnectingPoint num="1" id="1599" />
+<TGConnectingPoint num="2" id="1600" />
+<TGConnectingPoint num="3" id="1601" />
+<TGConnectingPoint num="4" id="1602" />
+<TGConnectingPoint num="5" id="1603" />
+<TGConnectingPoint num="6" id="1604" />
+<TGConnectingPoint num="7" id="1605" />
+<TGConnectingPoint num="8" id="1606" />
+<TGConnectingPoint num="9" id="1607" />
+<TGConnectingPoint num="10" id="1608" />
+<TGConnectingPoint num="11" id="1609" />
+<TGConnectingPoint num="12" id="1610" />
+<TGConnectingPoint num="13" id="1611" />
+<TGConnectingPoint num="14" id="1612" />
+<TGConnectingPoint num="15" id="1613" />
+<TGConnectingPoint num="16" id="1614" />
+<TGConnectingPoint num="17" id="1615" />
+<TGConnectingPoint num="18" id="1616" />
+<TGConnectingPoint num="19" id="1617" />
+<TGConnectingPoint num="20" id="1618" />
+<TGConnectingPoint num="21" id="1619" />
+<TGConnectingPoint num="22" id="1620" />
+<TGConnectingPoint num="23" id="1621" />
<extraparam>
<info stereotype="CPURR" nodeName="CPU1" />
<attributes nbOfCores="1" byteDataSize="4" schedulingPolicy="0" sliceTime="10000" goIdleTime="10" maxConsecutiveIdleCycles="10" pipelineSize="5" taskSwitchingTime="20" branchingPredictionPenalty="2" cacheMiss="5" execiTime="1" execcTime="1" clockRatio="2" MECType="0" encryption="0"/>
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1101" id="1747" >
-<father id="1772" num="0" />
-<cdparam x="167" y="445" />
-<sizeparam width="163" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1101" id="1597" >
+<father id="1622" num="0" />
+<cdparam x="160" y="445" />
+<sizeparam width="172" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="2" minY="0" maxY="86" />
+<cdrectangleparam minX="0" maxX="-7" minY="0" maxY="86" />
<infoparam name="TGComponent" value="AppC::InterfaceDevice" />
-<TGConnectingPoint num="0" id="1739" />
-<TGConnectingPoint num="1" id="1740" />
-<TGConnectingPoint num="2" id="1741" />
-<TGConnectingPoint num="3" id="1742" />
-<TGConnectingPoint num="4" id="1743" />
-<TGConnectingPoint num="5" id="1744" />
-<TGConnectingPoint num="6" id="1745" />
-<TGConnectingPoint num="7" id="1746" />
+<TGConnectingPoint num="0" id="1589" />
+<TGConnectingPoint num="1" id="1590" />
+<TGConnectingPoint num="2" id="1591" />
+<TGConnectingPoint num="3" id="1592" />
+<TGConnectingPoint num="4" id="1593" />
+<TGConnectingPoint num="5" id="1594" />
+<TGConnectingPoint num="6" id="1595" />
+<TGConnectingPoint num="7" id="1596" />
<extraparam>
<info value="AppC::InterfaceDevice" taskName="InterfaceDevice" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1100" id="1824" >
+<COMPONENT type="1100" id="1674" >
<cdparam x="389" y="243" />
<sizeparam width="250" height="146" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="CPU0" value="name" />
-<TGConnectingPoint num="0" id="1800" />
-<TGConnectingPoint num="1" id="1801" />
-<TGConnectingPoint num="2" id="1802" />
-<TGConnectingPoint num="3" id="1803" />
-<TGConnectingPoint num="4" id="1804" />
-<TGConnectingPoint num="5" id="1805" />
-<TGConnectingPoint num="6" id="1806" />
-<TGConnectingPoint num="7" id="1807" />
-<TGConnectingPoint num="8" id="1808" />
-<TGConnectingPoint num="9" id="1809" />
-<TGConnectingPoint num="10" id="1810" />
-<TGConnectingPoint num="11" id="1811" />
-<TGConnectingPoint num="12" id="1812" />
-<TGConnectingPoint num="13" id="1813" />
-<TGConnectingPoint num="14" id="1814" />
-<TGConnectingPoint num="15" id="1815" />
-<TGConnectingPoint num="16" id="1816" />
-<TGConnectingPoint num="17" id="1817" />
-<TGConnectingPoint num="18" id="1818" />
-<TGConnectingPoint num="19" id="1819" />
-<TGConnectingPoint num="20" id="1820" />
-<TGConnectingPoint num="21" id="1821" />
-<TGConnectingPoint num="22" id="1822" />
-<TGConnectingPoint num="23" id="1823" />
+<TGConnectingPoint num="0" id="1650" />
+<TGConnectingPoint num="1" id="1651" />
+<TGConnectingPoint num="2" id="1652" />
+<TGConnectingPoint num="3" id="1653" />
+<TGConnectingPoint num="4" id="1654" />
+<TGConnectingPoint num="5" id="1655" />
+<TGConnectingPoint num="6" id="1656" />
+<TGConnectingPoint num="7" id="1657" />
+<TGConnectingPoint num="8" id="1658" />
+<TGConnectingPoint num="9" id="1659" />
+<TGConnectingPoint num="10" id="1660" />
+<TGConnectingPoint num="11" id="1661" />
+<TGConnectingPoint num="12" id="1662" />
+<TGConnectingPoint num="13" id="1663" />
+<TGConnectingPoint num="14" id="1664" />
+<TGConnectingPoint num="15" id="1665" />
+<TGConnectingPoint num="16" id="1666" />
+<TGConnectingPoint num="17" id="1667" />
+<TGConnectingPoint num="18" id="1668" />
+<TGConnectingPoint num="19" id="1669" />
+<TGConnectingPoint num="20" id="1670" />
+<TGConnectingPoint num="21" id="1671" />
+<TGConnectingPoint num="22" id="1672" />
+<TGConnectingPoint num="23" id="1673" />
<extraparam>
<info stereotype="CPURR" nodeName="CPU0" />
<attributes nbOfCores="1" byteDataSize="4" schedulingPolicy="0" sliceTime="10000" goIdleTime="10" maxConsecutiveIdleCycles="10" pipelineSize="5" taskSwitchingTime="20" branchingPredictionPenalty="2" cacheMiss="18" execiTime="1" execcTime="1" clockRatio="3" MECType="0" encryption="0"/>
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1101" id="1781" >
-<father id="1824" num="0" />
+<SUBCOMPONENT type="1101" id="1631" >
+<father id="1674" num="0" />
<cdparam x="486" y="303" />
-<sizeparam width="136" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="141" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="114" minY="0" maxY="106" />
+<cdrectangleparam minX="0" maxX="109" minY="0" maxY="106" />
<infoparam name="TGComponent" value="AppC::SmartCard" />
-<TGConnectingPoint num="0" id="1773" />
-<TGConnectingPoint num="1" id="1774" />
-<TGConnectingPoint num="2" id="1775" />
-<TGConnectingPoint num="3" id="1776" />
-<TGConnectingPoint num="4" id="1777" />
-<TGConnectingPoint num="5" id="1778" />
-<TGConnectingPoint num="6" id="1779" />
-<TGConnectingPoint num="7" id="1780" />
+<TGConnectingPoint num="0" id="1623" />
+<TGConnectingPoint num="1" id="1624" />
+<TGConnectingPoint num="2" id="1625" />
+<TGConnectingPoint num="3" id="1626" />
+<TGConnectingPoint num="4" id="1627" />
+<TGConnectingPoint num="5" id="1628" />
+<TGConnectingPoint num="6" id="1629" />
+<TGConnectingPoint num="7" id="1630" />
<extraparam>
<info value="AppC::SmartCard" taskName="SmartCard" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1101" id="1790" >
-<father id="1824" num="1" />
+<SUBCOMPONENT type="1101" id="1640" >
+<father id="1674" num="1" />
<cdparam x="415" y="349" />
-<sizeparam width="139" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="144" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="111" minY="0" maxY="106" />
+<cdrectangleparam minX="0" maxX="106" minY="0" maxY="106" />
<infoparam name="TGComponent" value="AppC::Application" />
-<TGConnectingPoint num="0" id="1782" />
-<TGConnectingPoint num="1" id="1783" />
-<TGConnectingPoint num="2" id="1784" />
-<TGConnectingPoint num="3" id="1785" />
-<TGConnectingPoint num="4" id="1786" />
-<TGConnectingPoint num="5" id="1787" />
-<TGConnectingPoint num="6" id="1788" />
-<TGConnectingPoint num="7" id="1789" />
+<TGConnectingPoint num="0" id="1632" />
+<TGConnectingPoint num="1" id="1633" />
+<TGConnectingPoint num="2" id="1634" />
+<TGConnectingPoint num="3" id="1635" />
+<TGConnectingPoint num="4" id="1636" />
+<TGConnectingPoint num="5" id="1637" />
+<TGConnectingPoint num="6" id="1638" />
+<TGConnectingPoint num="7" id="1639" />
<extraparam>
<info value="AppC::Application" taskName="Application" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1101" id="1799" >
-<father id="1824" num="2" />
+<SUBCOMPONENT type="1101" id="1649" >
+<father id="1674" num="2" />
<cdparam x="396" y="258" />
-<sizeparam width="108" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="109" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="142" minY="0" maxY="106" />
+<cdrectangleparam minX="0" maxX="141" minY="0" maxY="106" />
<infoparam name="TGComponent" value="AppC::TCPIP" />
-<TGConnectingPoint num="0" id="1791" />
-<TGConnectingPoint num="1" id="1792" />
-<TGConnectingPoint num="2" id="1793" />
-<TGConnectingPoint num="3" id="1794" />
-<TGConnectingPoint num="4" id="1795" />
-<TGConnectingPoint num="5" id="1796" />
-<TGConnectingPoint num="6" id="1797" />
-<TGConnectingPoint num="7" id="1798" />
+<TGConnectingPoint num="0" id="1641" />
+<TGConnectingPoint num="1" id="1642" />
+<TGConnectingPoint num="2" id="1643" />
+<TGConnectingPoint num="3" id="1644" />
+<TGConnectingPoint num="4" id="1645" />
+<TGConnectingPoint num="5" id="1646" />
+<TGConnectingPoint num="6" id="1647" />
+<TGConnectingPoint num="7" id="1648" />
<extraparam>
<info value="AppC::TCPIP" taskName="TCPIP" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="125" id="1825" >
+<CONNECTOR type="125" id="1675" >
<cdparam x="513" y="536" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Memory0 to Bus0" value="{info}" />
-<P1 x="514" y="527" id="1656" />
-<P2 x="514" y="488" id="1686" />
+<P1 x="514" y="527" id="1506" />
+<P2 x="514" y="488" id="1536" />
<AutomaticDrawing data="true" />
<extraparam>
<info priority="0" />
<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="1826" >
+<CONNECTOR type="125" id="1676" >
<cdparam x="301" y="469" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from CPU1 to Bus0" value="{info}" />
-<P1 x="332" y="463" id="1752" />
-<P2 x="389" y="463" id="1683" />
+<P1 x="332" y="463" id="1602" />
+<P2 x="389" y="463" id="1533" />
<AutomaticDrawing data="true" />
<extraparam>
<info priority="0" />
<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="1827" >
+<CONNECTOR type="125" id="1677" >
<cdparam x="773" y="479" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from CPU2 to Bus0" value="{info}" />
-<P1 x="685" y="463" id="1717" />
-<P2 x="639" y="463" id="1684" />
+<P1 x="685" y="463" id="1567" />
+<P2 x="639" y="463" id="1534" />
<AutomaticDrawing data="true" />
<extraparam>
<info priority="0" />
<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="1828" >
+<CONNECTOR type="125" id="1678" >
<cdparam x="499" y="331" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from CPU0 to Bus0" value="{info}" />
-<P1 x="514" y="389" id="1806" />
-<P2 x="514" y="438" id="1681" />
+<P1 x="514" y="389" id="1656" />
+<P2 x="514" y="438" id="1531" />
<AutomaticDrawing data="true" />
<extraparam>
<info priority="0" />
@@ -6725,53 +6725,53 @@ On prend b=1 comme exemple
<Modeling type="Diplodocus Methodology" nameTab="DIPLODOCUS_Methodology" >
<DiplodocusMethodologyDiagramPanel name="DIPLODOCUS_Methodology" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0" >
-<COMPONENT type="6003" id="1833" >
+<COMPONENT type="6003" id="1683" >
<cdparam x="60" y="417" />
<sizeparam width="200" height="120" minWidth="10" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="TGComponent" value="Requirements" />
-<TGConnectingPoint num="0" id="1829" />
-<TGConnectingPoint num="1" id="1830" />
-<TGConnectingPoint num="2" id="1831" />
-<TGConnectingPoint num="3" id="1832" />
+<TGConnectingPoint num="0" id="1679" />
+<TGConnectingPoint num="1" id="1680" />
+<TGConnectingPoint num="2" id="1681" />
+<TGConnectingPoint num="3" id="1682" />
</COMPONENT>
-<COMPONENT type="6006" id="1838" >
+<COMPONENT type="6006" id="1688" >
<cdparam x="600" y="100" />
<sizeparam width="200" height="120" minWidth="10" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="TGComponent" value="Com. Patterns" />
-<TGConnectingPoint num="0" id="1834" />
-<TGConnectingPoint num="1" id="1835" />
-<TGConnectingPoint num="2" id="1836" />
-<TGConnectingPoint num="3" id="1837" />
+<TGConnectingPoint num="0" id="1684" />
+<TGConnectingPoint num="1" id="1685" />
+<TGConnectingPoint num="2" id="1686" />
+<TGConnectingPoint num="3" id="1687" />
</COMPONENT>
-<COMPONENT type="6002" id="1847" >
+<COMPONENT type="6002" id="1697" >
<cdparam x="518" y="306" />
<sizeparam width="318" height="136" minWidth="10" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="TGComponent" value="Mapping" />
-<TGConnectingPoint num="0" id="1841" />
-<TGConnectingPoint num="1" id="1842" />
-<TGConnectingPoint num="2" id="1843" />
-<TGConnectingPoint num="3" id="1844" />
-<TGConnectingPoint num="4" id="1845" />
-<TGConnectingPoint num="5" id="1846" />
-</COMPONENT>
-<SUBCOMPONENT type="6005" id="1839" >
-<father id="1847" num="0" />
+<TGConnectingPoint num="0" id="1691" />
+<TGConnectingPoint num="1" id="1692" />
+<TGConnectingPoint num="2" id="1693" />
+<TGConnectingPoint num="3" id="1694" />
+<TGConnectingPoint num="4" id="1695" />
+<TGConnectingPoint num="5" id="1696" />
+</COMPONENT>
+<SUBCOMPONENT type="6005" id="1689" >
+<father id="1697" num="0" />
<cdparam x="523" y="361" />
<sizeparam width="10" height="10" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="605" maxX="605" minY="355" maxY="355" />
<infoparam name="value " value="Mapping2" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="6005" id="1840" >
-<father id="1847" num="1" />
+<SUBCOMPONENT type="6005" id="1690" >
+<father id="1697" num="1" />
<cdparam x="523" y="346" />
<sizeparam width="10" height="10" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -6779,27 +6779,27 @@ On prend b=1 comme exemple
<infoparam name="value " value="Mapping1" />
</SUBCOMPONENT>
-<COMPONENT type="6001" id="1854" >
+<COMPONENT type="6001" id="1704" >
<cdparam x="850" y="100" />
<sizeparam width="200" height="120" minWidth="10" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="TGComponent" value="Architecture" />
-<TGConnectingPoint num="0" id="1850" />
-<TGConnectingPoint num="1" id="1851" />
-<TGConnectingPoint num="2" id="1852" />
-<TGConnectingPoint num="3" id="1853" />
+<TGConnectingPoint num="0" id="1700" />
+<TGConnectingPoint num="1" id="1701" />
+<TGConnectingPoint num="2" id="1702" />
+<TGConnectingPoint num="3" id="1703" />
</COMPONENT>
-<SUBCOMPONENT type="6005" id="1848" >
-<father id="1854" num="0" />
+<SUBCOMPONENT type="6005" id="1698" >
+<father id="1704" num="0" />
<cdparam x="855" y="155" />
<sizeparam width="10" height="10" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="855" maxX="855" minY="155" maxY="155" />
<infoparam name="value " value="Mapping2" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="6005" id="1849" >
-<father id="1854" num="1" />
+<SUBCOMPONENT type="6005" id="1699" >
+<father id="1704" num="1" />
<cdparam x="855" y="140" />
<sizeparam width="10" height="10" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -6807,19 +6807,19 @@ On prend b=1 comme exemple
<infoparam name="value " value="Mapping1" />
</SUBCOMPONENT>
-<COMPONENT type="6000" id="1860" >
+<COMPONENT type="6000" id="1710" >
<cdparam x="233" y="101" />
<sizeparam width="334" height="161" minWidth="10" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="TGComponent" value="Application" />
-<TGConnectingPoint num="0" id="1856" />
-<TGConnectingPoint num="1" id="1857" />
-<TGConnectingPoint num="2" id="1858" />
-<TGConnectingPoint num="3" id="1859" />
+<TGConnectingPoint num="0" id="1706" />
+<TGConnectingPoint num="1" id="1707" />
+<TGConnectingPoint num="2" id="1708" />
+<TGConnectingPoint num="3" id="1709" />
</COMPONENT>
-<SUBCOMPONENT type="6005" id="1855" >
-<father id="1860" num="0" />
+<SUBCOMPONENT type="6005" id="1705" >
+<father id="1710" num="0" />
<cdparam x="238" y="141" />
<sizeparam width="10" height="10" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -6827,31 +6827,31 @@ On prend b=1 comme exemple
<infoparam name="value " value="AppC" />
</SUBCOMPONENT>
-<CONNECTOR type="6004" id="1862" >
+<CONNECTOR type="6004" id="1712" >
<cdparam x="950" y="220" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="<<deriveReqt>>" />
-<TGConnectingPoint num="0" id="1861" />
-<P1 x="950" y="220" id="1850" />
-<P2 x="740" y="306" id="1842" />
+<TGConnectingPoint num="0" id="1711" />
+<P1 x="950" y="220" id="1700" />
+<P2 x="740" y="306" id="1692" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="6004" id="1864" >
+<CONNECTOR type="6004" id="1714" >
<cdparam x="700" y="220" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="<<deriveReqt>>" />
-<TGConnectingPoint num="0" id="1863" />
-<P1 x="700" y="220" id="1834" />
-<P2 x="677" y="306" id="1843" />
+<TGConnectingPoint num="0" id="1713" />
+<P1 x="700" y="220" id="1684" />
+<P2 x="677" y="306" id="1693" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="6004" id="1866" >
+<CONNECTOR type="6004" id="1716" >
<cdparam x="450" y="220" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="<<deriveReqt>>" />
-<TGConnectingPoint num="0" id="1865" />
-<P1 x="400" y="262" id="1856" />
-<P2 x="613" y="306" id="1841" />
+<TGConnectingPoint num="0" id="1715" />
+<P1 x="400" y="262" id="1706" />
+<P2 x="613" y="306" id="1691" />
<AutomaticDrawing data="true" />
</CONNECTOR>
diff --git a/rundse/build.gradle b/rundse/build.gradle
index 183d2292bc5033027721e1be982e4e948bb108ec..efd94316ec206be9129bd2d0535ddcc3bded206f 100644
--- a/rundse/build.gradle
+++ b/rundse/build.gradle
@@ -13,8 +13,8 @@ dependencies {
compileOnly name: 'opencloud'
compileOnly name: 'JavaPlot'
compileOnly name: 'derbynet'
+ compileOnly name: 'commons-math3-3.6.1'
compileOnly name: 'commons-codec-1.10'
- compileOnly name: 'commons-io-2.5-javadoc'
compileOnly name: 'commons-io-2.5'
compileOnly name: 'jsoup-1.8.1'
compileOnly name: 'gs-core-1.3'
diff --git a/src/main/java/dseengine/CPUWholeResult.java b/src/main/java/dseengine/CPUWholeResult.java
index d13f9116b143c5a9ee8dfbd6ef90372e5238ce5c..ca780a2dfe8829e689a2d443320948d42341bde8 100755
--- a/src/main/java/dseengine/CPUWholeResult.java
+++ b/src/main/java/dseengine/CPUWholeResult.java
@@ -94,23 +94,23 @@ public class CPUWholeResult {
BusContentionWholeResult bcwr;
if (rescpu.contentions != null) {
- TraceManager.addDev("Working on contentions");
+ //TraceManager.addDev("Working on contentions");
for(BusContentionResult ct: rescpu.contentions) {
- TraceManager.addDev("One contention");
+ //TraceManager.addDev("One contention");
o = contentionTable.get(ct.id);
if (o == null) {
bcwr = new BusContentionWholeResult(ct);
contentionTable.put(ct.id, bcwr);
addContentionOnBus(bcwr);
- TraceManager.addDev("adding contention");
+ //TraceManager.addDev("adding contention");
} else {
bcwr = (BusContentionWholeResult)o;
bcwr.updateResults(ct);
- TraceManager.addDev("updating contention");
+ //TraceManager.addDev("updating contention");
}
}
} else {
- TraceManager.addDev("null contention");
+ //TraceManager.addDev("null contention");
}
}
@@ -138,7 +138,7 @@ public class CPUWholeResult {
double average = 0;
if (contentions == null) {
- TraceManager.addDev("No contention");
+ //TraceManager.addDev("No contention");
return 0;
}
@@ -153,7 +153,7 @@ public class CPUWholeResult {
long max = 0;
if (contentions == null) {
- TraceManager.addDev("No contention");
+ //TraceManager.addDev("No contention");
return 0;
}
@@ -168,7 +168,7 @@ public class CPUWholeResult {
long min = 10000000;
if (contentions == null) {
- TraceManager.addDev("No contention");
+ //TraceManager.addDev("No contention");
return 0;
}
diff --git a/src/main/java/dseengine/DSEConfiguration.java b/src/main/java/dseengine/DSEConfiguration.java
index 052824c9cc02d5989067f216d6f14ab4c3e34fa7..a01313f215073a4e5395ba0d47800a37bab440de 100755
--- a/src/main/java/dseengine/DSEConfiguration.java
+++ b/src/main/java/dseengine/DSEConfiguration.java
@@ -62,6 +62,7 @@ import java.io.File;
import java.io.InputStreamReader;
import java.util.*;
import java.util.List;
+import org.apache.commons.math3.util.CombinatoricsUtils;
//import tmltranslator.touppaal.*;
//import tmltranslator.tomappingsystemc.*;
@@ -145,7 +146,7 @@ public class DSEConfiguration implements Runnable {
private int minNbOfCPUs = 1;
private int maxNbOfCPUs = 2;
private int minNbOfCoresPerCPU = 1;
- private int maxNbOfCoresPerCPU = 2;
+ private int maxNbOfCoresPerCPU = 1;
private int nbOfSimulationsPerMapping = 1;
private TMLModeling<TGComponent> taskModel = null;
// private TMLModeling secModel = null;
@@ -1128,7 +1129,7 @@ public class DSEConfiguration implements Runnable {
rankMappings(dsemapresults);
- sb.append("\nGrades: (Mapping#, grade)\n");
+ //sb.append("\nGrades: (Mapping#, grade)\n");
int[] grades = dsemapresults.getGrades().clone();
int j;
for(j=0; j<grades.length; j++) {
@@ -1136,24 +1137,24 @@ public class DSEConfiguration implements Runnable {
}
sb.append("\n");
- TraceManager.addDev("Ranking");
+ //TraceManager.addDev("Ranking");
sb.append("\nRanking (Rank, mapping, grade)\n");
int[] index = new int[grades.length];
for(j=0; j<grades.length; j++) {
index[j] = j;
}
- TraceManager.addDev("Ranking 0");
+ //TraceManager.addDev("Ranking 0");
Conversion.quickSort(grades, 0, grades.length-1, index);
- TraceManager.addDev("Ranking 1");
+ //TraceManager.addDev("Ranking 1");
for(j=grades.length-1; j>=0; j--) {
sb.append("(#" + (grades.length-j) + ", " + index[j] + ", " + grades[j]+ ") ");
}
- TraceManager.addDev("Ranking done");
+ //TraceManager.addDev("Ranking done");
try {
@@ -1323,7 +1324,10 @@ public class DSEConfiguration implements Runnable {
return -1;
}
- TraceManager.addDev("Task model loaded");
+ TraceManager.addDev("runDSE. Going to give info on CPUs and mappings");
+ TraceManager.addDev("runDSE. Task model loaded. Nb of cpus=" + minNbOfCPUs + "-> " + maxNbOfCPUs);
+
+
mappings = generateAllMappings(taskModel);
@@ -1603,6 +1607,16 @@ public class DSEConfiguration implements Runnable {
return 0;
}
+ public long getNbOfPossibleMappings(TMLModeling tl) {
+ long nb = 0;
+ int nbOfTasks = tl.getTasks().size();
+ for (int i=minNbOfCPUs; i<=maxNbOfCPUs; i++) {
+
+ nb += CombinatoricsUtils.stirlingS2(nbOfTasks, i);
+ }
+ return nb;
+ }
+
public Vector<TMLMapping<TGComponent>> generateAllMappings(TMLModeling<TGComponent> _tmlm) {
TraceManager.addDev("Generate all mappings");
if (_tmlm == null) {
@@ -1618,13 +1632,17 @@ public class DSEConfiguration implements Runnable {
return null;
}
+
+
int min = Math.max(1, minNbOfCPUs);
int max = Math.min(nbOfTasks, maxNbOfCPUs);
- if (max <= min) {
+ if (max < min) {
max = min + 1;
}
+ TraceManager.addDev("runDSE. Task model loaded. Nb of possible mappings:" + getNbOfPossibleMappings(_tmlm));
+
Vector<TMLMapping<TGComponent>> maps = new Vector<>();
for(int cpt=min; cpt<=max; cpt++) {
@@ -1696,6 +1714,7 @@ public class DSEConfiguration implements Runnable {
private void computeMappings(Vector<TMLTask> remainingTasks, CPUWithTasks[] cpus_tasks, Vector<TMLMapping<TGComponent>> maps, TMLModeling<TGComponent> _tmlm) {
if (remainingTasks.size() == 0) {
// Can generate the mapping from cpus_tasks
+ TraceManager.addDev("Making mapping");
makeMapping(cpus_tasks, maps, _tmlm);
return;
}
@@ -1708,9 +1727,9 @@ public class DSEConfiguration implements Runnable {
TraceManager.addDev("Mapping task: " + t.getName());
// Two solutions: either it is mapped on the first free CPU, or it is mapped on an already occupied CPU
- // Memo: all cpus must have at least on task at the end
+ // Memo: all cpus must have at least one task at the end
- // Must it be mapped a free CPU?
+ // Must it be mapped to a free CPU?
if (nbOfFreeCPUs(cpus_tasks) >= (remainingTasks.size()+1)) {
// The task must be mapped on a free CPU
// Search for the first free CPU
@@ -1727,7 +1746,7 @@ public class DSEConfiguration implements Runnable {
TraceManager.addDev("Task could not be mapped on a free CPU: " + t.getName());
}
- TraceManager.addDev("Regular mapping of: " + t.getName());
+ TraceManager.addDev("Regular mapping of: " + t.getName() + " length=" + cpus_tasks.length);
// It can be mapped on whatever CPU, until the first free one has been met (the first free CPU is inclusive)
remainingTasks.remove(t);
for(int i=0; i<cpus_tasks.length; i++) {
diff --git a/src/main/java/tmltranslator/TMLArchitecture.java b/src/main/java/tmltranslator/TMLArchitecture.java
index a6619663b42c6a9c2de1cb18e6939d281ca58c6a..99f88e29e9384b08c5546b85fb52361fffa8b7b4 100755
--- a/src/main/java/tmltranslator/TMLArchitecture.java
+++ b/src/main/java/tmltranslator/TMLArchitecture.java
@@ -404,17 +404,17 @@ public class TMLArchitecture {
if (node instanceof HwCPU) {
HwCPU cpu = (HwCPU)node;
complexity += cpu.nbOfCores * cpu.byteDataSize * cpu.pipelineSize;
- TraceManager.addDev("complexity CPU= " + complexity);
+ //TraceManager.addDev("complexity CPU= " + complexity);
}
if (node instanceof HwBus) {
HwBus bus = (HwBus)node;
complexity += bus.byteDataSize * bus.pipelineSize;
- TraceManager.addDev("complexity bus= " + complexity);
+ //TraceManager.addDev("complexity bus= " + complexity);
}
}
- TraceManager.addDev("Complexity = " + complexity);
+ //TraceManager.addDev("Complexity = " + complexity);
return complexity;
}
diff --git a/src/main/java/tmltranslator/TMLPort.java b/src/main/java/tmltranslator/TMLPort.java
index e41780cc20fcd1c08054be357c43c1a1fc920809..bd27fe3023e7991ab7e1b720b278ebdbccf98edf 100755
--- a/src/main/java/tmltranslator/TMLPort.java
+++ b/src/main/java/tmltranslator/TMLPort.java
@@ -61,9 +61,9 @@ public class TMLPort extends TMLElement {
private String dataFlowType;
public TMLPort( String _name, Object _referenceObject ) {
-
super( _name, _referenceObject );
- dataFlowType = ( (TMLCPrimitivePort)referenceObject ).getDataFlowType();
+ if (referenceObject instanceof TMLCPrimitivePort)
+ dataFlowType = ( (TMLCPrimitivePort)referenceObject ).getDataFlowType();
}
diff --git a/src/main/java/ui/window/JDialogDSE.java b/src/main/java/ui/window/JDialogDSE.java
index bd89754214f171d44ac86463373b77f39fcc406b..1d1936e365747bc5fadd17640026885f37fce2ff 100644
--- a/src/main/java/ui/window/JDialogDSE.java
+++ b/src/main/java/ui/window/JDialogDSE.java
@@ -764,10 +764,14 @@ public class JDialogDSE extends JDialog implements ActionListener, ListSelection
output+="Simulation execution error \n";
return;
}
+
+ TraceManager.addDev("Setting min nb of CPUs to:" + NbMinCPU);
if (config.setMinNbOfCPUs(NbMinCPU) != 0) {
TraceManager.addDev("Can't set Min # CPUS to " + NbMinCPU);
output+="Can't set Min # CPUS to " + NbMinCPU+"\n";
}
+
+ TraceManager.addDev("Setting max nb of CPUs to:" + NbMaxCPU);
if (config.setMaxNbOfCPUs(NbMaxCPU) != 0) {
TraceManager.addDev("Can't set Max # CPUS to " + NbMaxCPU);
output+="Can't set Max # CPUS to " + NbMaxCPU +"\n";
@@ -804,12 +808,12 @@ public class JDialogDSE extends JDialog implements ActionListener, ListSelection
TraceManager.addDev("Can't print all results");
output+="Can't print all results \n";
}
- System.out.println("Results printed");
+ //System.out.println("Results printed");
if (config.printResultsSummary("", true, true)!=0){
TraceManager.addDev("Can't print result summary");
output+="Can't print result summary \n";
}
- System.out.println("Results summary printed");
+ //System.out.println("Results summary printed");
jp1.setSelectedIndex(1);
outputText.setText(output + "\n" + config.overallResults);
}
@@ -824,7 +828,7 @@ public class JDialogDSE extends JDialog implements ActionListener, ListSelection
if (config.replaceTapValues(tap)<0){
output+="Error changing values";
}
- System.out.println(tap[0]);
+ //System.out.println(tap[0]);
if (config.printResultsSummary("", true, true)!=0){
TraceManager.addDev("Can't print result summary");
output+="Can't print result summary \n";
diff --git a/ttool/build.gradle b/ttool/build.gradle
index 2adfb218224928d2dcbd3a84b88f5a86fce80554..f9171294c8694d3e8076e6df92943af87d764d44 100644
--- a/ttool/build.gradle
+++ b/ttool/build.gradle
@@ -23,7 +23,7 @@ dependencies {
compile name: 'JavaPlot'
compile name: 'derbynet'
compile name: 'commons-codec-1.10'
- compile name: 'commons-io-2.5-javadoc'
+ compile name: 'commons-math3-3.6.1'
compile name: 'commons-io-2.5'
compile name: 'jsoup-1.8.1'
compile name: 'gs-core-1.3'
diff --git a/webcrawler/client/build.gradle b/webcrawler/client/build.gradle
index e5a8cd6693da2a5466dc43b9a2060697fe88c43f..35a4972218f9c4b36843e15ca61c750d7820dac0 100644
--- a/webcrawler/client/build.gradle
+++ b/webcrawler/client/build.gradle
@@ -15,7 +15,6 @@ dependencies {
compileOnly name: 'commons-codec-1.10'
compileOnly name: 'jsoup-1.8.1'
compileOnly name: 'commons-io-2.5'
- compileOnly name: 'commons-io-2.5-javadoc'
compileOnly name: 'derbyclient-10.9.1.0'
compileOnly name: 'derbynet'
compileOnly name: 'dom4j-1.6.1'
diff --git a/webcrawler/server/build.gradle b/webcrawler/server/build.gradle
index 62463a0ccf634a250c19b7678319ba12a8856813..70e6e8e89f878fb0f827b891def6cc7bb6d40353 100644
--- a/webcrawler/server/build.gradle
+++ b/webcrawler/server/build.gradle
@@ -15,7 +15,6 @@ dependencies {
compileOnly name: 'commons-codec-1.10'
compileOnly name: 'jsoup-1.8.1'
compile name: 'commons-io-2.5'
- compile name: 'commons-io-2.5-javadoc'
compile name: 'derbyclient-10.9.1.0'
compile name: 'derbynet'
compile name: 'dom4j-1.6.1'