From f95f802754d8cd94d172a90b044e17cb1280ec8d Mon Sep 17 00:00:00 2001
From: Ludovic Apvrille <ludovic.apvrille@telecom-paristech.fr>
Date: Mon, 26 Mar 2018 20:21:23 +0200
Subject: [PATCH] Update on simulators and models
---
.idea/misc.xml | 2 +-
modeling/testforkandjoin.xml | 2330 +++++++++--------
src/main/java/ui/GTURTLEModeling.java | 11 +-
.../window/JDialogProverifVerification.java | 659 +++--
4 files changed, 1577 insertions(+), 1425 deletions(-)
diff --git a/.idea/misc.xml b/.idea/misc.xml
index b755d8ca46..51e5191ed4 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -38,7 +38,7 @@
<property name="caretWidth" class="java.lang.Integer" />
</properties>
</component>
- <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="false" project-jdk-name="1.7" project-jdk-type="JavaSDK">
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build" />
</component>
</project>
\ No newline at end of file
diff --git a/modeling/testforkandjoin.xml b/modeling/testforkandjoin.xml
index 418a327102..fa5ca4a6ed 100644
--- a/modeling/testforkandjoin.xml
+++ b/modeling/testforkandjoin.xml
@@ -1,84 +1,84 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<TURTLEGMODELING version="1.0beta">
+<TURTLEGMODELING version="0.99">
<Modeling type="TML Component Design" nameTab="FVFork" >
<TMLComponentTaskDiagramPanel name="TML Component Task Diagram" minX="10" maxX="2500" minY="10" maxY="1500" channels="true" events="true" requests="true" zoom="1.0" >
-<CONNECTOR type="126" id="282" >
+<CONNECTOR type="126" id="1" >
<cdparam x="418" y="288" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="418" y="288" id="236" />
-<P2 x="508" y="412" id="281" />
+<P1 x="418" y="288" id="5" />
+<P2 x="521" y="399" id="20" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="126" id="271" >
+<CONNECTOR type="126" id="2" >
<cdparam x="412" y="279" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="412" y="279" id="238" />
-<P2 x="512" y="172" id="270" />
+<P1 x="412" y="279" id="7" />
+<P2 x="525" y="159" id="31" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="126" id="260" >
+<CONNECTOR type="126" id="3" >
<cdparam x="292" y="261" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="292" y="261" id="259" />
-<P2 x="396" y="288" id="235" />
+<P1 x="279" y="248" id="42" />
+<P2 x="396" y="288" id="4" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<COMPONENT type="1207" id="234" >
+<COMPONENT type="1207" id="19" >
<cdparam x="396" y="277" />
<sizeparam width="22" height="22" minWidth="10" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="Composite port" value="F" />
-<TGConnectingPoint num="0" id="235" />
-<TGConnectingPoint num="1" id="236" />
-<TGConnectingPoint num="2" id="237" />
-<TGConnectingPoint num="3" id="238" />
-<TGConnectingPoint num="4" id="239" />
-<TGConnectingPoint num="5" id="240" />
-<TGConnectingPoint num="6" id="241" />
-<TGConnectingPoint num="7" id="242" />
-<TGConnectingPoint num="8" id="243" />
-<TGConnectingPoint num="9" id="244" />
-<TGConnectingPoint num="10" id="245" />
-<TGConnectingPoint num="11" id="246" />
-<TGConnectingPoint num="12" id="247" />
-<TGConnectingPoint num="13" id="248" />
-<TGConnectingPoint num="14" id="249" />
+<TGConnectingPoint num="0" id="4" />
+<TGConnectingPoint num="1" id="5" />
+<TGConnectingPoint num="2" id="6" />
+<TGConnectingPoint num="3" id="7" />
+<TGConnectingPoint num="4" id="8" />
+<TGConnectingPoint num="5" id="9" />
+<TGConnectingPoint num="6" id="10" />
+<TGConnectingPoint num="7" id="11" />
+<TGConnectingPoint num="8" id="12" />
+<TGConnectingPoint num="9" id="13" />
+<TGConnectingPoint num="10" id="14" />
+<TGConnectingPoint num="11" id="15" />
+<TGConnectingPoint num="12" id="16" />
+<TGConnectingPoint num="13" id="17" />
+<TGConnectingPoint num="14" id="18" />
</COMPONENT>
-<COMPONENT type="1202" id="223" >
+<COMPONENT type="1202" id="30" >
<cdparam x="521" y="340" />
<sizeparam width="200" height="150" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="Primitive component" value="Dest2" />
-<TGConnectingPoint num="0" id="224" />
-<TGConnectingPoint num="1" id="225" />
-<TGConnectingPoint num="2" id="226" />
-<TGConnectingPoint num="3" id="227" />
-<TGConnectingPoint num="4" id="228" />
-<TGConnectingPoint num="5" id="229" />
-<TGConnectingPoint num="6" id="230" />
-<TGConnectingPoint num="7" id="231" />
+<TGConnectingPoint num="0" id="22" />
+<TGConnectingPoint num="1" id="23" />
+<TGConnectingPoint num="2" id="24" />
+<TGConnectingPoint num="3" id="25" />
+<TGConnectingPoint num="4" id="26" />
+<TGConnectingPoint num="5" id="27" />
+<TGConnectingPoint num="6" id="28" />
+<TGConnectingPoint num="7" id="29" />
<extraparam>
<Data isAttacker="No" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1203" id="272" >
-<father id="223" num="0" />
+<SUBCOMPONENT type="1203" id="21" >
+<father id="30" num="0" />
<cdparam x="508" y="399" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Channel comm" />
-<TGConnectingPoint num="0" id="281" />
+<infoparam name="Primitive port" value="Channel chfork2" />
+<TGConnectingPoint num="0" id="20" />
<extraparam>
-<Prop commName="chfork2" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="1" checkStrongAuthStatus="1" />
+<Prop commName="chfork2" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" referenceReq="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -87,34 +87,34 @@
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1202" id="212" >
+<COMPONENT type="1202" id="41" >
<cdparam x="525" y="103" />
<sizeparam width="200" height="150" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="Primitive component" value="Dest1" />
-<TGConnectingPoint num="0" id="213" />
-<TGConnectingPoint num="1" id="214" />
-<TGConnectingPoint num="2" id="215" />
-<TGConnectingPoint num="3" id="216" />
-<TGConnectingPoint num="4" id="217" />
-<TGConnectingPoint num="5" id="218" />
-<TGConnectingPoint num="6" id="219" />
-<TGConnectingPoint num="7" id="220" />
+<TGConnectingPoint num="0" id="33" />
+<TGConnectingPoint num="1" id="34" />
+<TGConnectingPoint num="2" id="35" />
+<TGConnectingPoint num="3" id="36" />
+<TGConnectingPoint num="4" id="37" />
+<TGConnectingPoint num="5" id="38" />
+<TGConnectingPoint num="6" id="39" />
+<TGConnectingPoint num="7" id="40" />
<extraparam>
<Data isAttacker="No" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1203" id="261" >
-<father id="212" num="0" />
+<SUBCOMPONENT type="1203" id="32" >
+<father id="41" num="0" />
<cdparam x="512" y="159" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Channel comm" />
-<TGConnectingPoint num="0" id="270" />
+<infoparam name="Primitive port" value="Channel chfork1" />
+<TGConnectingPoint num="0" id="31" />
<extraparam>
-<Prop commName="chfork1" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="true" checkConfStatus="1" checkAuth="false" checkWeakAuthStatus="1" checkStrongAuthStatus="1" />
+<Prop commName="chfork1" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="true" checkConfStatus="1" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" referenceReq="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -123,34 +123,34 @@
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1202" id="201" >
+<COMPONENT type="1202" id="52" >
<cdparam x="79" y="162" />
<sizeparam width="200" height="150" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="Primitive component" value="src" />
-<TGConnectingPoint num="0" id="202" />
-<TGConnectingPoint num="1" id="203" />
-<TGConnectingPoint num="2" id="204" />
-<TGConnectingPoint num="3" id="205" />
-<TGConnectingPoint num="4" id="206" />
-<TGConnectingPoint num="5" id="207" />
-<TGConnectingPoint num="6" id="208" />
-<TGConnectingPoint num="7" id="209" />
+<TGConnectingPoint num="0" id="44" />
+<TGConnectingPoint num="1" id="45" />
+<TGConnectingPoint num="2" id="46" />
+<TGConnectingPoint num="3" id="47" />
+<TGConnectingPoint num="4" id="48" />
+<TGConnectingPoint num="5" id="49" />
+<TGConnectingPoint num="6" id="50" />
+<TGConnectingPoint num="7" id="51" />
<extraparam>
<Data isAttacker="No" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1203" id="250" >
-<father id="201" num="0" />
+<SUBCOMPONENT type="1203" id="43" >
+<father id="52" num="0" />
<cdparam x="266" y="248" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Channel comm" />
-<TGConnectingPoint num="0" id="259" />
+<infoparam name="Primitive port" value="Channel chfork" />
+<TGConnectingPoint num="0" id="42" />
<extraparam>
-<Prop commName="chfork" commType="0" origin="true" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="1" checkStrongAuthStatus="1" />
+<Prop commName="chfork" commType="0" origin="true" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" referenceReq="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -162,154 +162,154 @@
</TMLComponentTaskDiagramPanel>
-<TMLActivityDiagramPanel name="src" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="1001" id="3620" >
-<cdparam x="413" y="181" />
+<TMLActivityDiagramPanel name="Dest2" minX="10" maxX="2500" minY="10" maxY="1500" >
+<COMPONENT type="1001" id="54" >
+<cdparam x="394" y="190" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="3621" />
+<TGConnectingPoint num="0" id="53" />
</COMPONENT>
-<COMPONENT type="1006" id="3616" >
-<cdparam x="380" y="112" />
-<sizeparam width="67" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1009" id="57" >
+<cdparam x="377" y="113" />
+<sizeparam width="74" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="write channel" value="chfork(5)" />
-<TGConnectingPoint num="0" id="3617" />
-<TGConnectingPoint num="1" id="3618" />
+<infoparam name="read channel" value="chfork2(5) " />
+<TGConnectingPoint num="0" id="55" />
+<TGConnectingPoint num="1" id="56" />
<extraparam>
-<Data channelName="chfork" nbOfSamples="5" secPattern="" isAttacker="No" />
+<Data channelName="chfork2" nbOfSamples="5" secPattern="" isAttacker="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1000" id="210" >
+<COMPONENT type="1000" id="59" >
<cdparam x="400" y="50" />
<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="211" />
+<TGConnectingPoint num="0" id="58" />
</COMPONENT>
-<CONNECTOR type="115" id="3619" >
+<CONNECTOR type="115" id="60" >
<cdparam x="407" y="70" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="407" y="70" id="211" />
-<P2 x="413" y="107" id="3617" />
+<P1 x="407" y="70" id="58" />
+<P2 x="414" y="108" id="55" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="3622" >
-<cdparam x="413" y="137" />
+<CONNECTOR type="115" id="61" >
+<cdparam x="414" y="138" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="413" y="137" id="3618" />
-<P2 x="423" y="176" id="3621" />
+<P1 x="414" y="138" id="56" />
+<P2 x="404" y="185" id="53" />
<AutomaticDrawing data="true" />
</CONNECTOR>
</TMLActivityDiagramPanel>
<TMLActivityDiagramPanel name="Dest1" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="1001" id="3627" >
+<COMPONENT type="1001" id="63" >
<cdparam x="420" y="183" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="3628" />
+<TGConnectingPoint num="0" id="62" />
</COMPONENT>
-<COMPONENT type="1009" id="3623" >
-<cdparam x="380" y="110" />
-<sizeparam width="79" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1009" id="66" >
+<cdparam x="382" y="110" />
+<sizeparam width="74" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="read channel" value="chfork1(5) " />
-<TGConnectingPoint num="0" id="3624" />
-<TGConnectingPoint num="1" id="3625" />
+<TGConnectingPoint num="0" id="64" />
+<TGConnectingPoint num="1" id="65" />
<extraparam>
<Data channelName="chfork1" nbOfSamples="5" secPattern="" isAttacker="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1000" id="221" >
+<COMPONENT type="1000" id="68" >
<cdparam x="400" y="50" />
<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="222" />
+<TGConnectingPoint num="0" id="67" />
</COMPONENT>
-<CONNECTOR type="115" id="3626" >
+<CONNECTOR type="115" id="69" >
<cdparam x="407" y="70" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="407" y="70" id="222" />
-<P2 x="419" y="105" id="3624" />
+<P1 x="407" y="70" id="67" />
+<P2 x="419" y="105" id="64" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="3629" >
+<CONNECTOR type="115" id="70" >
<cdparam x="419" y="135" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="419" y="135" id="3625" />
-<P2 x="430" y="178" id="3628" />
+<P1 x="419" y="135" id="65" />
+<P2 x="430" y="178" id="62" />
<AutomaticDrawing data="true" />
</CONNECTOR>
</TMLActivityDiagramPanel>
-<TMLActivityDiagramPanel name="Dest2" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="1001" id="3634" >
-<cdparam x="394" y="190" />
+<TMLActivityDiagramPanel name="src" minX="10" maxX="2500" minY="10" maxY="1500" >
+<COMPONENT type="1001" id="72" >
+<cdparam x="413" y="181" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="3635" />
+<TGConnectingPoint num="0" id="71" />
</COMPONENT>
-<COMPONENT type="1009" id="3630" >
-<cdparam x="375" y="113" />
-<sizeparam width="79" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1006" id="75" >
+<cdparam x="382" y="112" />
+<sizeparam width="62" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="read channel" value="chfork2(5) " />
-<TGConnectingPoint num="0" id="3631" />
-<TGConnectingPoint num="1" id="3632" />
+<infoparam name="write channel" value="chfork(5)" />
+<TGConnectingPoint num="0" id="73" />
+<TGConnectingPoint num="1" id="74" />
<extraparam>
-<Data channelName="chfork2" nbOfSamples="5" secPattern="" isAttacker="No" />
+<Data channelName="chfork" nbOfSamples="5" secPattern="" isAttacker="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1000" id="232" >
+<COMPONENT type="1000" id="77" >
<cdparam x="400" y="50" />
<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="233" />
+<TGConnectingPoint num="0" id="76" />
</COMPONENT>
-<CONNECTOR type="115" id="3633" >
+<CONNECTOR type="115" id="78" >
<cdparam x="407" y="70" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="407" y="70" id="233" />
-<P2 x="414" y="108" id="3631" />
+<P1 x="407" y="70" id="76" />
+<P2 x="413" y="107" id="73" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="3636" >
-<cdparam x="414" y="138" />
+<CONNECTOR type="115" id="79" >
+<cdparam x="413" y="137" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="414" y="138" id="3632" />
-<P2 x="404" y="185" id="3635" />
+<P1 x="413" y="137" id="74" />
+<P2 x="423" y="176" id="71" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -322,617 +322,617 @@
<Modeling type="TML Architecture" nameTab="ArchitectureFork" >
<TMLArchiDiagramPanel name="DIPLODOCUS architecture and mapping Diagram" minX="10" maxX="2500" minY="10" maxY="1500" attributes="0" masterClockFrequency="200" >
-<CONNECTOR type="125" id="3588" >
-<cdparam x="299" y="534" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="{info}" />
-<P1 x="299" y="525" id="834" />
-<P2 x="354" y="495" id="801" />
-<AutomaticDrawing data="true" />
-<extraparam>
-<info priority="0" />
-<spy value="false" />
-</extraparam>
-</CONNECTOR>
-<CONNECTOR type="125" id="3587" >
-<cdparam x="300" y="351" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="{info}" />
-<P1 x="300" y="351" id="291" />
-<P2 x="354" y="445" id="796" />
-<AutomaticDrawing data="true" />
-<extraparam>
-<info priority="0" />
-<spy value="false" />
-</extraparam>
-</CONNECTOR>
-<CONNECTOR type="125" id="3577" >
-<cdparam x="1062" y="771" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="{info}" />
-<P1 x="934" y="783" id="2520" />
-<P2 x="1077" y="731" id="1573" />
-<AutomaticDrawing data="true" />
-<extraparam>
-<info priority="0" />
-<spy value="false" />
-</extraparam>
-</CONNECTOR>
-<CONNECTOR type="125" id="1774" >
-<cdparam x="1327" y="720" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="{info}" />
-<P1 x="1327" y="720" id="645" />
-<P2 x="1202" y="718" id="1580" />
-<AutomaticDrawing data="true" />
-<extraparam>
-<info priority="0" />
-<spy value="false" />
-</extraparam>
-</CONNECTOR>
-<CONNECTOR type="125" id="1773" >
-<cdparam x="997" y="600" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="{info}" />
-<P1 x="997" y="600" id="855" />
-<P2 x="1077" y="681" id="1568" />
-<AutomaticDrawing data="true" />
-<extraparam>
-<info priority="0" />
-<spy value="false" />
-</extraparam>
-</CONNECTOR>
-<CONNECTOR type="125" id="872" >
-<cdparam x="807" y="555" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="{info}" />
-<P1 x="807" y="555" id="858" />
-<P2 x="604" y="482" id="809" />
-<AutomaticDrawing data="true" />
-<extraparam>
-<info priority="0" />
-<spy value="false" />
-</extraparam>
-</CONNECTOR>
-<COMPONENT type="1106" id="847" >
+<COMPONENT type="1106" id="104" >
<cdparam x="807" y="540" />
<sizeparam width="190" height="60" minWidth="100" minHeight="35" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="BridgeDest2" value="name" />
-<TGConnectingPoint num="0" id="848" />
-<TGConnectingPoint num="1" id="849" />
-<TGConnectingPoint num="2" id="850" />
-<TGConnectingPoint num="3" id="851" />
-<TGConnectingPoint num="4" id="852" />
-<TGConnectingPoint num="5" id="853" />
-<TGConnectingPoint num="6" id="854" />
-<TGConnectingPoint num="7" id="855" />
-<TGConnectingPoint num="8" id="856" />
-<TGConnectingPoint num="9" id="857" />
-<TGConnectingPoint num="10" id="858" />
-<TGConnectingPoint num="11" id="859" />
-<TGConnectingPoint num="12" id="860" />
-<TGConnectingPoint num="13" id="861" />
-<TGConnectingPoint num="14" id="862" />
-<TGConnectingPoint num="15" id="863" />
-<TGConnectingPoint num="16" id="864" />
-<TGConnectingPoint num="17" id="865" />
-<TGConnectingPoint num="18" id="866" />
-<TGConnectingPoint num="19" id="867" />
-<TGConnectingPoint num="20" id="868" />
-<TGConnectingPoint num="21" id="869" />
-<TGConnectingPoint num="22" id="870" />
-<TGConnectingPoint num="23" id="871" />
+<TGConnectingPoint num="0" id="80" />
+<TGConnectingPoint num="1" id="81" />
+<TGConnectingPoint num="2" id="82" />
+<TGConnectingPoint num="3" id="83" />
+<TGConnectingPoint num="4" id="84" />
+<TGConnectingPoint num="5" id="85" />
+<TGConnectingPoint num="6" id="86" />
+<TGConnectingPoint num="7" id="87" />
+<TGConnectingPoint num="8" id="88" />
+<TGConnectingPoint num="9" id="89" />
+<TGConnectingPoint num="10" id="90" />
+<TGConnectingPoint num="11" id="91" />
+<TGConnectingPoint num="12" id="92" />
+<TGConnectingPoint num="13" id="93" />
+<TGConnectingPoint num="14" id="94" />
+<TGConnectingPoint num="15" id="95" />
+<TGConnectingPoint num="16" id="96" />
+<TGConnectingPoint num="17" id="97" />
+<TGConnectingPoint num="18" id="98" />
+<TGConnectingPoint num="19" id="99" />
+<TGConnectingPoint num="20" id="100" />
+<TGConnectingPoint num="21" id="101" />
+<TGConnectingPoint num="22" id="102" />
+<TGConnectingPoint num="23" id="103" />
<extraparam>
<info stereotype="BRIDGE" nodeName="BridgeDest2" />
<attributes bufferByteDataSize="4" clockRatio="1" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1105" id="822" >
+<COMPONENT type="1105" id="129" >
<cdparam x="70" y="489" />
<sizeparam width="229" height="147" minWidth="100" minHeight="35" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="MemorySrc" value="name" />
-<TGConnectingPoint num="0" id="823" />
-<TGConnectingPoint num="1" id="824" />
-<TGConnectingPoint num="2" id="825" />
-<TGConnectingPoint num="3" id="826" />
-<TGConnectingPoint num="4" id="827" />
-<TGConnectingPoint num="5" id="828" />
-<TGConnectingPoint num="6" id="829" />
-<TGConnectingPoint num="7" id="830" />
-<TGConnectingPoint num="8" id="831" />
-<TGConnectingPoint num="9" id="832" />
-<TGConnectingPoint num="10" id="833" />
-<TGConnectingPoint num="11" id="834" />
-<TGConnectingPoint num="12" id="835" />
-<TGConnectingPoint num="13" id="836" />
-<TGConnectingPoint num="14" id="837" />
-<TGConnectingPoint num="15" id="838" />
-<TGConnectingPoint num="16" id="839" />
-<TGConnectingPoint num="17" id="840" />
-<TGConnectingPoint num="18" id="841" />
-<TGConnectingPoint num="19" id="842" />
-<TGConnectingPoint num="20" id="843" />
-<TGConnectingPoint num="21" id="844" />
-<TGConnectingPoint num="22" id="845" />
-<TGConnectingPoint num="23" id="846" />
+<TGConnectingPoint num="0" id="105" />
+<TGConnectingPoint num="1" id="106" />
+<TGConnectingPoint num="2" id="107" />
+<TGConnectingPoint num="3" id="108" />
+<TGConnectingPoint num="4" id="109" />
+<TGConnectingPoint num="5" id="110" />
+<TGConnectingPoint num="6" id="111" />
+<TGConnectingPoint num="7" id="112" />
+<TGConnectingPoint num="8" id="113" />
+<TGConnectingPoint num="9" id="114" />
+<TGConnectingPoint num="10" id="115" />
+<TGConnectingPoint num="11" id="116" />
+<TGConnectingPoint num="12" id="117" />
+<TGConnectingPoint num="13" id="118" />
+<TGConnectingPoint num="14" id="119" />
+<TGConnectingPoint num="15" id="120" />
+<TGConnectingPoint num="16" id="121" />
+<TGConnectingPoint num="17" id="122" />
+<TGConnectingPoint num="18" id="123" />
+<TGConnectingPoint num="19" id="124" />
+<TGConnectingPoint num="20" id="125" />
+<TGConnectingPoint num="21" id="126" />
+<TGConnectingPoint num="22" id="127" />
+<TGConnectingPoint num="23" id="128" />
<extraparam>
<info stereotype="MEMORY" nodeName="MemorySrc" />
-<attributes byteDataSize="4" memorySize="1024" clockRatio="1" bufferType="0" />
+<attributes byteDataSize="4" clockRatio="1" bufferType="0" />
</extraparam>
</COMPONENT>
-<CONNECTOR type="125" id="821" >
-<cdparam x="806" y="478" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="{info}" />
-<P1 x="809" y="421" id="774" />
-<P2 x="604" y="470" id="800" />
-<AutomaticDrawing data="true" />
-<extraparam>
-<info priority="0" />
-<spy value="false" />
-</extraparam>
-</CONNECTOR>
-<CONNECTOR type="125" id="820" >
-<cdparam x="922" y="447" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="{info}" />
-<P1 x="925" y="390" id="780" />
-<P2 x="1023" y="353" id="708" />
-<AutomaticDrawing data="true" />
-<extraparam>
-<info priority="0" />
-<spy value="false" />
-</extraparam>
-</CONNECTOR>
-<COMPONENT type="1102" id="795" >
+<COMPONENT type="1102" id="154" >
<cdparam x="354" y="445" />
<sizeparam width="250" height="50" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="BusSrc" value="name" />
-<TGConnectingPoint num="0" id="796" />
-<TGConnectingPoint num="1" id="797" />
-<TGConnectingPoint num="2" id="798" />
-<TGConnectingPoint num="3" id="799" />
-<TGConnectingPoint num="4" id="800" />
-<TGConnectingPoint num="5" id="801" />
-<TGConnectingPoint num="6" id="802" />
-<TGConnectingPoint num="7" id="803" />
-<TGConnectingPoint num="8" id="804" />
-<TGConnectingPoint num="9" id="805" />
-<TGConnectingPoint num="10" id="806" />
-<TGConnectingPoint num="11" id="807" />
-<TGConnectingPoint num="12" id="808" />
-<TGConnectingPoint num="13" id="809" />
-<TGConnectingPoint num="14" id="810" />
-<TGConnectingPoint num="15" id="811" />
-<TGConnectingPoint num="16" id="812" />
-<TGConnectingPoint num="17" id="813" />
-<TGConnectingPoint num="18" id="814" />
-<TGConnectingPoint num="19" id="815" />
-<TGConnectingPoint num="20" id="816" />
-<TGConnectingPoint num="21" id="817" />
-<TGConnectingPoint num="22" id="818" />
-<TGConnectingPoint num="23" id="819" />
+<TGConnectingPoint num="0" id="130" />
+<TGConnectingPoint num="1" id="131" />
+<TGConnectingPoint num="2" id="132" />
+<TGConnectingPoint num="3" id="133" />
+<TGConnectingPoint num="4" id="134" />
+<TGConnectingPoint num="5" id="135" />
+<TGConnectingPoint num="6" id="136" />
+<TGConnectingPoint num="7" id="137" />
+<TGConnectingPoint num="8" id="138" />
+<TGConnectingPoint num="9" id="139" />
+<TGConnectingPoint num="10" id="140" />
+<TGConnectingPoint num="11" id="141" />
+<TGConnectingPoint num="12" id="142" />
+<TGConnectingPoint num="13" id="143" />
+<TGConnectingPoint num="14" id="144" />
+<TGConnectingPoint num="15" id="145" />
+<TGConnectingPoint num="16" id="146" />
+<TGConnectingPoint num="17" id="147" />
+<TGConnectingPoint num="18" id="148" />
+<TGConnectingPoint num="19" id="149" />
+<TGConnectingPoint num="20" id="150" />
+<TGConnectingPoint num="21" id="151" />
+<TGConnectingPoint num="22" id="152" />
+<TGConnectingPoint num="23" id="153" />
<extraparam>
<info stereotype="BUS-RR" nodeName="BusSrc" />
<attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" clockRatio="1" privacy="0" referenceAttack="null" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1106" id="770" >
+<COMPONENT type="1106" id="179" >
<cdparam x="809" y="390" />
<sizeparam width="155" height="62" minWidth="100" minHeight="35" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="BridgeDest1" value="name" />
-<TGConnectingPoint num="0" id="771" />
-<TGConnectingPoint num="1" id="772" />
-<TGConnectingPoint num="2" id="773" />
-<TGConnectingPoint num="3" id="774" />
-<TGConnectingPoint num="4" id="775" />
-<TGConnectingPoint num="5" id="776" />
-<TGConnectingPoint num="6" id="777" />
-<TGConnectingPoint num="7" id="778" />
-<TGConnectingPoint num="8" id="779" />
-<TGConnectingPoint num="9" id="780" />
-<TGConnectingPoint num="10" id="781" />
-<TGConnectingPoint num="11" id="782" />
-<TGConnectingPoint num="12" id="783" />
-<TGConnectingPoint num="13" id="784" />
-<TGConnectingPoint num="14" id="785" />
-<TGConnectingPoint num="15" id="786" />
-<TGConnectingPoint num="16" id="787" />
-<TGConnectingPoint num="17" id="788" />
-<TGConnectingPoint num="18" id="789" />
-<TGConnectingPoint num="19" id="790" />
-<TGConnectingPoint num="20" id="791" />
-<TGConnectingPoint num="21" id="792" />
-<TGConnectingPoint num="22" id="793" />
-<TGConnectingPoint num="23" id="794" />
+<TGConnectingPoint num="0" id="155" />
+<TGConnectingPoint num="1" id="156" />
+<TGConnectingPoint num="2" id="157" />
+<TGConnectingPoint num="3" id="158" />
+<TGConnectingPoint num="4" id="159" />
+<TGConnectingPoint num="5" id="160" />
+<TGConnectingPoint num="6" id="161" />
+<TGConnectingPoint num="7" id="162" />
+<TGConnectingPoint num="8" id="163" />
+<TGConnectingPoint num="9" id="164" />
+<TGConnectingPoint num="10" id="165" />
+<TGConnectingPoint num="11" id="166" />
+<TGConnectingPoint num="12" id="167" />
+<TGConnectingPoint num="13" id="168" />
+<TGConnectingPoint num="14" id="169" />
+<TGConnectingPoint num="15" id="170" />
+<TGConnectingPoint num="16" id="171" />
+<TGConnectingPoint num="17" id="172" />
+<TGConnectingPoint num="18" id="173" />
+<TGConnectingPoint num="19" id="174" />
+<TGConnectingPoint num="20" id="175" />
+<TGConnectingPoint num="21" id="176" />
+<TGConnectingPoint num="22" id="177" />
+<TGConnectingPoint num="23" id="178" />
<extraparam>
<info stereotype="BRIDGE" nodeName="BridgeDest1" />
<attributes bufferByteDataSize="4" clockRatio="1" />
</extraparam>
</COMPONENT>
-<CONNECTOR type="125" id="769" >
-<cdparam x="888" y="253" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="{info}" />
-<P1 x="1211" y="251" id="323" />
-<P2 x="1148" y="303" id="703" />
-<AutomaticDrawing data="true" />
-<extraparam>
-<info priority="0" />
-<spy value="false" />
-</extraparam>
-</CONNECTOR>
-<CONNECTOR type="125" id="768" >
-<cdparam x="614" y="272" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="{info}" />
-<P1 x="815" y="241" id="750" />
-<P2 x="1086" y="303" id="695" />
-<AutomaticDrawing data="true" />
-<extraparam>
-<info priority="0" />
-<spy value="false" />
-</extraparam>
-</CONNECTOR>
-<COMPONENT type="1100" id="283" >
+<COMPONENT type="1100" id="213" >
<cdparam x="96" y="251" />
<sizeparam width="204" height="100" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="CPUSrc" value="name" />
-<TGConnectingPoint num="0" id="284" />
-<TGConnectingPoint num="1" id="285" />
-<TGConnectingPoint num="2" id="286" />
-<TGConnectingPoint num="3" id="287" />
-<TGConnectingPoint num="4" id="288" />
-<TGConnectingPoint num="5" id="289" />
-<TGConnectingPoint num="6" id="290" />
-<TGConnectingPoint num="7" id="291" />
-<TGConnectingPoint num="8" id="292" />
-<TGConnectingPoint num="9" id="293" />
-<TGConnectingPoint num="10" id="294" />
-<TGConnectingPoint num="11" id="295" />
-<TGConnectingPoint num="12" id="296" />
-<TGConnectingPoint num="13" id="297" />
-<TGConnectingPoint num="14" id="298" />
-<TGConnectingPoint num="15" id="299" />
-<TGConnectingPoint num="16" id="300" />
-<TGConnectingPoint num="17" id="301" />
-<TGConnectingPoint num="18" id="302" />
-<TGConnectingPoint num="19" id="303" />
-<TGConnectingPoint num="20" id="304" />
-<TGConnectingPoint num="21" id="305" />
-<TGConnectingPoint num="22" id="306" />
-<TGConnectingPoint num="23" id="307" />
+<TGConnectingPoint num="0" id="189" />
+<TGConnectingPoint num="1" id="190" />
+<TGConnectingPoint num="2" id="191" />
+<TGConnectingPoint num="3" id="192" />
+<TGConnectingPoint num="4" id="193" />
+<TGConnectingPoint num="5" id="194" />
+<TGConnectingPoint num="6" id="195" />
+<TGConnectingPoint num="7" id="196" />
+<TGConnectingPoint num="8" id="197" />
+<TGConnectingPoint num="9" id="198" />
+<TGConnectingPoint num="10" id="199" />
+<TGConnectingPoint num="11" id="200" />
+<TGConnectingPoint num="12" id="201" />
+<TGConnectingPoint num="13" id="202" />
+<TGConnectingPoint num="14" id="203" />
+<TGConnectingPoint num="15" id="204" />
+<TGConnectingPoint num="16" id="205" />
+<TGConnectingPoint num="17" id="206" />
+<TGConnectingPoint num="18" id="207" />
+<TGConnectingPoint num="19" id="208" />
+<TGConnectingPoint num="20" id="209" />
+<TGConnectingPoint num="21" id="210" />
+<TGConnectingPoint num="22" id="211" />
+<TGConnectingPoint num="23" id="212" />
<extraparam>
<info stereotype="CPURR" nodeName="CPUSrc" />
<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="1" MECType="0" encryption="0"/>
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1101" id="3578" >
-<father id="283" num="0" />
+<SUBCOMPONENT type="1101" id="188" >
+<father id="213" num="0" />
<cdparam x="105" y="292" />
-<sizeparam width="104" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="100" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="100" minY="0" maxY="60" />
+<cdrectangleparam minX="0" maxX="104" minY="0" maxY="60" />
<infoparam name="TGComponent" value="FVFork::src" />
-<TGConnectingPoint num="0" id="3579" />
-<TGConnectingPoint num="1" id="3580" />
-<TGConnectingPoint num="2" id="3581" />
-<TGConnectingPoint num="3" id="3582" />
-<TGConnectingPoint num="4" id="3583" />
-<TGConnectingPoint num="5" id="3584" />
-<TGConnectingPoint num="6" id="3585" />
-<TGConnectingPoint num="7" id="3586" />
+<TGConnectingPoint num="0" id="180" />
+<TGConnectingPoint num="1" id="181" />
+<TGConnectingPoint num="2" id="182" />
+<TGConnectingPoint num="3" id="183" />
+<TGConnectingPoint num="4" id="184" />
+<TGConnectingPoint num="5" id="185" />
+<TGConnectingPoint num="6" id="186" />
+<TGConnectingPoint num="7" id="187" />
<extraparam>
<info value="FVFork::src" taskName="src" referenceTaskName="FVFork" priority="0" operation="T0" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1100" id="641" >
+<COMPONENT type="1100" id="247" >
<cdparam x="1327" y="620" />
<sizeparam width="250" height="200" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="CPUDest2" value="name" />
-<TGConnectingPoint num="0" id="642" />
-<TGConnectingPoint num="1" id="643" />
-<TGConnectingPoint num="2" id="644" />
-<TGConnectingPoint num="3" id="645" />
-<TGConnectingPoint num="4" id="646" />
-<TGConnectingPoint num="5" id="647" />
-<TGConnectingPoint num="6" id="648" />
-<TGConnectingPoint num="7" id="649" />
-<TGConnectingPoint num="8" id="650" />
-<TGConnectingPoint num="9" id="651" />
-<TGConnectingPoint num="10" id="652" />
-<TGConnectingPoint num="11" id="653" />
-<TGConnectingPoint num="12" id="654" />
-<TGConnectingPoint num="13" id="655" />
-<TGConnectingPoint num="14" id="656" />
-<TGConnectingPoint num="15" id="657" />
-<TGConnectingPoint num="16" id="658" />
-<TGConnectingPoint num="17" id="659" />
-<TGConnectingPoint num="18" id="660" />
-<TGConnectingPoint num="19" id="661" />
-<TGConnectingPoint num="20" id="662" />
-<TGConnectingPoint num="21" id="663" />
-<TGConnectingPoint num="22" id="664" />
-<TGConnectingPoint num="23" id="665" />
+<TGConnectingPoint num="0" id="223" />
+<TGConnectingPoint num="1" id="224" />
+<TGConnectingPoint num="2" id="225" />
+<TGConnectingPoint num="3" id="226" />
+<TGConnectingPoint num="4" id="227" />
+<TGConnectingPoint num="5" id="228" />
+<TGConnectingPoint num="6" id="229" />
+<TGConnectingPoint num="7" id="230" />
+<TGConnectingPoint num="8" id="231" />
+<TGConnectingPoint num="9" id="232" />
+<TGConnectingPoint num="10" id="233" />
+<TGConnectingPoint num="11" id="234" />
+<TGConnectingPoint num="12" id="235" />
+<TGConnectingPoint num="13" id="236" />
+<TGConnectingPoint num="14" id="237" />
+<TGConnectingPoint num="15" id="238" />
+<TGConnectingPoint num="16" id="239" />
+<TGConnectingPoint num="17" id="240" />
+<TGConnectingPoint num="18" id="241" />
+<TGConnectingPoint num="19" id="242" />
+<TGConnectingPoint num="20" id="243" />
+<TGConnectingPoint num="21" id="244" />
+<TGConnectingPoint num="22" id="245" />
+<TGConnectingPoint num="23" id="246" />
<extraparam>
<info stereotype="CPURR" nodeName="CPUDest2" />
<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="1" MECType="0" encryption="0"/>
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1101" id="3607" >
-<father id="641" num="0" />
+<SUBCOMPONENT type="1101" id="222" >
+<father id="247" num="0" />
<cdparam x="1349" y="701" />
-<sizeparam width="122" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="116" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="128" minY="0" maxY="160" />
+<cdrectangleparam minX="0" maxX="134" minY="0" maxY="160" />
<infoparam name="TGComponent" value="FVFork::Dest2" />
-<TGConnectingPoint num="0" id="3608" />
-<TGConnectingPoint num="1" id="3609" />
-<TGConnectingPoint num="2" id="3610" />
-<TGConnectingPoint num="3" id="3611" />
-<TGConnectingPoint num="4" id="3612" />
-<TGConnectingPoint num="5" id="3613" />
-<TGConnectingPoint num="6" id="3614" />
-<TGConnectingPoint num="7" id="3615" />
+<TGConnectingPoint num="0" id="214" />
+<TGConnectingPoint num="1" id="215" />
+<TGConnectingPoint num="2" id="216" />
+<TGConnectingPoint num="3" id="217" />
+<TGConnectingPoint num="4" id="218" />
+<TGConnectingPoint num="5" id="219" />
+<TGConnectingPoint num="6" id="220" />
+<TGConnectingPoint num="7" id="221" />
<extraparam>
<info value="FVFork::Dest2" taskName="Dest2" referenceTaskName="FVFork" priority="0" operation="T0" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1100" id="308" >
+<COMPONENT type="1100" id="281" >
<cdparam x="1152" y="145" />
<sizeparam width="237" height="106" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="CPUDest1" value="name" />
-<TGConnectingPoint num="0" id="309" />
-<TGConnectingPoint num="1" id="310" />
-<TGConnectingPoint num="2" id="311" />
-<TGConnectingPoint num="3" id="312" />
-<TGConnectingPoint num="4" id="313" />
-<TGConnectingPoint num="5" id="314" />
-<TGConnectingPoint num="6" id="315" />
-<TGConnectingPoint num="7" id="316" />
-<TGConnectingPoint num="8" id="317" />
-<TGConnectingPoint num="9" id="318" />
-<TGConnectingPoint num="10" id="319" />
-<TGConnectingPoint num="11" id="320" />
-<TGConnectingPoint num="12" id="321" />
-<TGConnectingPoint num="13" id="322" />
-<TGConnectingPoint num="14" id="323" />
-<TGConnectingPoint num="15" id="324" />
-<TGConnectingPoint num="16" id="325" />
-<TGConnectingPoint num="17" id="326" />
-<TGConnectingPoint num="18" id="327" />
-<TGConnectingPoint num="19" id="328" />
-<TGConnectingPoint num="20" id="329" />
-<TGConnectingPoint num="21" id="330" />
-<TGConnectingPoint num="22" id="331" />
-<TGConnectingPoint num="23" id="332" />
+<TGConnectingPoint num="0" id="257" />
+<TGConnectingPoint num="1" id="258" />
+<TGConnectingPoint num="2" id="259" />
+<TGConnectingPoint num="3" id="260" />
+<TGConnectingPoint num="4" id="261" />
+<TGConnectingPoint num="5" id="262" />
+<TGConnectingPoint num="6" id="263" />
+<TGConnectingPoint num="7" id="264" />
+<TGConnectingPoint num="8" id="265" />
+<TGConnectingPoint num="9" id="266" />
+<TGConnectingPoint num="10" id="267" />
+<TGConnectingPoint num="11" id="268" />
+<TGConnectingPoint num="12" id="269" />
+<TGConnectingPoint num="13" id="270" />
+<TGConnectingPoint num="14" id="271" />
+<TGConnectingPoint num="15" id="272" />
+<TGConnectingPoint num="16" id="273" />
+<TGConnectingPoint num="17" id="274" />
+<TGConnectingPoint num="18" id="275" />
+<TGConnectingPoint num="19" id="276" />
+<TGConnectingPoint num="20" id="277" />
+<TGConnectingPoint num="21" id="278" />
+<TGConnectingPoint num="22" id="279" />
+<TGConnectingPoint num="23" id="280" />
<extraparam>
<info stereotype="CPURR" nodeName="CPUDest1" />
<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="1" MECType="0" encryption="0"/>
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1101" id="3598" >
-<father id="308" num="0" />
+<SUBCOMPONENT type="1101" id="256" >
+<father id="281" num="0" />
<cdparam x="1165" y="190" />
-<sizeparam width="122" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="116" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="115" minY="0" maxY="66" />
+<cdrectangleparam minX="0" maxX="121" minY="0" maxY="66" />
<infoparam name="TGComponent" value="FVFork::Dest1" />
-<TGConnectingPoint num="0" id="3599" />
-<TGConnectingPoint num="1" id="3600" />
-<TGConnectingPoint num="2" id="3601" />
-<TGConnectingPoint num="3" id="3602" />
-<TGConnectingPoint num="4" id="3603" />
-<TGConnectingPoint num="5" id="3604" />
-<TGConnectingPoint num="6" id="3605" />
-<TGConnectingPoint num="7" id="3606" />
+<TGConnectingPoint num="0" id="248" />
+<TGConnectingPoint num="1" id="249" />
+<TGConnectingPoint num="2" id="250" />
+<TGConnectingPoint num="3" id="251" />
+<TGConnectingPoint num="4" id="252" />
+<TGConnectingPoint num="5" id="253" />
+<TGConnectingPoint num="6" id="254" />
+<TGConnectingPoint num="7" id="255" />
<extraparam>
<info value="FVFork::Dest1" taskName="Dest1" referenceTaskName="FVFork" priority="0" operation="T0" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1102" id="1566" >
+<COMPONENT type="1102" id="306" >
<cdparam x="952" y="681" />
<sizeparam width="250" height="50" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="BusDest2" value="name" />
-<TGConnectingPoint num="0" id="1567" />
-<TGConnectingPoint num="1" id="1568" />
-<TGConnectingPoint num="2" id="1569" />
-<TGConnectingPoint num="3" id="1570" />
-<TGConnectingPoint num="4" id="1571" />
-<TGConnectingPoint num="5" id="1572" />
-<TGConnectingPoint num="6" id="1573" />
-<TGConnectingPoint num="7" id="1574" />
-<TGConnectingPoint num="8" id="1575" />
-<TGConnectingPoint num="9" id="1576" />
-<TGConnectingPoint num="10" id="1577" />
-<TGConnectingPoint num="11" id="1578" />
-<TGConnectingPoint num="12" id="1579" />
-<TGConnectingPoint num="13" id="1580" />
-<TGConnectingPoint num="14" id="1581" />
-<TGConnectingPoint num="15" id="1582" />
-<TGConnectingPoint num="16" id="1583" />
-<TGConnectingPoint num="17" id="1584" />
-<TGConnectingPoint num="18" id="1585" />
-<TGConnectingPoint num="19" id="1586" />
-<TGConnectingPoint num="20" id="1587" />
-<TGConnectingPoint num="21" id="1588" />
-<TGConnectingPoint num="22" id="1589" />
-<TGConnectingPoint num="23" id="1590" />
+<TGConnectingPoint num="0" id="282" />
+<TGConnectingPoint num="1" id="283" />
+<TGConnectingPoint num="2" id="284" />
+<TGConnectingPoint num="3" id="285" />
+<TGConnectingPoint num="4" id="286" />
+<TGConnectingPoint num="5" id="287" />
+<TGConnectingPoint num="6" id="288" />
+<TGConnectingPoint num="7" id="289" />
+<TGConnectingPoint num="8" id="290" />
+<TGConnectingPoint num="9" id="291" />
+<TGConnectingPoint num="10" id="292" />
+<TGConnectingPoint num="11" id="293" />
+<TGConnectingPoint num="12" id="294" />
+<TGConnectingPoint num="13" id="295" />
+<TGConnectingPoint num="14" id="296" />
+<TGConnectingPoint num="15" id="297" />
+<TGConnectingPoint num="16" id="298" />
+<TGConnectingPoint num="17" id="299" />
+<TGConnectingPoint num="18" id="300" />
+<TGConnectingPoint num="19" id="301" />
+<TGConnectingPoint num="20" id="302" />
+<TGConnectingPoint num="21" id="303" />
+<TGConnectingPoint num="22" id="304" />
+<TGConnectingPoint num="23" id="305" />
<extraparam>
<info stereotype="BUS-RR" nodeName="BusDest2" />
<attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" clockRatio="1" privacy="0" referenceAttack="null" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1102" id="693" >
+<COMPONENT type="1102" id="331" >
<cdparam x="961" y="303" />
<sizeparam width="250" height="50" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="BusDest1" value="name" />
-<TGConnectingPoint num="0" id="694" />
-<TGConnectingPoint num="1" id="695" />
-<TGConnectingPoint num="2" id="696" />
-<TGConnectingPoint num="3" id="697" />
-<TGConnectingPoint num="4" id="698" />
-<TGConnectingPoint num="5" id="699" />
-<TGConnectingPoint num="6" id="700" />
-<TGConnectingPoint num="7" id="701" />
-<TGConnectingPoint num="8" id="702" />
-<TGConnectingPoint num="9" id="703" />
-<TGConnectingPoint num="10" id="704" />
-<TGConnectingPoint num="11" id="705" />
-<TGConnectingPoint num="12" id="706" />
-<TGConnectingPoint num="13" id="707" />
-<TGConnectingPoint num="14" id="708" />
-<TGConnectingPoint num="15" id="709" />
-<TGConnectingPoint num="16" id="710" />
-<TGConnectingPoint num="17" id="711" />
-<TGConnectingPoint num="18" id="712" />
-<TGConnectingPoint num="19" id="713" />
-<TGConnectingPoint num="20" id="714" />
-<TGConnectingPoint num="21" id="715" />
-<TGConnectingPoint num="22" id="716" />
-<TGConnectingPoint num="23" id="717" />
+<TGConnectingPoint num="0" id="307" />
+<TGConnectingPoint num="1" id="308" />
+<TGConnectingPoint num="2" id="309" />
+<TGConnectingPoint num="3" id="310" />
+<TGConnectingPoint num="4" id="311" />
+<TGConnectingPoint num="5" id="312" />
+<TGConnectingPoint num="6" id="313" />
+<TGConnectingPoint num="7" id="314" />
+<TGConnectingPoint num="8" id="315" />
+<TGConnectingPoint num="9" id="316" />
+<TGConnectingPoint num="10" id="317" />
+<TGConnectingPoint num="11" id="318" />
+<TGConnectingPoint num="12" id="319" />
+<TGConnectingPoint num="13" id="320" />
+<TGConnectingPoint num="14" id="321" />
+<TGConnectingPoint num="15" id="322" />
+<TGConnectingPoint num="16" id="323" />
+<TGConnectingPoint num="17" id="324" />
+<TGConnectingPoint num="18" id="325" />
+<TGConnectingPoint num="19" id="326" />
+<TGConnectingPoint num="20" id="327" />
+<TGConnectingPoint num="21" id="328" />
+<TGConnectingPoint num="22" id="329" />
+<TGConnectingPoint num="23" id="330" />
<extraparam>
<info stereotype="BUS-RR" nodeName="BusDest1" />
<attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" clockRatio="1" privacy="0" referenceAttack="null" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1105" id="2518" >
+<COMPONENT type="1105" id="365" >
<cdparam x="743" y="783" />
<sizeparam width="383" height="202" minWidth="100" minHeight="35" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="MemoryDest2" value="name" />
-<TGConnectingPoint num="0" id="2519" />
-<TGConnectingPoint num="1" id="2520" />
-<TGConnectingPoint num="2" id="2521" />
-<TGConnectingPoint num="3" id="2522" />
-<TGConnectingPoint num="4" id="2523" />
-<TGConnectingPoint num="5" id="2524" />
-<TGConnectingPoint num="6" id="2525" />
-<TGConnectingPoint num="7" id="2526" />
-<TGConnectingPoint num="8" id="2527" />
-<TGConnectingPoint num="9" id="2528" />
-<TGConnectingPoint num="10" id="2529" />
-<TGConnectingPoint num="11" id="2530" />
-<TGConnectingPoint num="12" id="2531" />
-<TGConnectingPoint num="13" id="2532" />
-<TGConnectingPoint num="14" id="2533" />
-<TGConnectingPoint num="15" id="2534" />
-<TGConnectingPoint num="16" id="2535" />
-<TGConnectingPoint num="17" id="2536" />
-<TGConnectingPoint num="18" id="2537" />
-<TGConnectingPoint num="19" id="2538" />
-<TGConnectingPoint num="20" id="2539" />
-<TGConnectingPoint num="21" id="2540" />
-<TGConnectingPoint num="22" id="2541" />
-<TGConnectingPoint num="23" id="2542" />
+<TGConnectingPoint num="0" id="341" />
+<TGConnectingPoint num="1" id="342" />
+<TGConnectingPoint num="2" id="343" />
+<TGConnectingPoint num="3" id="344" />
+<TGConnectingPoint num="4" id="345" />
+<TGConnectingPoint num="5" id="346" />
+<TGConnectingPoint num="6" id="347" />
+<TGConnectingPoint num="7" id="348" />
+<TGConnectingPoint num="8" id="349" />
+<TGConnectingPoint num="9" id="350" />
+<TGConnectingPoint num="10" id="351" />
+<TGConnectingPoint num="11" id="352" />
+<TGConnectingPoint num="12" id="353" />
+<TGConnectingPoint num="13" id="354" />
+<TGConnectingPoint num="14" id="355" />
+<TGConnectingPoint num="15" id="356" />
+<TGConnectingPoint num="16" id="357" />
+<TGConnectingPoint num="17" id="358" />
+<TGConnectingPoint num="18" id="359" />
+<TGConnectingPoint num="19" id="360" />
+<TGConnectingPoint num="20" id="361" />
+<TGConnectingPoint num="21" id="362" />
+<TGConnectingPoint num="22" id="363" />
+<TGConnectingPoint num="23" id="364" />
<extraparam>
<info stereotype="MEMORY" nodeName="MemoryDest2" />
-<attributes byteDataSize="4" memorySize="1024" clockRatio="1" bufferType="0" />
+<attributes byteDataSize="4" clockRatio="1" bufferType="0" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1103" id="3646" >
-<father id="2518" num="0" />
+<SUBCOMPONENT type="1103" id="340" >
+<father id="365" num="0" />
<cdparam x="854" y="834" />
-<sizeparam width="183" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="174" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="200" minY="0" maxY="162" />
+<cdrectangleparam minX="0" maxX="209" minY="0" maxY="162" />
<infoparam name="TGComponent" value="FVFork::chfork__chfork2" />
-<TGConnectingPoint num="0" id="3647" />
-<TGConnectingPoint num="1" id="3648" />
-<TGConnectingPoint num="2" id="3649" />
-<TGConnectingPoint num="3" id="3650" />
-<TGConnectingPoint num="4" id="3651" />
-<TGConnectingPoint num="5" id="3652" />
-<TGConnectingPoint num="6" id="3653" />
-<TGConnectingPoint num="7" id="3654" />
+<TGConnectingPoint num="0" id="332" />
+<TGConnectingPoint num="1" id="333" />
+<TGConnectingPoint num="2" id="334" />
+<TGConnectingPoint num="3" id="335" />
+<TGConnectingPoint num="4" id="336" />
+<TGConnectingPoint num="5" id="337" />
+<TGConnectingPoint num="6" id="338" />
+<TGConnectingPoint num="7" id="339" />
<extraparam>
<info value="FVFork::chfork__chfork2" communicationName="chfork__chfork2" referenceCommunicationName="FVFork" priority="0" typeName="channel" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1105" id="743" >
+<COMPONENT type="1105" id="399" >
<cdparam x="642" y="81" />
<sizeparam width="346" height="160" minWidth="100" minHeight="35" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="MemoryDest1" value="name" />
-<TGConnectingPoint num="0" id="744" />
-<TGConnectingPoint num="1" id="745" />
-<TGConnectingPoint num="2" id="746" />
-<TGConnectingPoint num="3" id="747" />
-<TGConnectingPoint num="4" id="748" />
-<TGConnectingPoint num="5" id="749" />
-<TGConnectingPoint num="6" id="750" />
-<TGConnectingPoint num="7" id="751" />
-<TGConnectingPoint num="8" id="752" />
-<TGConnectingPoint num="9" id="753" />
-<TGConnectingPoint num="10" id="754" />
-<TGConnectingPoint num="11" id="755" />
-<TGConnectingPoint num="12" id="756" />
-<TGConnectingPoint num="13" id="757" />
-<TGConnectingPoint num="14" id="758" />
-<TGConnectingPoint num="15" id="759" />
-<TGConnectingPoint num="16" id="760" />
-<TGConnectingPoint num="17" id="761" />
-<TGConnectingPoint num="18" id="762" />
-<TGConnectingPoint num="19" id="763" />
-<TGConnectingPoint num="20" id="764" />
-<TGConnectingPoint num="21" id="765" />
-<TGConnectingPoint num="22" id="766" />
-<TGConnectingPoint num="23" id="767" />
+<TGConnectingPoint num="0" id="375" />
+<TGConnectingPoint num="1" id="376" />
+<TGConnectingPoint num="2" id="377" />
+<TGConnectingPoint num="3" id="378" />
+<TGConnectingPoint num="4" id="379" />
+<TGConnectingPoint num="5" id="380" />
+<TGConnectingPoint num="6" id="381" />
+<TGConnectingPoint num="7" id="382" />
+<TGConnectingPoint num="8" id="383" />
+<TGConnectingPoint num="9" id="384" />
+<TGConnectingPoint num="10" id="385" />
+<TGConnectingPoint num="11" id="386" />
+<TGConnectingPoint num="12" id="387" />
+<TGConnectingPoint num="13" id="388" />
+<TGConnectingPoint num="14" id="389" />
+<TGConnectingPoint num="15" id="390" />
+<TGConnectingPoint num="16" id="391" />
+<TGConnectingPoint num="17" id="392" />
+<TGConnectingPoint num="18" id="393" />
+<TGConnectingPoint num="19" id="394" />
+<TGConnectingPoint num="20" id="395" />
+<TGConnectingPoint num="21" id="396" />
+<TGConnectingPoint num="22" id="397" />
+<TGConnectingPoint num="23" id="398" />
<extraparam>
<info stereotype="MEMORY" nodeName="MemoryDest1" />
-<attributes byteDataSize="4" memorySize="1024" clockRatio="1" bufferType="0" />
+<attributes byteDataSize="4" clockRatio="1" bufferType="0" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1103" id="3637" >
-<father id="743" num="0" />
+<SUBCOMPONENT type="1103" id="374" >
+<father id="399" num="0" />
<cdparam x="668" y="132" />
-<sizeparam width="183" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="174" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="163" minY="0" maxY="120" />
+<cdrectangleparam minX="0" maxX="172" minY="0" maxY="120" />
<infoparam name="TGComponent" value="FVFork::chfork__chfork1" />
-<TGConnectingPoint num="0" id="3638" />
-<TGConnectingPoint num="1" id="3639" />
-<TGConnectingPoint num="2" id="3640" />
-<TGConnectingPoint num="3" id="3641" />
-<TGConnectingPoint num="4" id="3642" />
-<TGConnectingPoint num="5" id="3643" />
-<TGConnectingPoint num="6" id="3644" />
-<TGConnectingPoint num="7" id="3645" />
+<TGConnectingPoint num="0" id="366" />
+<TGConnectingPoint num="1" id="367" />
+<TGConnectingPoint num="2" id="368" />
+<TGConnectingPoint num="3" id="369" />
+<TGConnectingPoint num="4" id="370" />
+<TGConnectingPoint num="5" id="371" />
+<TGConnectingPoint num="6" id="372" />
+<TGConnectingPoint num="7" id="373" />
<extraparam>
<info value="FVFork::chfork__chfork1" communicationName="chfork__chfork1" referenceCommunicationName="FVFork" priority="0" typeName="channel" />
</extraparam>
</SUBCOMPONENT>
+<CONNECTOR type="125" id="400" >
+<cdparam x="299" y="534" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="{info}" />
+<P1 x="299" y="525" id="116" />
+<P2 x="354" y="495" id="135" />
+<AutomaticDrawing data="true" />
+<extraparam>
+<info priority="0" />
+<spy value="false" />
+</extraparam>
+</CONNECTOR>
+<CONNECTOR type="125" id="401" >
+<cdparam x="300" y="351" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="{info}" />
+<P1 x="300" y="351" id="196" />
+<P2 x="354" y="445" id="130" />
+<AutomaticDrawing data="true" />
+<extraparam>
+<info priority="0" />
+<spy value="false" />
+</extraparam>
+</CONNECTOR>
+<CONNECTOR type="125" id="402" >
+<cdparam x="1062" y="771" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="{info}" />
+<P1 x="934" y="783" id="342" />
+<P2 x="1077" y="731" id="288" />
+<AutomaticDrawing data="true" />
+<extraparam>
+<info priority="0" />
+<spy value="false" />
+</extraparam>
+</CONNECTOR>
+<CONNECTOR type="125" id="403" >
+<cdparam x="1327" y="720" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="{info}" />
+<P1 x="1327" y="720" id="226" />
+<P2 x="1202" y="718" id="295" />
+<AutomaticDrawing data="true" />
+<extraparam>
+<info priority="0" />
+<spy value="false" />
+</extraparam>
+</CONNECTOR>
+<CONNECTOR type="125" id="404" >
+<cdparam x="997" y="600" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="{info}" />
+<P1 x="997" y="600" id="87" />
+<P2 x="1077" y="681" id="283" />
+<AutomaticDrawing data="true" />
+<extraparam>
+<info priority="0" />
+<spy value="false" />
+</extraparam>
+</CONNECTOR>
+<CONNECTOR type="125" id="405" >
+<cdparam x="807" y="555" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="{info}" />
+<P1 x="807" y="555" id="90" />
+<P2 x="604" y="482" id="143" />
+<AutomaticDrawing data="true" />
+<extraparam>
+<info priority="0" />
+<spy value="false" />
+</extraparam>
+</CONNECTOR>
+<CONNECTOR type="125" id="406" >
+<cdparam x="806" y="478" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="{info}" />
+<P1 x="809" y="421" id="158" />
+<P2 x="604" y="470" id="134" />
+<AutomaticDrawing data="true" />
+<extraparam>
+<info priority="0" />
+<spy value="false" />
+</extraparam>
+</CONNECTOR>
+<CONNECTOR type="125" id="407" >
+<cdparam x="922" y="447" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="{info}" />
+<P1 x="925" y="390" id="164" />
+<P2 x="1023" y="353" id="321" />
+<AutomaticDrawing data="true" />
+<extraparam>
+<info priority="0" />
+<spy value="false" />
+</extraparam>
+</CONNECTOR>
+<CONNECTOR type="125" id="408" >
+<cdparam x="888" y="253" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="{info}" />
+<P1 x="1211" y="251" id="271" />
+<P2 x="1148" y="303" id="316" />
+<AutomaticDrawing data="true" />
+<extraparam>
+<info priority="0" />
+<spy value="false" />
+</extraparam>
+</CONNECTOR>
+<CONNECTOR type="125" id="409" >
+<cdparam x="614" y="272" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="{info}" />
+<P1 x="815" y="241" id="381" />
+<P2 x="1086" y="303" id="308" />
+<AutomaticDrawing data="true" />
+<extraparam>
+<info priority="0" />
+<spy value="false" />
+</extraparam>
+</CONNECTOR>
</TMLArchiDiagramPanel>
@@ -943,81 +943,81 @@
<Modeling type="TML Component Design" nameTab="FVJoin" >
<TMLComponentTaskDiagramPanel name="TML Component Task Diagram" minX="10" maxX="2500" minY="10" maxY="1500" channels="true" events="true" requests="true" zoom="1.0" >
-<CONNECTOR type="126" id="14746" >
+<CONNECTOR type="126" id="410" >
<cdparam x="421" y="445" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="421" y="445" id="14745" />
-<P2 x="555" y="312" id="14704" />
+<P1 x="408" y="432" id="451" />
+<P2 x="555" y="312" id="418" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="126" id="14725" >
+<CONNECTOR type="126" id="411" >
<cdparam x="572" y="304" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="572" y="304" id="14699" />
-<P2 x="738" y="304" id="14724" />
+<P1 x="572" y="304" id="413" />
+<P2 x="751" y="291" id="440" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="126" id="14714" >
+<CONNECTOR type="126" id="412" >
<cdparam x="417" y="221" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="Connector between ports" />
-<P1 x="417" y="221" id="14697" />
-<P2 x="555" y="295" id="14702" />
+<P1 x="404" y="208" id="429" />
+<P2 x="555" y="295" id="416" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<COMPONENT type="1208" id="14698" >
+<COMPONENT type="1208" id="428" >
<cdparam x="550" y="293" />
<sizeparam width="22" height="22" minWidth="10" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="Composite port" value="J" />
-<TGConnectingPoint num="0" id="14699" />
-<TGConnectingPoint num="1" id="14700" />
-<TGConnectingPoint num="2" id="14701" />
-<TGConnectingPoint num="3" id="14702" />
-<TGConnectingPoint num="4" id="14703" />
-<TGConnectingPoint num="5" id="14704" />
-<TGConnectingPoint num="6" id="14705" />
-<TGConnectingPoint num="7" id="14706" />
-<TGConnectingPoint num="8" id="14707" />
-<TGConnectingPoint num="9" id="14708" />
-<TGConnectingPoint num="10" id="14709" />
-<TGConnectingPoint num="11" id="14710" />
-<TGConnectingPoint num="12" id="14711" />
-<TGConnectingPoint num="13" id="14712" />
-<TGConnectingPoint num="14" id="14713" />
+<TGConnectingPoint num="0" id="413" />
+<TGConnectingPoint num="1" id="414" />
+<TGConnectingPoint num="2" id="415" />
+<TGConnectingPoint num="3" id="416" />
+<TGConnectingPoint num="4" id="417" />
+<TGConnectingPoint num="5" id="418" />
+<TGConnectingPoint num="6" id="419" />
+<TGConnectingPoint num="7" id="420" />
+<TGConnectingPoint num="8" id="421" />
+<TGConnectingPoint num="9" id="422" />
+<TGConnectingPoint num="10" id="423" />
+<TGConnectingPoint num="11" id="424" />
+<TGConnectingPoint num="12" id="425" />
+<TGConnectingPoint num="13" id="426" />
+<TGConnectingPoint num="14" id="427" />
</COMPONENT>
-<COMPONENT type="1202" id="3655" >
+<COMPONENT type="1202" id="439" >
<cdparam x="204" y="124" />
<sizeparam width="200" height="150" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="Primitive component" value="src1" />
-<TGConnectingPoint num="0" id="3656" />
-<TGConnectingPoint num="1" id="3657" />
-<TGConnectingPoint num="2" id="3658" />
-<TGConnectingPoint num="3" id="3659" />
-<TGConnectingPoint num="4" id="3660" />
-<TGConnectingPoint num="5" id="3661" />
-<TGConnectingPoint num="6" id="3662" />
-<TGConnectingPoint num="7" id="3663" />
+<TGConnectingPoint num="0" id="431" />
+<TGConnectingPoint num="1" id="432" />
+<TGConnectingPoint num="2" id="433" />
+<TGConnectingPoint num="3" id="434" />
+<TGConnectingPoint num="4" id="435" />
+<TGConnectingPoint num="5" id="436" />
+<TGConnectingPoint num="6" id="437" />
+<TGConnectingPoint num="7" id="438" />
<extraparam>
<Data isAttacker="No" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1203" id="14688" >
-<father id="3655" num="0" />
+<SUBCOMPONENT type="1203" id="430" >
+<father id="439" num="0" />
<cdparam x="391" y="208" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Channel comm" />
-<TGConnectingPoint num="0" id="14697" />
+<infoparam name="Primitive port" value="Channel chjoin1" />
+<TGConnectingPoint num="0" id="429" />
<extraparam>
-<Prop commName="chjoin1" commType="0" origin="true" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="1" checkStrongAuthStatus="1" />
+<Prop commName="chjoin1" commType="0" origin="true" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" referenceReq="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1026,34 +1026,34 @@
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1202" id="14647" >
+<COMPONENT type="1202" id="450" >
<cdparam x="751" y="224" />
<sizeparam width="200" height="150" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="Primitive component" value="dest" />
-<TGConnectingPoint num="0" id="14648" />
-<TGConnectingPoint num="1" id="14649" />
-<TGConnectingPoint num="2" id="14650" />
-<TGConnectingPoint num="3" id="14651" />
-<TGConnectingPoint num="4" id="14652" />
-<TGConnectingPoint num="5" id="14653" />
-<TGConnectingPoint num="6" id="14654" />
-<TGConnectingPoint num="7" id="14655" />
+<TGConnectingPoint num="0" id="442" />
+<TGConnectingPoint num="1" id="443" />
+<TGConnectingPoint num="2" id="444" />
+<TGConnectingPoint num="3" id="445" />
+<TGConnectingPoint num="4" id="446" />
+<TGConnectingPoint num="5" id="447" />
+<TGConnectingPoint num="6" id="448" />
+<TGConnectingPoint num="7" id="449" />
<extraparam>
<Data isAttacker="No" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1203" id="14715" >
-<father id="14647" num="0" />
+<SUBCOMPONENT type="1203" id="441" >
+<father id="450" num="0" />
<cdparam x="738" y="291" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Channel comm" />
-<TGConnectingPoint num="0" id="14724" />
+<infoparam name="Primitive port" value="Channel chjoin" />
+<TGConnectingPoint num="0" id="440" />
<extraparam>
-<Prop commName="chjoin" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="1" checkStrongAuthStatus="1" />
+<Prop commName="chjoin" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" referenceReq="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1062,34 +1062,34 @@
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1202" id="7319" >
+<COMPONENT type="1202" id="461" >
<cdparam x="208" y="363" />
<sizeparam width="200" height="150" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="Primitive component" value="src2" />
-<TGConnectingPoint num="0" id="7320" />
-<TGConnectingPoint num="1" id="7321" />
-<TGConnectingPoint num="2" id="7322" />
-<TGConnectingPoint num="3" id="7323" />
-<TGConnectingPoint num="4" id="7324" />
-<TGConnectingPoint num="5" id="7325" />
-<TGConnectingPoint num="6" id="7326" />
-<TGConnectingPoint num="7" id="7327" />
+<TGConnectingPoint num="0" id="453" />
+<TGConnectingPoint num="1" id="454" />
+<TGConnectingPoint num="2" id="455" />
+<TGConnectingPoint num="3" id="456" />
+<TGConnectingPoint num="4" id="457" />
+<TGConnectingPoint num="5" id="458" />
+<TGConnectingPoint num="6" id="459" />
+<TGConnectingPoint num="7" id="460" />
<extraparam>
<Data isAttacker="No" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1203" id="14736" >
-<father id="7319" num="0" />
+<SUBCOMPONENT type="1203" id="452" >
+<father id="461" num="0" />
<cdparam x="395" y="432" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Channel comm" />
-<TGConnectingPoint num="0" id="14745" />
+<infoparam name="Primitive port" value="Channel chjoin2" />
+<TGConnectingPoint num="0" id="451" />
<extraparam>
-<Prop commName="chjoin2" commType="0" origin="true" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="1" checkStrongAuthStatus="1" />
+<Prop commName="chjoin2" commType="0" origin="true" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" referenceReq="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -1102,153 +1102,153 @@
</TMLComponentTaskDiagramPanel>
<TMLActivityDiagramPanel name="src1" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="1001" id="15180" >
+<COMPONENT type="1001" id="463" >
<cdparam x="409" y="155" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="15181" />
+<TGConnectingPoint num="0" id="462" />
</COMPONENT>
-<COMPONENT type="1006" id="15176" >
+<COMPONENT type="1006" id="466" >
<cdparam x="375" y="98" />
<sizeparam width="73" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="write channel" value="chjoin1(5)" />
-<TGConnectingPoint num="0" id="15177" />
-<TGConnectingPoint num="1" id="15178" />
+<TGConnectingPoint num="0" id="464" />
+<TGConnectingPoint num="1" id="465" />
<extraparam>
<Data channelName="chjoin1" nbOfSamples="5" secPattern="" isAttacker="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1000" id="3664" >
+<COMPONENT type="1000" id="468" >
<cdparam x="400" y="50" />
<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="3665" />
+<TGConnectingPoint num="0" id="467" />
</COMPONENT>
-<CONNECTOR type="115" id="15179" >
+<CONNECTOR type="115" id="469" >
<cdparam x="407" y="70" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="407" y="70" id="3665" />
-<P2 x="411" y="93" id="15177" />
+<P1 x="407" y="70" id="467" />
+<P2 x="411" y="93" id="464" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="15182" >
+<CONNECTOR type="115" id="470" >
<cdparam x="411" y="123" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="411" y="123" id="15178" />
-<P2 x="419" y="150" id="15181" />
+<P1 x="411" y="123" id="465" />
+<P2 x="419" y="150" id="462" />
<AutomaticDrawing data="true" />
</CONNECTOR>
</TMLActivityDiagramPanel>
-<TMLActivityDiagramPanel name="src2" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="1001" id="15187" >
-<cdparam x="402" y="167" />
+<TMLActivityDiagramPanel name="dest" minX="10" maxX="2500" minY="10" maxY="1500" >
+<COMPONENT type="1001" id="472" >
+<cdparam x="423" y="170" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="15188" />
+<TGConnectingPoint num="0" id="471" />
</COMPONENT>
-<COMPONENT type="1006" id="15183" >
-<cdparam x="377" y="108" />
-<sizeparam width="73" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1009" id="475" >
+<cdparam x="385" y="106" />
+<sizeparam width="77" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="write channel" value="chjoin2(5)" />
-<TGConnectingPoint num="0" id="15184" />
-<TGConnectingPoint num="1" id="15185" />
+<infoparam name="read channel" value="chjoin(10) " />
+<TGConnectingPoint num="0" id="473" />
+<TGConnectingPoint num="1" id="474" />
<extraparam>
-<Data channelName="chjoin2" nbOfSamples="5" secPattern="" isAttacker="No" />
+<Data channelName="chjoin" nbOfSamples="10" secPattern="" isAttacker="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1000" id="3664" >
+<COMPONENT type="1000" id="477" >
<cdparam x="400" y="50" />
<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="3665" />
+<TGConnectingPoint num="0" id="476" />
</COMPONENT>
-<CONNECTOR type="115" id="15186" >
+<CONNECTOR type="115" id="478" >
<cdparam x="407" y="70" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="407" y="70" id="3665" />
-<P2 x="413" y="103" id="15184" />
+<P1 x="407" y="70" id="476" />
+<P2 x="423" y="101" id="473" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="15189" >
-<cdparam x="413" y="133" />
+<CONNECTOR type="115" id="479" >
+<cdparam x="423" y="131" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="413" y="133" id="15185" />
-<P2 x="412" y="162" id="15188" />
+<P1 x="423" y="131" id="474" />
+<P2 x="433" y="165" id="471" />
<AutomaticDrawing data="true" />
</CONNECTOR>
</TMLActivityDiagramPanel>
-<TMLActivityDiagramPanel name="dest" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="1001" id="15194" >
-<cdparam x="423" y="170" />
+<TMLActivityDiagramPanel name="src2" minX="10" maxX="2500" minY="10" maxY="1500" >
+<COMPONENT type="1001" id="481" >
+<cdparam x="402" y="167" />
<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="15195" />
+<TGConnectingPoint num="0" id="480" />
</COMPONENT>
-<COMPONENT type="1009" id="15190" >
-<cdparam x="385" y="106" />
-<sizeparam width="77" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1006" id="484" >
+<cdparam x="377" y="108" />
+<sizeparam width="73" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="read channel" value="chjoin(10) " />
-<TGConnectingPoint num="0" id="15191" />
-<TGConnectingPoint num="1" id="15192" />
+<infoparam name="write channel" value="chjoin2(5)" />
+<TGConnectingPoint num="0" id="482" />
+<TGConnectingPoint num="1" id="483" />
<extraparam>
-<Data channelName="chjoin" nbOfSamples="10" secPattern="" isAttacker="No" />
+<Data channelName="chjoin2" nbOfSamples="5" secPattern="" isAttacker="No" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1000" id="3664" >
+<COMPONENT type="1000" id="486" >
<cdparam x="400" y="50" />
<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="3665" />
+<TGConnectingPoint num="0" id="485" />
</COMPONENT>
-<CONNECTOR type="115" id="15193" >
+<CONNECTOR type="115" id="487" >
<cdparam x="407" y="70" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="407" y="70" id="3665" />
-<P2 x="423" y="101" id="15191" />
+<P1 x="407" y="70" id="485" />
+<P2 x="413" y="103" id="482" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="15196" >
-<cdparam x="423" y="131" />
+<CONNECTOR type="115" id="488" >
+<cdparam x="413" y="133" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="423" y="131" id="15192" />
-<P2 x="433" y="165" id="15195" />
+<P1 x="413" y="133" id="483" />
+<P2 x="412" y="162" id="480" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -1261,611 +1261,611 @@
<Modeling type="TML Architecture" nameTab="ArchitectureJoin" >
<TMLArchiDiagramPanel name="DIPLODOCUS architecture and mapping Diagram" minX="10" maxX="2500" minY="10" maxY="1500" attributes="0" masterClockFrequency="200" >
-<COMPONENT type="1106" id="848" >
+<COMPONENT type="1106" id="513" >
<cdparam x="872" y="545" />
<sizeparam width="190" height="60" minWidth="100" minHeight="35" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="BridgeDest2" value="name" />
-<TGConnectingPoint num="0" id="849" />
-<TGConnectingPoint num="1" id="850" />
-<TGConnectingPoint num="2" id="851" />
-<TGConnectingPoint num="3" id="852" />
-<TGConnectingPoint num="4" id="853" />
-<TGConnectingPoint num="5" id="854" />
-<TGConnectingPoint num="6" id="855" />
-<TGConnectingPoint num="7" id="856" />
-<TGConnectingPoint num="8" id="857" />
-<TGConnectingPoint num="9" id="858" />
-<TGConnectingPoint num="10" id="859" />
-<TGConnectingPoint num="11" id="860" />
-<TGConnectingPoint num="12" id="861" />
-<TGConnectingPoint num="13" id="862" />
-<TGConnectingPoint num="14" id="863" />
-<TGConnectingPoint num="15" id="864" />
-<TGConnectingPoint num="16" id="865" />
-<TGConnectingPoint num="17" id="866" />
-<TGConnectingPoint num="18" id="867" />
-<TGConnectingPoint num="19" id="868" />
-<TGConnectingPoint num="20" id="869" />
-<TGConnectingPoint num="21" id="870" />
-<TGConnectingPoint num="22" id="871" />
-<TGConnectingPoint num="23" id="872" />
+<TGConnectingPoint num="0" id="489" />
+<TGConnectingPoint num="1" id="490" />
+<TGConnectingPoint num="2" id="491" />
+<TGConnectingPoint num="3" id="492" />
+<TGConnectingPoint num="4" id="493" />
+<TGConnectingPoint num="5" id="494" />
+<TGConnectingPoint num="6" id="495" />
+<TGConnectingPoint num="7" id="496" />
+<TGConnectingPoint num="8" id="497" />
+<TGConnectingPoint num="9" id="498" />
+<TGConnectingPoint num="10" id="499" />
+<TGConnectingPoint num="11" id="500" />
+<TGConnectingPoint num="12" id="501" />
+<TGConnectingPoint num="13" id="502" />
+<TGConnectingPoint num="14" id="503" />
+<TGConnectingPoint num="15" id="504" />
+<TGConnectingPoint num="16" id="505" />
+<TGConnectingPoint num="17" id="506" />
+<TGConnectingPoint num="18" id="507" />
+<TGConnectingPoint num="19" id="508" />
+<TGConnectingPoint num="20" id="509" />
+<TGConnectingPoint num="21" id="510" />
+<TGConnectingPoint num="22" id="511" />
+<TGConnectingPoint num="23" id="512" />
<extraparam>
<info stereotype="BRIDGE" nodeName="BridgeDest2" />
<attributes bufferByteDataSize="4" clockRatio="1" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1105" id="823" >
+<COMPONENT type="1105" id="556" >
<cdparam x="135" y="494" />
<sizeparam width="267" height="215" minWidth="100" minHeight="35" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="MemoryDest" value="name" />
-<TGConnectingPoint num="0" id="824" />
-<TGConnectingPoint num="1" id="825" />
-<TGConnectingPoint num="2" id="826" />
-<TGConnectingPoint num="3" id="827" />
-<TGConnectingPoint num="4" id="828" />
-<TGConnectingPoint num="5" id="829" />
-<TGConnectingPoint num="6" id="830" />
-<TGConnectingPoint num="7" id="831" />
-<TGConnectingPoint num="8" id="832" />
-<TGConnectingPoint num="9" id="833" />
-<TGConnectingPoint num="10" id="834" />
-<TGConnectingPoint num="11" id="835" />
-<TGConnectingPoint num="12" id="836" />
-<TGConnectingPoint num="13" id="837" />
-<TGConnectingPoint num="14" id="838" />
-<TGConnectingPoint num="15" id="839" />
-<TGConnectingPoint num="16" id="840" />
-<TGConnectingPoint num="17" id="841" />
-<TGConnectingPoint num="18" id="842" />
-<TGConnectingPoint num="19" id="843" />
-<TGConnectingPoint num="20" id="844" />
-<TGConnectingPoint num="21" id="845" />
-<TGConnectingPoint num="22" id="846" />
-<TGConnectingPoint num="23" id="847" />
+<TGConnectingPoint num="0" id="532" />
+<TGConnectingPoint num="1" id="533" />
+<TGConnectingPoint num="2" id="534" />
+<TGConnectingPoint num="3" id="535" />
+<TGConnectingPoint num="4" id="536" />
+<TGConnectingPoint num="5" id="537" />
+<TGConnectingPoint num="6" id="538" />
+<TGConnectingPoint num="7" id="539" />
+<TGConnectingPoint num="8" id="540" />
+<TGConnectingPoint num="9" id="541" />
+<TGConnectingPoint num="10" id="542" />
+<TGConnectingPoint num="11" id="543" />
+<TGConnectingPoint num="12" id="544" />
+<TGConnectingPoint num="13" id="545" />
+<TGConnectingPoint num="14" id="546" />
+<TGConnectingPoint num="15" id="547" />
+<TGConnectingPoint num="16" id="548" />
+<TGConnectingPoint num="17" id="549" />
+<TGConnectingPoint num="18" id="550" />
+<TGConnectingPoint num="19" id="551" />
+<TGConnectingPoint num="20" id="552" />
+<TGConnectingPoint num="21" id="553" />
+<TGConnectingPoint num="22" id="554" />
+<TGConnectingPoint num="23" id="555" />
<extraparam>
<info stereotype="MEMORY" nodeName="MemoryDest" />
-<attributes byteDataSize="4" memorySize="1024" clockRatio="1" bufferType="0" />
+<attributes byteDataSize="4" clockRatio="1" bufferType="0" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1103" id="15206" >
-<father id="823" num="0" />
+<SUBCOMPONENT type="1103" id="522" >
+<father id="556" num="0" />
<cdparam x="170" y="586" />
-<sizeparam width="174" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="166" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="93" minY="0" maxY="175" />
+<cdrectangleparam minX="0" maxX="101" minY="0" maxY="175" />
<infoparam name="TGComponent" value="FVJoin::chjoin1__chjoin" />
-<TGConnectingPoint num="0" id="15207" />
-<TGConnectingPoint num="1" id="15208" />
-<TGConnectingPoint num="2" id="15209" />
-<TGConnectingPoint num="3" id="15210" />
-<TGConnectingPoint num="4" id="15211" />
-<TGConnectingPoint num="5" id="15212" />
-<TGConnectingPoint num="6" id="15213" />
-<TGConnectingPoint num="7" id="15214" />
+<TGConnectingPoint num="0" id="514" />
+<TGConnectingPoint num="1" id="515" />
+<TGConnectingPoint num="2" id="516" />
+<TGConnectingPoint num="3" id="517" />
+<TGConnectingPoint num="4" id="518" />
+<TGConnectingPoint num="5" id="519" />
+<TGConnectingPoint num="6" id="520" />
+<TGConnectingPoint num="7" id="521" />
<extraparam>
<info value="FVJoin::chjoin1__chjoin" communicationName="chjoin1__chjoin" referenceCommunicationName="FVJoin" priority="0" typeName="channel" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1103" id="15197" >
-<father id="823" num="1" />
+<SUBCOMPONENT type="1103" id="531" >
+<father id="556" num="1" />
<cdparam x="146" y="537" />
-<sizeparam width="174" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="166" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="93" minY="0" maxY="175" />
+<cdrectangleparam minX="0" maxX="101" minY="0" maxY="175" />
<infoparam name="TGComponent" value="FVJoin::chjoin2__chjoin" />
-<TGConnectingPoint num="0" id="15198" />
-<TGConnectingPoint num="1" id="15199" />
-<TGConnectingPoint num="2" id="15200" />
-<TGConnectingPoint num="3" id="15201" />
-<TGConnectingPoint num="4" id="15202" />
-<TGConnectingPoint num="5" id="15203" />
-<TGConnectingPoint num="6" id="15204" />
-<TGConnectingPoint num="7" id="15205" />
+<TGConnectingPoint num="0" id="523" />
+<TGConnectingPoint num="1" id="524" />
+<TGConnectingPoint num="2" id="525" />
+<TGConnectingPoint num="3" id="526" />
+<TGConnectingPoint num="4" id="527" />
+<TGConnectingPoint num="5" id="528" />
+<TGConnectingPoint num="6" id="529" />
+<TGConnectingPoint num="7" id="530" />
<extraparam>
<info value="FVJoin::chjoin2__chjoin" communicationName="chjoin2__chjoin" referenceCommunicationName="FVJoin" priority="0" typeName="channel" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1102" id="796" >
+<COMPONENT type="1102" id="581" >
<cdparam x="419" y="450" />
<sizeparam width="250" height="50" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="BusDest" value="name" />
-<TGConnectingPoint num="0" id="797" />
-<TGConnectingPoint num="1" id="798" />
-<TGConnectingPoint num="2" id="799" />
-<TGConnectingPoint num="3" id="800" />
-<TGConnectingPoint num="4" id="801" />
-<TGConnectingPoint num="5" id="802" />
-<TGConnectingPoint num="6" id="803" />
-<TGConnectingPoint num="7" id="804" />
-<TGConnectingPoint num="8" id="805" />
-<TGConnectingPoint num="9" id="806" />
-<TGConnectingPoint num="10" id="807" />
-<TGConnectingPoint num="11" id="808" />
-<TGConnectingPoint num="12" id="809" />
-<TGConnectingPoint num="13" id="810" />
-<TGConnectingPoint num="14" id="811" />
-<TGConnectingPoint num="15" id="812" />
-<TGConnectingPoint num="16" id="813" />
-<TGConnectingPoint num="17" id="814" />
-<TGConnectingPoint num="18" id="815" />
-<TGConnectingPoint num="19" id="816" />
-<TGConnectingPoint num="20" id="817" />
-<TGConnectingPoint num="21" id="818" />
-<TGConnectingPoint num="22" id="819" />
-<TGConnectingPoint num="23" id="820" />
+<TGConnectingPoint num="0" id="557" />
+<TGConnectingPoint num="1" id="558" />
+<TGConnectingPoint num="2" id="559" />
+<TGConnectingPoint num="3" id="560" />
+<TGConnectingPoint num="4" id="561" />
+<TGConnectingPoint num="5" id="562" />
+<TGConnectingPoint num="6" id="563" />
+<TGConnectingPoint num="7" id="564" />
+<TGConnectingPoint num="8" id="565" />
+<TGConnectingPoint num="9" id="566" />
+<TGConnectingPoint num="10" id="567" />
+<TGConnectingPoint num="11" id="568" />
+<TGConnectingPoint num="12" id="569" />
+<TGConnectingPoint num="13" id="570" />
+<TGConnectingPoint num="14" id="571" />
+<TGConnectingPoint num="15" id="572" />
+<TGConnectingPoint num="16" id="573" />
+<TGConnectingPoint num="17" id="574" />
+<TGConnectingPoint num="18" id="575" />
+<TGConnectingPoint num="19" id="576" />
+<TGConnectingPoint num="20" id="577" />
+<TGConnectingPoint num="21" id="578" />
+<TGConnectingPoint num="22" id="579" />
+<TGConnectingPoint num="23" id="580" />
<extraparam>
<info stereotype="BUS-RR" nodeName="BusDest" />
<attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" clockRatio="1" privacy="0" referenceAttack="null" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1106" id="771" >
+<COMPONENT type="1106" id="606" >
<cdparam x="874" y="395" />
<sizeparam width="155" height="62" minWidth="100" minHeight="35" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="BridgeDest1" value="name" />
-<TGConnectingPoint num="0" id="772" />
-<TGConnectingPoint num="1" id="773" />
-<TGConnectingPoint num="2" id="774" />
-<TGConnectingPoint num="3" id="775" />
-<TGConnectingPoint num="4" id="776" />
-<TGConnectingPoint num="5" id="777" />
-<TGConnectingPoint num="6" id="778" />
-<TGConnectingPoint num="7" id="779" />
-<TGConnectingPoint num="8" id="780" />
-<TGConnectingPoint num="9" id="781" />
-<TGConnectingPoint num="10" id="782" />
-<TGConnectingPoint num="11" id="783" />
-<TGConnectingPoint num="12" id="784" />
-<TGConnectingPoint num="13" id="785" />
-<TGConnectingPoint num="14" id="786" />
-<TGConnectingPoint num="15" id="787" />
-<TGConnectingPoint num="16" id="788" />
-<TGConnectingPoint num="17" id="789" />
-<TGConnectingPoint num="18" id="790" />
-<TGConnectingPoint num="19" id="791" />
-<TGConnectingPoint num="20" id="792" />
-<TGConnectingPoint num="21" id="793" />
-<TGConnectingPoint num="22" id="794" />
-<TGConnectingPoint num="23" id="795" />
+<TGConnectingPoint num="0" id="582" />
+<TGConnectingPoint num="1" id="583" />
+<TGConnectingPoint num="2" id="584" />
+<TGConnectingPoint num="3" id="585" />
+<TGConnectingPoint num="4" id="586" />
+<TGConnectingPoint num="5" id="587" />
+<TGConnectingPoint num="6" id="588" />
+<TGConnectingPoint num="7" id="589" />
+<TGConnectingPoint num="8" id="590" />
+<TGConnectingPoint num="9" id="591" />
+<TGConnectingPoint num="10" id="592" />
+<TGConnectingPoint num="11" id="593" />
+<TGConnectingPoint num="12" id="594" />
+<TGConnectingPoint num="13" id="595" />
+<TGConnectingPoint num="14" id="596" />
+<TGConnectingPoint num="15" id="597" />
+<TGConnectingPoint num="16" id="598" />
+<TGConnectingPoint num="17" id="599" />
+<TGConnectingPoint num="18" id="600" />
+<TGConnectingPoint num="19" id="601" />
+<TGConnectingPoint num="20" id="602" />
+<TGConnectingPoint num="21" id="603" />
+<TGConnectingPoint num="22" id="604" />
+<TGConnectingPoint num="23" id="605" />
<extraparam>
<info stereotype="BRIDGE" nodeName="BridgeDest1" />
<attributes bufferByteDataSize="4" clockRatio="1" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1100" id="284" >
+<COMPONENT type="1100" id="640" >
<cdparam x="161" y="256" />
<sizeparam width="204" height="100" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="CPUDest" value="name" />
-<TGConnectingPoint num="0" id="285" />
-<TGConnectingPoint num="1" id="286" />
-<TGConnectingPoint num="2" id="287" />
-<TGConnectingPoint num="3" id="288" />
-<TGConnectingPoint num="4" id="289" />
-<TGConnectingPoint num="5" id="290" />
-<TGConnectingPoint num="6" id="291" />
-<TGConnectingPoint num="7" id="292" />
-<TGConnectingPoint num="8" id="293" />
-<TGConnectingPoint num="9" id="294" />
-<TGConnectingPoint num="10" id="295" />
-<TGConnectingPoint num="11" id="296" />
-<TGConnectingPoint num="12" id="297" />
-<TGConnectingPoint num="13" id="298" />
-<TGConnectingPoint num="14" id="299" />
-<TGConnectingPoint num="15" id="300" />
-<TGConnectingPoint num="16" id="301" />
-<TGConnectingPoint num="17" id="302" />
-<TGConnectingPoint num="18" id="303" />
-<TGConnectingPoint num="19" id="304" />
-<TGConnectingPoint num="20" id="305" />
-<TGConnectingPoint num="21" id="306" />
-<TGConnectingPoint num="22" id="307" />
-<TGConnectingPoint num="23" id="308" />
+<TGConnectingPoint num="0" id="616" />
+<TGConnectingPoint num="1" id="617" />
+<TGConnectingPoint num="2" id="618" />
+<TGConnectingPoint num="3" id="619" />
+<TGConnectingPoint num="4" id="620" />
+<TGConnectingPoint num="5" id="621" />
+<TGConnectingPoint num="6" id="622" />
+<TGConnectingPoint num="7" id="623" />
+<TGConnectingPoint num="8" id="624" />
+<TGConnectingPoint num="9" id="625" />
+<TGConnectingPoint num="10" id="626" />
+<TGConnectingPoint num="11" id="627" />
+<TGConnectingPoint num="12" id="628" />
+<TGConnectingPoint num="13" id="629" />
+<TGConnectingPoint num="14" id="630" />
+<TGConnectingPoint num="15" id="631" />
+<TGConnectingPoint num="16" id="632" />
+<TGConnectingPoint num="17" id="633" />
+<TGConnectingPoint num="18" id="634" />
+<TGConnectingPoint num="19" id="635" />
+<TGConnectingPoint num="20" id="636" />
+<TGConnectingPoint num="21" id="637" />
+<TGConnectingPoint num="22" id="638" />
+<TGConnectingPoint num="23" id="639" />
<extraparam>
<info stereotype="CPURR" nodeName="CPUDest" />
<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="1" MECType="0" encryption="0"/>
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1101" id="3579" >
-<father id="284" num="0" />
+<SUBCOMPONENT type="1101" id="615" >
+<father id="640" num="0" />
<cdparam x="183" y="295" />
-<sizeparam width="108" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="103" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="96" minY="0" maxY="60" />
+<cdrectangleparam minX="0" maxX="101" minY="0" maxY="60" />
<infoparam name="TGComponent" value="FVJoin::dest" />
-<TGConnectingPoint num="0" id="3580" />
-<TGConnectingPoint num="1" id="3581" />
-<TGConnectingPoint num="2" id="3582" />
-<TGConnectingPoint num="3" id="3583" />
-<TGConnectingPoint num="4" id="3584" />
-<TGConnectingPoint num="5" id="3585" />
-<TGConnectingPoint num="6" id="3586" />
-<TGConnectingPoint num="7" id="3587" />
+<TGConnectingPoint num="0" id="607" />
+<TGConnectingPoint num="1" id="608" />
+<TGConnectingPoint num="2" id="609" />
+<TGConnectingPoint num="3" id="610" />
+<TGConnectingPoint num="4" id="611" />
+<TGConnectingPoint num="5" id="612" />
+<TGConnectingPoint num="6" id="613" />
+<TGConnectingPoint num="7" id="614" />
<extraparam>
<info value="FVJoin::dest" taskName="dest" referenceTaskName="FVJoin" priority="0" operation="src" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1100" id="642" >
+<COMPONENT type="1100" id="674" >
<cdparam x="1392" y="625" />
<sizeparam width="250" height="200" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="CPUSrc2" value="name" />
-<TGConnectingPoint num="0" id="643" />
-<TGConnectingPoint num="1" id="644" />
-<TGConnectingPoint num="2" id="645" />
-<TGConnectingPoint num="3" id="646" />
-<TGConnectingPoint num="4" id="647" />
-<TGConnectingPoint num="5" id="648" />
-<TGConnectingPoint num="6" id="649" />
-<TGConnectingPoint num="7" id="650" />
-<TGConnectingPoint num="8" id="651" />
-<TGConnectingPoint num="9" id="652" />
-<TGConnectingPoint num="10" id="653" />
-<TGConnectingPoint num="11" id="654" />
-<TGConnectingPoint num="12" id="655" />
-<TGConnectingPoint num="13" id="656" />
-<TGConnectingPoint num="14" id="657" />
-<TGConnectingPoint num="15" id="658" />
-<TGConnectingPoint num="16" id="659" />
-<TGConnectingPoint num="17" id="660" />
-<TGConnectingPoint num="18" id="661" />
-<TGConnectingPoint num="19" id="662" />
-<TGConnectingPoint num="20" id="663" />
-<TGConnectingPoint num="21" id="664" />
-<TGConnectingPoint num="22" id="665" />
-<TGConnectingPoint num="23" id="666" />
+<TGConnectingPoint num="0" id="650" />
+<TGConnectingPoint num="1" id="651" />
+<TGConnectingPoint num="2" id="652" />
+<TGConnectingPoint num="3" id="653" />
+<TGConnectingPoint num="4" id="654" />
+<TGConnectingPoint num="5" id="655" />
+<TGConnectingPoint num="6" id="656" />
+<TGConnectingPoint num="7" id="657" />
+<TGConnectingPoint num="8" id="658" />
+<TGConnectingPoint num="9" id="659" />
+<TGConnectingPoint num="10" id="660" />
+<TGConnectingPoint num="11" id="661" />
+<TGConnectingPoint num="12" id="662" />
+<TGConnectingPoint num="13" id="663" />
+<TGConnectingPoint num="14" id="664" />
+<TGConnectingPoint num="15" id="665" />
+<TGConnectingPoint num="16" id="666" />
+<TGConnectingPoint num="17" id="667" />
+<TGConnectingPoint num="18" id="668" />
+<TGConnectingPoint num="19" id="669" />
+<TGConnectingPoint num="20" id="670" />
+<TGConnectingPoint num="21" id="671" />
+<TGConnectingPoint num="22" id="672" />
+<TGConnectingPoint num="23" id="673" />
<extraparam>
<info stereotype="CPURR" nodeName="CPUSrc2" />
<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="1" MECType="0" encryption="0"/>
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1101" id="3608" >
-<father id="642" num="0" />
+<SUBCOMPONENT type="1101" id="649" >
+<father id="674" num="0" />
<cdparam x="1414" y="706" />
-<sizeparam width="107" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="103" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="143" minY="0" maxY="160" />
+<cdrectangleparam minX="0" maxX="147" minY="0" maxY="160" />
<infoparam name="TGComponent" value="FVJoin::src2" />
-<TGConnectingPoint num="0" id="3609" />
-<TGConnectingPoint num="1" id="3610" />
-<TGConnectingPoint num="2" id="3611" />
-<TGConnectingPoint num="3" id="3612" />
-<TGConnectingPoint num="4" id="3613" />
-<TGConnectingPoint num="5" id="3614" />
-<TGConnectingPoint num="6" id="3615" />
-<TGConnectingPoint num="7" id="3616" />
+<TGConnectingPoint num="0" id="641" />
+<TGConnectingPoint num="1" id="642" />
+<TGConnectingPoint num="2" id="643" />
+<TGConnectingPoint num="3" id="644" />
+<TGConnectingPoint num="4" id="645" />
+<TGConnectingPoint num="5" id="646" />
+<TGConnectingPoint num="6" id="647" />
+<TGConnectingPoint num="7" id="648" />
<extraparam>
<info value="FVJoin::src2" taskName="src2" referenceTaskName="FVJoin" priority="0" operation="Dest2" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1100" id="309" >
+<COMPONENT type="1100" id="708" >
<cdparam x="1217" y="150" />
<sizeparam width="237" height="106" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="CPUSrc1" value="name" />
-<TGConnectingPoint num="0" id="310" />
-<TGConnectingPoint num="1" id="311" />
-<TGConnectingPoint num="2" id="312" />
-<TGConnectingPoint num="3" id="313" />
-<TGConnectingPoint num="4" id="314" />
-<TGConnectingPoint num="5" id="315" />
-<TGConnectingPoint num="6" id="316" />
-<TGConnectingPoint num="7" id="317" />
-<TGConnectingPoint num="8" id="318" />
-<TGConnectingPoint num="9" id="319" />
-<TGConnectingPoint num="10" id="320" />
-<TGConnectingPoint num="11" id="321" />
-<TGConnectingPoint num="12" id="322" />
-<TGConnectingPoint num="13" id="323" />
-<TGConnectingPoint num="14" id="324" />
-<TGConnectingPoint num="15" id="325" />
-<TGConnectingPoint num="16" id="326" />
-<TGConnectingPoint num="17" id="327" />
-<TGConnectingPoint num="18" id="328" />
-<TGConnectingPoint num="19" id="329" />
-<TGConnectingPoint num="20" id="330" />
-<TGConnectingPoint num="21" id="331" />
-<TGConnectingPoint num="22" id="332" />
-<TGConnectingPoint num="23" id="333" />
+<TGConnectingPoint num="0" id="684" />
+<TGConnectingPoint num="1" id="685" />
+<TGConnectingPoint num="2" id="686" />
+<TGConnectingPoint num="3" id="687" />
+<TGConnectingPoint num="4" id="688" />
+<TGConnectingPoint num="5" id="689" />
+<TGConnectingPoint num="6" id="690" />
+<TGConnectingPoint num="7" id="691" />
+<TGConnectingPoint num="8" id="692" />
+<TGConnectingPoint num="9" id="693" />
+<TGConnectingPoint num="10" id="694" />
+<TGConnectingPoint num="11" id="695" />
+<TGConnectingPoint num="12" id="696" />
+<TGConnectingPoint num="13" id="697" />
+<TGConnectingPoint num="14" id="698" />
+<TGConnectingPoint num="15" id="699" />
+<TGConnectingPoint num="16" id="700" />
+<TGConnectingPoint num="17" id="701" />
+<TGConnectingPoint num="18" id="702" />
+<TGConnectingPoint num="19" id="703" />
+<TGConnectingPoint num="20" id="704" />
+<TGConnectingPoint num="21" id="705" />
+<TGConnectingPoint num="22" id="706" />
+<TGConnectingPoint num="23" id="707" />
<extraparam>
<info stereotype="CPURR" nodeName="CPUSrc1" />
<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="1" MECType="0" encryption="0"/>
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1101" id="15149" >
-<father id="309" num="0" />
+<SUBCOMPONENT type="1101" id="683" >
+<father id="708" num="0" />
<cdparam x="1243" y="193" />
-<sizeparam width="107" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="103" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="130" minY="0" maxY="66" />
+<cdrectangleparam minX="0" maxX="134" minY="0" maxY="66" />
<infoparam name="TGComponent" value="FVJoin::src1" />
-<TGConnectingPoint num="0" id="15150" />
-<TGConnectingPoint num="1" id="15151" />
-<TGConnectingPoint num="2" id="15152" />
-<TGConnectingPoint num="3" id="15153" />
-<TGConnectingPoint num="4" id="15154" />
-<TGConnectingPoint num="5" id="15155" />
-<TGConnectingPoint num="6" id="15156" />
-<TGConnectingPoint num="7" id="15157" />
+<TGConnectingPoint num="0" id="675" />
+<TGConnectingPoint num="1" id="676" />
+<TGConnectingPoint num="2" id="677" />
+<TGConnectingPoint num="3" id="678" />
+<TGConnectingPoint num="4" id="679" />
+<TGConnectingPoint num="5" id="680" />
+<TGConnectingPoint num="6" id="681" />
+<TGConnectingPoint num="7" id="682" />
<extraparam>
<info value="FVJoin::src1" taskName="src1" referenceTaskName="FVJoin" priority="0" operation="Dest2" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1102" id="1567" >
+<COMPONENT type="1102" id="733" >
<cdparam x="1017" y="686" />
<sizeparam width="250" height="50" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="BusSrc2" value="name" />
-<TGConnectingPoint num="0" id="1568" />
-<TGConnectingPoint num="1" id="1569" />
-<TGConnectingPoint num="2" id="1570" />
-<TGConnectingPoint num="3" id="1571" />
-<TGConnectingPoint num="4" id="1572" />
-<TGConnectingPoint num="5" id="1573" />
-<TGConnectingPoint num="6" id="1574" />
-<TGConnectingPoint num="7" id="1575" />
-<TGConnectingPoint num="8" id="1576" />
-<TGConnectingPoint num="9" id="1577" />
-<TGConnectingPoint num="10" id="1578" />
-<TGConnectingPoint num="11" id="1579" />
-<TGConnectingPoint num="12" id="1580" />
-<TGConnectingPoint num="13" id="1581" />
-<TGConnectingPoint num="14" id="1582" />
-<TGConnectingPoint num="15" id="1583" />
-<TGConnectingPoint num="16" id="1584" />
-<TGConnectingPoint num="17" id="1585" />
-<TGConnectingPoint num="18" id="1586" />
-<TGConnectingPoint num="19" id="1587" />
-<TGConnectingPoint num="20" id="1588" />
-<TGConnectingPoint num="21" id="1589" />
-<TGConnectingPoint num="22" id="1590" />
-<TGConnectingPoint num="23" id="1591" />
+<TGConnectingPoint num="0" id="709" />
+<TGConnectingPoint num="1" id="710" />
+<TGConnectingPoint num="2" id="711" />
+<TGConnectingPoint num="3" id="712" />
+<TGConnectingPoint num="4" id="713" />
+<TGConnectingPoint num="5" id="714" />
+<TGConnectingPoint num="6" id="715" />
+<TGConnectingPoint num="7" id="716" />
+<TGConnectingPoint num="8" id="717" />
+<TGConnectingPoint num="9" id="718" />
+<TGConnectingPoint num="10" id="719" />
+<TGConnectingPoint num="11" id="720" />
+<TGConnectingPoint num="12" id="721" />
+<TGConnectingPoint num="13" id="722" />
+<TGConnectingPoint num="14" id="723" />
+<TGConnectingPoint num="15" id="724" />
+<TGConnectingPoint num="16" id="725" />
+<TGConnectingPoint num="17" id="726" />
+<TGConnectingPoint num="18" id="727" />
+<TGConnectingPoint num="19" id="728" />
+<TGConnectingPoint num="20" id="729" />
+<TGConnectingPoint num="21" id="730" />
+<TGConnectingPoint num="22" id="731" />
+<TGConnectingPoint num="23" id="732" />
<extraparam>
<info stereotype="BUS-RR" nodeName="BusSrc2" />
<attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" clockRatio="1" privacy="0" referenceAttack="null" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1102" id="694" >
+<COMPONENT type="1102" id="758" >
<cdparam x="1026" y="308" />
<sizeparam width="250" height="50" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="BusSrc1" value="name" />
-<TGConnectingPoint num="0" id="695" />
-<TGConnectingPoint num="1" id="696" />
-<TGConnectingPoint num="2" id="697" />
-<TGConnectingPoint num="3" id="698" />
-<TGConnectingPoint num="4" id="699" />
-<TGConnectingPoint num="5" id="700" />
-<TGConnectingPoint num="6" id="701" />
-<TGConnectingPoint num="7" id="702" />
-<TGConnectingPoint num="8" id="703" />
-<TGConnectingPoint num="9" id="704" />
-<TGConnectingPoint num="10" id="705" />
-<TGConnectingPoint num="11" id="706" />
-<TGConnectingPoint num="12" id="707" />
-<TGConnectingPoint num="13" id="708" />
-<TGConnectingPoint num="14" id="709" />
-<TGConnectingPoint num="15" id="710" />
-<TGConnectingPoint num="16" id="711" />
-<TGConnectingPoint num="17" id="712" />
-<TGConnectingPoint num="18" id="713" />
-<TGConnectingPoint num="19" id="714" />
-<TGConnectingPoint num="20" id="715" />
-<TGConnectingPoint num="21" id="716" />
-<TGConnectingPoint num="22" id="717" />
-<TGConnectingPoint num="23" id="718" />
+<TGConnectingPoint num="0" id="734" />
+<TGConnectingPoint num="1" id="735" />
+<TGConnectingPoint num="2" id="736" />
+<TGConnectingPoint num="3" id="737" />
+<TGConnectingPoint num="4" id="738" />
+<TGConnectingPoint num="5" id="739" />
+<TGConnectingPoint num="6" id="740" />
+<TGConnectingPoint num="7" id="741" />
+<TGConnectingPoint num="8" id="742" />
+<TGConnectingPoint num="9" id="743" />
+<TGConnectingPoint num="10" id="744" />
+<TGConnectingPoint num="11" id="745" />
+<TGConnectingPoint num="12" id="746" />
+<TGConnectingPoint num="13" id="747" />
+<TGConnectingPoint num="14" id="748" />
+<TGConnectingPoint num="15" id="749" />
+<TGConnectingPoint num="16" id="750" />
+<TGConnectingPoint num="17" id="751" />
+<TGConnectingPoint num="18" id="752" />
+<TGConnectingPoint num="19" id="753" />
+<TGConnectingPoint num="20" id="754" />
+<TGConnectingPoint num="21" id="755" />
+<TGConnectingPoint num="22" id="756" />
+<TGConnectingPoint num="23" id="757" />
<extraparam>
<info stereotype="BUS-RR" nodeName="BusSrc1" />
<attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" clockRatio="1" privacy="0" referenceAttack="null" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1105" id="2519" >
+<COMPONENT type="1105" id="783" >
<cdparam x="808" y="788" />
<sizeparam width="386" height="147" minWidth="100" minHeight="35" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="MemorySrc2" value="name" />
-<TGConnectingPoint num="0" id="2520" />
-<TGConnectingPoint num="1" id="2521" />
-<TGConnectingPoint num="2" id="2522" />
-<TGConnectingPoint num="3" id="2523" />
-<TGConnectingPoint num="4" id="2524" />
-<TGConnectingPoint num="5" id="2525" />
-<TGConnectingPoint num="6" id="2526" />
-<TGConnectingPoint num="7" id="2527" />
-<TGConnectingPoint num="8" id="2528" />
-<TGConnectingPoint num="9" id="2529" />
-<TGConnectingPoint num="10" id="2530" />
-<TGConnectingPoint num="11" id="2531" />
-<TGConnectingPoint num="12" id="2532" />
-<TGConnectingPoint num="13" id="2533" />
-<TGConnectingPoint num="14" id="2534" />
-<TGConnectingPoint num="15" id="2535" />
-<TGConnectingPoint num="16" id="2536" />
-<TGConnectingPoint num="17" id="2537" />
-<TGConnectingPoint num="18" id="2538" />
-<TGConnectingPoint num="19" id="2539" />
-<TGConnectingPoint num="20" id="2540" />
-<TGConnectingPoint num="21" id="2541" />
-<TGConnectingPoint num="22" id="2542" />
-<TGConnectingPoint num="23" id="2543" />
+<TGConnectingPoint num="0" id="759" />
+<TGConnectingPoint num="1" id="760" />
+<TGConnectingPoint num="2" id="761" />
+<TGConnectingPoint num="3" id="762" />
+<TGConnectingPoint num="4" id="763" />
+<TGConnectingPoint num="5" id="764" />
+<TGConnectingPoint num="6" id="765" />
+<TGConnectingPoint num="7" id="766" />
+<TGConnectingPoint num="8" id="767" />
+<TGConnectingPoint num="9" id="768" />
+<TGConnectingPoint num="10" id="769" />
+<TGConnectingPoint num="11" id="770" />
+<TGConnectingPoint num="12" id="771" />
+<TGConnectingPoint num="13" id="772" />
+<TGConnectingPoint num="14" id="773" />
+<TGConnectingPoint num="15" id="774" />
+<TGConnectingPoint num="16" id="775" />
+<TGConnectingPoint num="17" id="776" />
+<TGConnectingPoint num="18" id="777" />
+<TGConnectingPoint num="19" id="778" />
+<TGConnectingPoint num="20" id="779" />
+<TGConnectingPoint num="21" id="780" />
+<TGConnectingPoint num="22" id="781" />
+<TGConnectingPoint num="23" id="782" />
<extraparam>
<info stereotype="MEMORY" nodeName="MemorySrc2" />
-<attributes byteDataSize="4" memorySize="1024" clockRatio="1" bufferType="0" />
+<attributes byteDataSize="4" clockRatio="1" bufferType="0" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1105" id="744" >
+<COMPONENT type="1105" id="808" >
<cdparam x="707" y="117" />
<sizeparam width="351" height="129" minWidth="100" minHeight="35" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="MemorySrc1" value="name" />
-<TGConnectingPoint num="0" id="745" />
-<TGConnectingPoint num="1" id="746" />
-<TGConnectingPoint num="2" id="747" />
-<TGConnectingPoint num="3" id="748" />
-<TGConnectingPoint num="4" id="749" />
-<TGConnectingPoint num="5" id="750" />
-<TGConnectingPoint num="6" id="751" />
-<TGConnectingPoint num="7" id="752" />
-<TGConnectingPoint num="8" id="753" />
-<TGConnectingPoint num="9" id="754" />
-<TGConnectingPoint num="10" id="755" />
-<TGConnectingPoint num="11" id="756" />
-<TGConnectingPoint num="12" id="757" />
-<TGConnectingPoint num="13" id="758" />
-<TGConnectingPoint num="14" id="759" />
-<TGConnectingPoint num="15" id="760" />
-<TGConnectingPoint num="16" id="761" />
-<TGConnectingPoint num="17" id="762" />
-<TGConnectingPoint num="18" id="763" />
-<TGConnectingPoint num="19" id="764" />
-<TGConnectingPoint num="20" id="765" />
-<TGConnectingPoint num="21" id="766" />
-<TGConnectingPoint num="22" id="767" />
-<TGConnectingPoint num="23" id="768" />
+<TGConnectingPoint num="0" id="784" />
+<TGConnectingPoint num="1" id="785" />
+<TGConnectingPoint num="2" id="786" />
+<TGConnectingPoint num="3" id="787" />
+<TGConnectingPoint num="4" id="788" />
+<TGConnectingPoint num="5" id="789" />
+<TGConnectingPoint num="6" id="790" />
+<TGConnectingPoint num="7" id="791" />
+<TGConnectingPoint num="8" id="792" />
+<TGConnectingPoint num="9" id="793" />
+<TGConnectingPoint num="10" id="794" />
+<TGConnectingPoint num="11" id="795" />
+<TGConnectingPoint num="12" id="796" />
+<TGConnectingPoint num="13" id="797" />
+<TGConnectingPoint num="14" id="798" />
+<TGConnectingPoint num="15" id="799" />
+<TGConnectingPoint num="16" id="800" />
+<TGConnectingPoint num="17" id="801" />
+<TGConnectingPoint num="18" id="802" />
+<TGConnectingPoint num="19" id="803" />
+<TGConnectingPoint num="20" id="804" />
+<TGConnectingPoint num="21" id="805" />
+<TGConnectingPoint num="22" id="806" />
+<TGConnectingPoint num="23" id="807" />
<extraparam>
<info stereotype="MEMORY" nodeName="MemorySrc1" />
-<attributes byteDataSize="4" memorySize="1024" clockRatio="1" bufferType="0" />
+<attributes byteDataSize="4" clockRatio="1" bufferType="0" />
</extraparam>
</COMPONENT>
-<CONNECTOR type="125" id="3589" >
+<CONNECTOR type="125" id="809" >
<cdparam x="364" y="539" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="{info}" />
-<P1 x="402" y="547" id="835" />
-<P2 x="419" y="500" id="802" />
+<P1 x="402" y="547" id="543" />
+<P2 x="419" y="500" id="562" />
<AutomaticDrawing data="true" />
<extraparam>
<info priority="0" />
<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="3588" >
+<CONNECTOR type="125" id="810" >
<cdparam x="365" y="356" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="{info}" />
-<P1 x="365" y="356" id="292" />
-<P2 x="419" y="450" id="797" />
+<P1 x="365" y="356" id="623" />
+<P2 x="419" y="450" id="557" />
<AutomaticDrawing data="true" />
<extraparam>
<info priority="0" />
<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="3578" >
+<CONNECTOR type="125" id="811" >
<cdparam x="1127" y="776" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="{info}" />
-<P1 x="1001" y="788" id="2521" />
-<P2 x="1142" y="736" id="1574" />
+<P1 x="1001" y="788" id="760" />
+<P2 x="1142" y="736" id="715" />
<AutomaticDrawing data="true" />
<extraparam>
<info priority="0" />
<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="1775" >
+<CONNECTOR type="125" id="812" >
<cdparam x="1392" y="725" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="{info}" />
-<P1 x="1392" y="725" id="646" />
-<P2 x="1267" y="723" id="1581" />
+<P1 x="1392" y="725" id="653" />
+<P2 x="1267" y="723" id="722" />
<AutomaticDrawing data="true" />
<extraparam>
<info priority="0" />
<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="1774" >
+<CONNECTOR type="125" id="813" >
<cdparam x="1062" y="605" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="{info}" />
-<P1 x="1062" y="605" id="856" />
-<P2 x="1142" y="686" id="1569" />
+<P1 x="1062" y="605" id="496" />
+<P2 x="1142" y="686" id="710" />
<AutomaticDrawing data="true" />
<extraparam>
<info priority="0" />
<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="873" >
+<CONNECTOR type="125" id="814" >
<cdparam x="872" y="560" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="{info}" />
-<P1 x="872" y="560" id="859" />
-<P2 x="669" y="487" id="810" />
+<P1 x="872" y="560" id="499" />
+<P2 x="669" y="487" id="570" />
<AutomaticDrawing data="true" />
<extraparam>
<info priority="0" />
<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="822" >
+<CONNECTOR type="125" id="815" >
<cdparam x="871" y="483" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="{info}" />
-<P1 x="874" y="426" id="775" />
-<P2 x="669" y="475" id="801" />
+<P1 x="874" y="426" id="585" />
+<P2 x="669" y="475" id="561" />
<AutomaticDrawing data="true" />
<extraparam>
<info priority="0" />
<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="821" >
+<CONNECTOR type="125" id="816" >
<cdparam x="987" y="452" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="{info}" />
-<P1 x="990" y="395" id="781" />
-<P2 x="1088" y="358" id="709" />
+<P1 x="990" y="395" id="591" />
+<P2 x="1088" y="358" id="748" />
<AutomaticDrawing data="true" />
<extraparam>
<info priority="0" />
<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="770" >
+<CONNECTOR type="125" id="817" >
<cdparam x="953" y="258" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="{info}" />
-<P1 x="1276" y="256" id="324" />
-<P2 x="1213" y="308" id="704" />
+<P1 x="1276" y="256" id="698" />
+<P2 x="1213" y="308" id="743" />
<AutomaticDrawing data="true" />
<extraparam>
<info priority="0" />
<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="769" >
+<CONNECTOR type="125" id="818" >
<cdparam x="679" y="277" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="{info}" />
-<P1 x="882" y="246" id="751" />
-<P2 x="1151" y="308" id="696" />
+<P1 x="882" y="246" id="790" />
+<P2 x="1151" y="308" id="735" />
<AutomaticDrawing data="true" />
<extraparam>
<info priority="0" />
@@ -1880,4 +1880,196 @@
+<Modeling type="TML Component Design" nameTab="DIPLODOCUS_C_Design" >
+<TMLComponentTaskDiagramPanel name="TML Component Task Diagram" minX="10" maxX="2500" minY="10" maxY="1500" channels="true" events="true" requests="true" zoom="1.0" >
+<CONNECTOR type="126" id="819" >
+<cdparam x="368" y="181" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="Connector between ports" />
+<P1 x="368" y="181" id="831" />
+<P2 x="545" y="177" id="820" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<COMPONENT type="1202" id="830" >
+<cdparam x="558" y="109" />
+<sizeparam width="200" height="150" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="Primitive component" value="Task2" />
+<TGConnectingPoint num="0" id="822" />
+<TGConnectingPoint num="1" id="823" />
+<TGConnectingPoint num="2" id="824" />
+<TGConnectingPoint num="3" id="825" />
+<TGConnectingPoint num="4" id="826" />
+<TGConnectingPoint num="5" id="827" />
+<TGConnectingPoint num="6" id="828" />
+<TGConnectingPoint num="7" id="829" />
+<extraparam>
+<Data isAttacker="No" />
+</extraparam>
+</COMPONENT>
+<SUBCOMPONENT type="1203" id="821" >
+<father id="830" num="0" />
+<cdparam x="545" y="164" />
+<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
+<infoparam name="Primitive port" value="Channel comm" />
+<TGConnectingPoint num="0" id="820" />
+<extraparam>
+<Prop commName="comm" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" referenceReq="" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
+</extraparam>
+</SUBCOMPONENT>
+
+<COMPONENT type="1202" id="841" >
+<cdparam x="155" y="105" />
+<sizeparam width="200" height="150" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="Primitive component" value="Task1" />
+<TGConnectingPoint num="0" id="833" />
+<TGConnectingPoint num="1" id="834" />
+<TGConnectingPoint num="2" id="835" />
+<TGConnectingPoint num="3" id="836" />
+<TGConnectingPoint num="4" id="837" />
+<TGConnectingPoint num="5" id="838" />
+<TGConnectingPoint num="6" id="839" />
+<TGConnectingPoint num="7" id="840" />
+<extraparam>
+<Data isAttacker="No" />
+</extraparam>
+</COMPONENT>
+<SUBCOMPONENT type="1203" id="832" >
+<father id="841" num="0" />
+<cdparam x="342" y="168" />
+<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
+<infoparam name="Primitive port" value="Channel comm" />
+<TGConnectingPoint num="0" id="831" />
+<extraparam>
+<Prop commName="comm" commType="0" origin="true" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" referenceReq="" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
+</extraparam>
+</SUBCOMPONENT>
+
+
+</TMLComponentTaskDiagramPanel>
+
+<TMLActivityDiagramPanel name="Task2" minX="10" maxX="2500" minY="10" maxY="1500" >
+<COMPONENT type="1001" id="843" >
+<cdparam x="410" y="180" />
+<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="stop state" value="null" />
+<TGConnectingPoint num="0" id="842" />
+</COMPONENT>
+
+<COMPONENT type="1009" id="846" >
+<cdparam x="382" y="117" />
+<sizeparam width="65" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="read channel" value="comm(5) " />
+<TGConnectingPoint num="0" id="844" />
+<TGConnectingPoint num="1" id="845" />
+<extraparam>
+<Data channelName="comm" nbOfSamples="5" secPattern="" isAttacker="No" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1000" id="848" >
+<cdparam x="400" y="50" />
+<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="start state" value="null" />
+<TGConnectingPoint num="0" id="847" />
+</COMPONENT>
+
+<CONNECTOR type="115" id="849" >
+<cdparam x="407" y="70" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1 x="407" y="70" id="847" />
+<P2 x="414" y="112" id="844" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="850" >
+<cdparam x="414" y="142" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1 x="414" y="142" id="845" />
+<P2 x="420" y="175" id="842" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+
+</TMLActivityDiagramPanel>
+
+<TMLActivityDiagramPanel name="Task1" minX="10" maxX="2500" minY="10" maxY="1500" >
+<COMPONENT type="1001" id="852" >
+<cdparam x="423" y="163" />
+<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="stop state" value="null" />
+<TGConnectingPoint num="0" id="851" />
+</COMPONENT>
+
+<COMPONENT type="1006" id="855" >
+<cdparam x="380" y="98" />
+<sizeparam width="61" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="write channel" value="comm(5)" />
+<TGConnectingPoint num="0" id="853" />
+<TGConnectingPoint num="1" id="854" />
+<extraparam>
+<Data channelName="comm" nbOfSamples="5" secPattern="" isAttacker="No" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1000" id="857" >
+<cdparam x="400" y="50" />
+<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="start state" value="null" />
+<TGConnectingPoint num="0" id="856" />
+</COMPONENT>
+
+<CONNECTOR type="115" id="858" >
+<cdparam x="407" y="70" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1 x="407" y="70" id="856" />
+<P2 x="410" y="93" id="853" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="859" >
+<cdparam x="410" y="123" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1 x="410" y="123" id="854" />
+<P2 x="433" y="158" id="851" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+
+</TMLActivityDiagramPanel>
+
+</Modeling>
+
+
+
+
</TURTLEGMODELING>
\ No newline at end of file
diff --git a/src/main/java/ui/GTURTLEModeling.java b/src/main/java/ui/GTURTLEModeling.java
index 555e56bcc3..01a9f89601 100755
--- a/src/main/java/ui/GTURTLEModeling.java
+++ b/src/main/java/ui/GTURTLEModeling.java
@@ -740,7 +740,7 @@ public class GTURTLEModeling {
}
public TMLMapping<TGComponent> drawFirewall(TMLMapping<TGComponent> map) {
- // System.out.println("DRAWING FIREWALL");
+ // System.out.println("DRAWING FIREWALL");
TGComponent comp = map.getTMLModeling().getTGComponent();
TMLComponentDesignPanel tmlcdp = (TMLComponentDesignPanel) comp.getTDiagramPanel().tp;
// TMLComponentDesignPanel tmlcdp = map.getTMLCDesignPanel();
@@ -1931,7 +1931,8 @@ public class GTURTLEModeling {
return autoSecure(gui, name, map, newarch, "100", "0", "100", true, false, false);
}
- public TMLMapping<TGComponent> autoSecure(MainGUI gui, String name, TMLMapping<TGComponent> map, TMLArchiPanel newarch, boolean autoConf, boolean autoWeakAuth, boolean autoStrongAuth) {
+ public TMLMapping<TGComponent> autoSecure(MainGUI gui, String name, TMLMapping<TGComponent> map, TMLArchiPanel newarch, boolean autoConf,
+ boolean autoWeakAuth, boolean autoStrongAuth) {
return autoSecure(gui, name, map, newarch, "100", "0", "100", autoConf, autoWeakAuth, autoStrongAuth);
}
@@ -1946,7 +1947,8 @@ public class GTURTLEModeling {
return autoSecure(gui, "enc", tmap, newarch, encComp, overhead, decComp, true, false, false);
}
- public TMLMapping<TGComponent> autoSecure(MainGUI gui, String encComp, String overhead, String decComp, boolean autoConf, boolean autoWeakAuth, boolean autoStrongAuth) {
+ public TMLMapping<TGComponent> autoSecure(MainGUI gui, String encComp, String overhead, String decComp, boolean autoConf, boolean autoWeakAuth,
+ boolean autoStrongAuth) {
if (tmap == null) {
return null;
}
@@ -1957,7 +1959,8 @@ public class GTURTLEModeling {
return autoSecure(gui, "enc", tmap, newarch, encComp, overhead, decComp, autoConf, autoWeakAuth, autoStrongAuth);
}
- public TMLMapping<TGComponent> autoSecure(MainGUI gui, String name, TMLMapping<TGComponent> map, TMLArchiPanel newarch, String encComp, String overhead, String decComp) {
+ public TMLMapping<TGComponent> autoSecure(MainGUI gui, String name, TMLMapping<TGComponent> map, TMLArchiPanel newarch, String encComp, String
+ overhead, String decComp) {
return autoSecure(gui, name, tmap, newarch, encComp, overhead, decComp, true, false, false);
}
diff --git a/src/main/java/ui/window/JDialogProverifVerification.java b/src/main/java/ui/window/JDialogProverifVerification.java
index c3432f1b27..9607023684 100644
--- a/src/main/java/ui/window/JDialogProverifVerification.java
+++ b/src/main/java/ui/window/JDialogProverifVerification.java
@@ -1,26 +1,26 @@
/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
- *
+ *
* ludovic.apvrille AT enst.fr
- *
+ *
* This software is a computer program whose purpose is to allow the
* edition of TURTLE analysis, design and deployment diagrams, to
* allow the generation of RT-LOTOS or Java code from this diagram,
* and at last to allow the analysis of formal validation traces
* obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
* from INRIA Rhone-Alpes.
- *
+ *
* This software is governed by the CeCILL license under French law and
* abiding by the rules of distribution of free software. You can use,
* modify and/ or redistribute the software under the terms of the CeCILL
* license as circulated by CEA, CNRS and INRIA at the following URL
* "http://www.cecill.info".
- *
+ *
* As a counterpart to the access to the source code and rights to copy,
* modify and redistribute granted by the license, users are provided only
* with a limited warranty and the software's author, the holder of the
* economic rights, and the successive licensors have only limited
* liability.
- *
+ *
* In this respect, the user's attention is drawn to the risks associated
* with loading, using, modifying and/or developing or reproducing the
* software by the user in light of its specific status of free software,
@@ -31,14 +31,12 @@
* requirements in conditions enabling the security of their systems and/or
* data to be ensured and, more generally, to use and operate it in the
* same conditions as regards security.
- *
+ *
* The fact that you are presently reading this means that you have had
* knowledge of the CeCILL license and that you accept its terms.
*/
-
-
package ui.window;
import avatartranslator.AvatarPragma;
@@ -80,14 +78,14 @@ import java.io.*;
import java.util.*;
-
/**
* Class JDialogProverifVerification
* Dialog for managing the generation of ProVerif code and execution of
* ProVerif
* Creation: 19/02/2017
- * @version 1.0 19/02/2017
+ *
* @author Ludovic APVRILLE
+ * @version 1.0 19/02/2017
*/
public class JDialogProverifVerification extends JDialog implements ActionListener, ListSelectionListener, MouseListener, Runnable, MasterProcessInterface, ProVerifOutputListener {
@@ -106,28 +104,28 @@ public class JDialogProverifVerification extends JDialog implements ActionListen
protected final static int STARTED = 2;
protected final static int STOPPED = 3;
- public final static int REACHABILITY_ALL = 1;
- public final static int REACHABILITY_SELECTED = 2;
- public final static int REACHABILITY_NONE = 3;
+ public final static int REACHABILITY_ALL = 1;
+ public final static int REACHABILITY_SELECTED = 2;
+ public final static int REACHABILITY_NONE = 3;
- TURTLEPanel currPanel;
-
+ TURTLEPanel currPanel;
+
int mode;
-
-
+
+
//Security
HashMap<String, HashSet<String>> cpuTaskMap = new HashMap<String, HashSet<String>>();
- HashMap<String, String> taskCpuMap = new HashMap<String, String>();
- Vector<String> selectedTasks =new Vector<String>();
- Vector<String> ignoredTasks =new Vector<String>();
- JList<String> listSelected;
- JList<String> listIgnored;
+ HashMap<String, String> taskCpuMap = new HashMap<String, String>();
+ Vector<String> selectedTasks = new Vector<String>();
+ Vector<String> ignoredTasks = new Vector<String>();
+ JList<String> listSelected;
+ JList<String> listIgnored;
- protected static String encCC="100";
- protected static String decCC="100";
+ protected static String encCC = "100";
+ protected static String decCC = "100";
protected static String secOv = "100";
private ProVerifOutputAnalyzer pvoa;
@@ -138,25 +136,26 @@ public class JDialogProverifVerification extends JDialog implements ActionListen
protected JButton close;
private JPopupMenu popup;
JPanel listPanel;
-
-
+
+
//security generation buttons
ButtonGroup secGroup;
-
+
protected JCheckBox autoSec, autoConf, autoWeakAuth, autoStrongAuth, autoMapKeys, custom, addHSM;
protected JTextField encTime, decTime, secOverhead;
- protected JComboBox<String> addtoCPU;
+ protected JComboBox<String> addtoCPU;
+
+ protected JCheckBox removeForkAndJoin;
- Map<JCheckBox, ArrayList<JCheckBox>> cpuTaskObjs = new HashMap<JCheckBox, ArrayList<JCheckBox>>();
+ Map<JCheckBox, ArrayList<JCheckBox>> cpuTaskObjs = new HashMap<JCheckBox, ArrayList<JCheckBox>>();
private class MyMenuItem extends JMenuItem {
AvatarPragma pragma;
ProVerifQueryResult result;
- MyMenuItem(String text)
- {
+ MyMenuItem(String text) {
super(text);
}
}
@@ -173,37 +172,38 @@ public class JDialogProverifVerification extends JDialog implements ActionListen
private Map<AvatarPragma, ProVerifQueryResult> results;
- private boolean limit;
+ private boolean limit;
private boolean go = false;
private String hostProVerif;
protected RshClient rshc;
-
+
protected JTabbedPane jp1;
+
private class ProVerifVerificationException extends Exception {
private String message;
- ProVerifVerificationException(String message)
- {
+ ProVerifVerificationException(String message) {
this.message = message;
}
- public String getMessage()
- {
+ public String getMessage() {
return this.message;
}
}
- /** Creates new form */
+ /**
+ * Creates new form
+ */
public JDialogProverifVerification(Frame f, MainGUI _mgui, String title, String _hostProVerif, String _pathCode, String _pathExecute, AvatarDesignPanel adp, boolean lim, HashMap<String, HashSet<String>> cpuTasks) {
super(f, title, Dialog.ModalityType.DOCUMENT_MODAL);
mgui = _mgui;
this.adp = adp;
this.pvoa = null;
- this.limit=lim;
+ this.limit = lim;
pathCode = _pathCode;
@@ -213,14 +213,14 @@ public class JDialogProverifVerification extends JDialog implements ActionListen
hostProVerif = _hostProVerif;
this.cpuTaskMap = cpuTasks;
- for (String cpu: cpuTasks.keySet()){
- for (String task: cpuTasks.get(cpu)){
- ignoredTasks.add(task);
- taskCpuMap.put(task,cpu);
- }
- }
- currPanel = mgui.getCurrentTURTLEPanel();
-
+ for (String cpu : cpuTasks.keySet()) {
+ for (String task : cpuTasks.get(cpu)) {
+ ignoredTasks.add(task);
+ taskCpuMap.put(task, cpu);
+ }
+ }
+ currPanel = mgui.getCurrentTURTLEPanel();
+
initComponents();
myInitComponents();
pack();
@@ -257,15 +257,13 @@ public class JDialogProverifVerification extends JDialog implements ActionListen
}
protected void initComponents() {
-
- jp1 = GraphicLib.createTabbedPane();//new JTabbedPane();
+
+ jp1 = GraphicLib.createTabbedPane();//new JTabbedPane();
int curY = 0;
Container c = getContentPane();
setFont(new Font("Helvetica", Font.PLAIN, 14));
c.setLayout(new BorderLayout());
-
-
JPanel jp02 = new JPanel();
GridBagLayout gridbag01 = new GridBagLayout();
@@ -281,51 +279,51 @@ public class JDialogProverifVerification extends JDialog implements ActionListen
c01.gridheight = 1;
//genJava.addActionListener(this);
- secGroup=new ButtonGroup();
- autoSec= new JCheckBox("Add security");
- jp02.add(autoSec, c01);
- autoSec.addActionListener(this);
- secGroup.add(autoSec);
- autoConf= new JCheckBox("Add security (Confidentiality)");
+ secGroup = new ButtonGroup();
+ autoSec = new JCheckBox("Add security");
+ jp02.add(autoSec, c01);
+ autoSec.addActionListener(this);
+ secGroup.add(autoSec);
+ autoConf = new JCheckBox("Add security (Confidentiality)");
jp02.add(autoConf, c01);
- autoConf.setEnabled(false);
- autoConf.addActionListener(this);
- autoWeakAuth= new JCheckBox("Add security (Weak Authenticity)");
- autoWeakAuth.setEnabled(false);
+ autoConf.setEnabled(false);
+ autoConf.addActionListener(this);
+ autoWeakAuth = new JCheckBox("Add security (Weak Authenticity)");
+ autoWeakAuth.setEnabled(false);
jp02.add(autoWeakAuth, c01);
- autoWeakAuth.addActionListener(this);
+ autoWeakAuth.addActionListener(this);
- autoStrongAuth= new JCheckBox("Add security (Strong Authenticity)");
- autoStrongAuth.setEnabled(false);
+ autoStrongAuth = new JCheckBox("Add security (Strong Authenticity)");
+ autoStrongAuth.setEnabled(false);
jp02.add(autoStrongAuth, c01);
- autoStrongAuth.addActionListener(this);
- autoMapKeys= new JCheckBox("Add Keys");
- autoMapKeys.addActionListener(this);
+ autoStrongAuth.addActionListener(this);
+ autoMapKeys = new JCheckBox("Add Keys");
+ autoMapKeys.addActionListener(this);
jp02.add(autoMapKeys, c01);
- secGroup.add(autoMapKeys);
+ secGroup.add(autoMapKeys);
addHSM = new JCheckBox("Add HSM");
- jp02.add(addHSM,c01);
- addHSM.addActionListener(this);
- secGroup.add(addHSM);
- jp02.add(new JLabel("Add HSM to component:"),c01);
- listIgnored = new JList<String>(ignoredTasks);
-
-
- listPanel = new JPanel();
- GridBagConstraints c02 = new GridBagConstraints();
- c02.gridwidth=1;
- c02.gridheight=1;
- c02.fill= GridBagConstraints.BOTH;
- listIgnored.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION );
+ jp02.add(addHSM, c01);
+ addHSM.addActionListener(this);
+ secGroup.add(addHSM);
+ jp02.add(new JLabel("Add HSM to component:"), c01);
+ listIgnored = new JList<String>(ignoredTasks);
+
+
+ listPanel = new JPanel();
+ GridBagConstraints c02 = new GridBagConstraints();
+ c02.gridwidth = 1;
+ c02.gridheight = 1;
+ c02.fill = GridBagConstraints.BOTH;
+ listIgnored.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
listIgnored.addListSelectionListener(this);
JScrollPane scrollPane1 = new JScrollPane(listIgnored);
- scrollPane1.setPreferredSize(new Dimension(250,200));
+ scrollPane1.setPreferredSize(new Dimension(250, 200));
listPanel.add(scrollPane1, BorderLayout.WEST);
- JPanel buttonPanel = new JPanel();
- GridBagConstraints c13 = new GridBagConstraints();
- c13.gridwidth=GridBagConstraints.REMAINDER;
- c13.gridheight=1;
+ JPanel buttonPanel = new JPanel();
+ GridBagConstraints c13 = new GridBagConstraints();
+ c13.gridwidth = GridBagConstraints.REMAINDER;
+ c13.gridheight = 1;
JButton allValidated = new JButton(IconManager.imgic50);
allValidated.setPreferredSize(new Dimension(50, 25));
allValidated.addActionListener(this);
@@ -344,29 +342,29 @@ public class JDialogProverifVerification extends JDialog implements ActionListen
addOneIgnored.addActionListener(this);
addOneIgnored.setPreferredSize(new Dimension(50, 25));
addOneIgnored.setActionCommand("addOneIgnored");
- buttonPanel.add(addOneIgnored, c13);
+ buttonPanel.add(addOneIgnored, c13);
JButton allIgnored = new JButton(IconManager.imgic44);
allIgnored.addActionListener(this);
allIgnored.setPreferredSize(new Dimension(50, 25));
allIgnored.setActionCommand("allIgnored");
buttonPanel.add(allIgnored, c13);
- listPanel.add(buttonPanel, c02);
- buttonPanel.setPreferredSize(new Dimension(50,200));
+ listPanel.add(buttonPanel, c02);
+ buttonPanel.setPreferredSize(new Dimension(50, 200));
- listSelected=new JList<String>(selectedTasks);
+ listSelected = new JList<String>(selectedTasks);
//listValidated.setPreferredSize(new Dimension(200, 250));
- listSelected.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION );
+ listSelected.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
listSelected.addListSelectionListener(this);
JScrollPane scrollPane2 = new JScrollPane(listSelected);
- scrollPane2.setPreferredSize(new Dimension(250,200));
+ scrollPane2.setPreferredSize(new Dimension(250, 200));
listPanel.add(scrollPane2, BorderLayout.CENTER);
- listPanel.setPreferredSize(new Dimension(600,250));
- listPanel.setMinimumSize(new Dimension(600,250));
- c01.gridheight=10;
- jp02.add(listPanel,c01);
- c02.gridheight=1;
+ listPanel.setPreferredSize(new Dimension(600, 250));
+ listPanel.setMinimumSize(new Dimension(600, 250));
+ c01.gridheight = 10;
+ jp02.add(listPanel, c01);
+ c02.gridheight = 1;
/*
@@ -390,30 +388,33 @@ public class JDialogProverifVerification extends JDialog implements ActionListen
addHSM.setEnabled(false);
}
*/
- // addToComp = new JTextField(compName);
+ // addToComp = new JTextField(compName);
//jp01.add(addToComp,c01);
+ removeForkAndJoin = new JCheckBox("Remove fork and join operators");
+ if (mgui.isExperimentalOn()) {
+ //jp02.add(removeForkAndJoin, c01);
+ //removeForkAndJoin.addActionListener(this);
+ }
custom = new JCheckBox("Custom performance attributes");
- jp02.add(custom,c01);
- custom.addActionListener(this);
+ jp02.add(custom, c01);
+ custom.addActionListener(this);
- jp02.add(new JLabel("Encryption Computational Complexity"),c01);
+ jp02.add(new JLabel("Encryption Computational Complexity"), c01);
encTime = new JTextField(encCC);
- encTime.setEnabled(false);
- jp02.add(encTime,c01);
+ encTime.setEnabled(false);
+ jp02.add(encTime, c01);
- jp02.add(new JLabel("Decryption Computational Complexity"),c01);
+ jp02.add(new JLabel("Decryption Computational Complexity"), c01);
decTime = new JTextField(decCC);
- decTime.setEnabled(false);
- jp02.add(decTime,c01);
+ decTime.setEnabled(false);
+ jp02.add(decTime, c01);
- jp02.add(new JLabel("Data Overhead (bits)"),c01);
+ jp02.add(new JLabel("Data Overhead (bits)"), c01);
secOverhead = new JTextField(secOv);
- secOverhead.setEnabled(false);
- jp02.add(secOverhead,c01);
-
-
+ secOverhead.setEnabled(false);
+ jp02.add(secOverhead, c01);
JPanel jp01 = new JPanel();
@@ -422,18 +423,12 @@ public class JDialogProverifVerification extends JDialog implements ActionListen
jp01.setBorder(new javax.swing.border.TitledBorder("Verification options"));
-
-
-
-
-
-
JLabel gen = new JLabel("Generate ProVerif code in: ");
-
+
addComponent(jp01, gen, 0, curY, 1, GridBagConstraints.CENTER, GridBagConstraints.BOTH);
code1 = new JTextField(pathCode, 100);
- code1.setPreferredSize(new Dimension(100,10));
+ code1.setPreferredSize(new Dimension(100, 10));
addComponent(jp01, code1, 1, curY, 3, GridBagConstraints.EAST, GridBagConstraints.BOTH);
curY++;
@@ -453,9 +448,9 @@ public class JDialogProverifVerification extends JDialog implements ActionListen
addComponent(jp01, stateReachabilityAll, 1, curY, 1, GridBagConstraints.CENTER, GridBagConstraints.BOTH);
addComponent(jp01, stateReachabilitySelected, 2, curY, 1, GridBagConstraints.CENTER, GridBagConstraints.BOTH);
addComponent(jp01, stateReachabilityNone, 3, curY, 1, GridBagConstraints.CENTER, GridBagConstraints.BOTH);
- stateReachabilityGroup.add (stateReachabilityAll);
- stateReachabilityGroup.add (stateReachabilitySelected);
- stateReachabilityGroup.add (stateReachabilityNone);
+ stateReachabilityGroup.add(stateReachabilityAll);
+ stateReachabilityGroup.add(stateReachabilitySelected);
+ stateReachabilityGroup.add(stateReachabilityNone);
stateReachabilityAll.setSelected(true);
curY++;
@@ -465,8 +460,8 @@ public class JDialogProverifVerification extends JDialog implements ActionListen
JRadioButton privateChannelNoDup = new JRadioButton("No");
addComponent(jp01, privateChannelDup, 2, curY, 1, GridBagConstraints.CENTER, GridBagConstraints.BOTH);
addComponent(jp01, privateChannelNoDup, 3, curY, 1, GridBagConstraints.CENTER, GridBagConstraints.BOTH);
- privateChannelGroup.add (privateChannelDup);
- privateChannelGroup.add (privateChannelNoDup);
+ privateChannelGroup.add(privateChannelDup);
+ privateChannelGroup.add(privateChannelNoDup);
// TODO: change that
// privateChannelNoDup.setSelected(true);
privateChannelDup.setSelected(true);
@@ -475,27 +470,27 @@ public class JDialogProverifVerification extends JDialog implements ActionListen
typedLanguage = new JCheckBox("Generate typed Pi calculus");
typedLanguage.setSelected(true);
addComponent(jp01, typedLanguage, 0, curY, 1, GridBagConstraints.CENTER, GridBagConstraints.BOTH);
- curY++;
- loopLimit = new JTextField("1", 3);
- if (limit){
- addComponent(jp01, new JLabel("Limit on loop iterations:"), 0, curY, 1, GridBagConstraints.CENTER, GridBagConstraints.BOTH);
- addComponent(jp01, loopLimit, 1, curY, 2, GridBagConstraints.CENTER, GridBagConstraints.BOTH);
- curY++;
- }
+ curY++;
+ loopLimit = new JTextField("1", 3);
+ if (limit) {
+ addComponent(jp01, new JLabel("Limit on loop iterations:"), 0, curY, 1, GridBagConstraints.CENTER, GridBagConstraints.BOTH);
+ addComponent(jp01, loopLimit, 1, curY, 2, GridBagConstraints.CENTER, GridBagConstraints.BOTH);
+ curY++;
+ }
+
+ JLabel empty = new JLabel("");
+ jp01.add(empty, new GridBagConstraints(0, curY, 3, 1, 1.0, 1.0, GridBagConstraints.CENTER, GridBagConstraints.BOTH, insets, 0, 0));
- JLabel empty = new JLabel("");
- jp01.add(empty, new GridBagConstraints(0, curY, 3, 1, 1.0, 1.0,GridBagConstraints.CENTER, GridBagConstraints.BOTH, insets, 0, 0));
-
jta = new JPanel();
jta.setLayout(new GridBagLayout());
jta.setBorder(new javax.swing.border.TitledBorder("Results"));
Font f = new Font("Courrier", Font.BOLD, 12);
jta.setFont(f);
jsp = new JScrollPane(jta, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
- jsp.setPreferredSize(new Dimension(300,300));
+ jsp.setPreferredSize(new Dimension(300, 300));
c.add(jsp, BorderLayout.CENTER);
-
- // addComponent(jp01, jsp, 1, curY, 2, GridBagConstraints.CENTER, GridBagConstraints.BOTH);
+
+ // addComponent(jp01, jsp, 1, curY, 2, GridBagConstraints.CENTER, GridBagConstraints.BOTH);
start = new JButton("Start", IconManager.imgic53);
stop = new JButton("Stop", IconManager.imgic55);
close = new JButton("Close", IconManager.imgic27);
@@ -515,11 +510,11 @@ public class JDialogProverifVerification extends JDialog implements ActionListen
jp1.add("Security Verification", jp01);
-
- if (currPanel instanceof TMLArchiPanel){
- //Can only secure a mapping
- jp1.add("Automated Security", jp02);
- }
+
+ if (currPanel instanceof TMLArchiPanel) {
+ //Can only secure a mapping
+ jp1.add("Automated Security", jp02);
+ }
c.add(jp1, BorderLayout.NORTH);
c.add(jp2, BorderLayout.SOUTH);
@@ -528,18 +523,18 @@ public class JDialogProverifVerification extends JDialog implements ActionListen
this.menuItem.addActionListener(this);
popup.add(this.menuItem);
}
-
+
private void handleStartButton() {
- //
+ //
}
private void addOneIgnored() {
- int [] list = listSelected.getSelectedIndices();
+ int[] list = listSelected.getSelectedIndices();
Vector<String> v = new Vector<String>();
String o;
- for (int i=0; i<list.length; i++){
+ for (int i = 0; i < list.length; i++) {
o = selectedTasks.elementAt(list[i]);
ignoredTasks.addElement(o);
v.addElement(o);
@@ -552,11 +547,11 @@ public class JDialogProverifVerification extends JDialog implements ActionListen
}
private void addOneValidated() {
- int [] list = listIgnored.getSelectedIndices();
+ int[] list = listIgnored.getSelectedIndices();
Vector<String> v = new Vector<String>();
String o;
-
- for (int i=0; i<list.length; i++){
+
+ for (int i = 0; i < list.length; i++) {
o = ignoredTasks.elementAt(list[i]);
selectedTasks.addElement(o);
v.addElement(o);
@@ -585,8 +580,7 @@ public class JDialogProverifVerification extends JDialog implements ActionListen
}
-
- public void actionPerformed(ActionEvent evt) {
+ public void actionPerformed(ActionEvent evt) {
String command = evt.getActionCommand();
switch (command) {
@@ -651,46 +645,44 @@ public class JDialogProverifVerification extends JDialog implements ActionListen
}
break;
default:
- if ( (evt.getSource() == autoWeakAuth) ||(evt.getSource() == autoStrongAuth) ||(evt.getSource() == autoConf) || (evt.getSource() == autoMapKeys)) {
- handleStartButton();
- }
- else if (evt.getSource() instanceof JCheckBox){
- //Disable and enable tasks
- JCheckBox src = (JCheckBox) evt.getSource();
- if (cpuTaskObjs.containsKey(src)){
- for (JCheckBox taskBox: cpuTaskObjs.get(src)){
- taskBox.setEnabled(src.isSelected());
- }
- }
- }
- else if (command.equals("addOneIgnored")) {
- addOneIgnored();
- } else if (command.equals("addOneValidated")) {
- addOneValidated();
- } else if (command.equals("allValidated")) {
- allValidated();
- } else if (command.equals("allIgnored")) {
- allIgnored();
- }
- if (evt.getSource() == addHSM){
- listPanel.setEnabled(addHSM.isSelected());
- }
- if (evt.getSource() == autoConf || evt.getSource() == autoSec ||evt.getSource() == autoMapKeys || evt.getSource() == addHSM || evt.getSource()==autoWeakAuth){
- //autoWeakAuth.setEnabled(autoConf.isSelected());
- autoConf.setEnabled(autoSec.isSelected());
- autoWeakAuth.setEnabled(autoSec.isSelected());
- autoStrongAuth.setEnabled(autoWeakAuth.isSelected());
- if (!autoSec.isSelected()){
- autoConf.setSelected(false);
- autoWeakAuth.setSelected(false);
- autoStrongAuth.setSelected(false);
- }
- }
- if (evt.getSource() == custom){
- encTime.setEnabled(custom.isSelected());
- decTime.setEnabled(custom.isSelected());
- secOverhead.setEnabled(custom.isSelected());
- }
+ if ((evt.getSource() == autoWeakAuth) || (evt.getSource() == autoStrongAuth) || (evt.getSource() == autoConf) || (evt.getSource() == autoMapKeys)) {
+ handleStartButton();
+ } else if (evt.getSource() instanceof JCheckBox) {
+ //Disable and enable tasks
+ JCheckBox src = (JCheckBox) evt.getSource();
+ if (cpuTaskObjs.containsKey(src)) {
+ for (JCheckBox taskBox : cpuTaskObjs.get(src)) {
+ taskBox.setEnabled(src.isSelected());
+ }
+ }
+ } else if (command.equals("addOneIgnored")) {
+ addOneIgnored();
+ } else if (command.equals("addOneValidated")) {
+ addOneValidated();
+ } else if (command.equals("allValidated")) {
+ allValidated();
+ } else if (command.equals("allIgnored")) {
+ allIgnored();
+ }
+ if (evt.getSource() == addHSM) {
+ listPanel.setEnabled(addHSM.isSelected());
+ }
+ if (evt.getSource() == autoConf || evt.getSource() == autoSec || evt.getSource() == autoMapKeys || evt.getSource() == addHSM || evt.getSource() == autoWeakAuth) {
+ //autoWeakAuth.setEnabled(autoConf.isSelected());
+ autoConf.setEnabled(autoSec.isSelected());
+ autoWeakAuth.setEnabled(autoSec.isSelected());
+ autoStrongAuth.setEnabled(autoWeakAuth.isSelected());
+ if (!autoSec.isSelected()) {
+ autoConf.setSelected(false);
+ autoWeakAuth.setSelected(false);
+ autoStrongAuth.setSelected(false);
+ }
+ }
+ if (evt.getSource() == custom) {
+ encTime.setEnabled(custom.isSelected());
+ decTime.setEnabled(custom.isSelected());
+ secOverhead.setEnabled(custom.isSelected());
+ }
}
}
@@ -705,14 +697,14 @@ public class JDialogProverifVerification extends JDialog implements ActionListen
}
public void stopProcess() {
- if (rshc != null ){
+ if (rshc != null) {
try {
rshc.stopCommand();
} catch (LauncherException ignored) {
}
}
rshc = null;
- mode = STOPPED;
+ mode = STOPPED;
setButtons();
go = false;
}
@@ -746,36 +738,34 @@ public class JDialogProverifVerification extends JDialog implements ActionListen
TraceManager.addDev("Thread started");
File testFile;
try {
- if (jp1.getSelectedIndex() == 1){
- encCC=encTime.getText();
- decCC=decTime.getText();
- secOv = secOverhead.getText();
- TMLMapping map;
- if (autoConf.isSelected() || autoWeakAuth.isSelected() || autoStrongAuth.isSelected()){
- if (custom.isSelected()){
- map = mgui.gtm.autoSecure(mgui, encCC,secOv,decCC,autoConf.isSelected(), autoWeakAuth.isSelected(),autoStrongAuth.isSelected());
- }
- else {
- map = mgui.gtm.autoSecure(mgui,autoConf.isSelected(), autoWeakAuth.isSelected(),autoStrongAuth.isSelected());
- }
- }
- else if (addHSM.isSelected()){
-
- // ArrayList<String> comps = new ArrayList<String>();
- // comps.add(addToComp.getText());
- Map<String, java.util.List<String>> selectedCpuTasks = new HashMap<String, java.util.List<String>>();
-
- for (String task: selectedTasks){
- String cpu = taskCpuMap.get(task);
- if (selectedCpuTasks.containsKey(cpu)){
- selectedCpuTasks.get(cpu).add(task);
- }
- else {
- ArrayList<String> tasks = new ArrayList<String>();
- tasks.add(task);
- selectedCpuTasks.put(cpu,tasks);
- }
- }
+ if (jp1.getSelectedIndex() == 1) {
+ encCC = encTime.getText();
+ decCC = decTime.getText();
+ secOv = secOverhead.getText();
+ TMLMapping map;
+ if (autoConf.isSelected() || autoWeakAuth.isSelected() || autoStrongAuth.isSelected()) {
+ if (custom.isSelected()) {
+ map = mgui.gtm.autoSecure(mgui, encCC, secOv, decCC, autoConf.isSelected(), autoWeakAuth.isSelected(), autoStrongAuth
+ .isSelected());
+ } else {
+ map = mgui.gtm.autoSecure(mgui, autoConf.isSelected(), autoWeakAuth.isSelected(), autoStrongAuth.isSelected());
+ }
+ } else if (addHSM.isSelected()) {
+
+ // ArrayList<String> comps = new ArrayList<String>();
+ // comps.add(addToComp.getText());
+ Map<String, java.util.List<String>> selectedCpuTasks = new HashMap<String, java.util.List<String>>();
+
+ for (String task : selectedTasks) {
+ String cpu = taskCpuMap.get(task);
+ if (selectedCpuTasks.containsKey(cpu)) {
+ selectedCpuTasks.get(cpu).add(task);
+ } else {
+ ArrayList<String> tasks = new ArrayList<String>();
+ tasks.add(task);
+ selectedCpuTasks.put(cpu, tasks);
+ }
+ }
/*for (JCheckBox cpu: cpuTaskObjs.keySet()){
ArrayList<String> tasks = new ArrayList<String>();
for (JCheckBox task: cpuTaskObjs.get(cpu)){
@@ -788,82 +778,78 @@ public class JDialogProverifVerification extends JDialog implements ActionListen
}
}
mgui.gtm.addHSM(mgui, selectedCpuTasks);*/
- mgui.gtm.addHSM(mgui, selectedCpuTasks);
- }
- if (autoMapKeys.isSelected()){
- mgui.gtm.autoMapKeys();
- }
- mode = NOT_STARTED;
- }
- else {
- testGo();
- pathCode = code1.getText().trim ();
+ mgui.gtm.addHSM(mgui, selectedCpuTasks);
+ }
+ if (autoMapKeys.isSelected()) {
+ mgui.gtm.autoMapKeys();
+ }
+ mode = NOT_STARTED;
+ } else {
+ testGo();
+ pathCode = code1.getText().trim();
+
+ if (pathCode.isEmpty()) {
+ pathCode += "pvspec";
+ }
+
+ SpecConfigTTool.checkAndCreateProverifDir(pathCode);
- if (pathCode.isEmpty()) {
pathCode += "pvspec";
- }
-
- SpecConfigTTool.checkAndCreateProverifDir(pathCode);
+ testFile = new File(pathCode);
- pathCode += "pvspec";
- testFile = new File(pathCode);
-
- File dir = testFile.getParentFile();
+ File dir = testFile.getParentFile();
- if (dir == null || !dir.exists()) {
- mode = STOPPED;
- setButtons();
- throw new ProVerifVerificationException("Error: invalid file: " + pathCode);
- }
+ if (dir == null || !dir.exists()) {
+ mode = STOPPED;
+ setButtons();
+ throw new ProVerifVerificationException("Error: invalid file: " + pathCode);
+ }
- if (testFile.exists()){
- // FIXME Raise error if modified since last
- TraceManager.addDev("FILE EXISTS!!!");
- }
+ if (testFile.exists()) {
+ // FIXME Raise error if modified since last
+ TraceManager.addDev("FILE EXISTS!!!");
+ }
- if ( !mgui.gtm.generateProVerifFromAVATAR(
+ if (!mgui.gtm.generateProVerifFromAVATAR(
pathCode,
- stateReachabilityAll.isSelected () ? REACHABILITY_ALL : stateReachabilitySelected.isSelected () ? REACHABILITY_SELECTED : REACHABILITY_NONE,
+ stateReachabilityAll.isSelected() ? REACHABILITY_ALL : stateReachabilitySelected.isSelected() ? REACHABILITY_SELECTED : REACHABILITY_NONE,
typedLanguage.isSelected(),
privateChannelDup.isSelected(),
loopLimit.getText())
- ) {
- throw new ProVerifVerificationException("Could not generate proverif code");
- }
+ ) {
+ throw new ProVerifVerificationException("Could not generate proverif code");
+ }
- String cmd = exe2.getText().trim();
+ String cmd = exe2.getText().trim();
- if (this.typedLanguage.isSelected())
- {
- cmd += " -in pitype ";
- }
- else
- {
- cmd += " -in pi ";
- }
+ if (this.typedLanguage.isSelected()) {
+ cmd += " -in pitype ";
+ } else {
+ cmd += " -in pi ";
+ }
- cmd += pathCode;
- //jta.append("" + mgui.gtm.getCheckingWarnings().size() + " warning(s)\n");
- testGo();
+ cmd += pathCode;
+ //jta.append("" + mgui.gtm.getCheckingWarnings().size() + " warning(s)\n");
+ testGo();
- this.rshc = new RshClient(hostProVerif);
- this.rshc.setCmd(cmd);
- this.rshc.sendExecuteCommandRequest();
- RshClientReader reader = this.rshc.getDataReaderFromProcess();
+ this.rshc = new RshClient(hostProVerif);
+ this.rshc.setCmd(cmd);
+ this.rshc.sendExecuteCommandRequest();
+ RshClientReader reader = this.rshc.getDataReaderFromProcess();
- if (this.pvoa == null) {
- this.pvoa = mgui.gtm.getProVerifOutputAnalyzer ();
- this.pvoa.addListener(this);
- }
- this.pvoa.analyzeOutput(reader, typedLanguage.isSelected());
+ if (this.pvoa == null) {
+ this.pvoa = mgui.gtm.getProVerifOutputAnalyzer();
+ this.pvoa.addListener(this);
+ }
+ this.pvoa.analyzeOutput(reader, typedLanguage.isSelected());
- mgui.modelBacktracingProVerif(pvoa);
+ mgui.modelBacktracingProVerif(pvoa);
- mode = NOT_STARTED;
+ mode = NOT_STARTED;
- }
+ }
} catch (LauncherException | ProVerifVerificationException le) {
JLabel label = new JLabel("Error: " + le.getMessage());
label.setAlignmentX(Component.LEFT_ALIGNMENT);
@@ -872,7 +858,7 @@ public class JDialogProverifVerification extends JDialog implements ActionListen
} catch (InterruptedException ie) {
mode = NOT_STARTED;
} catch (FileException e) {
- System.err.println(e.getMessage() + " : Can't generate proverif file.");
+ System.err.println(e.getMessage() + " : Can't generate proverif file.");
} catch (Exception e) {
mode = STOPPED;
throw e;
@@ -884,7 +870,7 @@ public class JDialogProverifVerification extends JDialog implements ActionListen
}
protected void setButtons() {
- switch(mode) {
+ switch (mode) {
case NOT_STARTED:
start.setEnabled(true);
stop.setEnabled(false);
@@ -908,52 +894,42 @@ public class JDialogProverifVerification extends JDialog implements ActionListen
}
@Override
- public void setError()
- {
+ public void setError() {
}
@Override
- public void appendOut(String s)
- {
+ public void appendOut(String s) {
}
@Override
- public boolean hasToContinue()
- {
+ public boolean hasToContinue() {
return this.go;
}
@Override
- public void mouseClicked(MouseEvent e)
- {
+ public void mouseClicked(MouseEvent e) {
}
@Override
- public void mouseEntered(MouseEvent e)
- {
+ public void mouseEntered(MouseEvent e) {
}
@Override
- public void mouseExited(MouseEvent e)
- {
+ public void mouseExited(MouseEvent e) {
}
@Override
- public void mousePressed(MouseEvent e)
- {
+ public void mousePressed(MouseEvent e) {
this.maybeShowPopup(e);
}
@Override
- public void mouseReleased(MouseEvent e)
- {
+ public void mouseReleased(MouseEvent e) {
this.maybeShowPopup(e);
}
- private void maybeShowPopup(MouseEvent e)
- {
- if (e.isPopupTrigger() && e.getComponent() instanceof JList)
- {
+ private void maybeShowPopup(MouseEvent e) {
+ if (e.isPopupTrigger() && e.getComponent() instanceof JList) {
JList curList = (JList) e.getComponent();
int row = curList.locationToIndex(e.getPoint());
curList.clearSelection();
@@ -962,22 +938,20 @@ public class JDialogProverifVerification extends JDialog implements ActionListen
if (o instanceof AvatarPragma) {
this.menuItem.pragma = (AvatarPragma) o;
this.menuItem.result = this.results.get(this.menuItem.pragma);
- // this.menuItem.setEnabled(this.adp != null && this.menuItem.result.getTrace() != null);
- this.menuItem.setEnabled(this.menuItem.result.getTrace() != null);
+ // this.menuItem.setEnabled(this.adp != null && this.menuItem.result.getTrace() != null);
+ this.menuItem.setEnabled(this.menuItem.result.getTrace() != null);
popup.show(e.getComponent(), e.getX(), e.getY());
}
}
}
@Override
- public void valueChanged(ListSelectionEvent e)
- {
+ public void valueChanged(ListSelectionEvent e) {
// TODO: unselect the other lists
}
@Override
- public void proVerifOutputChanged()
- {
+ public void proVerifOutputChanged() {
JLabel label;
this.jta.removeAll();
@@ -990,62 +964,47 @@ public class JDialogProverifVerification extends JDialog implements ActionListen
label = new JLabel("----------------");
label.setAlignmentX(Component.LEFT_ALIGNMENT);
this.jta.add(label, this.createGbc(y++));
- this.jta.add(Box.createRigidArea(new Dimension(0,5)), this.createGbc(y++));
- for(String error: pvoa.getErrors()) {
+ this.jta.add(Box.createRigidArea(new Dimension(0, 5)), this.createGbc(y++));
+ for (String error : pvoa.getErrors()) {
label = new JLabel(error);
label.setAlignmentX(Component.LEFT_ALIGNMENT);
- this.jta.add(label,this.createGbc(y++));
+ this.jta.add(label, this.createGbc(y++));
}
} else {
- LinkedList<AvatarPragma> reachableEvents = new LinkedList<> ();
- LinkedList<AvatarPragma> nonReachableEvents = new LinkedList<> ();
- LinkedList<AvatarPragma> secretTerms = new LinkedList<> ();
- LinkedList<AvatarPragma> nonSecretTerms = new LinkedList<> ();
- LinkedList<AvatarPragma> satisfiedStrongAuth = new LinkedList<> ();
- LinkedList<AvatarPragma> satisfiedWeakAuth = new LinkedList<> ();
- LinkedList<AvatarPragma> nonSatisfiedAuth = new LinkedList<> ();
- LinkedList<AvatarPragma> nonProved = new LinkedList<> ();
+ LinkedList<AvatarPragma> reachableEvents = new LinkedList<>();
+ LinkedList<AvatarPragma> nonReachableEvents = new LinkedList<>();
+ LinkedList<AvatarPragma> secretTerms = new LinkedList<>();
+ LinkedList<AvatarPragma> nonSecretTerms = new LinkedList<>();
+ LinkedList<AvatarPragma> satisfiedStrongAuth = new LinkedList<>();
+ LinkedList<AvatarPragma> satisfiedWeakAuth = new LinkedList<>();
+ LinkedList<AvatarPragma> nonSatisfiedAuth = new LinkedList<>();
+ LinkedList<AvatarPragma> nonProved = new LinkedList<>();
this.results = this.pvoa.getResults();
- for (AvatarPragma pragma: this.results.keySet())
- {
- if (pragma instanceof AvatarPragmaReachability)
- {
+ for (AvatarPragma pragma : this.results.keySet()) {
+ if (pragma instanceof AvatarPragmaReachability) {
ProVerifQueryResult r = this.results.get(pragma);
- if (r.isProved())
- {
+ if (r.isProved()) {
if (r.isSatisfied())
reachableEvents.add(pragma);
else
nonReachableEvents.add(pragma);
- }
- else
+ } else
nonProved.add(pragma);
- }
-
- else if (pragma instanceof AvatarPragmaSecret)
- {
+ } else if (pragma instanceof AvatarPragmaSecret) {
ProVerifQueryResult r = this.results.get(pragma);
- if (r.isProved())
- {
+ if (r.isProved()) {
if (r.isSatisfied())
secretTerms.add(pragma);
else
nonSecretTerms.add(pragma);
- }
- else
+ } else
nonProved.add(pragma);
- }
-
- else if (pragma instanceof AvatarPragmaAuthenticity)
- {
+ } else if (pragma instanceof AvatarPragmaAuthenticity) {
ProVerifQueryAuthResult r = (ProVerifQueryAuthResult) this.results.get(pragma);
- if (!r.isWeakProved())
- {
+ if (!r.isWeakProved()) {
nonProved.add(pragma);
- }
- else
- {
+ } else {
if (!r.isProved())
nonProved.add(pragma);
if (r.isProved() && r.isSatisfied())
@@ -1058,7 +1017,7 @@ public class JDialogProverifVerification extends JDialog implements ActionListen
}
}
- Collection<ProVerifResultSection> sectionsList = new LinkedList<> ();
+ Collection<ProVerifResultSection> sectionsList = new LinkedList<>();
Collections.sort(reachableEvents);
Collections.sort(nonReachableEvents);
Collections.sort(secretTerms);
@@ -1078,20 +1037,18 @@ public class JDialogProverifVerification extends JDialog implements ActionListen
int y = 0;
- for (ProVerifResultSection section: sectionsList)
- {
- if (!section.results.isEmpty())
- {
+ for (ProVerifResultSection section : sectionsList) {
+ if (!section.results.isEmpty()) {
label = new JLabel(section.title);
label.setAlignmentX(Component.LEFT_ALIGNMENT);
this.jta.add(label, this.createGbc(y++));
- this.jta.add(Box.createRigidArea(new Dimension(0,5)), this.createGbc(y++));
- section.jlist = new JList<> (section.results.toArray (new AvatarPragma[0]));
+ this.jta.add(Box.createRigidArea(new Dimension(0, 5)), this.createGbc(y++));
+ section.jlist = new JList<>(section.results.toArray(new AvatarPragma[0]));
section.jlist.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
section.jlist.addMouseListener(this);
section.jlist.setAlignmentX(Component.LEFT_ALIGNMENT);
this.jta.add(section.jlist, this.createGbc(y++));
- this.jta.add(Box.createRigidArea(new Dimension(0,10)), this.createGbc(y++));
+ this.jta.add(Box.createRigidArea(new Dimension(0, 10)), this.createGbc(y++));
}
}
}
--
GitLab