From 46d16d993bee7f3d45690e0a57bf909f91d3c7e2 Mon Sep 17 00:00:00 2001
From: Minh Hiep Pham <minh.pham@telecom-paristech.fr>
Date: Mon, 25 Mar 2019 11:24:38 +0100
Subject: [PATCH] Updated test class and model test for component task diagram
(not yet for the achitecture clone test)
---
.../CloneCompositeComponentTest.xml | 1062 +++++++++-------
.../test/java/ui/TDiagramPanelCloneTest.java | 52 +-
.../tmltranslator/expected/expected_spec1.tml | 78 +-
.../tmltranslator/expected/expected_spec2.tml | 62 +-
.../tmltranslator/expected/expected_spec3.tml | 52 +-
.../tmltranslator/expected/expected_spec4.tml | 88 ++
.../input/CloneCompositeComponentTest.xml | 1102 +++++++++--------
7 files changed, 1423 insertions(+), 1073 deletions(-)
create mode 100644 ttool/src/test/resources/tmltranslator/expected/expected_spec4.tml
diff --git a/modeling/DIPLODOCUS/CloneCompositeComponentTest.xml b/modeling/DIPLODOCUS/CloneCompositeComponentTest.xml
index 845dc4df66..407049607f 100644
--- a/modeling/DIPLODOCUS/CloneCompositeComponentTest.xml
+++ b/modeling/DIPLODOCUS/CloneCompositeComponentTest.xml
@@ -2,148 +2,112 @@
<TURTLEGMODELING version="1.0beta">
-<Modeling type="TML Component Design" nameTab="Application" tabs="TML Component Task Diagram$PrimitiveComp2$PrimitiveComp1$PrimitiveComp3$PrimitiveComp4$PrimitiveComp5$PrimitiveComp6$PrimitiveComp7" >
+<Modeling type="TML Component Design" nameTab="Application" tabs="TML Component Task Diagram$PrimitiveComp2$PrimitiveComp1$PrimitiveComp3$PrimitiveComp4$PrimitiveComp5$PrimitiveComp6" >
<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="5" >
-<cdparam x="1151" y="234" />
+<CONNECTOR type="126" id="1" >
+<cdparam x="1144" y="348" />
<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="1143" y="232" id="6" />
-<P2 x="1236" y="232" id="96" />
+<P1 x="1131" y="335" id="85" />
+<P2 x="1131" y="392" id="87" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="126" id="4" >
+<CONNECTOR type="126" id="2" >
<cdparam x="424" y="585" />
<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="424" y="585" id="41" />
-<P2 x="521" y="585" id="39" />
+<P1 x="424" y="559" id="30" />
+<P2 x="521" y="559" id="28" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="3" >
<cdparam x="878" y="469" />
<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="430" y="208" id="61" />
-<P2 x="564" y="209" id="74" />
+<P1 x="417" y="195" id="50" />
+<P2 x="577" y="196" id="63" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="126" id="2" >
+<CONNECTOR type="126" id="4" >
<cdparam x="1021" y="460" />
<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="564" y="164" id="76" />
-<P2 x="430" y="163" id="63" />
+<P1 x="577" y="151" id="65" />
+<P2 x="417" y="150" id="52" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="126" id="1" >
+<CONNECTOR type="126" id="5" >
<cdparam x="475" y="480" />
<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="467" y="365" id="28" />
-<P2 x="514" y="364" id="17" />
+<P1 x="454" y="352" id="17" />
+<P2 x="527" y="351" id="6" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<COMPONENT type="1202" id="16" >
-<cdparam x="930" y="155" />
-<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="PrimitiveComp6" />
-<TGConnectingPoint num="0" id="8" />
-<TGConnectingPoint num="1" id="9" />
-<TGConnectingPoint num="2" id="10" />
-<TGConnectingPoint num="3" id="11" />
-<TGConnectingPoint num="4" id="12" />
-<TGConnectingPoint num="5" id="13" />
-<TGConnectingPoint num="6" id="14" />
-<TGConnectingPoint num="7" id="15" />
-<extraparam>
-<Data isAttacker="No" Operation="" />
-</extraparam>
-</COMPONENT>
-<SUBCOMPONENT type="1203" id="7" >
-<father id="16" num="0" />
-<cdparam x="1117" y="219" />
-<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 channel4" />
-<TGConnectingPoint num="0" id="6" />
-<extraparam>
-<Prop commName="channel4" 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" vc="-1" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-
-<COMPONENT type="1200" id="95" >
+<COMPONENT type="1200" id="84" >
<cdparam x="186" y="10" />
<sizeparam width="672" height="618" 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="Composite component" value="CompositeComp1" />
-<TGConnectingPoint num="0" id="87" />
-<TGConnectingPoint num="1" id="88" />
-<TGConnectingPoint num="2" id="89" />
-<TGConnectingPoint num="3" id="90" />
-<TGConnectingPoint num="4" id="91" />
-<TGConnectingPoint num="5" id="92" />
-<TGConnectingPoint num="6" id="93" />
-<TGConnectingPoint num="7" id="94" />
+<TGConnectingPoint num="0" id="76" />
+<TGConnectingPoint num="1" id="77" />
+<TGConnectingPoint num="2" id="78" />
+<TGConnectingPoint num="3" id="79" />
+<TGConnectingPoint num="4" id="80" />
+<TGConnectingPoint num="5" id="81" />
+<TGConnectingPoint num="6" id="82" />
+<TGConnectingPoint num="7" id="83" />
<extraparam>
<info hiddeni="false" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1200" id="60" >
-<father id="95" num="0" />
+<SUBCOMPONENT type="1200" id="49" >
+<father id="84" num="0" />
<cdparam x="266" y="278" />
<sizeparam width="471" height="329" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="201" minY="0" maxY="289" />
<infoparam name="Composite component" value="CompositeComp2" />
-<TGConnectingPoint num="0" id="52" />
-<TGConnectingPoint num="1" id="53" />
-<TGConnectingPoint num="2" id="54" />
-<TGConnectingPoint num="3" id="55" />
-<TGConnectingPoint num="4" id="56" />
-<TGConnectingPoint num="5" id="57" />
-<TGConnectingPoint num="6" id="58" />
-<TGConnectingPoint num="7" id="59" />
+<TGConnectingPoint num="0" id="41" />
+<TGConnectingPoint num="1" id="42" />
+<TGConnectingPoint num="2" id="43" />
+<TGConnectingPoint num="3" id="44" />
+<TGConnectingPoint num="4" id="45" />
+<TGConnectingPoint num="5" id="46" />
+<TGConnectingPoint num="6" id="47" />
+<TGConnectingPoint num="7" id="48" />
<extraparam>
<info hiddeni="false" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1202" id="27" >
-<father id="60" num="0" />
+<SUBCOMPONENT type="1202" id="16" >
+<father id="49" num="0" />
<cdparam x="527" y="316" />
<sizeparam width="200" height="150" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="271" minY="0" maxY="179" />
<infoparam name="Primitive component" value="PrimitiveComp4" />
-<TGConnectingPoint num="0" id="19" />
-<TGConnectingPoint num="1" id="20" />
-<TGConnectingPoint num="2" id="21" />
-<TGConnectingPoint num="3" id="22" />
-<TGConnectingPoint num="4" id="23" />
-<TGConnectingPoint num="5" id="24" />
-<TGConnectingPoint num="6" id="25" />
-<TGConnectingPoint num="7" id="26" />
+<TGConnectingPoint num="0" id="8" />
+<TGConnectingPoint num="1" id="9" />
+<TGConnectingPoint num="2" id="10" />
+<TGConnectingPoint num="3" id="11" />
+<TGConnectingPoint num="4" id="12" />
+<TGConnectingPoint num="5" id="13" />
+<TGConnectingPoint num="6" id="14" />
+<TGConnectingPoint num="7" id="15" />
<extraparam>
<Data isAttacker="No" Operation="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="18" >
-<father id="27" num="0" />
+<SUBCOMPONENT type="1203" id="7" >
+<father id="16" num="0" />
<cdparam x="514" y="351" />
<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 channel2" />
-<TGConnectingPoint num="0" id="17" />
+<TGConnectingPoint num="0" id="6" />
<extraparam>
<Prop commName="channel2" 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" vc="-1" />
<Type type="0" typeOther="" />
@@ -153,33 +117,33 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1202" id="38" >
-<father id="60" num="1" />
+<SUBCOMPONENT type="1202" id="27" >
+<father id="49" num="1" />
<cdparam x="285" y="318" />
<sizeparam width="169" height="150" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="302" minY="0" maxY="179" />
<infoparam name="Primitive component" value="PrimitiveComp3" />
-<TGConnectingPoint num="0" id="30" />
-<TGConnectingPoint num="1" id="31" />
-<TGConnectingPoint num="2" id="32" />
-<TGConnectingPoint num="3" id="33" />
-<TGConnectingPoint num="4" id="34" />
-<TGConnectingPoint num="5" id="35" />
-<TGConnectingPoint num="6" id="36" />
-<TGConnectingPoint num="7" id="37" />
+<TGConnectingPoint num="0" id="19" />
+<TGConnectingPoint num="1" id="20" />
+<TGConnectingPoint num="2" id="21" />
+<TGConnectingPoint num="3" id="22" />
+<TGConnectingPoint num="4" id="23" />
+<TGConnectingPoint num="5" id="24" />
+<TGConnectingPoint num="6" id="25" />
+<TGConnectingPoint num="7" id="26" />
<extraparam>
<Data isAttacker="No" Operation="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="29" >
-<father id="38" num="0" />
+<SUBCOMPONENT type="1203" id="18" >
+<father id="27" num="0" />
<cdparam x="441" y="352" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="156" minY="-13" maxY="137" />
<infoparam name="Primitive port" value="Channel channel2" />
-<TGConnectingPoint num="0" id="28" />
+<TGConnectingPoint num="0" id="17" />
<extraparam>
<Prop commName="channel2" 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" vc="-1" />
<Type type="0" typeOther="" />
@@ -189,33 +153,33 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1202" id="51" >
-<father id="60" num="2" />
+<SUBCOMPONENT type="1202" id="40" >
+<father id="49" num="2" />
<cdparam x="399" y="491" />
<sizeparam width="169" height="81" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="302" minY="0" maxY="248" />
<infoparam name="Primitive component" value="PrimitiveComp5" />
-<TGConnectingPoint num="0" id="43" />
-<TGConnectingPoint num="1" id="44" />
-<TGConnectingPoint num="2" id="45" />
-<TGConnectingPoint num="3" id="46" />
-<TGConnectingPoint num="4" id="47" />
-<TGConnectingPoint num="5" id="48" />
-<TGConnectingPoint num="6" id="49" />
-<TGConnectingPoint num="7" id="50" />
+<TGConnectingPoint num="0" id="32" />
+<TGConnectingPoint num="1" id="33" />
+<TGConnectingPoint num="2" id="34" />
+<TGConnectingPoint num="3" id="35" />
+<TGConnectingPoint num="4" id="36" />
+<TGConnectingPoint num="5" id="37" />
+<TGConnectingPoint num="6" id="38" />
+<TGConnectingPoint num="7" id="39" />
<extraparam>
<Data isAttacker="No" Operation="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="40" >
-<father id="51" num="0" />
+<SUBCOMPONENT type="1203" id="29" >
+<father id="40" num="0" />
<cdparam x="508" y="559" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="156" minY="-13" maxY="68" />
<infoparam name="Primitive port" value="Channel channel3" />
-<TGConnectingPoint num="0" id="39" />
+<TGConnectingPoint num="0" id="28" />
<extraparam>
<Prop commName="channel3" 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" vc="-1" />
<Type type="0" typeOther="" />
@@ -225,14 +189,14 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="42" >
-<father id="51" num="1" />
+<SUBCOMPONENT type="1203" id="31" >
+<father id="40" num="1" />
<cdparam x="411" y="559" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="156" minY="-13" maxY="68" />
<infoparam name="Primitive port" value="Channel channel3" />
-<TGConnectingPoint num="0" id="41" />
+<TGConnectingPoint num="0" id="30" />
<extraparam>
<Prop commName="channel3" 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" vc="-1" />
<Type type="0" typeOther="" />
@@ -242,33 +206,33 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1202" id="73" >
-<father id="95" num="1" />
+<SUBCOMPONENT type="1202" id="62" >
+<father id="84" num="1" />
<cdparam x="217" y="116" />
<sizeparam width="200" height="150" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="472" minY="0" maxY="468" />
<infoparam name="Primitive component" value="PrimitiveComp1" />
-<TGConnectingPoint num="0" id="65" />
-<TGConnectingPoint num="1" id="66" />
-<TGConnectingPoint num="2" id="67" />
-<TGConnectingPoint num="3" id="68" />
-<TGConnectingPoint num="4" id="69" />
-<TGConnectingPoint num="5" id="70" />
-<TGConnectingPoint num="6" id="71" />
-<TGConnectingPoint num="7" id="72" />
+<TGConnectingPoint num="0" id="54" />
+<TGConnectingPoint num="1" id="55" />
+<TGConnectingPoint num="2" id="56" />
+<TGConnectingPoint num="3" id="57" />
+<TGConnectingPoint num="4" id="58" />
+<TGConnectingPoint num="5" id="59" />
+<TGConnectingPoint num="6" id="60" />
+<TGConnectingPoint num="7" id="61" />
<extraparam>
<Data isAttacker="No" Operation="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="62" >
-<father id="73" num="0" />
+<SUBCOMPONENT type="1203" id="51" >
+<father id="62" num="0" />
<cdparam x="404" y="195" />
<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="Event event" />
-<TGConnectingPoint num="0" id="61" />
+<TGConnectingPoint num="0" id="50" />
<extraparam>
<Prop commName="event" commType="1" origin="true" finite="true" 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" vc="-1" />
<Type type="0" typeOther="" />
@@ -278,14 +242,14 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="64" >
-<father id="73" num="1" />
+<SUBCOMPONENT type="1203" id="53" >
+<father id="62" num="1" />
<cdparam x="404" y="150" />
<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 channel" />
-<TGConnectingPoint num="0" id="63" />
+<TGConnectingPoint num="0" id="52" />
<extraparam>
<Prop commName="channel" 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" vc="-1" />
<Type type="0" typeOther="" />
@@ -295,33 +259,33 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1202" id="86" >
-<father id="95" num="2" />
+<SUBCOMPONENT type="1202" id="75" >
+<father id="84" num="2" />
<cdparam x="577" y="116" />
<sizeparam width="200" height="150" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="472" minY="0" maxY="468" />
<infoparam name="Primitive component" value="PrimitiveComp2" />
-<TGConnectingPoint num="0" id="78" />
-<TGConnectingPoint num="1" id="79" />
-<TGConnectingPoint num="2" id="80" />
-<TGConnectingPoint num="3" id="81" />
-<TGConnectingPoint num="4" id="82" />
-<TGConnectingPoint num="5" id="83" />
-<TGConnectingPoint num="6" id="84" />
-<TGConnectingPoint num="7" id="85" />
+<TGConnectingPoint num="0" id="67" />
+<TGConnectingPoint num="1" id="68" />
+<TGConnectingPoint num="2" id="69" />
+<TGConnectingPoint num="3" id="70" />
+<TGConnectingPoint num="4" id="71" />
+<TGConnectingPoint num="5" id="72" />
+<TGConnectingPoint num="6" id="73" />
+<TGConnectingPoint num="7" id="74" />
<extraparam>
<Data isAttacker="No" Operation="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="75" >
-<father id="86" num="0" />
+<SUBCOMPONENT type="1203" id="64" >
+<father id="75" num="0" />
<cdparam x="564" y="196" />
<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="Event event" />
-<TGConnectingPoint num="0" id="74" />
+<TGConnectingPoint num="0" id="63" />
<extraparam>
<Prop commName="event" commType="1" 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" vc="-1" />
<Type type="0" typeOther="" />
@@ -331,14 +295,14 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="77" >
-<father id="86" num="1" />
+<SUBCOMPONENT type="1203" id="66" >
+<father id="75" num="1" />
<cdparam x="564" y="151" />
<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 channel" />
-<TGConnectingPoint num="0" id="76" />
+<TGConnectingPoint num="0" id="65" />
<extraparam>
<Prop commName="channel" 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" vc="-1" />
<Type type="0" typeOther="" />
@@ -349,32 +313,49 @@
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1202" id="106" >
-<cdparam x="1249" y="157" />
+<COMPONENT type="1202" id="97" >
+<cdparam x="931" y="292" />
<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="PrimitiveComp7" />
-<TGConnectingPoint num="0" id="98" />
-<TGConnectingPoint num="1" id="99" />
-<TGConnectingPoint num="2" id="100" />
-<TGConnectingPoint num="3" id="101" />
-<TGConnectingPoint num="4" id="102" />
-<TGConnectingPoint num="5" id="103" />
-<TGConnectingPoint num="6" id="104" />
-<TGConnectingPoint num="7" id="105" />
+<infoparam name="Primitive component" value="PrimitiveComp6" />
+<TGConnectingPoint num="0" id="89" />
+<TGConnectingPoint num="1" id="90" />
+<TGConnectingPoint num="2" id="91" />
+<TGConnectingPoint num="3" id="92" />
+<TGConnectingPoint num="4" id="93" />
+<TGConnectingPoint num="5" id="94" />
+<TGConnectingPoint num="6" id="95" />
+<TGConnectingPoint num="7" id="96" />
<extraparam>
<Data isAttacker="No" Operation="" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1203" id="97" >
-<father id="106" num="0" />
-<cdparam x="1236" y="219" />
+<SUBCOMPONENT type="1203" id="86" >
+<father id="97" num="0" />
+<cdparam x="1118" y="335" />
<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 channel4" />
-<TGConnectingPoint num="0" id="96" />
+<TGConnectingPoint num="0" id="85" />
+<extraparam>
+<Prop commName="channel4" 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" vc="-1" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1203" id="88" >
+<father id="97" num="1" />
+<cdparam x="1118" y="392" />
+<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 channel4" />
+<TGConnectingPoint num="0" id="87" />
<extraparam>
<Prop commName="channel4" 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" vc="-1" />
<Type type="0" typeOther="" />
@@ -389,81 +370,81 @@
</TMLComponentTaskDiagramPanel>
<TMLActivityDiagramPanel name="PrimitiveComp2" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="1001" id="119" >
+<COMPONENT type="1001" id="99" >
<cdparam x="520" y="416" />
<sizeparam width="20" height="20" 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="stop state" value="null" />
-<TGConnectingPoint num="0" id="118" />
+<TGConnectingPoint num="0" id="98" />
</COMPONENT>
-<COMPONENT type="1001" id="121" >
+<COMPONENT type="1001" id="101" >
<cdparam x="397" y="418" />
<sizeparam width="20" height="20" 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="stop state" value="null" />
-<TGConnectingPoint num="0" id="120" />
+<TGConnectingPoint num="0" id="100" />
</COMPONENT>
-<COMPONENT type="1010" id="124" >
+<COMPONENT type="1010" id="104" >
<cdparam x="501" y="302" />
<sizeparam width="59" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="wait event" value="event() " />
-<TGConnectingPoint num="0" id="122" />
-<TGConnectingPoint num="1" id="123" />
+<TGConnectingPoint num="0" id="102" />
+<TGConnectingPoint num="1" id="103" />
<extraparam>
<Data eventName="event" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1009" id="127" >
+<COMPONENT type="1009" id="107" >
<cdparam x="366" y="296" />
<sizeparam width="82" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="read channel" value="channel(1) " />
-<TGConnectingPoint num="0" id="125" />
-<TGConnectingPoint num="1" id="126" />
+<TGConnectingPoint num="0" id="105" />
+<TGConnectingPoint num="1" id="106" />
<extraparam>
<Data channelName="channel" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="Yes" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1012" id="135" >
+<COMPONENT type="1012" id="115" >
<cdparam x="392" y="175" />
<sizeparam width="30" height="30" 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="choice" value="null" />
-<TGConnectingPoint num="0" id="131" />
-<TGConnectingPoint num="1" id="132" />
-<TGConnectingPoint num="2" id="133" />
-<TGConnectingPoint num="3" id="134" />
+<TGConnectingPoint num="0" id="111" />
+<TGConnectingPoint num="1" id="112" />
+<TGConnectingPoint num="2" id="113" />
+<TGConnectingPoint num="3" id="114" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="128" >
-<father id="135" num="0" />
+<SUBCOMPONENT type="-1" id="108" >
+<father id="115" num="0" />
<cdparam x="367" y="185" />
<sizeparam width="14" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
<infoparam name="guard 1" value="[ ]" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="129" >
-<father id="135" num="1" />
+<SUBCOMPONENT type="-1" id="109" >
+<father id="115" num="1" />
<cdparam x="427" y="185" />
<sizeparam width="14" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
<infoparam name="guard 2" value="[ ]" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="130" >
-<father id="135" num="2" />
+<SUBCOMPONENT type="-1" id="110" >
+<father id="115" num="2" />
<cdparam x="412" y="220" />
<sizeparam width="14" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -471,25 +452,25 @@
<infoparam name="guard 3" value="[ ]" />
</SUBCOMPONENT>
-<COMPONENT type="1000" id="137" >
+<COMPONENT type="1000" id="117" >
<cdparam x="400" y="50" />
<sizeparam width="15" height="15" 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="start state" value="null" />
-<TGConnectingPoint num="0" id="136" />
+<TGConnectingPoint num="0" id="116" />
</COMPONENT>
-<CONNECTOR type="115" id="139" >
+<CONNECTOR type="115" id="119" >
<cdparam x="447" y="190" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="447" y="190" id="133" />
-<P2 x="530" y="297" id="122" />
+<P1 x="447" y="190" id="113" />
+<P2 x="530" y="297" id="102" />
<Point x="530" y="190" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="138" >
-<father id="139" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="118" >
+<father id="119" num="0" />
<cdparam x="530" y="190" />
<sizeparam width="1" height="1" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -497,117 +478,117 @@
<infoparam name="point " value="null" />
</SUBCOMPONENT>
-<CONNECTOR type="115" id="140" >
+<CONNECTOR type="115" id="120" >
<cdparam x="407" y="65" />
<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="65" id="136" />
-<P2 x="407" y="165" id="131" />
+<P1 x="407" y="65" id="116" />
+<P2 x="407" y="165" id="111" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="141" >
+<CONNECTOR type="115" id="121" >
<cdparam x="407" y="230" />
<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="230" id="134" />
-<P2 x="407" y="291" id="125" />
+<P1 x="407" y="230" id="114" />
+<P2 x="407" y="291" id="105" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="142" >
+<CONNECTOR type="115" id="122" >
<cdparam x="407" y="321" />
<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="321" id="126" />
-<P2 x="407" y="413" id="120" />
+<P1 x="407" y="321" id="106" />
+<P2 x="407" y="413" id="100" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="143" >
+<CONNECTOR type="115" id="123" >
<cdparam x="530" y="327" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="530" y="327" id="123" />
-<P2 x="530" y="411" id="118" />
+<P1 x="530" y="327" id="103" />
+<P2 x="530" y="411" id="98" />
<AutomaticDrawing data="true" />
</CONNECTOR>
</TMLActivityDiagramPanel>
<TMLActivityDiagramPanel name="PrimitiveComp1" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="1001" id="145" >
+<COMPONENT type="1001" id="125" >
<cdparam x="397" y="440" />
<sizeparam width="20" height="20" 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="stop state" value="null" />
-<TGConnectingPoint num="0" id="144" />
+<TGConnectingPoint num="0" id="124" />
</COMPONENT>
-<COMPONENT type="1001" id="147" >
+<COMPONENT type="1001" id="127" >
<cdparam x="302" y="444" />
<sizeparam width="20" height="20" 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="stop state" value="null" />
-<TGConnectingPoint num="0" id="146" />
+<TGConnectingPoint num="0" id="126" />
</COMPONENT>
-<COMPONENT type="1008" id="150" >
+<COMPONENT type="1008" id="130" >
<cdparam x="285" y="326" />
<sizeparam width="55" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="send event" value="event()" />
-<TGConnectingPoint num="0" id="148" />
-<TGConnectingPoint num="1" id="149" />
+<TGConnectingPoint num="0" id="128" />
+<TGConnectingPoint num="1" id="129" />
<extraparam>
<Data eventName="event" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1006" id="153" >
+<COMPONENT type="1006" id="133" >
<cdparam x="368" y="324" />
<sizeparam width="78" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="write channel" value="channel(1)" />
-<TGConnectingPoint num="0" id="151" />
-<TGConnectingPoint num="1" id="152" />
+<TGConnectingPoint num="0" id="131" />
+<TGConnectingPoint num="1" id="132" />
<extraparam>
<Data channelName="channel" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="Yes" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1012" id="161" >
+<COMPONENT type="1012" id="141" >
<cdparam x="392" y="183" />
<sizeparam width="30" height="30" 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="choice" value="null" />
-<TGConnectingPoint num="0" id="157" />
-<TGConnectingPoint num="1" id="158" />
-<TGConnectingPoint num="2" id="159" />
-<TGConnectingPoint num="3" id="160" />
+<TGConnectingPoint num="0" id="137" />
+<TGConnectingPoint num="1" id="138" />
+<TGConnectingPoint num="2" id="139" />
+<TGConnectingPoint num="3" id="140" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="154" >
-<father id="161" num="0" />
+<SUBCOMPONENT type="-1" id="134" >
+<father id="141" num="0" />
<cdparam x="367" y="193" />
<sizeparam width="14" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
<infoparam name="guard 1" value="[ ]" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="155" >
-<father id="161" num="1" />
+<SUBCOMPONENT type="-1" id="135" >
+<father id="141" num="1" />
<cdparam x="427" y="193" />
<sizeparam width="14" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
<infoparam name="guard 2" value="[ ]" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="156" >
-<father id="161" num="2" />
+<SUBCOMPONENT type="-1" id="136" >
+<father id="141" num="2" />
<cdparam x="412" y="228" />
<sizeparam width="14" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -615,25 +596,25 @@
<infoparam name="guard 3" value="[ ]" />
</SUBCOMPONENT>
-<COMPONENT type="1000" id="163" >
+<COMPONENT type="1000" id="143" >
<cdparam x="400" y="50" />
<sizeparam width="15" height="15" 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="start state" value="null" />
-<TGConnectingPoint num="0" id="162" />
+<TGConnectingPoint num="0" id="142" />
</COMPONENT>
-<CONNECTOR type="115" id="165" >
+<CONNECTOR type="115" id="145" >
<cdparam x="367" y="198" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="367" y="198" id="158" />
-<P2 x="312" y="321" id="148" />
+<P1 x="367" y="198" id="138" />
+<P2 x="312" y="321" id="128" />
<Point x="312" y="198" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="164" >
-<father id="165" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="144" >
+<father id="145" num="0" />
<cdparam x="312" y="198" />
<sizeparam width="1" height="1" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -641,296 +622,288 @@
<infoparam name="point " value="null" />
</SUBCOMPONENT>
-<CONNECTOR type="115" id="166" >
+<CONNECTOR type="115" id="146" >
<cdparam x="407" y="65" />
<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="65" id="162" />
-<P2 x="407" y="173" id="157" />
+<P1 x="407" y="65" id="142" />
+<P2 x="407" y="173" id="137" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="167" >
+<CONNECTOR type="115" id="147" >
<cdparam x="407" y="238" />
<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="238" id="160" />
-<P2 x="407" y="319" id="151" />
+<P1 x="407" y="238" id="140" />
+<P2 x="407" y="319" id="131" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="168" >
+<CONNECTOR type="115" id="148" >
<cdparam x="312" y="351" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="312" y="351" id="149" />
-<P2 x="312" y="439" id="146" />
+<P1 x="312" y="351" id="129" />
+<P2 x="312" y="439" id="126" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="169" >
+<CONNECTOR type="115" id="149" >
<cdparam x="407" y="349" />
<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="349" id="152" />
-<P2 x="407" y="435" id="144" />
+<P1 x="407" y="349" id="132" />
+<P2 x="407" y="435" id="124" />
<AutomaticDrawing data="true" />
</CONNECTOR>
</TMLActivityDiagramPanel>
<TMLActivityDiagramPanel name="PrimitiveComp3" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="1001" id="171" >
+<COMPONENT type="1001" id="151" >
<cdparam x="397" y="269" />
<sizeparam width="20" height="20" 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="stop state" value="null" />
-<TGConnectingPoint num="0" id="170" />
+<TGConnectingPoint num="0" id="150" />
</COMPONENT>
-<COMPONENT type="1006" id="174" >
+<COMPONENT type="1006" id="154" >
<cdparam x="364" y="143" />
<sizeparam width="86" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="write channel" value="channel2(1)" />
-<TGConnectingPoint num="0" id="172" />
-<TGConnectingPoint num="1" id="173" />
+<TGConnectingPoint num="0" id="152" />
+<TGConnectingPoint num="1" id="153" />
<extraparam>
<Data channelName="channel2" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="Yes" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1000" id="176" >
+<COMPONENT type="1000" id="156" >
<cdparam x="400" y="50" />
<sizeparam width="15" height="15" 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="start state" value="null" />
-<TGConnectingPoint num="0" id="175" />
+<TGConnectingPoint num="0" id="155" />
</COMPONENT>
-<CONNECTOR type="115" id="177" >
+<CONNECTOR type="115" id="157" >
<cdparam x="407" y="168" />
<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="168" id="173" />
-<P2 x="407" y="264" id="170" />
+<P1 x="407" y="168" id="153" />
+<P2 x="407" y="264" id="150" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="178" >
+<CONNECTOR type="115" id="158" >
<cdparam x="407" y="65" />
<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="65" id="175" />
-<P2 x="407" y="138" id="172" />
+<P1 x="407" y="65" id="155" />
+<P2 x="407" y="138" id="152" />
<AutomaticDrawing data="true" />
</CONNECTOR>
</TMLActivityDiagramPanel>
<TMLActivityDiagramPanel name="PrimitiveComp4" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="1001" id="180" >
+<COMPONENT type="1001" id="160" >
<cdparam x="397" y="274" />
<sizeparam width="20" height="20" 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="stop state" value="null" />
-<TGConnectingPoint num="0" id="179" />
+<TGConnectingPoint num="0" id="159" />
</COMPONENT>
-<COMPONENT type="1009" id="183" >
+<COMPONENT type="1009" id="163" >
<cdparam x="362" y="162" />
<sizeparam width="90" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="read channel" value="channel2(1) " />
-<TGConnectingPoint num="0" id="181" />
-<TGConnectingPoint num="1" id="182" />
+<TGConnectingPoint num="0" id="161" />
+<TGConnectingPoint num="1" id="162" />
<extraparam>
<Data channelName="channel2" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="Yes" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1000" id="185" >
+<COMPONENT type="1000" id="165" >
<cdparam x="400" y="50" />
<sizeparam width="15" height="15" 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="start state" value="null" />
-<TGConnectingPoint num="0" id="184" />
+<TGConnectingPoint num="0" id="164" />
</COMPONENT>
-<CONNECTOR type="115" id="186" >
+<CONNECTOR type="115" id="166" >
<cdparam x="407" y="65" />
<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="65" id="184" />
-<P2 x="407" y="157" id="181" />
+<P1 x="407" y="65" id="164" />
+<P2 x="407" y="157" id="161" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="187" >
+<CONNECTOR type="115" id="167" >
<cdparam x="407" y="187" />
<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="187" id="182" />
-<P2 x="407" y="269" id="179" />
+<P1 x="407" y="187" id="162" />
+<P2 x="407" y="269" id="159" />
<AutomaticDrawing data="true" />
</CONNECTOR>
</TMLActivityDiagramPanel>
<TMLActivityDiagramPanel name="PrimitiveComp5" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="1001" id="189" >
-<cdparam x="397" y="269" />
+<COMPONENT type="1001" id="169" >
+<cdparam x="397" y="342" />
<sizeparam width="20" height="20" 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="stop state" value="null" />
-<TGConnectingPoint num="0" id="188" />
+<TGConnectingPoint num="0" id="168" />
+</COMPONENT>
+
+<COMPONENT type="1009" id="172" >
+<cdparam x="362" y="238" />
+<sizeparam width="90" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<enabled value="true" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="read channel" value="channel3(1) " />
+<TGConnectingPoint num="0" id="170" />
+<TGConnectingPoint num="1" id="171" />
+<extraparam>
+<Data channelName="channel3" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="Yes" />
+</extraparam>
</COMPONENT>
-<COMPONENT type="1006" id="192" >
+<COMPONENT type="1006" id="175" >
<cdparam x="364" y="143" />
<sizeparam width="86" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="write channel" value="channel3(1)" />
-<TGConnectingPoint num="0" id="190" />
-<TGConnectingPoint num="1" id="191" />
+<TGConnectingPoint num="0" id="173" />
+<TGConnectingPoint num="1" id="174" />
<extraparam>
<Data channelName="channel3" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="Yes" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1000" id="194" >
+<COMPONENT type="1000" id="177" >
<cdparam x="400" y="50" />
<sizeparam width="15" height="15" 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="start state" value="null" />
-<TGConnectingPoint num="0" id="193" />
+<TGConnectingPoint num="0" id="176" />
</COMPONENT>
-<CONNECTOR type="115" id="195" >
+<CONNECTOR type="115" id="178" >
+<cdparam x="407" y="65" />
+<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="65" id="176" />
+<P2 x="407" y="138" id="173" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="179" >
<cdparam x="407" y="168" />
<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="168" id="191" />
-<P2 x="407" y="264" id="188" />
+<P1 x="407" y="168" id="174" />
+<P2 x="407" y="233" id="170" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="196" >
-<cdparam x="407" y="65" />
+<CONNECTOR type="115" id="180" >
+<cdparam x="407" y="263" />
<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="65" id="193" />
-<P2 x="407" y="138" id="190" />
+<P1 x="407" y="263" id="171" />
+<P2 x="407" y="337" id="168" />
<AutomaticDrawing data="true" />
</CONNECTOR>
</TMLActivityDiagramPanel>
<TMLActivityDiagramPanel name="PrimitiveComp6" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="1001" id="198" >
-<cdparam x="397" y="221" />
+<COMPONENT type="1001" id="182" >
+<cdparam x="397" y="331" />
<sizeparam width="20" height="20" 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="stop state" value="null" />
-<TGConnectingPoint num="0" id="197" />
+<TGConnectingPoint num="0" id="181" />
</COMPONENT>
-<COMPONENT type="1006" id="201" >
-<cdparam x="364" y="133" />
-<sizeparam width="86" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1009" id="185" >
+<cdparam x="362" y="233" />
+<sizeparam width="90" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="write channel" value="channel4(1)" />
-<TGConnectingPoint num="0" id="199" />
-<TGConnectingPoint num="1" id="200" />
+<infoparam name="read channel" value="channel4(1) " />
+<TGConnectingPoint num="0" id="183" />
+<TGConnectingPoint num="1" id="184" />
<extraparam>
<Data channelName="channel4" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="Yes" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1000" id="203" >
-<cdparam x="400" y="50" />
-<sizeparam width="15" height="15" 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="start state" value="null" />
-<TGConnectingPoint num="0" id="202" />
-</COMPONENT>
-
-<CONNECTOR type="115" id="204" >
-<cdparam x="407" y="65" />
-<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="65" id="202" />
-<P2 x="407" y="128" id="199" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="205" >
-<cdparam x="407" y="158" />
-<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="158" id="200" />
-<P2 x="407" y="216" id="197" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-
-</TMLActivityDiagramPanel>
-
-<TMLActivityDiagramPanel name="PrimitiveComp7" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="1001" id="207" >
-<cdparam x="397" y="244" />
-<sizeparam width="20" height="20" 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="stop state" value="null" />
-<TGConnectingPoint num="0" id="206" />
-</COMPONENT>
-
-<COMPONENT type="1009" id="210" >
-<cdparam x="362" y="144" />
-<sizeparam width="90" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1006" id="188" >
+<cdparam x="364" y="133" />
+<sizeparam width="86" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="read channel" value="channel4(1) " />
-<TGConnectingPoint num="0" id="208" />
-<TGConnectingPoint num="1" id="209" />
+<infoparam name="write channel" value="channel4(1)" />
+<TGConnectingPoint num="0" id="186" />
+<TGConnectingPoint num="1" id="187" />
<extraparam>
<Data channelName="channel4" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="Yes" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1000" id="212" >
+<COMPONENT type="1000" id="190" >
<cdparam x="400" y="50" />
<sizeparam width="15" height="15" 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="start state" value="null" />
-<TGConnectingPoint num="0" id="211" />
+<TGConnectingPoint num="0" id="189" />
</COMPONENT>
-<CONNECTOR type="115" id="213" >
+<CONNECTOR type="115" id="191" >
<cdparam x="407" y="65" />
<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="65" id="211" />
-<P2 x="407" y="139" id="208" />
+<P1 x="407" y="65" id="189" />
+<P2 x="407" y="128" id="186" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="192" >
+<cdparam x="407" y="158" />
+<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="158" id="187" />
+<P2 x="407" y="228" id="183" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="214" >
-<cdparam x="407" y="169" />
+<CONNECTOR type="115" id="193" >
+<cdparam x="407" y="258" />
<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="169" id="209" />
-<P2 x="407" y="239" id="206" />
+<P1 x="407" y="258" id="184" />
+<P2 x="407" y="326" id="181" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -943,199 +916,330 @@
<Modeling type="TML Architecture" nameTab="Architecture" >
<TMLArchiDiagramPanel name="DIPLODOCUS architecture and mapping Diagram" minX="10" maxX="2500" minY="10" maxY="1500" attributes="0" masterClockFrequency="200" >
-<COMPONENT type="1105" id="248" >
-<cdparam x="198" y="533" />
-<sizeparam width="200" height="200" 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="Memory0" value="name" />
-<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="8" id="232" />
-<TGConnectingPoint num="9" id="233" />
-<TGConnectingPoint num="10" id="234" />
-<TGConnectingPoint num="11" id="235" />
-<TGConnectingPoint num="12" id="236" />
-<TGConnectingPoint num="13" id="237" />
-<TGConnectingPoint num="14" id="238" />
-<TGConnectingPoint num="15" id="239" />
-<TGConnectingPoint num="16" id="240" />
-<TGConnectingPoint num="17" id="241" />
-<TGConnectingPoint num="18" id="242" />
-<TGConnectingPoint num="19" id="243" />
-<TGConnectingPoint num="20" id="244" />
-<TGConnectingPoint num="21" id="245" />
-<TGConnectingPoint num="22" id="246" />
-<TGConnectingPoint num="23" id="247" />
-<extraparam>
-<info stereotype="MEMORY" nodeName="Memory0" />
-<attributes byteDataSize="4" memorySize="1024" clockRatio="1" bufferType="0" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1107" id="273" >
-<cdparam x="770" y="426" />
+<COMPONENT type="1107" id="218" >
+<cdparam x="648" y="377" />
<sizeparam width="200" height="200" 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="DMA0" value="name" />
-<TGConnectingPoint num="0" id="249" />
-<TGConnectingPoint num="1" id="250" />
-<TGConnectingPoint num="2" id="251" />
-<TGConnectingPoint num="3" id="252" />
-<TGConnectingPoint num="4" id="253" />
-<TGConnectingPoint num="5" id="254" />
-<TGConnectingPoint num="6" id="255" />
-<TGConnectingPoint num="7" id="256" />
-<TGConnectingPoint num="8" id="257" />
-<TGConnectingPoint num="9" id="258" />
-<TGConnectingPoint num="10" id="259" />
-<TGConnectingPoint num="11" id="260" />
-<TGConnectingPoint num="12" id="261" />
-<TGConnectingPoint num="13" id="262" />
-<TGConnectingPoint num="14" id="263" />
-<TGConnectingPoint num="15" id="264" />
-<TGConnectingPoint num="16" id="265" />
-<TGConnectingPoint num="17" id="266" />
-<TGConnectingPoint num="18" id="267" />
-<TGConnectingPoint num="19" id="268" />
-<TGConnectingPoint num="20" id="269" />
-<TGConnectingPoint num="21" id="270" />
-<TGConnectingPoint num="22" id="271" />
-<TGConnectingPoint num="23" id="272" />
+<TGConnectingPoint num="0" id="194" />
+<TGConnectingPoint num="1" id="195" />
+<TGConnectingPoint num="2" id="196" />
+<TGConnectingPoint num="3" id="197" />
+<TGConnectingPoint num="4" id="198" />
+<TGConnectingPoint num="5" id="199" />
+<TGConnectingPoint num="6" id="200" />
+<TGConnectingPoint num="7" id="201" />
+<TGConnectingPoint num="8" id="202" />
+<TGConnectingPoint num="9" id="203" />
+<TGConnectingPoint num="10" id="204" />
+<TGConnectingPoint num="11" id="205" />
+<TGConnectingPoint num="12" id="206" />
+<TGConnectingPoint num="13" id="207" />
+<TGConnectingPoint num="14" id="208" />
+<TGConnectingPoint num="15" id="209" />
+<TGConnectingPoint num="16" id="210" />
+<TGConnectingPoint num="17" id="211" />
+<TGConnectingPoint num="18" id="212" />
+<TGConnectingPoint num="19" id="213" />
+<TGConnectingPoint num="20" id="214" />
+<TGConnectingPoint num="21" id="215" />
+<TGConnectingPoint num="22" id="216" />
+<TGConnectingPoint num="23" id="217" />
<extraparam>
<info stereotype="DMA" nodeName="DMA0" />
<attributes byteDataSize="4" nbOfChannels="1" clockRatio="1" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1102" id="298" >
+<COMPONENT type="1102" id="243" >
<cdparam x="316" y="416" />
<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="Bus0" value="name" />
-<TGConnectingPoint num="0" id="274" />
-<TGConnectingPoint num="1" id="275" />
-<TGConnectingPoint num="2" id="276" />
-<TGConnectingPoint num="3" id="277" />
-<TGConnectingPoint num="4" id="278" />
-<TGConnectingPoint num="5" id="279" />
-<TGConnectingPoint num="6" id="280" />
-<TGConnectingPoint num="7" id="281" />
-<TGConnectingPoint num="8" id="282" />
-<TGConnectingPoint num="9" id="283" />
-<TGConnectingPoint num="10" id="284" />
-<TGConnectingPoint num="11" id="285" />
-<TGConnectingPoint num="12" id="286" />
-<TGConnectingPoint num="13" id="287" />
-<TGConnectingPoint num="14" id="288" />
-<TGConnectingPoint num="15" id="289" />
-<TGConnectingPoint num="16" id="290" />
-<TGConnectingPoint num="17" id="291" />
-<TGConnectingPoint num="18" id="292" />
-<TGConnectingPoint num="19" id="293" />
-<TGConnectingPoint num="20" id="294" />
-<TGConnectingPoint num="21" id="295" />
-<TGConnectingPoint num="22" id="296" />
-<TGConnectingPoint num="23" id="297" />
+<TGConnectingPoint num="0" id="219" />
+<TGConnectingPoint num="1" id="220" />
+<TGConnectingPoint num="2" id="221" />
+<TGConnectingPoint num="3" id="222" />
+<TGConnectingPoint num="4" id="223" />
+<TGConnectingPoint num="5" id="224" />
+<TGConnectingPoint num="6" id="225" />
+<TGConnectingPoint num="7" id="226" />
+<TGConnectingPoint num="8" id="227" />
+<TGConnectingPoint num="9" id="228" />
+<TGConnectingPoint num="10" id="229" />
+<TGConnectingPoint num="11" id="230" />
+<TGConnectingPoint num="12" id="231" />
+<TGConnectingPoint num="13" id="232" />
+<TGConnectingPoint num="14" id="233" />
+<TGConnectingPoint num="15" id="234" />
+<TGConnectingPoint num="16" id="235" />
+<TGConnectingPoint num="17" id="236" />
+<TGConnectingPoint num="18" id="237" />
+<TGConnectingPoint num="19" id="238" />
+<TGConnectingPoint num="20" id="239" />
+<TGConnectingPoint num="21" id="240" />
+<TGConnectingPoint num="22" id="241" />
+<TGConnectingPoint num="23" id="242" />
<extraparam>
<info stereotype="BUS-RR" nodeName="Bus0" />
<attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" clockRatio="1" privacy="0" referenceAttack="null" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1100" id="332" >
-<cdparam x="319" y="128" />
-<sizeparam width="316" height="200" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1105" id="268" >
+<cdparam x="415" y="607" />
+<sizeparam width="200" height="200" 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="Memory0" value="name" />
+<TGConnectingPoint num="0" id="244" />
+<TGConnectingPoint num="1" id="245" />
+<TGConnectingPoint num="2" id="246" />
+<TGConnectingPoint num="3" id="247" />
+<TGConnectingPoint num="4" id="248" />
+<TGConnectingPoint num="5" id="249" />
+<TGConnectingPoint num="6" id="250" />
+<TGConnectingPoint num="7" id="251" />
+<TGConnectingPoint num="8" id="252" />
+<TGConnectingPoint num="9" id="253" />
+<TGConnectingPoint num="10" id="254" />
+<TGConnectingPoint num="11" id="255" />
+<TGConnectingPoint num="12" id="256" />
+<TGConnectingPoint num="13" id="257" />
+<TGConnectingPoint num="14" id="258" />
+<TGConnectingPoint num="15" id="259" />
+<TGConnectingPoint num="16" id="260" />
+<TGConnectingPoint num="17" id="261" />
+<TGConnectingPoint num="18" id="262" />
+<TGConnectingPoint num="19" id="263" />
+<TGConnectingPoint num="20" id="264" />
+<TGConnectingPoint num="21" id="265" />
+<TGConnectingPoint num="22" id="266" />
+<TGConnectingPoint num="23" id="267" />
+<extraparam>
+<info stereotype="MEMORY" nodeName="Memory0" />
+<attributes byteDataSize="4" memorySize="1024" clockRatio="1" bufferType="0" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1100" id="293" >
+<cdparam x="792" y="120" />
+<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="CPU1" value="name" />
+<TGConnectingPoint num="0" id="269" />
+<TGConnectingPoint num="1" id="270" />
+<TGConnectingPoint num="2" id="271" />
+<TGConnectingPoint num="3" id="272" />
+<TGConnectingPoint num="4" id="273" />
+<TGConnectingPoint num="5" id="274" />
+<TGConnectingPoint num="6" id="275" />
+<TGConnectingPoint num="7" id="276" />
+<TGConnectingPoint num="8" id="277" />
+<TGConnectingPoint num="9" id="278" />
+<TGConnectingPoint num="10" id="279" />
+<TGConnectingPoint num="11" id="280" />
+<TGConnectingPoint num="12" id="281" />
+<TGConnectingPoint num="13" id="282" />
+<TGConnectingPoint num="14" id="283" />
+<TGConnectingPoint num="15" id="284" />
+<TGConnectingPoint num="16" id="285" />
+<TGConnectingPoint num="17" id="286" />
+<TGConnectingPoint num="18" id="287" />
+<TGConnectingPoint num="19" id="288" />
+<TGConnectingPoint num="20" id="289" />
+<TGConnectingPoint num="21" id="290" />
+<TGConnectingPoint num="22" id="291" />
+<TGConnectingPoint num="23" id="292" />
+<extraparam>
+<info stereotype="CPURR" nodeName="CPU1" />
+<attributes nbOfCores="1" byteDataSize="4" schedulingPolicy="0" sliceTime="10000" goIdleTime="10" maxConsecutiveIdleCycles="10" pipelineSize="5" taskSwitchingTime="20" branchingPredictionPenalty="2" cacheMiss="5" execiTime="1" execcTime="1" clockRatio="1" operation="" MECType="0" encryption="0"/>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1100" id="372" >
+<cdparam x="83" y="128" />
+<sizeparam width="552" height="225" 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="CPU0" value="name" />
-<TGConnectingPoint num="0" id="308" />
-<TGConnectingPoint num="1" id="309" />
-<TGConnectingPoint num="2" id="310" />
-<TGConnectingPoint num="3" id="311" />
-<TGConnectingPoint num="4" id="312" />
-<TGConnectingPoint num="5" id="313" />
-<TGConnectingPoint num="6" id="314" />
-<TGConnectingPoint num="7" id="315" />
-<TGConnectingPoint num="8" id="316" />
-<TGConnectingPoint num="9" id="317" />
-<TGConnectingPoint num="10" id="318" />
-<TGConnectingPoint num="11" id="319" />
-<TGConnectingPoint num="12" id="320" />
-<TGConnectingPoint num="13" id="321" />
-<TGConnectingPoint num="14" id="322" />
-<TGConnectingPoint num="15" id="323" />
-<TGConnectingPoint num="16" id="324" />
-<TGConnectingPoint num="17" id="325" />
-<TGConnectingPoint num="18" id="326" />
-<TGConnectingPoint num="19" id="327" />
-<TGConnectingPoint num="20" id="328" />
-<TGConnectingPoint num="21" id="329" />
-<TGConnectingPoint num="22" id="330" />
-<TGConnectingPoint num="23" id="331" />
+<TGConnectingPoint num="0" id="348" />
+<TGConnectingPoint num="1" id="349" />
+<TGConnectingPoint num="2" id="350" />
+<TGConnectingPoint num="3" id="351" />
+<TGConnectingPoint num="4" id="352" />
+<TGConnectingPoint num="5" id="353" />
+<TGConnectingPoint num="6" id="354" />
+<TGConnectingPoint num="7" id="355" />
+<TGConnectingPoint num="8" id="356" />
+<TGConnectingPoint num="9" id="357" />
+<TGConnectingPoint num="10" id="358" />
+<TGConnectingPoint num="11" id="359" />
+<TGConnectingPoint num="12" id="360" />
+<TGConnectingPoint num="13" id="361" />
+<TGConnectingPoint num="14" id="362" />
+<TGConnectingPoint num="15" id="363" />
+<TGConnectingPoint num="16" id="364" />
+<TGConnectingPoint num="17" id="365" />
+<TGConnectingPoint num="18" id="366" />
+<TGConnectingPoint num="19" id="367" />
+<TGConnectingPoint num="20" id="368" />
+<TGConnectingPoint num="21" id="369" />
+<TGConnectingPoint num="22" id="370" />
+<TGConnectingPoint num="23" id="371" />
<extraparam>
<info stereotype="CPU" nodeName="CPU0" />
<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" operation="" MECType="0" encryption="0"/>
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1101" id="307" >
-<father id="332" num="0" />
-<cdparam x="379" y="220" />
+<SUBCOMPONENT type="1101" id="302" >
+<father id="372" num="0" />
+<cdparam x="126" y="164" />
<sizeparam width="207" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="109" minY="0" maxY="160" />
+<cdrectangleparam minX="0" maxX="345" minY="0" maxY="185" />
<infoparam name="TGComponent" value="Application::PrimitiveComp1" />
-<TGConnectingPoint num="0" id="299" />
-<TGConnectingPoint num="1" id="300" />
-<TGConnectingPoint num="2" id="301" />
-<TGConnectingPoint num="3" id="302" />
-<TGConnectingPoint num="4" id="303" />
-<TGConnectingPoint num="5" id="304" />
-<TGConnectingPoint num="6" id="305" />
-<TGConnectingPoint num="7" id="306" />
+<TGConnectingPoint num="0" id="294" />
+<TGConnectingPoint num="1" id="295" />
+<TGConnectingPoint num="2" id="296" />
+<TGConnectingPoint num="3" id="297" />
+<TGConnectingPoint num="4" id="298" />
+<TGConnectingPoint num="5" id="299" />
+<TGConnectingPoint num="6" id="300" />
+<TGConnectingPoint num="7" id="301" />
+<extraparam>
+<info value="Application::PrimitiveComp1" taskName="PrimitiveComp1" referenceTaskName="Application" priority="0" operationMEC="PrimitiveComp4" fatherComponentMECType="0" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1101" id="311" >
+<father id="372" num="1" />
+<cdparam x="415" y="245" />
+<sizeparam width="207" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="345" minY="0" maxY="185" />
+<infoparam name="TGComponent" value="Application::PrimitiveComp6" />
+<TGConnectingPoint num="0" id="303" />
+<TGConnectingPoint num="1" id="304" />
+<TGConnectingPoint num="2" id="305" />
+<TGConnectingPoint num="3" id="306" />
+<TGConnectingPoint num="4" id="307" />
+<TGConnectingPoint num="5" id="308" />
+<TGConnectingPoint num="6" id="309" />
+<TGConnectingPoint num="7" id="310" />
+<extraparam>
+<info value="Application::PrimitiveComp6" taskName="PrimitiveComp6" referenceTaskName="Application" priority="0" operationMEC="PrimitiveComp6" fatherComponentMECType="0" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1101" id="320" >
+<father id="372" num="2" />
+<cdparam x="416" y="199" />
+<sizeparam width="207" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="345" minY="0" maxY="185" />
+<infoparam name="TGComponent" value="Application::PrimitiveComp5" />
+<TGConnectingPoint num="0" id="312" />
+<TGConnectingPoint num="1" id="313" />
+<TGConnectingPoint num="2" id="314" />
+<TGConnectingPoint num="3" id="315" />
+<TGConnectingPoint num="4" id="316" />
+<TGConnectingPoint num="5" id="317" />
+<TGConnectingPoint num="6" id="318" />
+<TGConnectingPoint num="7" id="319" />
+<extraparam>
+<info value="Application::PrimitiveComp5" taskName="PrimitiveComp5" referenceTaskName="Application" priority="0" operationMEC="PrimitiveComp6" fatherComponentMECType="0" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1101" id="329" >
+<father id="372" num="3" />
+<cdparam x="416" y="149" />
+<sizeparam width="207" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="345" minY="0" maxY="185" />
+<infoparam name="TGComponent" value="Application::PrimitiveComp4" />
+<TGConnectingPoint num="0" id="321" />
+<TGConnectingPoint num="1" id="322" />
+<TGConnectingPoint num="2" id="323" />
+<TGConnectingPoint num="3" id="324" />
+<TGConnectingPoint num="4" id="325" />
+<TGConnectingPoint num="5" id="326" />
+<TGConnectingPoint num="6" id="327" />
+<TGConnectingPoint num="7" id="328" />
+<extraparam>
+<info value="Application::PrimitiveComp4" taskName="PrimitiveComp4" referenceTaskName="Application" priority="0" operationMEC="PrimitiveComp6" fatherComponentMECType="0" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1101" id="338" >
+<father id="372" num="4" />
+<cdparam x="109" y="269" />
+<sizeparam width="207" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="345" minY="0" maxY="185" />
+<infoparam name="TGComponent" value="Application::PrimitiveComp3" />
+<TGConnectingPoint num="0" id="330" />
+<TGConnectingPoint num="1" id="331" />
+<TGConnectingPoint num="2" id="332" />
+<TGConnectingPoint num="3" id="333" />
+<TGConnectingPoint num="4" id="334" />
+<TGConnectingPoint num="5" id="335" />
+<TGConnectingPoint num="6" id="336" />
+<TGConnectingPoint num="7" id="337" />
+<extraparam>
+<info value="Application::PrimitiveComp3" taskName="PrimitiveComp3" referenceTaskName="Application" priority="0" operationMEC="PrimitiveComp6" fatherComponentMECType="0" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1101" id="347" >
+<father id="372" num="5" />
+<cdparam x="107" y="224" />
+<sizeparam width="207" height="34" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="345" minY="0" maxY="191" />
+<infoparam name="TGComponent" value="Application::PrimitiveComp2" />
+<TGConnectingPoint num="0" id="339" />
+<TGConnectingPoint num="1" id="340" />
+<TGConnectingPoint num="2" id="341" />
+<TGConnectingPoint num="3" id="342" />
+<TGConnectingPoint num="4" id="343" />
+<TGConnectingPoint num="5" id="344" />
+<TGConnectingPoint num="6" id="345" />
+<TGConnectingPoint num="7" id="346" />
<extraparam>
-<info value="Application::PrimitiveComp1" taskName="PrimitiveComp1" referenceTaskName="Application" priority="0" operationMEC="PrimitiveComp6" fatherComponentMECType="0" />
+<info value="Application::PrimitiveComp2" taskName="PrimitiveComp2" referenceTaskName="Application" priority="0" operationMEC="PrimitiveComp6" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="125" id="333" >
+<CONNECTOR type="125" id="373" >
<cdparam x="444" y="328" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="{info}" />
-<P1 x="477" y="328" id="314" />
-<P2 x="441" y="416" id="275" />
+<P1 x="359" y="353" id="354" />
+<P2 x="441" y="416" id="220" />
<AutomaticDrawing data="true" />
<extraparam>
<info priority="0" />
<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="334" >
+<CONNECTOR type="125" id="374" >
<cdparam x="298" y="533" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="{info}" />
-<P1 x="298" y="533" id="225" />
-<P2 x="441" y="466" id="280" />
+<P1 x="515" y="607" id="245" />
+<P2 x="441" y="466" id="225" />
<AutomaticDrawing data="true" />
<extraparam>
<info priority="0" />
<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="335" >
+<CONNECTOR type="125" id="375" >
<cdparam x="770" y="476" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="{info}" />
-<P1 x="770" y="476" id="259" />
-<P2 x="566" y="441" id="278" />
+<P1 x="648" y="427" id="204" />
+<P2 x="566" y="441" id="223" />
<AutomaticDrawing data="true" />
<extraparam>
<info priority="0" />
diff --git a/ttool/src/test/java/ui/TDiagramPanelCloneTest.java b/ttool/src/test/java/ui/TDiagramPanelCloneTest.java
index 18b15d556c..b977076687 100644
--- a/ttool/src/test/java/ui/TDiagramPanelCloneTest.java
+++ b/ttool/src/test/java/ui/TDiagramPanelCloneTest.java
@@ -1,15 +1,16 @@
package ui;
+import myutil.TraceManager;
import org.junit.*;
import tmltranslator.compareTMLTest.CompareTML;
-import ui.tmlcompd.TMLCCompositeComponent;
import ui.tmlcompd.TMLComponentTaskDiagramPanel;
+
import java.io.*;
import static org.junit.Assert.*;
/*
- * #issue 82
+ * #issue 82 + 186
* author : Minh Hiep
*/
public class TDiagramPanelCloneTest extends AbstractUITest {
@@ -18,9 +19,12 @@ public class TDiagramPanelCloneTest extends AbstractUITest {
static TGComponent tgComponent1;
static TGComponent tgComponent2;
static TGComponent tgComponent3;
+ static TGComponent tgComponent4;
+
final static String EXPECTED_FILE1 = getBaseResourcesDir() + "tmltranslator/expected/expected_spec1.tml";
final static String EXPECTED_FILE2 = getBaseResourcesDir() + "tmltranslator/expected/expected_spec2.tml";
final static String EXPECTED_FILE3 = getBaseResourcesDir() + "tmltranslator/expected/expected_spec3.tml";
+ final static String EXPECTED_FILE4 = getBaseResourcesDir() + "tmltranslator/expected/expected_spec4.tml";
@BeforeClass
@@ -41,7 +45,7 @@ public class TDiagramPanelCloneTest extends AbstractUITest {
for (TDiagramPanel tdp : _tab.getPanels()) {
if (tdp instanceof TMLComponentTaskDiagramPanel) {
diagramPanel = tdp;
- mainGUI.selectTab(tdp);
+ mainGUI.selectTab(diagramPanel);
break;
}
}
@@ -49,26 +53,32 @@ public class TDiagramPanelCloneTest extends AbstractUITest {
}
}
- for (TGComponent tgc : diagramPanel.getAllComponentList()) {
- if (tgc.getValue().equals("CompositeComp1")) {
- tgComponent1 = tgc;
- }
+ if (diagramPanel != null) {
+ //TraceManager.addDev("diagram pannel is non null !!!");
+ for (TGComponent tgc : diagramPanel.getAllComponentList()) {
+ if (tgc.getValue().equals("CompositeComp1")) {
+ tgComponent1 = tgc;
+ }
- if (tgc.getValue().equals("CompositeComp2")) {
- tgComponent2 = tgc;
- }
+ if (tgc.getValue().equals("CompositeComp2")) {
+ tgComponent2 = tgc;
+ }
+
+ if (tgc.getValue().equals("PrimitiveComp5")) {
+ tgComponent3 = tgc;
+ }
- if (tgc.getValue().equals("PrimitiveComp5")) {
- tgComponent3 = tgc;
+ if (tgc.getValue().equals("PrimitiveComp6")) {
+ tgComponent4 = tgc;
+ }
}
- }
+ }
}
@Test
public void testCloneCompositeComponentWithNullFather() throws Exception{
CompareTML compTML = new CompareTML();
diagramPanel.cloneComponent(tgComponent1);
- // mainGUI.modelChecking();
mainGUI.checkModelingSyntax(true);
mainGUI.generateTMLTxt();
File f1 = new File(EXPECTED_FILE1);
@@ -80,7 +90,6 @@ public class TDiagramPanelCloneTest extends AbstractUITest {
public void testCloneCompositeComponentWithNonNullFather() throws Exception {
CompareTML compTML = new CompareTML();
diagramPanel.cloneComponent(tgComponent2);
- // mainGUI.modelChecking();
mainGUI.checkModelingSyntax(true);
mainGUI.generateTMLTxt();
File f1 = new File(EXPECTED_FILE2);
@@ -89,7 +98,7 @@ public class TDiagramPanelCloneTest extends AbstractUITest {
}
@Test
- public void testClonePrimitiveComponent() throws Exception {
+ public void testClonePrimitiveComponentWithNonNullFather() throws Exception {
CompareTML compTML = new CompareTML();
diagramPanel.cloneComponent(tgComponent3);
// mainGUI.modelChecking();
@@ -101,6 +110,15 @@ public class TDiagramPanelCloneTest extends AbstractUITest {
}
-
+ @Test
+ public void testClonePrimitiveComponentWithNullFather() throws Exception {
+ CompareTML compTML = new CompareTML();
+ diagramPanel.cloneComponent(tgComponent4);
+ mainGUI.checkModelingSyntax(true);
+ mainGUI.generateTMLTxt();
+ File f1 = new File(EXPECTED_FILE4);
+ File f2 = new File("spec.tml"); // Generated file after executing "TML generation"
+ assertTrue(compTML.compareTML(f1,f2));
+ }
}
\ No newline at end of file
diff --git a/ttool/src/test/resources/tmltranslator/expected/expected_spec1.tml b/ttool/src/test/resources/tmltranslator/expected/expected_spec1.tml
index 8128892e0d..af70a535bc 100644
--- a/ttool/src/test/resources/tmltranslator/expected/expected_spec1.tml
+++ b/ttool/src/test/resources/tmltranslator/expected/expected_spec1.tml
@@ -1,125 +1,137 @@
// TML Application - FORMAT 0.1
// Application: /home/pham/Documents/TToolHelp/TTool/modeling/DIPLODOCUS/CloneCompositeComponentTest.xml
-// Generated: Wed Mar 20 17:19:43 CET 2019
+// Generated: Thu Mar 21 16:19:07 CET 2019
// Channels
-CHANNEL DIPLODOCUS_C_Design__channel BRBW 4 8 OUT DIPLODOCUS_C_Design__PrimitiveComp1 IN DIPLODOCUS_C_Design__PrimitiveComp2
-CHANNEL DIPLODOCUS_C_Design__channel2 BRBW 4 8 OUT DIPLODOCUS_C_Design__PrimitiveComp3 IN DIPLODOCUS_C_Design__PrimitiveComp4
-CHANNEL DIPLODOCUS_C_Design__channel2_0 BRBW 4 8 OUT DIPLODOCUS_C_Design__PrimitiveComp3_0 IN DIPLODOCUS_C_Design__PrimitiveComp4_0
-CHANNEL DIPLODOCUS_C_Design__channel3 BRBW 4 8 OUT DIPLODOCUS_C_Design__PrimitiveComp5 IN DIPLODOCUS_C_Design__PrimitiveComp5
-CHANNEL DIPLODOCUS_C_Design__channel3_0 BRBW 4 8 OUT DIPLODOCUS_C_Design__PrimitiveComp5_0 IN DIPLODOCUS_C_Design__PrimitiveComp5_0
-CHANNEL DIPLODOCUS_C_Design__channel_0 BRBW 4 8 OUT DIPLODOCUS_C_Design__PrimitiveComp1_0 IN DIPLODOCUS_C_Design__PrimitiveComp2_0
+CHANNEL Application__channel BRBW 4 8 OUT Application__PrimitiveComp1 IN Application__PrimitiveComp2
+CHANNEL Application__channel2 BRBW 4 8 OUT Application__PrimitiveComp3 IN Application__PrimitiveComp4
+CHANNEL Application__channel2_0 BRBW 4 8 OUT Application__PrimitiveComp3_0 IN Application__PrimitiveComp4_0
+CHANNEL Application__channel3 BRBW 4 8 OUT Application__PrimitiveComp5 IN Application__PrimitiveComp5
+CHANNEL Application__channel3_0 BRBW 4 8 OUT Application__PrimitiveComp5_0 IN Application__PrimitiveComp5_0
+CHANNEL Application__channel4 BRBW 4 8 OUT Application__PrimitiveComp6 IN Application__PrimitiveComp6
+CHANNEL Application__channel_0 BRBW 4 8 OUT Application__PrimitiveComp1_0 IN Application__PrimitiveComp2_0
// Events
-EVENT DIPLODOCUS_C_Design__event_0__DIPLODOCUS_C_Design__event_0() NIB 8 DIPLODOCUS_C_Design__PrimitiveComp1_0 DIPLODOCUS_C_Design__PrimitiveComp2_0
-EVENT DIPLODOCUS_C_Design__event__DIPLODOCUS_C_Design__event() NIB 8 DIPLODOCUS_C_Design__PrimitiveComp1 DIPLODOCUS_C_Design__PrimitiveComp2
+EVENT Application__event_0__Application__event_0() NIB 8 Application__PrimitiveComp1_0 Application__PrimitiveComp2_0
+EVENT Application__event__Application__event() NIB 8 Application__PrimitiveComp1 Application__PrimitiveComp2
// Requests
-TASK DIPLODOCUS_C_Design__PrimitiveComp1
+TASK Application__PrimitiveComp1
TASKOP
//Local variables
//Behavior
RAND
CASERAND 50
- NOTIFY DIPLODOCUS_C_Design__event__DIPLODOCUS_C_Design__event
+ NOTIFY Application__event__Application__event
ENDCASERAND
CASERAND 50
- WRITE DIPLODOCUS_C_Design__channel 1
+ WRITE Application__channel 1
ENDCASERAND
ENDRAND
ENDTASK
-TASK DIPLODOCUS_C_Design__PrimitiveComp1_0
+TASK Application__PrimitiveComp1_0
TASKOP
//Local variables
//Behavior
RAND
CASERAND 50
- NOTIFY DIPLODOCUS_C_Design__event_0__DIPLODOCUS_C_Design__event_0
+ NOTIFY Application__event_0__Application__event_0
ENDCASERAND
CASERAND 50
- WRITE DIPLODOCUS_C_Design__channel_0 1
+ WRITE Application__channel_0 1
ENDCASERAND
ENDRAND
ENDTASK
-TASK DIPLODOCUS_C_Design__PrimitiveComp2
+TASK Application__PrimitiveComp2
TASKOP
//Local variables
//Behavior
RAND
CASERAND 50
- WAIT DIPLODOCUS_C_Design__event__DIPLODOCUS_C_Design__event
+ WAIT Application__event__Application__event
ENDCASERAND
CASERAND 50
- READ DIPLODOCUS_C_Design__channel 1
+ READ Application__channel 1
ENDCASERAND
ENDRAND
ENDTASK
-TASK DIPLODOCUS_C_Design__PrimitiveComp2_0
+TASK Application__PrimitiveComp2_0
TASKOP
//Local variables
//Behavior
RAND
CASERAND 50
- WAIT DIPLODOCUS_C_Design__event_0__DIPLODOCUS_C_Design__event_0
+ WAIT Application__event_0__Application__event_0
ENDCASERAND
CASERAND 50
- READ DIPLODOCUS_C_Design__channel_0 1
+ READ Application__channel_0 1
ENDCASERAND
ENDRAND
ENDTASK
-TASK DIPLODOCUS_C_Design__PrimitiveComp3
+TASK Application__PrimitiveComp3
TASKOP
//Local variables
//Behavior
- WRITE DIPLODOCUS_C_Design__channel2 1
+ WRITE Application__channel2 1
ENDTASK
-TASK DIPLODOCUS_C_Design__PrimitiveComp3_0
+TASK Application__PrimitiveComp3_0
TASKOP
//Local variables
//Behavior
- WRITE DIPLODOCUS_C_Design__channel2_0 1
+ WRITE Application__channel2_0 1
ENDTASK
-TASK DIPLODOCUS_C_Design__PrimitiveComp4
+TASK Application__PrimitiveComp4
TASKOP
//Local variables
//Behavior
- READ DIPLODOCUS_C_Design__channel2 1
+ READ Application__channel2 1
ENDTASK
-TASK DIPLODOCUS_C_Design__PrimitiveComp4_0
+TASK Application__PrimitiveComp4_0
TASKOP
//Local variables
//Behavior
- READ DIPLODOCUS_C_Design__channel2_0 1
+ READ Application__channel2_0 1
ENDTASK
-TASK DIPLODOCUS_C_Design__PrimitiveComp5
+TASK Application__PrimitiveComp5
TASKOP
//Local variables
//Behavior
- WRITE DIPLODOCUS_C_Design__channel3 1
+ WRITE Application__channel3 1
+ READ Application__channel3 1
ENDTASK
-TASK DIPLODOCUS_C_Design__PrimitiveComp5_0
+TASK Application__PrimitiveComp5_0
TASKOP
//Local variables
//Behavior
- WRITE DIPLODOCUS_C_Design__channel3_0 1
+ WRITE Application__channel3_0 1
+ READ Application__channel3_0 1
+ENDTASK
+
+TASK Application__PrimitiveComp6
+ TASKOP
+ //Local variables
+
+ //Behavior
+ WRITE Application__channel4 1
+ READ Application__channel4 1
ENDTASK
diff --git a/ttool/src/test/resources/tmltranslator/expected/expected_spec2.tml b/ttool/src/test/resources/tmltranslator/expected/expected_spec2.tml
index 8f19b86de6..7158b20321 100644
--- a/ttool/src/test/resources/tmltranslator/expected/expected_spec2.tml
+++ b/ttool/src/test/resources/tmltranslator/expected/expected_spec2.tml
@@ -1,93 +1,105 @@
// TML Application - FORMAT 0.1
// Application: /home/pham/Documents/TToolHelp/TTool/modeling/DIPLODOCUS/CloneCompositeComponentTest.xml
-// Generated: Wed Mar 20 17:20:10 CET 2019
+// Generated: Thu Mar 21 16:19:37 CET 2019
// Channels
-CHANNEL DIPLODOCUS_C_Design__channel BRBW 4 8 OUT DIPLODOCUS_C_Design__PrimitiveComp1 IN DIPLODOCUS_C_Design__PrimitiveComp2
-CHANNEL DIPLODOCUS_C_Design__channel2 BRBW 4 8 OUT DIPLODOCUS_C_Design__PrimitiveComp3 IN DIPLODOCUS_C_Design__PrimitiveComp4
-CHANNEL DIPLODOCUS_C_Design__channel2_0 BRBW 4 8 OUT DIPLODOCUS_C_Design__PrimitiveComp3_0 IN DIPLODOCUS_C_Design__PrimitiveComp4_0
-CHANNEL DIPLODOCUS_C_Design__channel3 BRBW 4 8 OUT DIPLODOCUS_C_Design__PrimitiveComp5 IN DIPLODOCUS_C_Design__PrimitiveComp5
-CHANNEL DIPLODOCUS_C_Design__channel3_0 BRBW 4 8 OUT DIPLODOCUS_C_Design__PrimitiveComp5_0 IN DIPLODOCUS_C_Design__PrimitiveComp5_0
+CHANNEL Application__channel BRBW 4 8 OUT Application__PrimitiveComp1 IN Application__PrimitiveComp2
+CHANNEL Application__channel2 BRBW 4 8 OUT Application__PrimitiveComp3 IN Application__PrimitiveComp4
+CHANNEL Application__channel2_0 BRBW 4 8 OUT Application__PrimitiveComp3_0 IN Application__PrimitiveComp4_0
+CHANNEL Application__channel3 BRBW 4 8 OUT Application__PrimitiveComp5 IN Application__PrimitiveComp5
+CHANNEL Application__channel3_0 BRBW 4 8 OUT Application__PrimitiveComp5_0 IN Application__PrimitiveComp5_0
+CHANNEL Application__channel4 BRBW 4 8 OUT Application__PrimitiveComp6 IN Application__PrimitiveComp6
// Events
-EVENT DIPLODOCUS_C_Design__event__DIPLODOCUS_C_Design__event() NIB 8 DIPLODOCUS_C_Design__PrimitiveComp1 DIPLODOCUS_C_Design__PrimitiveComp2
+EVENT Application__event__Application__event() NIB 8 Application__PrimitiveComp1 Application__PrimitiveComp2
// Requests
-TASK DIPLODOCUS_C_Design__PrimitiveComp1
+TASK Application__PrimitiveComp1
TASKOP
//Local variables
//Behavior
RAND
CASERAND 50
- NOTIFY DIPLODOCUS_C_Design__event__DIPLODOCUS_C_Design__event
+ NOTIFY Application__event__Application__event
ENDCASERAND
CASERAND 50
- WRITE DIPLODOCUS_C_Design__channel 1
+ WRITE Application__channel 1
ENDCASERAND
ENDRAND
ENDTASK
-TASK DIPLODOCUS_C_Design__PrimitiveComp2
+TASK Application__PrimitiveComp2
TASKOP
//Local variables
//Behavior
RAND
CASERAND 50
- WAIT DIPLODOCUS_C_Design__event__DIPLODOCUS_C_Design__event
+ WAIT Application__event__Application__event
ENDCASERAND
CASERAND 50
- READ DIPLODOCUS_C_Design__channel 1
+ READ Application__channel 1
ENDCASERAND
ENDRAND
ENDTASK
-TASK DIPLODOCUS_C_Design__PrimitiveComp3
+TASK Application__PrimitiveComp3
TASKOP
//Local variables
//Behavior
- WRITE DIPLODOCUS_C_Design__channel2 1
+ WRITE Application__channel2 1
ENDTASK
-TASK DIPLODOCUS_C_Design__PrimitiveComp3_0
+TASK Application__PrimitiveComp3_0
TASKOP
//Local variables
//Behavior
- WRITE DIPLODOCUS_C_Design__channel2_0 1
+ WRITE Application__channel2_0 1
ENDTASK
-TASK DIPLODOCUS_C_Design__PrimitiveComp4
+TASK Application__PrimitiveComp4
TASKOP
//Local variables
//Behavior
- READ DIPLODOCUS_C_Design__channel2 1
+ READ Application__channel2 1
ENDTASK
-TASK DIPLODOCUS_C_Design__PrimitiveComp4_0
+TASK Application__PrimitiveComp4_0
TASKOP
//Local variables
//Behavior
- READ DIPLODOCUS_C_Design__channel2_0 1
+ READ Application__channel2_0 1
ENDTASK
-TASK DIPLODOCUS_C_Design__PrimitiveComp5
+TASK Application__PrimitiveComp5
TASKOP
//Local variables
//Behavior
- WRITE DIPLODOCUS_C_Design__channel3 1
+ WRITE Application__channel3 1
+ READ Application__channel3 1
ENDTASK
-TASK DIPLODOCUS_C_Design__PrimitiveComp5_0
+TASK Application__PrimitiveComp5_0
TASKOP
//Local variables
//Behavior
- WRITE DIPLODOCUS_C_Design__channel3_0 1
+ WRITE Application__channel3_0 1
+ READ Application__channel3_0 1
+ENDTASK
+
+TASK Application__PrimitiveComp6
+ TASKOP
+ //Local variables
+
+ //Behavior
+ WRITE Application__channel4 1
+ READ Application__channel4 1
ENDTASK
diff --git a/ttool/src/test/resources/tmltranslator/expected/expected_spec3.tml b/ttool/src/test/resources/tmltranslator/expected/expected_spec3.tml
index 470fe00678..22f063c21e 100644
--- a/ttool/src/test/resources/tmltranslator/expected/expected_spec3.tml
+++ b/ttool/src/test/resources/tmltranslator/expected/expected_spec3.tml
@@ -1,76 +1,88 @@
// TML Application - FORMAT 0.1
// Application: /home/pham/Documents/TToolHelp/TTool/modeling/DIPLODOCUS/CloneCompositeComponentTest.xml
-// Generated: Wed Mar 20 17:20:50 CET 2019
+// Generated: Thu Mar 21 16:20:51 CET 2019
// Channels
-CHANNEL DIPLODOCUS_C_Design__channel BRBW 4 8 OUT DIPLODOCUS_C_Design__PrimitiveComp1 IN DIPLODOCUS_C_Design__PrimitiveComp2
-CHANNEL DIPLODOCUS_C_Design__channel2 BRBW 4 8 OUT DIPLODOCUS_C_Design__PrimitiveComp3 IN DIPLODOCUS_C_Design__PrimitiveComp4
-CHANNEL DIPLODOCUS_C_Design__channel3 BRBW 4 8 OUT DIPLODOCUS_C_Design__PrimitiveComp5 IN DIPLODOCUS_C_Design__PrimitiveComp5
-CHANNEL DIPLODOCUS_C_Design__channel3_0 BRBW 4 8 OUT DIPLODOCUS_C_Design__PrimitiveComp5_0 IN DIPLODOCUS_C_Design__PrimitiveComp5_0
+CHANNEL Application__channel BRBW 4 8 OUT Application__PrimitiveComp1 IN Application__PrimitiveComp2
+CHANNEL Application__channel2 BRBW 4 8 OUT Application__PrimitiveComp3 IN Application__PrimitiveComp4
+CHANNEL Application__channel3 BRBW 4 8 OUT Application__PrimitiveComp5 IN Application__PrimitiveComp5
+CHANNEL Application__channel3_0 BRBW 4 8 OUT Application__PrimitiveComp5_0 IN Application__PrimitiveComp5_0
+CHANNEL Application__channel4 BRBW 4 8 OUT Application__PrimitiveComp6 IN Application__PrimitiveComp6
// Events
-EVENT DIPLODOCUS_C_Design__event__DIPLODOCUS_C_Design__event() NIB 8 DIPLODOCUS_C_Design__PrimitiveComp1 DIPLODOCUS_C_Design__PrimitiveComp2
+EVENT Application__event__Application__event() NIB 8 Application__PrimitiveComp1 Application__PrimitiveComp2
// Requests
-TASK DIPLODOCUS_C_Design__PrimitiveComp1
+TASK Application__PrimitiveComp1
TASKOP
//Local variables
//Behavior
RAND
CASERAND 50
- NOTIFY DIPLODOCUS_C_Design__event__DIPLODOCUS_C_Design__event
+ NOTIFY Application__event__Application__event
ENDCASERAND
CASERAND 50
- WRITE DIPLODOCUS_C_Design__channel 1
+ WRITE Application__channel 1
ENDCASERAND
ENDRAND
ENDTASK
-TASK DIPLODOCUS_C_Design__PrimitiveComp2
+TASK Application__PrimitiveComp2
TASKOP
//Local variables
//Behavior
RAND
CASERAND 50
- WAIT DIPLODOCUS_C_Design__event__DIPLODOCUS_C_Design__event
+ WAIT Application__event__Application__event
ENDCASERAND
CASERAND 50
- READ DIPLODOCUS_C_Design__channel 1
+ READ Application__channel 1
ENDCASERAND
ENDRAND
ENDTASK
-TASK DIPLODOCUS_C_Design__PrimitiveComp3
+TASK Application__PrimitiveComp3
TASKOP
//Local variables
//Behavior
- WRITE DIPLODOCUS_C_Design__channel2 1
+ WRITE Application__channel2 1
ENDTASK
-TASK DIPLODOCUS_C_Design__PrimitiveComp4
+TASK Application__PrimitiveComp4
TASKOP
//Local variables
//Behavior
- READ DIPLODOCUS_C_Design__channel2 1
+ READ Application__channel2 1
ENDTASK
-TASK DIPLODOCUS_C_Design__PrimitiveComp5
+TASK Application__PrimitiveComp5
TASKOP
//Local variables
//Behavior
- WRITE DIPLODOCUS_C_Design__channel3 1
+ WRITE Application__channel3 1
+ READ Application__channel3 1
ENDTASK
-TASK DIPLODOCUS_C_Design__PrimitiveComp5_0
+TASK Application__PrimitiveComp5_0
TASKOP
//Local variables
//Behavior
- WRITE DIPLODOCUS_C_Design__channel3_0 1
+ WRITE Application__channel3_0 1
+ READ Application__channel3_0 1
+ENDTASK
+
+TASK Application__PrimitiveComp6
+ TASKOP
+ //Local variables
+
+ //Behavior
+ WRITE Application__channel4 1
+ READ Application__channel4 1
ENDTASK
diff --git a/ttool/src/test/resources/tmltranslator/expected/expected_spec4.tml b/ttool/src/test/resources/tmltranslator/expected/expected_spec4.tml
new file mode 100644
index 0000000000..0187470adf
--- /dev/null
+++ b/ttool/src/test/resources/tmltranslator/expected/expected_spec4.tml
@@ -0,0 +1,88 @@
+// TML Application - FORMAT 0.1
+// Application: /home/pham/Documents/TToolHelp/TTool/modeling/DIPLODOCUS/CloneCompositeComponentTest.xml
+// Generated: Thu Mar 21 16:24:12 CET 2019
+
+// Channels
+CHANNEL Application__channel BRBW 4 8 OUT Application__PrimitiveComp1 IN Application__PrimitiveComp2
+CHANNEL Application__channel2 BRBW 4 8 OUT Application__PrimitiveComp3 IN Application__PrimitiveComp4
+CHANNEL Application__channel3 BRBW 4 8 OUT Application__PrimitiveComp5 IN Application__PrimitiveComp5
+CHANNEL Application__channel4 BRBW 4 8 OUT Application__PrimitiveComp6 IN Application__PrimitiveComp6
+CHANNEL Application__channel4_0 BRBW 4 8 OUT Application__PrimitiveComp6_0 IN Application__PrimitiveComp6_0
+
+// Events
+EVENT Application__event__Application__event() NIB 8 Application__PrimitiveComp1 Application__PrimitiveComp2
+
+// Requests
+
+TASK Application__PrimitiveComp1
+ TASKOP
+ //Local variables
+
+ //Behavior
+ RAND
+ CASERAND 50
+ NOTIFY Application__event__Application__event
+ ENDCASERAND
+ CASERAND 50
+ WRITE Application__channel 1
+ ENDCASERAND
+ ENDRAND
+ENDTASK
+
+TASK Application__PrimitiveComp2
+ TASKOP
+ //Local variables
+
+ //Behavior
+ RAND
+ CASERAND 50
+ WAIT Application__event__Application__event
+ ENDCASERAND
+ CASERAND 50
+ READ Application__channel 1
+ ENDCASERAND
+ ENDRAND
+ENDTASK
+
+TASK Application__PrimitiveComp3
+ TASKOP
+ //Local variables
+
+ //Behavior
+ WRITE Application__channel2 1
+ENDTASK
+
+TASK Application__PrimitiveComp4
+ TASKOP
+ //Local variables
+
+ //Behavior
+ READ Application__channel2 1
+ENDTASK
+
+TASK Application__PrimitiveComp5
+ TASKOP
+ //Local variables
+
+ //Behavior
+ WRITE Application__channel3 1
+ READ Application__channel3 1
+ENDTASK
+
+TASK Application__PrimitiveComp6
+ TASKOP
+ //Local variables
+
+ //Behavior
+ WRITE Application__channel4 1
+ READ Application__channel4 1
+ENDTASK
+
+TASK Application__PrimitiveComp6_0
+ TASKOP
+ //Local variables
+
+ //Behavior
+ WRITE Application__channel4_0 1
+ READ Application__channel4_0 1
+ENDTASK
diff --git a/ttool/src/test/resources/ui/diagram2tml/input/CloneCompositeComponentTest.xml b/ttool/src/test/resources/ui/diagram2tml/input/CloneCompositeComponentTest.xml
index 845dc4df66..7eff87debe 100644
--- a/ttool/src/test/resources/ui/diagram2tml/input/CloneCompositeComponentTest.xml
+++ b/ttool/src/test/resources/ui/diagram2tml/input/CloneCompositeComponentTest.xml
@@ -2,148 +2,112 @@
<TURTLEGMODELING version="1.0beta">
-<Modeling type="TML Component Design" nameTab="Application" tabs="TML Component Task Diagram$PrimitiveComp2$PrimitiveComp1$PrimitiveComp3$PrimitiveComp4$PrimitiveComp5$PrimitiveComp6$PrimitiveComp7" >
+<Modeling type="TML Component Design" nameTab="Application" tabs="TML Component Task Diagram$PrimitiveComp2$PrimitiveComp1$PrimitiveComp3$PrimitiveComp4$PrimitiveComp5$PrimitiveComp6" >
<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="5" >
-<cdparam x="1151" y="234" />
+<CONNECTOR type="126" id="1" >
+<cdparam x="1144" y="348" />
<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="1143" y="232" id="6" />
-<P2 x="1236" y="232" id="96" />
+<P1 x="1144" y="348" id="85" />
+<P2 x="1144" y="405" id="87" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="126" id="4" >
+<CONNECTOR type="126" id="2" >
<cdparam x="424" y="585" />
<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="424" y="585" id="41" />
-<P2 x="521" y="585" id="39" />
+<P1 x="424" y="585" id="30" />
+<P2 x="521" y="585" id="28" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="126" id="3" >
<cdparam x="878" y="469" />
<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="430" y="208" id="61" />
-<P2 x="564" y="209" id="74" />
+<P1 x="430" y="208" id="50" />
+<P2 x="564" y="209" id="63" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="126" id="2" >
+<CONNECTOR type="126" id="4" >
<cdparam x="1021" y="460" />
<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="564" y="164" id="76" />
-<P2 x="430" y="163" id="63" />
+<P1 x="564" y="164" id="65" />
+<P2 x="430" y="163" id="52" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="126" id="1" >
+<CONNECTOR type="126" id="5" >
<cdparam x="475" y="480" />
<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="467" y="365" id="28" />
-<P2 x="514" y="364" id="17" />
+<P1 x="467" y="365" id="17" />
+<P2 x="514" y="364" id="6" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<COMPONENT type="1202" id="16" >
-<cdparam x="930" y="155" />
-<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="PrimitiveComp6" />
-<TGConnectingPoint num="0" id="8" />
-<TGConnectingPoint num="1" id="9" />
-<TGConnectingPoint num="2" id="10" />
-<TGConnectingPoint num="3" id="11" />
-<TGConnectingPoint num="4" id="12" />
-<TGConnectingPoint num="5" id="13" />
-<TGConnectingPoint num="6" id="14" />
-<TGConnectingPoint num="7" id="15" />
-<extraparam>
-<Data isAttacker="No" Operation="" />
-</extraparam>
-</COMPONENT>
-<SUBCOMPONENT type="1203" id="7" >
-<father id="16" num="0" />
-<cdparam x="1117" y="219" />
-<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 channel4" />
-<TGConnectingPoint num="0" id="6" />
-<extraparam>
-<Prop commName="channel4" 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" vc="-1" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-
-<COMPONENT type="1200" id="95" >
+<COMPONENT type="1200" id="84" >
<cdparam x="186" y="10" />
<sizeparam width="672" height="618" 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="Composite component" value="CompositeComp1" />
-<TGConnectingPoint num="0" id="87" />
-<TGConnectingPoint num="1" id="88" />
-<TGConnectingPoint num="2" id="89" />
-<TGConnectingPoint num="3" id="90" />
-<TGConnectingPoint num="4" id="91" />
-<TGConnectingPoint num="5" id="92" />
-<TGConnectingPoint num="6" id="93" />
-<TGConnectingPoint num="7" id="94" />
+<TGConnectingPoint num="0" id="76" />
+<TGConnectingPoint num="1" id="77" />
+<TGConnectingPoint num="2" id="78" />
+<TGConnectingPoint num="3" id="79" />
+<TGConnectingPoint num="4" id="80" />
+<TGConnectingPoint num="5" id="81" />
+<TGConnectingPoint num="6" id="82" />
+<TGConnectingPoint num="7" id="83" />
<extraparam>
<info hiddeni="false" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1200" id="60" >
-<father id="95" num="0" />
+<SUBCOMPONENT type="1200" id="49" >
+<father id="84" num="0" />
<cdparam x="266" y="278" />
<sizeparam width="471" height="329" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="201" minY="0" maxY="289" />
<infoparam name="Composite component" value="CompositeComp2" />
-<TGConnectingPoint num="0" id="52" />
-<TGConnectingPoint num="1" id="53" />
-<TGConnectingPoint num="2" id="54" />
-<TGConnectingPoint num="3" id="55" />
-<TGConnectingPoint num="4" id="56" />
-<TGConnectingPoint num="5" id="57" />
-<TGConnectingPoint num="6" id="58" />
-<TGConnectingPoint num="7" id="59" />
+<TGConnectingPoint num="0" id="41" />
+<TGConnectingPoint num="1" id="42" />
+<TGConnectingPoint num="2" id="43" />
+<TGConnectingPoint num="3" id="44" />
+<TGConnectingPoint num="4" id="45" />
+<TGConnectingPoint num="5" id="46" />
+<TGConnectingPoint num="6" id="47" />
+<TGConnectingPoint num="7" id="48" />
<extraparam>
<info hiddeni="false" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1202" id="27" >
-<father id="60" num="0" />
+<SUBCOMPONENT type="1202" id="16" >
+<father id="49" num="0" />
<cdparam x="527" y="316" />
<sizeparam width="200" height="150" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="271" minY="0" maxY="179" />
<infoparam name="Primitive component" value="PrimitiveComp4" />
-<TGConnectingPoint num="0" id="19" />
-<TGConnectingPoint num="1" id="20" />
-<TGConnectingPoint num="2" id="21" />
-<TGConnectingPoint num="3" id="22" />
-<TGConnectingPoint num="4" id="23" />
-<TGConnectingPoint num="5" id="24" />
-<TGConnectingPoint num="6" id="25" />
-<TGConnectingPoint num="7" id="26" />
+<TGConnectingPoint num="0" id="8" />
+<TGConnectingPoint num="1" id="9" />
+<TGConnectingPoint num="2" id="10" />
+<TGConnectingPoint num="3" id="11" />
+<TGConnectingPoint num="4" id="12" />
+<TGConnectingPoint num="5" id="13" />
+<TGConnectingPoint num="6" id="14" />
+<TGConnectingPoint num="7" id="15" />
<extraparam>
<Data isAttacker="No" Operation="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="18" >
-<father id="27" num="0" />
+<SUBCOMPONENT type="1203" id="7" >
+<father id="16" num="0" />
<cdparam x="514" y="351" />
<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 channel2" />
-<TGConnectingPoint num="0" id="17" />
+<TGConnectingPoint num="0" id="6" />
<extraparam>
<Prop commName="channel2" 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" vc="-1" />
<Type type="0" typeOther="" />
@@ -153,33 +117,33 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1202" id="38" >
-<father id="60" num="1" />
+<SUBCOMPONENT type="1202" id="27" >
+<father id="49" num="1" />
<cdparam x="285" y="318" />
<sizeparam width="169" height="150" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="302" minY="0" maxY="179" />
<infoparam name="Primitive component" value="PrimitiveComp3" />
-<TGConnectingPoint num="0" id="30" />
-<TGConnectingPoint num="1" id="31" />
-<TGConnectingPoint num="2" id="32" />
-<TGConnectingPoint num="3" id="33" />
-<TGConnectingPoint num="4" id="34" />
-<TGConnectingPoint num="5" id="35" />
-<TGConnectingPoint num="6" id="36" />
-<TGConnectingPoint num="7" id="37" />
+<TGConnectingPoint num="0" id="19" />
+<TGConnectingPoint num="1" id="20" />
+<TGConnectingPoint num="2" id="21" />
+<TGConnectingPoint num="3" id="22" />
+<TGConnectingPoint num="4" id="23" />
+<TGConnectingPoint num="5" id="24" />
+<TGConnectingPoint num="6" id="25" />
+<TGConnectingPoint num="7" id="26" />
<extraparam>
<Data isAttacker="No" Operation="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="29" >
-<father id="38" num="0" />
+<SUBCOMPONENT type="1203" id="18" >
+<father id="27" num="0" />
<cdparam x="441" y="352" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="156" minY="-13" maxY="137" />
<infoparam name="Primitive port" value="Channel channel2" />
-<TGConnectingPoint num="0" id="28" />
+<TGConnectingPoint num="0" id="17" />
<extraparam>
<Prop commName="channel2" 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" vc="-1" />
<Type type="0" typeOther="" />
@@ -189,33 +153,33 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1202" id="51" >
-<father id="60" num="2" />
+<SUBCOMPONENT type="1202" id="40" >
+<father id="49" num="2" />
<cdparam x="399" y="491" />
<sizeparam width="169" height="81" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="302" minY="0" maxY="248" />
<infoparam name="Primitive component" value="PrimitiveComp5" />
-<TGConnectingPoint num="0" id="43" />
-<TGConnectingPoint num="1" id="44" />
-<TGConnectingPoint num="2" id="45" />
-<TGConnectingPoint num="3" id="46" />
-<TGConnectingPoint num="4" id="47" />
-<TGConnectingPoint num="5" id="48" />
-<TGConnectingPoint num="6" id="49" />
-<TGConnectingPoint num="7" id="50" />
+<TGConnectingPoint num="0" id="32" />
+<TGConnectingPoint num="1" id="33" />
+<TGConnectingPoint num="2" id="34" />
+<TGConnectingPoint num="3" id="35" />
+<TGConnectingPoint num="4" id="36" />
+<TGConnectingPoint num="5" id="37" />
+<TGConnectingPoint num="6" id="38" />
+<TGConnectingPoint num="7" id="39" />
<extraparam>
<Data isAttacker="No" Operation="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="40" >
-<father id="51" num="0" />
+<SUBCOMPONENT type="1203" id="29" >
+<father id="40" num="0" />
<cdparam x="508" y="559" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="156" minY="-13" maxY="68" />
<infoparam name="Primitive port" value="Channel channel3" />
-<TGConnectingPoint num="0" id="39" />
+<TGConnectingPoint num="0" id="28" />
<extraparam>
<Prop commName="channel3" 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" vc="-1" />
<Type type="0" typeOther="" />
@@ -225,14 +189,14 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="42" >
-<father id="51" num="1" />
+<SUBCOMPONENT type="1203" id="31" >
+<father id="40" num="1" />
<cdparam x="411" y="559" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="156" minY="-13" maxY="68" />
<infoparam name="Primitive port" value="Channel channel3" />
-<TGConnectingPoint num="0" id="41" />
+<TGConnectingPoint num="0" id="30" />
<extraparam>
<Prop commName="channel3" 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" vc="-1" />
<Type type="0" typeOther="" />
@@ -242,33 +206,33 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1202" id="73" >
-<father id="95" num="1" />
+<SUBCOMPONENT type="1202" id="62" >
+<father id="84" num="1" />
<cdparam x="217" y="116" />
<sizeparam width="200" height="150" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="472" minY="0" maxY="468" />
<infoparam name="Primitive component" value="PrimitiveComp1" />
-<TGConnectingPoint num="0" id="65" />
-<TGConnectingPoint num="1" id="66" />
-<TGConnectingPoint num="2" id="67" />
-<TGConnectingPoint num="3" id="68" />
-<TGConnectingPoint num="4" id="69" />
-<TGConnectingPoint num="5" id="70" />
-<TGConnectingPoint num="6" id="71" />
-<TGConnectingPoint num="7" id="72" />
+<TGConnectingPoint num="0" id="54" />
+<TGConnectingPoint num="1" id="55" />
+<TGConnectingPoint num="2" id="56" />
+<TGConnectingPoint num="3" id="57" />
+<TGConnectingPoint num="4" id="58" />
+<TGConnectingPoint num="5" id="59" />
+<TGConnectingPoint num="6" id="60" />
+<TGConnectingPoint num="7" id="61" />
<extraparam>
<Data isAttacker="No" Operation="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="62" >
-<father id="73" num="0" />
+<SUBCOMPONENT type="1203" id="51" >
+<father id="62" num="0" />
<cdparam x="404" y="195" />
<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="Event event" />
-<TGConnectingPoint num="0" id="61" />
+<TGConnectingPoint num="0" id="50" />
<extraparam>
<Prop commName="event" commType="1" origin="true" finite="true" 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" vc="-1" />
<Type type="0" typeOther="" />
@@ -278,14 +242,14 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="64" >
-<father id="73" num="1" />
+<SUBCOMPONENT type="1203" id="53" >
+<father id="62" num="1" />
<cdparam x="404" y="150" />
<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 channel" />
-<TGConnectingPoint num="0" id="63" />
+<TGConnectingPoint num="0" id="52" />
<extraparam>
<Prop commName="channel" 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" vc="-1" />
<Type type="0" typeOther="" />
@@ -295,33 +259,33 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1202" id="86" >
-<father id="95" num="2" />
+<SUBCOMPONENT type="1202" id="75" >
+<father id="84" num="2" />
<cdparam x="577" y="116" />
<sizeparam width="200" height="150" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="472" minY="0" maxY="468" />
<infoparam name="Primitive component" value="PrimitiveComp2" />
-<TGConnectingPoint num="0" id="78" />
-<TGConnectingPoint num="1" id="79" />
-<TGConnectingPoint num="2" id="80" />
-<TGConnectingPoint num="3" id="81" />
-<TGConnectingPoint num="4" id="82" />
-<TGConnectingPoint num="5" id="83" />
-<TGConnectingPoint num="6" id="84" />
-<TGConnectingPoint num="7" id="85" />
+<TGConnectingPoint num="0" id="67" />
+<TGConnectingPoint num="1" id="68" />
+<TGConnectingPoint num="2" id="69" />
+<TGConnectingPoint num="3" id="70" />
+<TGConnectingPoint num="4" id="71" />
+<TGConnectingPoint num="5" id="72" />
+<TGConnectingPoint num="6" id="73" />
+<TGConnectingPoint num="7" id="74" />
<extraparam>
<Data isAttacker="No" Operation="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="75" >
-<father id="86" num="0" />
+<SUBCOMPONENT type="1203" id="64" >
+<father id="75" num="0" />
<cdparam x="564" y="196" />
<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="Event event" />
-<TGConnectingPoint num="0" id="74" />
+<TGConnectingPoint num="0" id="63" />
<extraparam>
<Prop commName="event" commType="1" 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" vc="-1" />
<Type type="0" typeOther="" />
@@ -331,14 +295,14 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="77" >
-<father id="86" num="1" />
+<SUBCOMPONENT type="1203" id="66" >
+<father id="75" num="1" />
<cdparam x="564" y="151" />
<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 channel" />
-<TGConnectingPoint num="0" id="76" />
+<TGConnectingPoint num="0" id="65" />
<extraparam>
<Prop commName="channel" 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" vc="-1" />
<Type type="0" typeOther="" />
@@ -349,32 +313,49 @@
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1202" id="106" >
-<cdparam x="1249" y="157" />
+<COMPONENT type="1202" id="97" >
+<cdparam x="931" y="292" />
<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="PrimitiveComp7" />
-<TGConnectingPoint num="0" id="98" />
-<TGConnectingPoint num="1" id="99" />
-<TGConnectingPoint num="2" id="100" />
-<TGConnectingPoint num="3" id="101" />
-<TGConnectingPoint num="4" id="102" />
-<TGConnectingPoint num="5" id="103" />
-<TGConnectingPoint num="6" id="104" />
-<TGConnectingPoint num="7" id="105" />
+<infoparam name="Primitive component" value="PrimitiveComp6" />
+<TGConnectingPoint num="0" id="89" />
+<TGConnectingPoint num="1" id="90" />
+<TGConnectingPoint num="2" id="91" />
+<TGConnectingPoint num="3" id="92" />
+<TGConnectingPoint num="4" id="93" />
+<TGConnectingPoint num="5" id="94" />
+<TGConnectingPoint num="6" id="95" />
+<TGConnectingPoint num="7" id="96" />
<extraparam>
<Data isAttacker="No" Operation="" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1203" id="97" >
-<father id="106" num="0" />
-<cdparam x="1236" y="219" />
+<SUBCOMPONENT type="1203" id="86" >
+<father id="97" num="0" />
+<cdparam x="1118" y="335" />
+<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 channel4" />
+<TGConnectingPoint num="0" id="85" />
+<extraparam>
+<Prop commName="channel4" 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" vc="-1" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1203" id="88" >
+<father id="97" num="1" />
+<cdparam x="1118" y="392" />
<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 channel4" />
-<TGConnectingPoint num="0" id="96" />
+<TGConnectingPoint num="0" id="87" />
<extraparam>
<Prop commName="channel4" 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" vc="-1" />
<Type type="0" typeOther="" />
@@ -389,81 +370,81 @@
</TMLComponentTaskDiagramPanel>
<TMLActivityDiagramPanel name="PrimitiveComp2" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="1001" id="119" >
+<COMPONENT type="1001" id="99" >
<cdparam x="520" y="416" />
<sizeparam width="20" height="20" 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="stop state" value="null" />
-<TGConnectingPoint num="0" id="118" />
+<TGConnectingPoint num="0" id="98" />
</COMPONENT>
-<COMPONENT type="1001" id="121" >
+<COMPONENT type="1001" id="101" >
<cdparam x="397" y="418" />
<sizeparam width="20" height="20" 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="stop state" value="null" />
-<TGConnectingPoint num="0" id="120" />
+<TGConnectingPoint num="0" id="100" />
</COMPONENT>
-<COMPONENT type="1010" id="124" >
+<COMPONENT type="1010" id="104" >
<cdparam x="501" y="302" />
<sizeparam width="59" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="wait event" value="event() " />
-<TGConnectingPoint num="0" id="122" />
-<TGConnectingPoint num="1" id="123" />
+<TGConnectingPoint num="0" id="102" />
+<TGConnectingPoint num="1" id="103" />
<extraparam>
<Data eventName="event" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1009" id="127" >
+<COMPONENT type="1009" id="107" >
<cdparam x="366" y="296" />
<sizeparam width="82" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="read channel" value="channel(1) " />
-<TGConnectingPoint num="0" id="125" />
-<TGConnectingPoint num="1" id="126" />
+<TGConnectingPoint num="0" id="105" />
+<TGConnectingPoint num="1" id="106" />
<extraparam>
<Data channelName="channel" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="Yes" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1012" id="135" >
+<COMPONENT type="1012" id="115" >
<cdparam x="392" y="175" />
<sizeparam width="30" height="30" 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="choice" value="null" />
-<TGConnectingPoint num="0" id="131" />
-<TGConnectingPoint num="1" id="132" />
-<TGConnectingPoint num="2" id="133" />
-<TGConnectingPoint num="3" id="134" />
+<TGConnectingPoint num="0" id="111" />
+<TGConnectingPoint num="1" id="112" />
+<TGConnectingPoint num="2" id="113" />
+<TGConnectingPoint num="3" id="114" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="128" >
-<father id="135" num="0" />
+<SUBCOMPONENT type="-1" id="108" >
+<father id="115" num="0" />
<cdparam x="367" y="185" />
<sizeparam width="14" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
<infoparam name="guard 1" value="[ ]" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="129" >
-<father id="135" num="1" />
+<SUBCOMPONENT type="-1" id="109" >
+<father id="115" num="1" />
<cdparam x="427" y="185" />
<sizeparam width="14" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
<infoparam name="guard 2" value="[ ]" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="130" >
-<father id="135" num="2" />
+<SUBCOMPONENT type="-1" id="110" >
+<father id="115" num="2" />
<cdparam x="412" y="220" />
<sizeparam width="14" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -471,25 +452,25 @@
<infoparam name="guard 3" value="[ ]" />
</SUBCOMPONENT>
-<COMPONENT type="1000" id="137" >
+<COMPONENT type="1000" id="117" >
<cdparam x="400" y="50" />
<sizeparam width="15" height="15" 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="start state" value="null" />
-<TGConnectingPoint num="0" id="136" />
+<TGConnectingPoint num="0" id="116" />
</COMPONENT>
-<CONNECTOR type="115" id="139" >
+<CONNECTOR type="115" id="119" >
<cdparam x="447" y="190" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="447" y="190" id="133" />
-<P2 x="530" y="297" id="122" />
+<P1 x="447" y="190" id="113" />
+<P2 x="530" y="297" id="102" />
<Point x="530" y="190" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="138" >
-<father id="139" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="118" >
+<father id="119" num="0" />
<cdparam x="530" y="190" />
<sizeparam width="1" height="1" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -497,117 +478,117 @@
<infoparam name="point " value="null" />
</SUBCOMPONENT>
-<CONNECTOR type="115" id="140" >
+<CONNECTOR type="115" id="120" >
<cdparam x="407" y="65" />
<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="65" id="136" />
-<P2 x="407" y="165" id="131" />
+<P1 x="407" y="65" id="116" />
+<P2 x="407" y="165" id="111" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="141" >
+<CONNECTOR type="115" id="121" >
<cdparam x="407" y="230" />
<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="230" id="134" />
-<P2 x="407" y="291" id="125" />
+<P1 x="407" y="230" id="114" />
+<P2 x="407" y="291" id="105" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="142" >
+<CONNECTOR type="115" id="122" >
<cdparam x="407" y="321" />
<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="321" id="126" />
-<P2 x="407" y="413" id="120" />
+<P1 x="407" y="321" id="106" />
+<P2 x="407" y="413" id="100" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="143" >
+<CONNECTOR type="115" id="123" >
<cdparam x="530" y="327" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="530" y="327" id="123" />
-<P2 x="530" y="411" id="118" />
+<P1 x="530" y="327" id="103" />
+<P2 x="530" y="411" id="98" />
<AutomaticDrawing data="true" />
</CONNECTOR>
</TMLActivityDiagramPanel>
<TMLActivityDiagramPanel name="PrimitiveComp1" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="1001" id="145" >
+<COMPONENT type="1001" id="125" >
<cdparam x="397" y="440" />
<sizeparam width="20" height="20" 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="stop state" value="null" />
-<TGConnectingPoint num="0" id="144" />
+<TGConnectingPoint num="0" id="124" />
</COMPONENT>
-<COMPONENT type="1001" id="147" >
+<COMPONENT type="1001" id="127" >
<cdparam x="302" y="444" />
<sizeparam width="20" height="20" 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="stop state" value="null" />
-<TGConnectingPoint num="0" id="146" />
+<TGConnectingPoint num="0" id="126" />
</COMPONENT>
-<COMPONENT type="1008" id="150" >
+<COMPONENT type="1008" id="130" >
<cdparam x="285" y="326" />
<sizeparam width="55" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="send event" value="event()" />
-<TGConnectingPoint num="0" id="148" />
-<TGConnectingPoint num="1" id="149" />
+<TGConnectingPoint num="0" id="128" />
+<TGConnectingPoint num="1" id="129" />
<extraparam>
<Data eventName="event" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1006" id="153" >
+<COMPONENT type="1006" id="133" >
<cdparam x="368" y="324" />
<sizeparam width="78" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="write channel" value="channel(1)" />
-<TGConnectingPoint num="0" id="151" />
-<TGConnectingPoint num="1" id="152" />
+<TGConnectingPoint num="0" id="131" />
+<TGConnectingPoint num="1" id="132" />
<extraparam>
<Data channelName="channel" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="Yes" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1012" id="161" >
+<COMPONENT type="1012" id="141" >
<cdparam x="392" y="183" />
<sizeparam width="30" height="30" 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="choice" value="null" />
-<TGConnectingPoint num="0" id="157" />
-<TGConnectingPoint num="1" id="158" />
-<TGConnectingPoint num="2" id="159" />
-<TGConnectingPoint num="3" id="160" />
+<TGConnectingPoint num="0" id="137" />
+<TGConnectingPoint num="1" id="138" />
+<TGConnectingPoint num="2" id="139" />
+<TGConnectingPoint num="3" id="140" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="154" >
-<father id="161" num="0" />
+<SUBCOMPONENT type="-1" id="134" >
+<father id="141" num="0" />
<cdparam x="367" y="193" />
<sizeparam width="14" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
<infoparam name="guard 1" value="[ ]" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="155" >
-<father id="161" num="1" />
+<SUBCOMPONENT type="-1" id="135" >
+<father id="141" num="1" />
<cdparam x="427" y="193" />
<sizeparam width="14" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
<infoparam name="guard 2" value="[ ]" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="156" >
-<father id="161" num="2" />
+<SUBCOMPONENT type="-1" id="136" >
+<father id="141" num="2" />
<cdparam x="412" y="228" />
<sizeparam width="14" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -615,25 +596,25 @@
<infoparam name="guard 3" value="[ ]" />
</SUBCOMPONENT>
-<COMPONENT type="1000" id="163" >
+<COMPONENT type="1000" id="143" >
<cdparam x="400" y="50" />
<sizeparam width="15" height="15" 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="start state" value="null" />
-<TGConnectingPoint num="0" id="162" />
+<TGConnectingPoint num="0" id="142" />
</COMPONENT>
-<CONNECTOR type="115" id="165" >
+<CONNECTOR type="115" id="145" >
<cdparam x="367" y="198" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="367" y="198" id="158" />
-<P2 x="312" y="321" id="148" />
+<P1 x="367" y="198" id="138" />
+<P2 x="312" y="321" id="128" />
<Point x="312" y="198" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="164" >
-<father id="165" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="144" >
+<father id="145" num="0" />
<cdparam x="312" y="198" />
<sizeparam width="1" height="1" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -641,296 +622,288 @@
<infoparam name="point " value="null" />
</SUBCOMPONENT>
-<CONNECTOR type="115" id="166" >
+<CONNECTOR type="115" id="146" >
<cdparam x="407" y="65" />
<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="65" id="162" />
-<P2 x="407" y="173" id="157" />
+<P1 x="407" y="65" id="142" />
+<P2 x="407" y="173" id="137" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="167" >
+<CONNECTOR type="115" id="147" >
<cdparam x="407" y="238" />
<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="238" id="160" />
-<P2 x="407" y="319" id="151" />
+<P1 x="407" y="238" id="140" />
+<P2 x="407" y="319" id="131" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="168" >
+<CONNECTOR type="115" id="148" >
<cdparam x="312" y="351" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="312" y="351" id="149" />
-<P2 x="312" y="439" id="146" />
+<P1 x="312" y="351" id="129" />
+<P2 x="312" y="439" id="126" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="169" >
+<CONNECTOR type="115" id="149" >
<cdparam x="407" y="349" />
<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="349" id="152" />
-<P2 x="407" y="435" id="144" />
+<P1 x="407" y="349" id="132" />
+<P2 x="407" y="435" id="124" />
<AutomaticDrawing data="true" />
</CONNECTOR>
</TMLActivityDiagramPanel>
<TMLActivityDiagramPanel name="PrimitiveComp3" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="1001" id="171" >
+<COMPONENT type="1001" id="151" >
<cdparam x="397" y="269" />
<sizeparam width="20" height="20" 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="stop state" value="null" />
-<TGConnectingPoint num="0" id="170" />
+<TGConnectingPoint num="0" id="150" />
</COMPONENT>
-<COMPONENT type="1006" id="174" >
+<COMPONENT type="1006" id="154" >
<cdparam x="364" y="143" />
<sizeparam width="86" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="write channel" value="channel2(1)" />
-<TGConnectingPoint num="0" id="172" />
-<TGConnectingPoint num="1" id="173" />
+<TGConnectingPoint num="0" id="152" />
+<TGConnectingPoint num="1" id="153" />
<extraparam>
<Data channelName="channel2" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="Yes" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1000" id="176" >
+<COMPONENT type="1000" id="156" >
<cdparam x="400" y="50" />
<sizeparam width="15" height="15" 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="start state" value="null" />
-<TGConnectingPoint num="0" id="175" />
+<TGConnectingPoint num="0" id="155" />
</COMPONENT>
-<CONNECTOR type="115" id="177" >
+<CONNECTOR type="115" id="157" >
<cdparam x="407" y="168" />
<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="168" id="173" />
-<P2 x="407" y="264" id="170" />
+<P1 x="407" y="168" id="153" />
+<P2 x="407" y="264" id="150" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="178" >
+<CONNECTOR type="115" id="158" >
<cdparam x="407" y="65" />
<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="65" id="175" />
-<P2 x="407" y="138" id="172" />
+<P1 x="407" y="65" id="155" />
+<P2 x="407" y="138" id="152" />
<AutomaticDrawing data="true" />
</CONNECTOR>
</TMLActivityDiagramPanel>
<TMLActivityDiagramPanel name="PrimitiveComp4" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="1001" id="180" >
+<COMPONENT type="1001" id="160" >
<cdparam x="397" y="274" />
<sizeparam width="20" height="20" 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="stop state" value="null" />
-<TGConnectingPoint num="0" id="179" />
+<TGConnectingPoint num="0" id="159" />
</COMPONENT>
-<COMPONENT type="1009" id="183" >
+<COMPONENT type="1009" id="163" >
<cdparam x="362" y="162" />
<sizeparam width="90" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="read channel" value="channel2(1) " />
-<TGConnectingPoint num="0" id="181" />
-<TGConnectingPoint num="1" id="182" />
+<TGConnectingPoint num="0" id="161" />
+<TGConnectingPoint num="1" id="162" />
<extraparam>
<Data channelName="channel2" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="Yes" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1000" id="185" >
+<COMPONENT type="1000" id="165" >
<cdparam x="400" y="50" />
<sizeparam width="15" height="15" 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="start state" value="null" />
-<TGConnectingPoint num="0" id="184" />
+<TGConnectingPoint num="0" id="164" />
</COMPONENT>
-<CONNECTOR type="115" id="186" >
+<CONNECTOR type="115" id="166" >
<cdparam x="407" y="65" />
<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="65" id="184" />
-<P2 x="407" y="157" id="181" />
+<P1 x="407" y="65" id="164" />
+<P2 x="407" y="157" id="161" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="187" >
+<CONNECTOR type="115" id="167" >
<cdparam x="407" y="187" />
<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="187" id="182" />
-<P2 x="407" y="269" id="179" />
+<P1 x="407" y="187" id="162" />
+<P2 x="407" y="269" id="159" />
<AutomaticDrawing data="true" />
</CONNECTOR>
</TMLActivityDiagramPanel>
<TMLActivityDiagramPanel name="PrimitiveComp5" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="1001" id="189" >
-<cdparam x="397" y="269" />
+<COMPONENT type="1001" id="169" >
+<cdparam x="397" y="342" />
<sizeparam width="20" height="20" 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="stop state" value="null" />
-<TGConnectingPoint num="0" id="188" />
+<TGConnectingPoint num="0" id="168" />
</COMPONENT>
-<COMPONENT type="1006" id="192" >
+<COMPONENT type="1009" id="172" >
+<cdparam x="362" y="238" />
+<sizeparam width="90" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<enabled value="true" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="read channel" value="channel3(1) " />
+<TGConnectingPoint num="0" id="170" />
+<TGConnectingPoint num="1" id="171" />
+<extraparam>
+<Data channelName="channel3" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="Yes" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1006" id="175" >
<cdparam x="364" y="143" />
<sizeparam width="86" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="write channel" value="channel3(1)" />
-<TGConnectingPoint num="0" id="190" />
-<TGConnectingPoint num="1" id="191" />
+<TGConnectingPoint num="0" id="173" />
+<TGConnectingPoint num="1" id="174" />
<extraparam>
<Data channelName="channel3" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="Yes" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1000" id="194" >
+<COMPONENT type="1000" id="177" >
<cdparam x="400" y="50" />
<sizeparam width="15" height="15" 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="start state" value="null" />
-<TGConnectingPoint num="0" id="193" />
+<TGConnectingPoint num="0" id="176" />
</COMPONENT>
-<CONNECTOR type="115" id="195" >
+<CONNECTOR type="115" id="178" >
+<cdparam x="407" y="65" />
+<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="65" id="176" />
+<P2 x="407" y="138" id="173" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="179" >
<cdparam x="407" y="168" />
<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="168" id="191" />
-<P2 x="407" y="264" id="188" />
+<P1 x="407" y="168" id="174" />
+<P2 x="407" y="233" id="170" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="196" >
-<cdparam x="407" y="65" />
+<CONNECTOR type="115" id="180" >
+<cdparam x="407" y="263" />
<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="65" id="193" />
-<P2 x="407" y="138" id="190" />
+<P1 x="407" y="263" id="171" />
+<P2 x="407" y="337" id="168" />
<AutomaticDrawing data="true" />
</CONNECTOR>
</TMLActivityDiagramPanel>
<TMLActivityDiagramPanel name="PrimitiveComp6" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="1001" id="198" >
-<cdparam x="397" y="221" />
+<COMPONENT type="1001" id="182" >
+<cdparam x="397" y="331" />
<sizeparam width="20" height="20" 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="stop state" value="null" />
-<TGConnectingPoint num="0" id="197" />
+<TGConnectingPoint num="0" id="181" />
</COMPONENT>
-<COMPONENT type="1006" id="201" >
-<cdparam x="364" y="133" />
-<sizeparam width="86" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1009" id="185" >
+<cdparam x="362" y="233" />
+<sizeparam width="90" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="write channel" value="channel4(1)" />
-<TGConnectingPoint num="0" id="199" />
-<TGConnectingPoint num="1" id="200" />
+<infoparam name="read channel" value="channel4(1) " />
+<TGConnectingPoint num="0" id="183" />
+<TGConnectingPoint num="1" id="184" />
<extraparam>
<Data channelName="channel4" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="Yes" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1000" id="203" >
-<cdparam x="400" y="50" />
-<sizeparam width="15" height="15" 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="start state" value="null" />
-<TGConnectingPoint num="0" id="202" />
-</COMPONENT>
-
-<CONNECTOR type="115" id="204" >
-<cdparam x="407" y="65" />
-<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="65" id="202" />
-<P2 x="407" y="128" id="199" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="205" >
-<cdparam x="407" y="158" />
-<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="158" id="200" />
-<P2 x="407" y="216" id="197" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-
-</TMLActivityDiagramPanel>
-
-<TMLActivityDiagramPanel name="PrimitiveComp7" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="1001" id="207" >
-<cdparam x="397" y="244" />
-<sizeparam width="20" height="20" 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="stop state" value="null" />
-<TGConnectingPoint num="0" id="206" />
-</COMPONENT>
-
-<COMPONENT type="1009" id="210" >
-<cdparam x="362" y="144" />
-<sizeparam width="90" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1006" id="188" >
+<cdparam x="364" y="133" />
+<sizeparam width="86" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="read channel" value="channel4(1) " />
-<TGConnectingPoint num="0" id="208" />
-<TGConnectingPoint num="1" id="209" />
+<infoparam name="write channel" value="channel4(1)" />
+<TGConnectingPoint num="0" id="186" />
+<TGConnectingPoint num="1" id="187" />
<extraparam>
<Data channelName="channel4" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="Yes" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1000" id="212" >
+<COMPONENT type="1000" id="190" >
<cdparam x="400" y="50" />
<sizeparam width="15" height="15" 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="start state" value="null" />
-<TGConnectingPoint num="0" id="211" />
+<TGConnectingPoint num="0" id="189" />
</COMPONENT>
-<CONNECTOR type="115" id="213" >
+<CONNECTOR type="115" id="191" >
<cdparam x="407" y="65" />
<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="65" id="211" />
-<P2 x="407" y="139" id="208" />
+<P1 x="407" y="65" id="189" />
+<P2 x="407" y="128" id="186" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="115" id="214" >
-<cdparam x="407" y="169" />
+<CONNECTOR type="115" id="192" >
+<cdparam x="407" y="158" />
<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="169" id="209" />
-<P2 x="407" y="239" id="206" />
+<P1 x="407" y="158" id="187" />
+<P2 x="407" y="228" id="183" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="193" >
+<cdparam x="407" y="258" />
+<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="258" id="184" />
+<P2 x="407" y="326" id="181" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -943,205 +916,336 @@
<Modeling type="TML Architecture" nameTab="Architecture" >
<TMLArchiDiagramPanel name="DIPLODOCUS architecture and mapping Diagram" minX="10" maxX="2500" minY="10" maxY="1500" attributes="0" masterClockFrequency="200" >
-<COMPONENT type="1105" id="248" >
-<cdparam x="198" y="533" />
-<sizeparam width="200" height="200" 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="Memory0" value="name" />
-<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="8" id="232" />
-<TGConnectingPoint num="9" id="233" />
-<TGConnectingPoint num="10" id="234" />
-<TGConnectingPoint num="11" id="235" />
-<TGConnectingPoint num="12" id="236" />
-<TGConnectingPoint num="13" id="237" />
-<TGConnectingPoint num="14" id="238" />
-<TGConnectingPoint num="15" id="239" />
-<TGConnectingPoint num="16" id="240" />
-<TGConnectingPoint num="17" id="241" />
-<TGConnectingPoint num="18" id="242" />
-<TGConnectingPoint num="19" id="243" />
-<TGConnectingPoint num="20" id="244" />
-<TGConnectingPoint num="21" id="245" />
-<TGConnectingPoint num="22" id="246" />
-<TGConnectingPoint num="23" id="247" />
+<CONNECTOR type="125" id="375" >
+<cdparam x="444" y="328" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="{info}" />
+<P1 x="359" y="353" id="329" />
+<P2 x="441" y="416" id="220" />
+<AutomaticDrawing data="true" />
<extraparam>
-<info stereotype="MEMORY" nodeName="Memory0" />
-<attributes byteDataSize="4" memorySize="1024" clockRatio="1" bufferType="0" />
+<info priority="0" />
+<spy value="false" />
</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1107" id="273" >
-<cdparam x="770" y="426" />
+</CONNECTOR>
+<CONNECTOR type="125" id="374" >
+<cdparam x="298" y="533" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="{info}" />
+<P1 x="515" y="607" id="245" />
+<P2 x="441" y="466" id="225" />
+<AutomaticDrawing data="true" />
+<extraparam>
+<info priority="0" />
+<spy value="false" />
+</extraparam>
+</CONNECTOR>
+<CONNECTOR type="125" id="373" >
+<cdparam x="770" y="476" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="{info}" />
+<P1 x="648" y="427" id="204" />
+<P2 x="566" y="441" id="223" />
+<AutomaticDrawing data="true" />
+<extraparam>
+<info priority="0" />
+<spy value="false" />
+</extraparam>
+</CONNECTOR>
+<COMPONENT type="1107" id="218" >
+<cdparam x="648" y="377" />
<sizeparam width="200" height="200" 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="DMA0" value="name" />
-<TGConnectingPoint num="0" id="249" />
-<TGConnectingPoint num="1" id="250" />
-<TGConnectingPoint num="2" id="251" />
-<TGConnectingPoint num="3" id="252" />
-<TGConnectingPoint num="4" id="253" />
-<TGConnectingPoint num="5" id="254" />
-<TGConnectingPoint num="6" id="255" />
-<TGConnectingPoint num="7" id="256" />
-<TGConnectingPoint num="8" id="257" />
-<TGConnectingPoint num="9" id="258" />
-<TGConnectingPoint num="10" id="259" />
-<TGConnectingPoint num="11" id="260" />
-<TGConnectingPoint num="12" id="261" />
-<TGConnectingPoint num="13" id="262" />
-<TGConnectingPoint num="14" id="263" />
-<TGConnectingPoint num="15" id="264" />
-<TGConnectingPoint num="16" id="265" />
-<TGConnectingPoint num="17" id="266" />
-<TGConnectingPoint num="18" id="267" />
-<TGConnectingPoint num="19" id="268" />
-<TGConnectingPoint num="20" id="269" />
-<TGConnectingPoint num="21" id="270" />
-<TGConnectingPoint num="22" id="271" />
-<TGConnectingPoint num="23" id="272" />
+<TGConnectingPoint num="0" id="194" />
+<TGConnectingPoint num="1" id="195" />
+<TGConnectingPoint num="2" id="196" />
+<TGConnectingPoint num="3" id="197" />
+<TGConnectingPoint num="4" id="198" />
+<TGConnectingPoint num="5" id="199" />
+<TGConnectingPoint num="6" id="200" />
+<TGConnectingPoint num="7" id="201" />
+<TGConnectingPoint num="8" id="202" />
+<TGConnectingPoint num="9" id="203" />
+<TGConnectingPoint num="10" id="204" />
+<TGConnectingPoint num="11" id="205" />
+<TGConnectingPoint num="12" id="206" />
+<TGConnectingPoint num="13" id="207" />
+<TGConnectingPoint num="14" id="208" />
+<TGConnectingPoint num="15" id="209" />
+<TGConnectingPoint num="16" id="210" />
+<TGConnectingPoint num="17" id="211" />
+<TGConnectingPoint num="18" id="212" />
+<TGConnectingPoint num="19" id="213" />
+<TGConnectingPoint num="20" id="214" />
+<TGConnectingPoint num="21" id="215" />
+<TGConnectingPoint num="22" id="216" />
+<TGConnectingPoint num="23" id="217" />
<extraparam>
<info stereotype="DMA" nodeName="DMA0" />
<attributes byteDataSize="4" nbOfChannels="1" clockRatio="1" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1102" id="298" >
+<COMPONENT type="1102" id="243" >
<cdparam x="316" y="416" />
<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="Bus0" value="name" />
-<TGConnectingPoint num="0" id="274" />
-<TGConnectingPoint num="1" id="275" />
-<TGConnectingPoint num="2" id="276" />
-<TGConnectingPoint num="3" id="277" />
-<TGConnectingPoint num="4" id="278" />
-<TGConnectingPoint num="5" id="279" />
-<TGConnectingPoint num="6" id="280" />
-<TGConnectingPoint num="7" id="281" />
-<TGConnectingPoint num="8" id="282" />
-<TGConnectingPoint num="9" id="283" />
-<TGConnectingPoint num="10" id="284" />
-<TGConnectingPoint num="11" id="285" />
-<TGConnectingPoint num="12" id="286" />
-<TGConnectingPoint num="13" id="287" />
-<TGConnectingPoint num="14" id="288" />
-<TGConnectingPoint num="15" id="289" />
-<TGConnectingPoint num="16" id="290" />
-<TGConnectingPoint num="17" id="291" />
-<TGConnectingPoint num="18" id="292" />
-<TGConnectingPoint num="19" id="293" />
-<TGConnectingPoint num="20" id="294" />
-<TGConnectingPoint num="21" id="295" />
-<TGConnectingPoint num="22" id="296" />
-<TGConnectingPoint num="23" id="297" />
+<TGConnectingPoint num="0" id="219" />
+<TGConnectingPoint num="1" id="220" />
+<TGConnectingPoint num="2" id="221" />
+<TGConnectingPoint num="3" id="222" />
+<TGConnectingPoint num="4" id="223" />
+<TGConnectingPoint num="5" id="224" />
+<TGConnectingPoint num="6" id="225" />
+<TGConnectingPoint num="7" id="226" />
+<TGConnectingPoint num="8" id="227" />
+<TGConnectingPoint num="9" id="228" />
+<TGConnectingPoint num="10" id="229" />
+<TGConnectingPoint num="11" id="230" />
+<TGConnectingPoint num="12" id="231" />
+<TGConnectingPoint num="13" id="232" />
+<TGConnectingPoint num="14" id="233" />
+<TGConnectingPoint num="15" id="234" />
+<TGConnectingPoint num="16" id="235" />
+<TGConnectingPoint num="17" id="236" />
+<TGConnectingPoint num="18" id="237" />
+<TGConnectingPoint num="19" id="238" />
+<TGConnectingPoint num="20" id="239" />
+<TGConnectingPoint num="21" id="240" />
+<TGConnectingPoint num="22" id="241" />
+<TGConnectingPoint num="23" id="242" />
<extraparam>
<info stereotype="BUS-RR" nodeName="Bus0" />
<attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" clockRatio="1" privacy="0" referenceAttack="null" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1100" id="332" >
-<cdparam x="319" y="128" />
-<sizeparam width="316" height="200" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1105" id="268" >
+<cdparam x="415" y="607" />
+<sizeparam width="200" height="200" 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="Memory0" value="name" />
+<TGConnectingPoint num="0" id="244" />
+<TGConnectingPoint num="1" id="245" />
+<TGConnectingPoint num="2" id="246" />
+<TGConnectingPoint num="3" id="247" />
+<TGConnectingPoint num="4" id="248" />
+<TGConnectingPoint num="5" id="249" />
+<TGConnectingPoint num="6" id="250" />
+<TGConnectingPoint num="7" id="251" />
+<TGConnectingPoint num="8" id="252" />
+<TGConnectingPoint num="9" id="253" />
+<TGConnectingPoint num="10" id="254" />
+<TGConnectingPoint num="11" id="255" />
+<TGConnectingPoint num="12" id="256" />
+<TGConnectingPoint num="13" id="257" />
+<TGConnectingPoint num="14" id="258" />
+<TGConnectingPoint num="15" id="259" />
+<TGConnectingPoint num="16" id="260" />
+<TGConnectingPoint num="17" id="261" />
+<TGConnectingPoint num="18" id="262" />
+<TGConnectingPoint num="19" id="263" />
+<TGConnectingPoint num="20" id="264" />
+<TGConnectingPoint num="21" id="265" />
+<TGConnectingPoint num="22" id="266" />
+<TGConnectingPoint num="23" id="267" />
+<extraparam>
+<info stereotype="MEMORY" nodeName="Memory0" />
+<attributes byteDataSize="4" memorySize="1024" clockRatio="1" bufferType="0" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1100" id="372" >
+<cdparam x="792" y="120" />
+<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="CPU1" value="name" />
+<TGConnectingPoint num="0" id="348" />
+<TGConnectingPoint num="1" id="349" />
+<TGConnectingPoint num="2" id="350" />
+<TGConnectingPoint num="3" id="351" />
+<TGConnectingPoint num="4" id="352" />
+<TGConnectingPoint num="5" id="353" />
+<TGConnectingPoint num="6" id="354" />
+<TGConnectingPoint num="7" id="355" />
+<TGConnectingPoint num="8" id="356" />
+<TGConnectingPoint num="9" id="357" />
+<TGConnectingPoint num="10" id="358" />
+<TGConnectingPoint num="11" id="359" />
+<TGConnectingPoint num="12" id="360" />
+<TGConnectingPoint num="13" id="361" />
+<TGConnectingPoint num="14" id="362" />
+<TGConnectingPoint num="15" id="363" />
+<TGConnectingPoint num="16" id="364" />
+<TGConnectingPoint num="17" id="365" />
+<TGConnectingPoint num="18" id="366" />
+<TGConnectingPoint num="19" id="367" />
+<TGConnectingPoint num="20" id="368" />
+<TGConnectingPoint num="21" id="369" />
+<TGConnectingPoint num="22" id="370" />
+<TGConnectingPoint num="23" id="371" />
+<extraparam>
+<info stereotype="CPURR" nodeName="CPU1" />
+<attributes nbOfCores="1" byteDataSize="4" schedulingPolicy="0" sliceTime="10000" goIdleTime="10" maxConsecutiveIdleCycles="10" pipelineSize="5" taskSwitchingTime="20" branchingPredictionPenalty="2" cacheMiss="5" execiTime="1" execcTime="1" clockRatio="1" operation="" MECType="0" encryption="0"/>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1100" id="347" >
+<cdparam x="83" y="128" />
+<sizeparam width="552" height="225" 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="CPU0" value="name" />
-<TGConnectingPoint num="0" id="308" />
-<TGConnectingPoint num="1" id="309" />
-<TGConnectingPoint num="2" id="310" />
-<TGConnectingPoint num="3" id="311" />
-<TGConnectingPoint num="4" id="312" />
-<TGConnectingPoint num="5" id="313" />
-<TGConnectingPoint num="6" id="314" />
-<TGConnectingPoint num="7" id="315" />
-<TGConnectingPoint num="8" id="316" />
-<TGConnectingPoint num="9" id="317" />
-<TGConnectingPoint num="10" id="318" />
-<TGConnectingPoint num="11" id="319" />
-<TGConnectingPoint num="12" id="320" />
-<TGConnectingPoint num="13" id="321" />
-<TGConnectingPoint num="14" id="322" />
-<TGConnectingPoint num="15" id="323" />
-<TGConnectingPoint num="16" id="324" />
-<TGConnectingPoint num="17" id="325" />
-<TGConnectingPoint num="18" id="326" />
-<TGConnectingPoint num="19" id="327" />
-<TGConnectingPoint num="20" id="328" />
-<TGConnectingPoint num="21" id="329" />
-<TGConnectingPoint num="22" id="330" />
-<TGConnectingPoint num="23" id="331" />
+<TGConnectingPoint num="0" id="323" />
+<TGConnectingPoint num="1" id="324" />
+<TGConnectingPoint num="2" id="325" />
+<TGConnectingPoint num="3" id="326" />
+<TGConnectingPoint num="4" id="327" />
+<TGConnectingPoint num="5" id="328" />
+<TGConnectingPoint num="6" id="329" />
+<TGConnectingPoint num="7" id="330" />
+<TGConnectingPoint num="8" id="331" />
+<TGConnectingPoint num="9" id="332" />
+<TGConnectingPoint num="10" id="333" />
+<TGConnectingPoint num="11" id="334" />
+<TGConnectingPoint num="12" id="335" />
+<TGConnectingPoint num="13" id="336" />
+<TGConnectingPoint num="14" id="337" />
+<TGConnectingPoint num="15" id="338" />
+<TGConnectingPoint num="16" id="339" />
+<TGConnectingPoint num="17" id="340" />
+<TGConnectingPoint num="18" id="341" />
+<TGConnectingPoint num="19" id="342" />
+<TGConnectingPoint num="20" id="343" />
+<TGConnectingPoint num="21" id="344" />
+<TGConnectingPoint num="22" id="345" />
+<TGConnectingPoint num="23" id="346" />
<extraparam>
<info stereotype="CPU" nodeName="CPU0" />
<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" operation="" MECType="0" encryption="0"/>
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1101" id="307" >
-<father id="332" num="0" />
-<cdparam x="379" y="220" />
+<SUBCOMPONENT type="1101" id="384" >
+<father id="347" num="0" />
+<cdparam x="126" y="164" />
<sizeparam width="207" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="109" minY="0" maxY="160" />
+<cdrectangleparam minX="0" maxX="345" minY="0" maxY="185" />
<infoparam name="TGComponent" value="Application::PrimitiveComp1" />
-<TGConnectingPoint num="0" id="299" />
-<TGConnectingPoint num="1" id="300" />
-<TGConnectingPoint num="2" id="301" />
-<TGConnectingPoint num="3" id="302" />
-<TGConnectingPoint num="4" id="303" />
-<TGConnectingPoint num="5" id="304" />
-<TGConnectingPoint num="6" id="305" />
-<TGConnectingPoint num="7" id="306" />
+<TGConnectingPoint num="0" id="376" />
+<TGConnectingPoint num="1" id="377" />
+<TGConnectingPoint num="2" id="378" />
+<TGConnectingPoint num="3" id="379" />
+<TGConnectingPoint num="4" id="380" />
+<TGConnectingPoint num="5" id="381" />
+<TGConnectingPoint num="6" id="382" />
+<TGConnectingPoint num="7" id="383" />
<extraparam>
-<info value="Application::PrimitiveComp1" taskName="PrimitiveComp1" referenceTaskName="Application" priority="0" operationMEC="PrimitiveComp6" fatherComponentMECType="0" />
+<info value="Application::PrimitiveComp1" taskName="PrimitiveComp1" referenceTaskName="Application" priority="0" operationMEC="PrimitiveComp4" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-
-<CONNECTOR type="125" id="333" >
-<cdparam x="444" y="328" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="{info}" />
-<P1 x="477" y="328" id="314" />
-<P2 x="441" y="416" id="275" />
-<AutomaticDrawing data="true" />
+<SUBCOMPONENT type="1101" id="277" >
+<father id="347" num="1" />
+<cdparam x="415" y="245" />
+<sizeparam width="207" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="345" minY="0" maxY="185" />
+<infoparam name="TGComponent" value="Application::PrimitiveComp6" />
+<TGConnectingPoint num="0" id="269" />
+<TGConnectingPoint num="1" id="270" />
+<TGConnectingPoint num="2" id="271" />
+<TGConnectingPoint num="3" id="272" />
+<TGConnectingPoint num="4" id="273" />
+<TGConnectingPoint num="5" id="274" />
+<TGConnectingPoint num="6" id="275" />
+<TGConnectingPoint num="7" id="276" />
<extraparam>
-<info priority="0" />
-<spy value="false" />
+<info value="Application::PrimitiveComp6" taskName="PrimitiveComp6" referenceTaskName="Application" priority="0" operationMEC="PrimitiveComp6" fatherComponentMECType="0" />
</extraparam>
-</CONNECTOR>
-<CONNECTOR type="125" id="334" >
-<cdparam x="298" y="533" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="{info}" />
-<P1 x="298" y="533" id="225" />
-<P2 x="441" y="466" id="280" />
-<AutomaticDrawing data="true" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1101" id="286" >
+<father id="347" num="2" />
+<cdparam x="416" y="199" />
+<sizeparam width="207" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="345" minY="0" maxY="185" />
+<infoparam name="TGComponent" value="Application::PrimitiveComp5" />
+<TGConnectingPoint num="0" id="278" />
+<TGConnectingPoint num="1" id="279" />
+<TGConnectingPoint num="2" id="280" />
+<TGConnectingPoint num="3" id="281" />
+<TGConnectingPoint num="4" id="282" />
+<TGConnectingPoint num="5" id="283" />
+<TGConnectingPoint num="6" id="284" />
+<TGConnectingPoint num="7" id="285" />
<extraparam>
-<info priority="0" />
-<spy value="false" />
+<info value="Application::PrimitiveComp5" taskName="PrimitiveComp5" referenceTaskName="Application" priority="0" operationMEC="PrimitiveComp6" fatherComponentMECType="0" />
</extraparam>
-</CONNECTOR>
-<CONNECTOR type="125" id="335" >
-<cdparam x="770" y="476" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="{info}" />
-<P1 x="770" y="476" id="259" />
-<P2 x="566" y="441" id="278" />
-<AutomaticDrawing data="true" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1101" id="295" >
+<father id="347" num="3" />
+<cdparam x="416" y="149" />
+<sizeparam width="207" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="345" minY="0" maxY="185" />
+<infoparam name="TGComponent" value="Application::PrimitiveComp4" />
+<TGConnectingPoint num="0" id="287" />
+<TGConnectingPoint num="1" id="288" />
+<TGConnectingPoint num="2" id="289" />
+<TGConnectingPoint num="3" id="290" />
+<TGConnectingPoint num="4" id="291" />
+<TGConnectingPoint num="5" id="292" />
+<TGConnectingPoint num="6" id="293" />
+<TGConnectingPoint num="7" id="294" />
<extraparam>
-<info priority="0" />
-<spy value="false" />
+<info value="Application::PrimitiveComp4" taskName="PrimitiveComp4" referenceTaskName="Application" priority="0" operationMEC="PrimitiveComp6" fatherComponentMECType="0" />
</extraparam>
-</CONNECTOR>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1101" id="304" >
+<father id="347" num="4" />
+<cdparam x="109" y="269" />
+<sizeparam width="207" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="345" minY="0" maxY="185" />
+<infoparam name="TGComponent" value="Application::PrimitiveComp3" />
+<TGConnectingPoint num="0" id="296" />
+<TGConnectingPoint num="1" id="297" />
+<TGConnectingPoint num="2" id="298" />
+<TGConnectingPoint num="3" id="299" />
+<TGConnectingPoint num="4" id="300" />
+<TGConnectingPoint num="5" id="301" />
+<TGConnectingPoint num="6" id="302" />
+<TGConnectingPoint num="7" id="303" />
+<extraparam>
+<info value="Application::PrimitiveComp3" taskName="PrimitiveComp3" referenceTaskName="Application" priority="0" operationMEC="PrimitiveComp6" fatherComponentMECType="0" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1101" id="322" >
+<father id="347" num="5" />
+<cdparam x="107" y="224" />
+<sizeparam width="207" height="34" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="345" minY="0" maxY="191" />
+<infoparam name="TGComponent" value="Application::PrimitiveComp2" />
+<TGConnectingPoint num="0" id="314" />
+<TGConnectingPoint num="1" id="315" />
+<TGConnectingPoint num="2" id="316" />
+<TGConnectingPoint num="3" id="317" />
+<TGConnectingPoint num="4" id="318" />
+<TGConnectingPoint num="5" id="319" />
+<TGConnectingPoint num="6" id="320" />
+<TGConnectingPoint num="7" id="321" />
+<extraparam>
+<info value="Application::PrimitiveComp2" taskName="PrimitiveComp2" referenceTaskName="Application" priority="0" operationMEC="PrimitiveComp6" fatherComponentMECType="0" />
+</extraparam>
+</SUBCOMPONENT>
+
</TMLArchiDiagramPanel>
--
GitLab