diff --git a/modeling/AVATAR/CoffeeMachine_Avatar.xml b/modeling/AVATAR/CoffeeMachine_Avatar.xml
index 9dc6a280f25704237e6a8bf8ba406adb10be84d4..c84292d8b987d52620edeb34d0fe08d3f72578b0 100644
--- a/modeling/AVATAR/CoffeeMachine_Avatar.xml
+++ b/modeling/AVATAR/CoffeeMachine_Avatar.xml
@@ -1459,7 +1459,7 @@
<MainCode value="}"/>
<Optimized value="true" />
<considerTimingOperators value="true" />
-<Validated value="" />
+<Validated value="Wallet;CoffeeMachine;CoffeeButton;TeaButton;" />
<Ignored value="" />
<CONNECTOR type="5002" id="771" index="0" uid="f480e606-bbb6-4ab7-8f89-8abb37ff40bb" >
diff --git a/modeling/SysMLSec/AliceAndBob.xml b/modeling/SysMLSec/AliceAndBob.xml
index 44cdbbad30d6bf701b57c9704ed90297a1fe6bb3..c06f7d2abb33ced98e910a1c3bd8ed8a0ae15770 100644
--- a/modeling/SysMLSec/AliceAndBob.xml
+++ b/modeling/SysMLSec/AliceAndBob.xml
@@ -177,13 +177,13 @@
<Signal value="out chout(Message msg)" attached="true" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="5000" id="82" index="7" uid="32384080-e86a-41de-b441-4f6ae88f1cbe" >
+<SUBCOMPONENT type="5000" id="82" index="7" uid="a1c44cc9-9334-4d03-8988-e402248c1447" >
<father id="164" num="0" />
-<cdparam x="36" y="233" />
-<sizeparam width="215" height="126" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="263" y="233" />
+<sizeparam width="139" height="126" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="223" minY="0" maxY="93" />
-<infoparam name="Block0" value="Alice" />
+<cdrectangleparam minX="0" maxX="299" minY="0" maxY="93" />
+<infoparam name="Block0" value="Bob" />
<new d="false" />
<TGConnectingPoint num="0" id="42" />
<TGConnectingPoint num="1" id="43" />
@@ -228,10 +228,10 @@
<extraparam>
<blockType data="cryptoblock" color="-4072719" />
<CryptoBlock value="true" />
-<Attribute access="0" var="0" id="secretData" value="" type="8" typeOther="" />
<Attribute access="0" var="0" id="m" value="" type="5" typeOther="Message" />
-<Attribute access="0" var="0" id="m1" value="" type="5" typeOther="Message" />
+<Attribute access="0" var="0" id="m2" value="" type="5" typeOther="Message" />
<Attribute access="0" var="0" id="sk" value="" type="5" typeOther="Key" />
+<Attribute access="0" var="0" id="receivedData" value="" type="8" typeOther="" />
<Method value="Message encrypt(Message msg, Key k)" />
<Method value="Message decrypt(Message msg, Key k)" />
<Method value="Message sencrypt(Message msg, Key k)" />
@@ -256,13 +256,13 @@
<Method value="Message hash(Message msg)" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="5000" id="123" index="8" uid="a1c44cc9-9334-4d03-8988-e402248c1447" >
+<SUBCOMPONENT type="5000" id="123" index="8" uid="32384080-e86a-41de-b441-4f6ae88f1cbe" >
<father id="164" num="1" />
-<cdparam x="263" y="233" />
-<sizeparam width="139" height="126" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="36" y="233" />
+<sizeparam width="215" height="126" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="299" minY="0" maxY="93" />
-<infoparam name="Block0" value="Bob" />
+<cdrectangleparam minX="0" maxX="223" minY="0" maxY="93" />
+<infoparam name="Block0" value="Alice" />
<new d="false" />
<TGConnectingPoint num="0" id="83" />
<TGConnectingPoint num="1" id="84" />
@@ -307,10 +307,10 @@
<extraparam>
<blockType data="cryptoblock" color="-4072719" />
<CryptoBlock value="true" />
+<Attribute access="0" var="0" id="secretData" value="" type="8" typeOther="" />
<Attribute access="0" var="0" id="m" value="" type="5" typeOther="Message" />
-<Attribute access="0" var="0" id="m2" value="" type="5" typeOther="Message" />
+<Attribute access="0" var="0" id="m1" value="" type="5" typeOther="Message" />
<Attribute access="0" var="0" id="sk" value="" type="5" typeOther="Key" />
-<Attribute access="0" var="0" id="receivedData" value="" type="8" typeOther="" />
<Method value="Message encrypt(Message msg, Key k)" />
<Method value="Message decrypt(Message msg, Key k)" />
<Method value="Message sencrypt(Message msg, Key k)" />
@@ -1555,13 +1555,13 @@
<Signal value="out chout(Message msg)" attached="true" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="5000" id="857" index="7" uid="cc150a1e-1348-4fa4-98a9-3a612b6184cc" >
+<SUBCOMPONENT type="5000" id="857" index="7" uid="e802e723-57b4-4734-af20-cddadacc10e6" >
<father id="939" num="0" />
-<cdparam x="263" y="233" />
-<sizeparam width="139" height="126" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="36" y="233" />
+<sizeparam width="215" height="126" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="299" minY="0" maxY="93" />
-<infoparam name="Block0" value="Bob" />
+<cdrectangleparam minX="0" maxX="223" minY="0" maxY="93" />
+<infoparam name="Block0" value="Alice" />
<new d="false" />
<TGConnectingPoint num="0" id="817" />
<TGConnectingPoint num="1" id="818" />
@@ -1606,13 +1606,13 @@
<extraparam>
<blockType data="cryptoblock" color="-4072719" />
<CryptoBlock value="true" />
+<Attribute access="0" var="0" id="secretData" value="" type="8" typeOther="" />
<Attribute access="0" var="0" id="m" value="" type="5" typeOther="Message" />
-<Attribute access="0" var="0" id="m2" value="" type="5" typeOther="Message" />
+<Attribute access="0" var="0" id="m1" value="" type="5" typeOther="Message" />
<Attribute access="0" var="0" id="sk" value="" type="5" typeOther="Key" />
-<Attribute access="0" var="0" id="receivedData" value="" type="8" typeOther="" />
-<Attribute access="0" var="0" id="privK" value="" type="5" typeOther="Key" />
<Attribute access="0" var="0" id="pubK" value="" type="5" typeOther="Key" />
-<Attribute access="0" var="0" id="alicePubK" value="" type="5" typeOther="Key" />
+<Attribute access="0" var="0" id="privK" value="" type="5" typeOther="Key" />
+<Attribute access="0" var="0" id="bobPubK" value="" type="5" typeOther="Key" />
<Method value="Message encrypt(Message msg, Key k)" />
<Method value="Message decrypt(Message msg, Key k)" />
<Method value="Message sencrypt(Message msg, Key k)" />
@@ -1637,13 +1637,13 @@
<Method value="Message hash(Message msg)" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="5000" id="898" index="8" uid="e802e723-57b4-4734-af20-cddadacc10e6" >
+<SUBCOMPONENT type="5000" id="898" index="8" uid="cc150a1e-1348-4fa4-98a9-3a612b6184cc" >
<father id="939" num="1" />
-<cdparam x="36" y="233" />
-<sizeparam width="215" height="126" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="263" y="233" />
+<sizeparam width="139" height="126" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="223" minY="0" maxY="93" />
-<infoparam name="Block0" value="Alice" />
+<cdrectangleparam minX="0" maxX="299" minY="0" maxY="93" />
+<infoparam name="Block0" value="Bob" />
<new d="false" />
<TGConnectingPoint num="0" id="858" />
<TGConnectingPoint num="1" id="859" />
@@ -1688,13 +1688,13 @@
<extraparam>
<blockType data="cryptoblock" color="-4072719" />
<CryptoBlock value="true" />
-<Attribute access="0" var="0" id="secretData" value="" type="8" typeOther="" />
<Attribute access="0" var="0" id="m" value="" type="5" typeOther="Message" />
-<Attribute access="0" var="0" id="m1" value="" type="5" typeOther="Message" />
+<Attribute access="0" var="0" id="m2" value="" type="5" typeOther="Message" />
<Attribute access="0" var="0" id="sk" value="" type="5" typeOther="Key" />
-<Attribute access="0" var="0" id="pubK" value="" type="5" typeOther="Key" />
+<Attribute access="0" var="0" id="receivedData" value="" type="8" typeOther="" />
<Attribute access="0" var="0" id="privK" value="" type="5" typeOther="Key" />
-<Attribute access="0" var="0" id="bobPubK" value="" type="5" typeOther="Key" />
+<Attribute access="0" var="0" id="pubK" value="" type="5" typeOther="Key" />
+<Attribute access="0" var="0" id="alicePubK" value="" type="5" typeOther="Key" />
<Method value="Message encrypt(Message msg, Key k)" />
<Method value="Message decrypt(Message msg, Key k)" />
<Method value="Message sencrypt(Message msg, Key k)" />
@@ -3653,13 +3653,13 @@
<Signal value="out chout(Message msg)" attached="true" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="5000" id="2024" index="7" uid="7a040a26-feb9-4e9a-a609-908679df2a0b" >
+<SUBCOMPONENT type="5000" id="2024" index="7" uid="f24348ab-6d4a-40e6-a942-342d6222b23f" >
<father id="2147" num="0" />
-<cdparam x="115" y="249" />
-<sizeparam width="261" height="83" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="263" y="108" />
+<sizeparam width="139" height="126" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="177" minY="0" maxY="261" />
-<infoparam name="Block0" value="CA" />
+<cdrectangleparam minX="0" maxX="299" minY="0" maxY="218" />
+<infoparam name="Block0" value="Bob" />
<new d="false" />
<TGConnectingPoint num="0" id="1984" />
<TGConnectingPoint num="1" id="1985" />
@@ -3704,30 +3704,22 @@
<extraparam>
<blockType data="cryptoblock" color="-4072719" />
<CryptoBlock value="true" />
+<Attribute access="0" var="0" id="m" value="" type="5" typeOther="Message" />
+<Attribute access="0" var="0" id="m2" value="" type="5" typeOther="Message" />
+<Attribute access="0" var="0" id="sk" value="" type="5" typeOther="Key" />
+<Attribute access="0" var="0" id="receivedData" value="" type="8" typeOther="" />
<Attribute access="0" var="0" id="privK" value="" type="5" typeOther="Key" />
<Attribute access="0" var="0" id="pubK" value="" type="5" typeOther="Key" />
<Attribute access="0" var="0" id="alicePubK" value="" type="5" typeOther="Key" />
-<Attribute access="0" var="0" id="bobPubK" value="" type="5" typeOther="Key" />
+<Attribute access="0" var="0" id="CAPubK" value="" type="5" typeOther="Key" />
<Attribute access="0" var="0" id="aliceID" value="" type="8" typeOther="" />
-<Attribute access="0" var="0" id="bobID" value="" type="8" typeOther="" />
-<Attribute access="0" var="0" id="m" value="" type="5" typeOther="Message" />
-<Attribute access="0" var="0" id="newK" value="" type="5" typeOther="Key" />
-<Attribute access="0" var="0" id="newCert" value="" type="5" typeOther="Message" />
<Attribute access="0" var="0" id="m1" value="" type="5" typeOther="Message" />
-<Attribute access="0" var="0" id="m2" value="" type="5" typeOther="Message" />
-<Attribute access="0" var="0" id="newID" value="" type="8" typeOther="" />
-<Method value="Message aencrypt(Message msg, Key k)" />
-<Method value="Message adecrypt(Message msg, Key k)" />
-<Method value="Key pk(Key k)" />
-<Method value="Message sign(Message msg, Key k)" />
-<Method value="bool verifySign(Message msg1, Message sig, Key k)" />
-<Method value="Message cert(Key k, Message msg)" />
-<Method value="bool verifyCert(Message cert, Key k)" />
-<Method value="Key getpk(Message cert)" />
+<Attribute access="0" var="0" id="sig" value="" type="5" typeOther="Message" />
+<Attribute access="0" var="0" id="certOK" value="" type="4" typeOther="" />
+<Method value="Message encrypt(Message msg, Key k)" />
+<Method value="Message decrypt(Message msg, Key k)" />
<Method value="Message sencrypt(Message msg, Key k)" />
<Method value="Message sdecrypt(Message msg, Key k)" />
-<Method value="Key DH(Key pubK, Key privK)" />
-<Method value="Message hash(Message msg)" />
<Method value="Message MAC(Message msg, Key k)" />
<Method value="bool verifyMAC(Message msg, Key k, Message macmsg)" />
<Method value="Message concat2(Message msg1, Message msg2)" />
@@ -3736,6 +3728,16 @@
<Method value="get2(Message msg, Message msg1, Message msg2)" />
<Method value="get3(Message msg, Message msg1, Message msg2, Message msg3)" />
<Method value="get4(Message msg, Message msg1, Message msg2, Message msg3, Message msg4)" />
+<Method value="Message aencrypt(Message msg, Key k)" />
+<Method value="Message adecrypt(Message msg, Key k)" />
+<Method value="Key pk(Key k)" />
+<Method value="Message sign(Message msg, Key k)" />
+<Method value="bool verifySign(Message msg1, Message sig, Key k)" />
+<Method value="Message cert(Key k, Message msg)" />
+<Method value="bool verifyCert(Message cert, Key k)" />
+<Method value="Key getpk(Message cert)" />
+<Method value="Key DH(Key pubK, Key privK)" />
+<Method value="Message hash(Message msg)" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="5000" id="2065" index="8" uid="52a07889-a0b4-45e9-a97a-a5a5e144d49b" >
@@ -3825,13 +3827,13 @@
<Method value="Message hash(Message msg)" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="5000" id="2106" index="9" uid="f24348ab-6d4a-40e6-a942-342d6222b23f" >
+<SUBCOMPONENT type="5000" id="2106" index="9" uid="7a040a26-feb9-4e9a-a609-908679df2a0b" >
<father id="2147" num="2" />
-<cdparam x="263" y="108" />
-<sizeparam width="139" height="126" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="115" y="249" />
+<sizeparam width="261" height="83" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="299" minY="0" maxY="218" />
-<infoparam name="Block0" value="Bob" />
+<cdrectangleparam minX="0" maxX="177" minY="0" maxY="261" />
+<infoparam name="Block0" value="CA" />
<new d="false" />
<TGConnectingPoint num="0" id="2066" />
<TGConnectingPoint num="1" id="2067" />
@@ -3876,30 +3878,18 @@
<extraparam>
<blockType data="cryptoblock" color="-4072719" />
<CryptoBlock value="true" />
-<Attribute access="0" var="0" id="m" value="" type="5" typeOther="Message" />
-<Attribute access="0" var="0" id="m2" value="" type="5" typeOther="Message" />
-<Attribute access="0" var="0" id="sk" value="" type="5" typeOther="Key" />
-<Attribute access="0" var="0" id="receivedData" value="" type="8" typeOther="" />
<Attribute access="0" var="0" id="privK" value="" type="5" typeOther="Key" />
<Attribute access="0" var="0" id="pubK" value="" type="5" typeOther="Key" />
<Attribute access="0" var="0" id="alicePubK" value="" type="5" typeOther="Key" />
-<Attribute access="0" var="0" id="CAPubK" value="" type="5" typeOther="Key" />
+<Attribute access="0" var="0" id="bobPubK" value="" type="5" typeOther="Key" />
<Attribute access="0" var="0" id="aliceID" value="" type="8" typeOther="" />
+<Attribute access="0" var="0" id="bobID" value="" type="8" typeOther="" />
+<Attribute access="0" var="0" id="m" value="" type="5" typeOther="Message" />
+<Attribute access="0" var="0" id="newK" value="" type="5" typeOther="Key" />
+<Attribute access="0" var="0" id="newCert" value="" type="5" typeOther="Message" />
<Attribute access="0" var="0" id="m1" value="" type="5" typeOther="Message" />
-<Attribute access="0" var="0" id="sig" value="" type="5" typeOther="Message" />
-<Attribute access="0" var="0" id="certOK" value="" type="4" typeOther="" />
-<Method value="Message encrypt(Message msg, Key k)" />
-<Method value="Message decrypt(Message msg, Key k)" />
-<Method value="Message sencrypt(Message msg, Key k)" />
-<Method value="Message sdecrypt(Message msg, Key k)" />
-<Method value="Message MAC(Message msg, Key k)" />
-<Method value="bool verifyMAC(Message msg, Key k, Message macmsg)" />
-<Method value="Message concat2(Message msg1, Message msg2)" />
-<Method value="Message concat3(Message msg1, Message msg2, Message msg3)" />
-<Method value="Message concat4(Message msg1, Message msg2, Message msg3, Message msg4)" />
-<Method value="get2(Message msg, Message msg1, Message msg2)" />
-<Method value="get3(Message msg, Message msg1, Message msg2, Message msg3)" />
-<Method value="get4(Message msg, Message msg1, Message msg2, Message msg3, Message msg4)" />
+<Attribute access="0" var="0" id="m2" value="" type="5" typeOther="Message" />
+<Attribute access="0" var="0" id="newID" value="" type="8" typeOther="" />
<Method value="Message aencrypt(Message msg, Key k)" />
<Method value="Message adecrypt(Message msg, Key k)" />
<Method value="Key pk(Key k)" />
@@ -3908,8 +3898,18 @@
<Method value="Message cert(Key k, Message msg)" />
<Method value="bool verifyCert(Message cert, Key k)" />
<Method value="Key getpk(Message cert)" />
+<Method value="Message sencrypt(Message msg, Key k)" />
+<Method value="Message sdecrypt(Message msg, Key k)" />
<Method value="Key DH(Key pubK, Key privK)" />
<Method value="Message hash(Message msg)" />
+<Method value="Message MAC(Message msg, Key k)" />
+<Method value="bool verifyMAC(Message msg, Key k, Message macmsg)" />
+<Method value="Message concat2(Message msg1, Message msg2)" />
+<Method value="Message concat3(Message msg1, Message msg2, Message msg3)" />
+<Method value="Message concat4(Message msg1, Message msg2, Message msg3, Message msg4)" />
+<Method value="get2(Message msg, Message msg1, Message msg2)" />
+<Method value="get3(Message msg, Message msg1, Message msg2, Message msg3)" />
+<Method value="get4(Message msg, Message msg1, Message msg2, Message msg3, Message msg4)" />
</extraparam>
</SUBCOMPONENT>
@@ -6722,13 +6722,13 @@
<Signal value="out chout(Message msg)" attached="true" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="5000" id="3642" index="7" uid="58e32c17-1811-4588-ab32-863569a17a48" >
+<SUBCOMPONENT type="5000" id="3642" index="7" uid="7bb99390-2a74-452a-8601-e344bd028850" >
<father id="3724" num="0" />
-<cdparam x="36" y="233" />
-<sizeparam width="215" height="126" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="263" y="233" />
+<sizeparam width="139" height="126" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="223" minY="0" maxY="93" />
-<infoparam name="Block0" value="Alice" />
+<cdrectangleparam minX="0" maxX="299" minY="0" maxY="93" />
+<infoparam name="Block0" value="Bob" />
<new d="false" />
<TGConnectingPoint num="0" id="3602" />
<TGConnectingPoint num="1" id="3603" />
@@ -6773,8 +6773,8 @@
<extraparam>
<blockType data="cryptoblock" color="-4072719" />
<CryptoBlock value="true" />
-<Attribute access="0" var="0" id="secretData" value="" type="8" typeOther="" />
<Attribute access="0" var="0" id="m" value="" type="5" typeOther="Message" />
+<Attribute access="0" var="0" id="receivedData" value="" type="8" typeOther="" />
<Method value="Message encrypt(Message msg, Key k)" />
<Method value="Message decrypt(Message msg, Key k)" />
<Method value="Message sencrypt(Message msg, Key k)" />
@@ -6799,13 +6799,13 @@
<Method value="Message hash(Message msg)" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="5000" id="3683" index="8" uid="7bb99390-2a74-452a-8601-e344bd028850" >
+<SUBCOMPONENT type="5000" id="3683" index="8" uid="58e32c17-1811-4588-ab32-863569a17a48" >
<father id="3724" num="1" />
-<cdparam x="263" y="233" />
-<sizeparam width="139" height="126" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="36" y="233" />
+<sizeparam width="215" height="126" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="299" minY="0" maxY="93" />
-<infoparam name="Block0" value="Bob" />
+<cdrectangleparam minX="0" maxX="223" minY="0" maxY="93" />
+<infoparam name="Block0" value="Alice" />
<new d="false" />
<TGConnectingPoint num="0" id="3643" />
<TGConnectingPoint num="1" id="3644" />
@@ -6850,8 +6850,8 @@
<extraparam>
<blockType data="cryptoblock" color="-4072719" />
<CryptoBlock value="true" />
+<Attribute access="0" var="0" id="secretData" value="" type="8" typeOther="" />
<Attribute access="0" var="0" id="m" value="" type="5" typeOther="Message" />
-<Attribute access="0" var="0" id="receivedData" value="" type="8" typeOther="" />
<Method value="Message encrypt(Message msg, Key k)" />
<Method value="Message decrypt(Message msg, Key k)" />
<Method value="Message sencrypt(Message msg, Key k)" />
diff --git a/src/main/java/ai/AIAvatarSpecificationRequired.java b/src/main/java/ai/AIAvatarSpecificationRequired.java
new file mode 100644
index 0000000000000000000000000000000000000000..85bdd4e3ddcd1eac897302b9bb72818e57c5aa8c
--- /dev/null
+++ b/src/main/java/ai/AIAvatarSpecificationRequired.java
@@ -0,0 +1,58 @@
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ *
+ * ludovic.apvrille AT enst.fr
+ *
+ * This software is a computer program whose purpose is to allow the
+ * edition of TURTLE analysis, design and deployment diagrams, to
+ * allow the generation of RT-LOTOS or Java code from this diagram,
+ * and at last to allow the analysis of formal validation traces
+ * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ * from INRIA Rhone-Alpes.
+ *
+ * This software is governed by the CeCILL license under French law and
+ * abiding by the rules of distribution of free software. You can use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty and the software's author, the holder of the
+ * economic rights, and the successive licensors have only limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading, using, modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean that it is complicated to manipulate, and that also
+ * therefore means that it is reserved for developers and experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and, more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+
+
+package ai;
+
+
+import avatartranslator.AvatarSpecification;
+
+/**
+ * interface AIAvatarSpecificationRequired
+ *
+ * Creation: 15/06/2023
+ * @version 1.0 15/06/2023
+ * @author Ludovic APVRILLE
+ */
+
+
+public interface AIAvatarSpecificationRequired {
+
+ public void setAvatarSpecification(AvatarSpecification _specification);
+
+}
diff --git a/src/main/java/ai/AIStateMachine.java b/src/main/java/ai/AIStateMachine.java
index c090e200d23a6463edac7c195736a3e330ede3b0..a4e5e22df1946b588fca4d4eeaa598dde9cd360f 100644
--- a/src/main/java/ai/AIStateMachine.java
+++ b/src/main/java/ai/AIStateMachine.java
@@ -42,6 +42,7 @@ package ai;
import avatartranslator.AvatarBlock;
import avatartranslator.AvatarSpecification;
+import avatartranslator.tosysmlv2.AVATAR2SysMLV2;
import myutil.TraceManager;
import java.util.ArrayList;
@@ -56,9 +57,9 @@ import java.util.ArrayList;
*/
-public class AIStateMachine extends AIInteract implements AISysMLV2DiagramContent {
+public class AIStateMachine extends AIInteract implements AISysMLV2DiagramContent, AIAvatarSpecificationRequired {
private static String[] SUPPORTED_DIAGRAMS = {"BD"};
- private static String[] EXCLUSIONS_IN_INPUT = {"type"};
+ private static String[] EXCLUSIONS_IN_INPUT = {"state", "method"};
public static String KNOWLEDGE_ON_JSON_FOR_STATE_MACHINES = "When you are asked to identify the SysML state machine of a block, " +
"return them as a JSON specification " +
@@ -75,12 +76,12 @@ public class AIStateMachine extends AIInteract implements AISysMLV2DiagramConten
private String diagramContentInSysMLV2;
- private String[] KNOWLEDGE_SYSTEM_SPECIFICATION = {"The specification of the system is:"};
- private String[] KNOWLEDGE_SYSTEM_BLOCKS = {"The specification of the blocks in SysML V2 is:"};
+ private static String KNOWLEDGE_SYSTEM_SPECIFICATION = "The specification of the system is:";
+ private static String KNOWLEDGE_SYSTEM_BLOCKS = "The specification of the blocks in SysML V2 is:";
private String[] QUESTION_IDENTIFY_STATE_MACHINE = {"From the system specification, and from the definition of blocks and" +
" their " +
- "connections, identify the state machine of block:"};
+ "connections, identify the state machine of block: "};
public AIStateMachine(AIChatData _chatData) {
@@ -99,7 +100,14 @@ public class AIStateMachine extends AIInteract implements AISysMLV2DiagramConten
chatData.aiinterface.addKnowledge(KNOWLEDGE_SYSTEM_BLOCKS + diagramContentInSysMLV2, "ok");
// Getting block names for SysMLV2 spec
- ArrayList<String> blockNames = new ArrayList<>();
+ //TraceManager.addDev("SysML V2 spec: " + diagramContentInSysMLV2);
+ ArrayList<String> blockNames = AVATAR2SysMLV2.getAllBlockNames(diagramContentInSysMLV2);
+
+ TraceManager.addDev("Going to handle the following blocks: ");
+ for(String s: blockNames) {
+ TraceManager.addDev("\tblock: " + s);
+ }
+
boolean done = false;
int cpt = 0;
@@ -107,11 +115,13 @@ public class AIStateMachine extends AIInteract implements AISysMLV2DiagramConten
String questionT;
+
+
for(String blockName: blockNames) {
while (!done && cpt < 3) {
cpt++;
- questionT = QUESTION_IDENTIFY_STATE_MACHINE + blockName;
+ questionT = QUESTION_IDENTIFY_STATE_MACHINE[0] + blockName;
boolean ok = makeQuestion(questionT);
if (!ok) {
@@ -120,7 +130,8 @@ public class AIStateMachine extends AIInteract implements AISysMLV2DiagramConten
}
// Checking if only correct attributes are used, only valid signals, that there is a "Start" state, etc.
- ArrayList<String> errors;
+ // Can be done only if AvatarSpecifcation is non null
+ /*ArrayList<String> errors;
try {
TraceManager.addDev("Making specification from " + chatData.lastAnswer);
specification = AvatarSpecification.fromJSON(extractJSON(), "design", null);
@@ -142,12 +153,12 @@ public class AIStateMachine extends AIInteract implements AISysMLV2DiagramConten
TraceManager.addDev(" Avatar spec=" + specification);
}
- waitIfConditionTrue(!done && cpt < 20);
-
+ waitIfConditionTrue(!done && cpt < 20);*/
+ done = true;
cpt++;
}
}
- TraceManager.addDev("Reached end of AIBlock internal request cpt=" + cpt);
+ TraceManager.addDev("Reached end of AIStateMachine internal request cpt=" + cpt);
}
@@ -159,6 +170,9 @@ public class AIStateMachine extends AIInteract implements AISysMLV2DiagramConten
return specification;
}
+ public void setAvatarSpecification(AvatarSpecification _specification) {
+ specification = _specification;
+ };
public void setDiagramContentInSysMLV2(String _diagramContentInSysMLV2) {
diagramContentInSysMLV2 = _diagramContentInSysMLV2;
diff --git a/src/main/java/avatartranslator/AvatarBlock.java b/src/main/java/avatartranslator/AvatarBlock.java
index 1d44368b2dbc945e3d5a1c3ce0d3fae66cb1fc90..5bbc194b5e4df0cbdd93a99c706a55d07b70846d 100644
--- a/src/main/java/avatartranslator/AvatarBlock.java
+++ b/src/main/java/avatartranslator/AvatarBlock.java
@@ -38,21 +38,22 @@
package avatartranslator;
+import avatartranslator.intboolsolver.AvatarIBSExpressions;
+import avatartranslator.intboolsolver.AvatarIBSolver;
import myutil.NameChecker;
-import myutil.TraceManager;
import myutil.intboolsolver.IBSParamComp;
+import org.json.JSONArray;
+import org.json.JSONObject;
+
+import java.util.*;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
/**
* Class AvatarBlock
* Creation: 20/05/2010
*
* @author Ludovic APVRILLE, Raja GATGOUT
- * @version 1.1 01/07/2014
+ * @version 2.0 15/06/2023
*/
public class AvatarBlock extends AvatarElement implements AvatarStateMachineOwner, NameChecker.NameStartWithUpperCase, IBSParamComp {
@@ -612,7 +613,7 @@ public class AvatarBlock extends AvatarElement implements AvatarStateMachineOwne
}
public String findUniqueSignalName(String inputName) {
- for(AvatarSignal signal: signals) {
+ for (AvatarSignal signal : signals) {
if (signal.getSignalName().compareTo(inputName) == 0) {
return findUniqueSignalName(inputName + "0");
}
@@ -621,7 +622,7 @@ public class AvatarBlock extends AvatarElement implements AvatarStateMachineOwne
}
public String findUniqueAttributeName(String inputName) {
- for(AvatarAttribute attr: attributes) {
+ for (AvatarAttribute attr : attributes) {
if (attr.getName().compareTo(inputName) == 0) {
return findUniqueAttributeName(inputName + "0");
}
@@ -888,7 +889,7 @@ public class AvatarBlock extends AvatarElement implements AvatarStateMachineOwne
toKeep = true;
}
} else if (elt instanceof AvatarLibraryFunctionCall) {
- if ( ((AvatarLibraryFunctionCall)(elt)).getReturnAttributes().contains(attr)) {
+ if (((AvatarLibraryFunctionCall) (elt)).getReturnAttributes().contains(attr)) {
toKeep = true;
}
}
@@ -1003,4 +1004,81 @@ public class AvatarBlock extends AvatarElement implements AvatarStateMachineOwne
}
return nes;
}
+
+ // Returns errors as String
+ public ArrayList<String> makeStateMachineFromJSON(String _jsonSpec) {
+ if (_jsonSpec == null) {
+ return null;
+ }
+
+ asm.clear();
+ asm.makeBasicSM(this);
+
+ ArrayList<String> errors = new ArrayList<>();
+
+ JSONObject mainObject = new JSONObject(_jsonSpec);
+ JSONArray statesJSON = mainObject.getJSONArray("states");
+
+ for (int i = 0; i < statesJSON.length(); i++) {
+ JSONObject state0 = statesJSON.getJSONObject(i);
+ String name = AvatarSpecification.removeSpaces(state0.getString("name"));
+
+ AvatarState sameState = asm.getStateByName(name);
+ if (sameState != null) {
+ errors.add("State " + name + " is defined several times");
+ } else {
+ AvatarState newState = new AvatarState(name, this.getReferenceObject());
+ asm.addElement(newState);
+
+ if (name.toLowerCase(Locale.ROOT).compareTo("start") == 0) {
+ AvatarTransition at = new AvatarTransition(this, "firstTransition", this.getReferenceObject());
+ asm.addElement(at);
+ asm.getStartState().addNext(at);
+ at.addNext(newState);
+ }
+ }
+ }
+ for (int i = 0; i < statesJSON.length(); i++) {
+ JSONObject state0 = statesJSON.getJSONObject(i);
+ String name = AvatarSpecification.removeSpaces(state0.getString("name"));
+ if (name != null) {
+ AvatarState originState = asm.getStateByName(name);
+ if (originState != null) {
+ JSONArray transitionsJSON = state0.getJSONArray("transitions");
+ for (int j = 0; j < transitionsJSON.length(); j++) {
+ JSONObject transitions0 = transitionsJSON.getJSONObject(j);
+ String destinationState = AvatarSpecification.removeSpaces(transitions0.getString("destinationstate"));
+ if (destinationState == null) {
+ errors.add("A transition has no \"destinationstate\"");
+ } else {
+ AvatarState dstState = asm.getStateByName(name);
+ if (dstState == null) {
+ errors.add("A transition has a undefined destination state to state\"" + destinationState + "\"");
+ } else {
+ AvatarTransition at =
+ new AvatarTransition(this, "name" + "_to_" + destinationState, getReferenceObject());
+ asm.addElement(at);
+ originState.addNext(at);
+ at.addNext(dstState);
+
+ // Handling guard, after and action
+ String guard = transitions0.getString("guard");
+ if (guard != null) {
+ // Check if the guard is valid
+ AvatarIBSExpressions.BExpr g = AvatarIBSolver.parseBool(guard);
+ if (g != null) {
+
+ }
+ }
+ }
+
+ }
+ }
+ }
+ }
+ }
+
+
+ return errors;
+ }
}
diff --git a/src/main/java/avatartranslator/AvatarSpecification.java b/src/main/java/avatartranslator/AvatarSpecification.java
index 7cb434b5e8c743679157dcfc42e24fb568be1296..5503647c320575749e8c091c3317e4d30cc5054f 100644
--- a/src/main/java/avatartranslator/AvatarSpecification.java
+++ b/src/main/java/avatartranslator/AvatarSpecification.java
@@ -822,7 +822,7 @@ public class AvatarSpecification extends AvatarElement implements IBSParamSpec {
return jsonErrors;
}
- public String removeSpaces(String _input) {
+ public static String removeSpaces(String _input) {
return _input.trim().replaceAll(" ", "_");
}
diff --git a/src/main/java/avatartranslator/AvatarStateMachine.java b/src/main/java/avatartranslator/AvatarStateMachine.java
index ad47ce96dcf09bfb781826bb8e448fb88dc2d62a..f060dbd991c7438aa4029b90ea6442adc0875974 100644
--- a/src/main/java/avatartranslator/AvatarStateMachine.java
+++ b/src/main/java/avatartranslator/AvatarStateMachine.java
@@ -86,6 +86,13 @@ public class AvatarStateMachine extends AvatarElement {
return cpt;
}
+ public void clear () {
+ elements.clear();
+ startState = null;
+ allStates = null;
+ states = null;
+ }
+
public void makeBasicSM(AvatarStateMachineOwner owner) {
elements.clear();
@@ -233,6 +240,17 @@ public class AvatarStateMachine extends AvatarElement {
}
}
+ public AvatarState getStateByName(String _name) {
+ for(AvatarElement ae: elements) {
+ if (ae instanceof AvatarState) {
+ if (ae.getName().compareTo(_name) == 0) {
+ return (AvatarState) ae;
+ }
+ }
+ }
+ return null;
+ }
+
public void makeAllStates() {
int cpt = 0;
allStates = new AvatarStateElement[getNbOfStatesElement()];
diff --git a/src/main/java/avatartranslator/tosysmlv2/AVATAR2SysMLV2.java b/src/main/java/avatartranslator/tosysmlv2/AVATAR2SysMLV2.java
index 8d82f7f2be6e83788b27b5f0ece1bfdaa09caa81..6dea5719841e824e7102abd0ed6d8030cc62384b 100644
--- a/src/main/java/avatartranslator/tosysmlv2/AVATAR2SysMLV2.java
+++ b/src/main/java/avatartranslator/tosysmlv2/AVATAR2SysMLV2.java
@@ -39,8 +39,11 @@
package avatartranslator.tosysmlv2;
+import java.io.BufferedReader;
import java.io.File;
+import java.util.ArrayList;
import java.util.List;
+import java.util.Scanner;
import java.util.Vector;
import avatartranslator.*;
@@ -93,12 +96,15 @@ public class AVATAR2SysMLV2 {
private final static java.lang.String THEN = "then";
private final static String DEC = "\t";
+ private final static String DEC_METHOD = PRIVATE + " " + METHOD;
+
private AvatarSpecification avspec;
private int timeUnit;
private boolean debug;
private boolean tracing;
+ private String [] exclusions;
private Vector warnings;
@@ -148,12 +154,13 @@ public class AVATAR2SysMLV2 {
}
- public StringBuffer generateSysMLV2Spec(boolean _debug, boolean _tracing) {
+ public StringBuffer generateSysMLV2Spec(boolean _debug, boolean _tracing, String[] _exclusions) {
debug = _debug;
tracing = _tracing;
+ exclusions = _exclusions;
- TraceManager.addDev("AVATAR2SysMLV2 avspec=" + avspec);
+ //TraceManager.addDev("AVATAR2SysMLV2 avspec=" + avspec);
avspec.removeCompositeStates();
avspec.removeLibraryFunctionCalls();
@@ -173,6 +180,36 @@ public class AVATAR2SysMLV2 {
}
+ public boolean isExcluded(String key) {
+ return isExcluded(key, exclusions);
+ }
+
+ public static boolean isExcluded(String key, String []_exclusions) {
+ if (_exclusions == null) {
+ return false;
+ }
+ boolean ret = false;
+
+ for(String s: _exclusions) {
+ if (s.compareTo(key) == 0) {
+ return true;
+ }
+ }
+
+ return ret;
+ }
+
+ private void addIfNotExcluded(StringBuffer sb, String s, String category, String [] exclusions) {
+ if (exclusions != null) {
+ for (int i = 0; i < exclusions.length; i++) {
+ if (exclusions[i].compareTo(category) == 0) {
+ return;
+ }
+ }
+ }
+ sb.append(s);
+ }
+
public void makeBlocks(StringBuffer sysml) {
// Make non father blocks
// For each block, consider the son
@@ -197,8 +234,10 @@ public class AVATAR2SysMLV2 {
public void makePartDef(StringBuffer sysml, AvatarBlock block) {
sysml.append(PART_DEF + " " + getPartDef(block) + B_BRACKET);
- for(AvatarAttribute aa: block.getAttributes()) {
- sysml.append(getAttribute(aa) + END);
+ if (!isExcluded("attributes")) {
+ for (AvatarAttribute aa : block.getAttributes()) {
+ sysml.append(getAttribute(aa) + END);
+ }
}
if (block.getAttributes().size()>0) {
@@ -206,9 +245,12 @@ public class AVATAR2SysMLV2 {
}
// methods
- for(AvatarMethod am: block.getMethods()) {
- //TraceManager.addDev("Handling method:" + am);
- sysml.append(getMethod(am) + END);
+
+ if (!isExcluded("method")) {
+ for (AvatarMethod am : block.getMethods()) {
+ //TraceManager.addDev("Handling method:" + am);
+ sysml.append(getMethod(am) + END);
+ }
}
if (block.getMethods().size()>0) {
@@ -216,9 +258,11 @@ public class AVATAR2SysMLV2 {
}
// signals
- for(AvatarSignal as: block.getSignals()) {
- //TraceManager.addDev("Handling method:" + as);
- sysml.append(getSignal(as) + END);
+ if (!isExcluded("signals")) {
+ for (AvatarSignal as : block.getSignals()) {
+ //TraceManager.addDev("Handling method:" + as);
+ sysml.append(getSignal(as) + END);
+ }
}
// State machine
@@ -272,7 +316,8 @@ public class AVATAR2SysMLV2 {
}
public static String getMethod(AvatarMethod am) {
- java.lang.String ret = PRIVATE + " " + METHOD + " ";
+ java.lang.String ret = DEC_METHOD + " ";
+
ret += am.toString();
return ret;
@@ -306,23 +351,27 @@ public class AVATAR2SysMLV2 {
return ret;
}
- public static StringBuffer getStateMachine(AvatarStateMachine asm) {
+ public StringBuffer getStateMachine(AvatarStateMachine asm) {
StringBuffer ret = new StringBuffer("");
// declare all states
// Then handle each transition from a state until another state is reached
- for(AvatarStateMachineElement asme: asm.getListOfElements()) {
- if (asme instanceof AvatarState) {
- ret.append(STATE + " " + asme.getName() + END);
+ if (!isExcluded("state")) {
+ for (AvatarStateMachineElement asme : asm.getListOfElements()) {
+ if (!isExcluded("state")) {
+ if (asme instanceof AvatarState) {
+ ret.append(STATE + " " + asme.getName() + END);
+ }
+ }
}
- }
- ret.append(CR);
+ ret.append(CR);
- for(AvatarStateMachineElement asme: asm.getListOfElements()) {
- if ((asme instanceof AvatarState) || (asme instanceof AvatarStartState)){
- ret.append(getStateHandling(asme));
+ for (AvatarStateMachineElement asme : asm.getListOfElements()) {
+ if ((asme instanceof AvatarState) || (asme instanceof AvatarStartState)) {
+ ret.append(getStateHandling(asme));
+ }
}
}
@@ -482,6 +531,26 @@ public class AVATAR2SysMLV2 {
return ret;
}
+ public static ArrayList<String> getAllBlockNames(String _spec) {
+ ArrayList<String> listOfBlockNames = new ArrayList<>();
+
+ // Reading spec line and line and looking for:
+ // part <name> :
+ Scanner scanner = new Scanner(_spec);
+ while (scanner.hasNextLine()) {
+ String line = scanner.nextLine().trim();
+ if (line.startsWith("part ")) {
+ line = line.substring(5);
+ int index = line.indexOf(":");
+ if (index > -1) {
+ listOfBlockNames.add(line.substring(0, index).trim());
+ }
+ }
+ }
+
+ return listOfBlockNames;
+ }
+
}
diff --git a/src/main/java/tmltranslator/TMLSyntaxChecking.java b/src/main/java/tmltranslator/TMLSyntaxChecking.java
index e7c3f374e5c761be2fef671645e88e15bdb36e52..8b47bb0f55b948660e4d2a5bb41076e6750708bc 100755
--- a/src/main/java/tmltranslator/TMLSyntaxChecking.java
+++ b/src/main/java/tmltranslator/TMLSyntaxChecking.java
@@ -996,6 +996,8 @@ public class TMLSyntaxChecking {
String s = gen.determineRouting(mapping.getHwNodeOf(ch.getOriginTask()),
mapping.getHwNodeOf(ch.getDestinationTask()), ch);
if (s == null) {
+ TraceManager.addDev(INVALID_ROUTING + ": " + ch.getName() + " between " + ch.getOriginTask().getName() + " and " +
+ ch.getDestinationTask().getName());
addError(ch.getOriginTask(), null, INVALID_ROUTING + ": " + ch.getName() + " between " + ch.getOriginTask().getName() + " and " +
ch.getDestinationTask().getName(), TMLError.ERROR_STRUCTURE);
}
diff --git a/src/main/java/ui/ActivityDiagram2TMLTranslator.java b/src/main/java/ui/ActivityDiagram2TMLTranslator.java
index 4117efae560091caea77e937eb4fed20928827bf..4bdec9e3399abe4e1ca2329cdcb7cc93a66cd089 100644
--- a/src/main/java/ui/ActivityDiagram2TMLTranslator.java
+++ b/src/main/java/ui/ActivityDiagram2TMLTranslator.java
@@ -435,7 +435,7 @@ public class ActivityDiagram2TMLTranslator {
}
} else {
if (!event.hasOriginTask(tmltask)) {
- UICheckingError ce = new UICheckingError(CheckingError.BEHAVIOR_ERROR, ((TMLADReadChannel) tgc).getChannelName() + " is " +
+ UICheckingError ce = new UICheckingError(CheckingError.BEHAVIOR_ERROR, ((TMLADSendEvent) tgc).getEventName() + " is " +
"not an output event of task " + tmltask.getName());
ce.setTDiagramPanel(tadp);
ce.setTGComponent(tgc);
@@ -692,7 +692,7 @@ public class ActivityDiagram2TMLTranslator {
//TraceManager.addDev("Nb of param of event:" + event.getNbOfParams());
if (!event.hasDestinationTask(tmltask)) {
- UICheckingError ce = new UICheckingError(CheckingError.BEHAVIOR_ERROR, ((TMLADReadChannel) tgc).getChannelName() + " is " +
+ UICheckingError ce = new UICheckingError(CheckingError.BEHAVIOR_ERROR, ((TMLADWaitEvent) tgc).getEventName() + " is " +
"not an input event of task " + tmltask.getName());
ce.setTDiagramPanel(tadp);
ce.setTGComponent(tgc);
@@ -768,7 +768,7 @@ public class ActivityDiagram2TMLTranslator {
for (int i = 0; i < channels.length; i++) {
channel = tmlm.getChannelByName(getFromTable(tmltask, channels[i], table));
if (!channel.hasOriginTask(tmltask)) {
- UICheckingError ce = new UICheckingError(CheckingError.BEHAVIOR_ERROR, ((TMLADReadChannel) tgc).getChannelName() + " is " +
+ UICheckingError ce = new UICheckingError(CheckingError.BEHAVIOR_ERROR, ((TMLADWriteChannel) tgc).getChannelName() + " is " +
"not an output channel of task " + tmltask.getName());
ce.setTDiagramPanel(tadp);
ce.setTGComponent(tgc);
diff --git a/src/main/java/ui/GTURTLEModeling.java b/src/main/java/ui/GTURTLEModeling.java
index 646a02a93a3a2fb2ef1e49070762da803161d87e..0cd9e2f23006aefbf5d3261dad0e2972670d3e7a 100644
--- a/src/main/java/ui/GTURTLEModeling.java
+++ b/src/main/java/ui/GTURTLEModeling.java
@@ -2243,7 +2243,7 @@ public class GTURTLEModeling {
public String toSysMLV2() {
if (avatarspec != null) {
AVATAR2SysMLV2 toS = new AVATAR2SysMLV2(avatarspec);
- StringBuffer sb = toS.generateSysMLV2Spec(true, true);
+ StringBuffer sb = toS.generateSysMLV2Spec(true, true, null);
TraceManager.addDev("SysMLV2:\n" + sb.toString());
return sb.toString();
}
diff --git a/src/main/java/ui/avatarbd/AvatarBDPanel.java b/src/main/java/ui/avatarbd/AvatarBDPanel.java
index 14a085f16f292472f14cae31cb9d45b8a6d07d02..39b3ce91672b22386a0bbbb8e882f06095575936 100644
--- a/src/main/java/ui/avatarbd/AvatarBDPanel.java
+++ b/src/main/java/ui/avatarbd/AvatarBDPanel.java
@@ -957,7 +957,7 @@ public class AvatarBDPanel extends TDiagramPanel {
}
AvatarSpecification avspec = mgui.gtm.getAvatarSpecification();
AVATAR2SysMLV2 tosysmlv2 = new AVATAR2SysMLV2(avspec);
- StringBuffer sb = tosysmlv2.generateSysMLV2Spec(false, false);
+ StringBuffer sb = tosysmlv2.generateSysMLV2Spec(false, false, exclusions);
return sb;
}
}
diff --git a/src/main/java/ui/window/JFrameAI.java b/src/main/java/ui/window/JFrameAI.java
index b8716b111de6020542150dbb3281f536ebc33863..0698a3ec20fea76ae4466dc765fec5e601a7f466 100644
--- a/src/main/java/ui/window/JFrameAI.java
+++ b/src/main/java/ui/window/JFrameAI.java
@@ -39,10 +39,7 @@
package ui.window;
-import ai.AIChatData;
-import ai.AIFeedback;
-import ai.AIInteract;
-import ai.AISysMLV2DiagramContent;
+import ai.*;
import avatartranslator.AvatarSpecification;
import help.HelpEntry;
import help.HelpManager;
@@ -326,6 +323,21 @@ public class JFrameAI extends JFrame implements ActionListener {
return;
}
+ if (selected.aiInteract instanceof AIAvatarSpecificationRequired) {
+ TDiagramPanel tdp = mgui.getCurrentMainTDiagramPanel();
+ boolean found = false;
+ if (tdp instanceof AvatarBDPanel) {
+ found = true;
+ }
+
+ if (found) {
+ boolean ret = mgui.checkModelingSyntax(true);
+ if (ret) {
+ ((AIAvatarSpecificationRequired) (selected.aiInteract)).setAvatarSpecification(mgui.gtm.getAvatarSpecification());
+ }
+ }
+ }
+
if (selected.aiInteract instanceof AISysMLV2DiagramContent) {
TDiagramPanel tdp = mgui.getCurrentTDiagramPanel();
String[] validDiagrams = ((AISysMLV2DiagramContent)(selected.aiInteract)).getValidDiagrams();
@@ -646,9 +658,9 @@ public class JFrameAI extends JFrame implements ActionListener {
public void addToChat(String data, boolean user) {
if (user) {
- GraphicLib.appendToPane(chatOfStart().answer, "\nTTool:" + data + "\n", Color.blue);
+ GraphicLib.appendToPane(chatOfStart().answer, "\nTTool: " + data + "\n", Color.blue);
} else {
- GraphicLib.appendToPane(chatOfStart().answer, "\nAI:" + data + "\n", Color.red);
+ GraphicLib.appendToPane(chatOfStart().answer, "\nAI: " + data + "\n", Color.red);
}
}
diff --git a/ttool/src/test/java/ui/TDiagramPanelCloneArchitectureTest.java b/ttool/src/test/java/ui/TDiagramPanelCloneArchitectureTest.java
index fd3dcfe2d7893b971e6a1e79dc93d289db1fe449..af79c9d97392bec02cff6f88f8168829ace3627f 100644
--- a/ttool/src/test/java/ui/TDiagramPanelCloneArchitectureTest.java
+++ b/ttool/src/test/java/ui/TDiagramPanelCloneArchitectureTest.java
@@ -40,8 +40,10 @@
package ui;
import myutil.TraceManager;
+import org.apache.batik.anim.timing.Trace;
import org.junit.*;
import tmltranslator.*;
+import translator.CheckingError;
import ui.tmldd.TMLArchiDiagramPanel;
import java.io.*;
@@ -82,12 +84,14 @@ public class TDiagramPanelCloneArchitectureTest extends AbstractUITest {
super();
// Open expected model
+ TraceManager.addDev("*** Opening model");
mainGUI.openProjectFromFile(new File(EXPECTED_FILE_MODEL));
for(TURTLEPanel _tab : mainGUI.getTabs()) {
if(_tab instanceof TMLArchiPanel) {
for (TDiagramPanel tdp : _tab.getPanels()) {
if (tdp instanceof TMLArchiDiagramPanel) {
+ TraceManager.addDev("*** Selecting tdp TMLArchiDiagramPanel");
mainGUI.selectTab(tdp);
break;
}
@@ -96,16 +100,23 @@ public class TDiagramPanelCloneArchitectureTest extends AbstractUITest {
}
}
+ waiting();
+ TraceManager.addDev("*** Checking modeling syntax");
mainGUI.checkModelingSyntax(true);
+ TraceManager.addDev("*** Checking modeling syntax: done");
tmlMapping_exp = mainGUI.gtm.getTMLMapping();
+ TraceManager.addDev("*** Got mapping");
+
// Open testing model
+ TraceManager.addDev("*** Opening testing model");
mainGUI.openProjectFromFile(new File(RESOURCES_DIR));
}
@Before
public void setUp() {
+ TraceManager.addDev("*** Setup");
for(TURTLEPanel _tab : mainGUI.getTabs()) {
if(_tab instanceof TMLArchiPanel) {
for (TDiagramPanel tdp : _tab.getPanels()) {
@@ -123,7 +134,7 @@ public class TDiagramPanelCloneArchitectureTest extends AbstractUITest {
for (TGComponent tgc : architecture_clone.getAllComponentList()) {
- if (tgc.getName().equals("CPU1")) {
+ if (tgc.getName().equals("CPU0")) {
CPU_Cl = tgc;
}
@@ -155,14 +166,26 @@ public class TDiagramPanelCloneArchitectureTest extends AbstractUITest {
}
public void cloneHwNodesOfTestingModel(){
+
+ TraceManager.addDev("clone bus");
+ architecture_clone.cloneComponent(Bus_Cl);
+ for (TGComponent tgc : architecture_clone.getComponentList()) {
+ if (tgc.getName().equals("Bus0")) {
+ tgc.setName("Bus1");
+ break;
+ }
+ }
+
+ TraceManager.addDev("clone CPUs");
architecture_clone.cloneComponent(CPU_Cl);
for (TGComponent tgc : architecture_clone.getComponentList()) {
- if (tgc.getName().equals("CPU1")) {
- tgc.setName("CPU2");
+ if (tgc.getName().equals("CPU0")) {
+ tgc.setName("CPU1");
break;
}
}
+ TraceManager.addDev("clone FPGAs");
architecture_clone.cloneComponent(FPGA_Cl);
for (TGComponent tgc : architecture_clone.getComponentList()) {
if (tgc.getName().equals("FPGA0")) {
@@ -171,6 +194,7 @@ public class TDiagramPanelCloneArchitectureTest extends AbstractUITest {
}
}
+ TraceManager.addDev("clone Bridges");
architecture_clone.cloneComponent(Bridge_Cl);
for (TGComponent tgc : architecture_clone.getComponentList()) {
if (tgc.getName().equals("Bridge0")) {
@@ -179,14 +203,9 @@ public class TDiagramPanelCloneArchitectureTest extends AbstractUITest {
}
}
- architecture_clone.cloneComponent(Bus_Cl);
- for (TGComponent tgc : architecture_clone.getComponentList()) {
- if (tgc.getName().equals("Bus0")) {
- tgc.setName("Bus1");
- break;
- }
- }
+
+ TraceManager.addDev("clone DMA");
architecture_clone.cloneComponent(DMA_Cl);
for (TGComponent tgc : architecture_clone.getComponentList()) {
if (tgc.getName().equals("DMA0")) {
@@ -195,6 +214,7 @@ public class TDiagramPanelCloneArchitectureTest extends AbstractUITest {
}
}
+ TraceManager.addDev("clone Memory");
architecture_clone.cloneComponent(Memory_Cl);
for (TGComponent tgc : architecture_clone.getComponentList()) {
if (tgc.getName().equals("Memory0")) {
@@ -203,6 +223,7 @@ public class TDiagramPanelCloneArchitectureTest extends AbstractUITest {
}
}
+ TraceManager.addDev("clone HWA");
architecture_clone.cloneComponent(HWA_Cl);
for (TGComponent tgc : architecture_clone.getComponentList()) {
if (tgc.getName().equals("HWA0")) {
@@ -217,10 +238,35 @@ public class TDiagramPanelCloneArchitectureTest extends AbstractUITest {
@Test
public void testTMLMapping() {
- cloneHwNodesOfTestingModel();
- mainGUI.checkModelingSyntax(true);
- TMLMapping tmlMapping_clone = mainGUI.gtm.getTMLMapping();
- assertTrue(tmlMapping_clone.equalSpec(tmlMapping_exp));
+ try {
+ TraceManager.addDev("*** Clone");
+ cloneHwNodesOfTestingModel();
+ TraceManager.addDev("*** Check syntax");
+ waiting();
+ mainGUI.checkModelingSyntax(true);
+ for(CheckingError ce: mainGUI.gtm.getCheckingErrors()) {
+ TraceManager.addDev("Error: " + ce.getMessage());
+ }
+ TraceManager.addDev("*** Getting mapping");
+ TMLMapping tmlMapping_clone = mainGUI.gtm.getTMLMapping();
+
+ TraceManager.addDev("*** Comparing spec");
+ //assertNotNull(tmlMapping_clone);
+ //assertNotNull(tmlMapping_exp);
+ assertTrue(tmlMapping_clone.equalSpec(tmlMapping_exp));
+
+ } catch (Exception e) {
+ TraceManager.addDev("Exception: " + e.getClass() + " / " + e.getMessage());
+ //assertTrue(false);
+ }
+ }
+
+ public void waiting() {
+ try {
+ Thread.currentThread().sleep(5000);
+ } catch (Exception e) {
+
+ }
}
}
\ No newline at end of file
diff --git a/ttool/src/test/resources/ui/diagram2tml/expected/Expected_CloneArchitecture.xml b/ttool/src/test/resources/ui/diagram2tml/expected/Expected_CloneArchitecture.xml
index cc9752d03c7e5505e3fc14a980fb24579eb03760..337b2c105ac2f5d7076141744686013ab1e6b195 100644
--- a/ttool/src/test/resources/ui/diagram2tml/expected/Expected_CloneArchitecture.xml
+++ b/ttool/src/test/resources/ui/diagram2tml/expected/Expected_CloneArchitecture.xml
@@ -1,55 +1,61 @@
<?xml version="1.0" encoding="UTF-8"?>
-<TURTLEGMODELING version="1.0beta" ANIMATE_INTERACTIVE_SIMULATION="true" ACTIVATE_PENALTIES="false" UPDATE_INFORMATION_DIPLO_SIM="false" ANIMATE_WITH_INFO_DIPLO_SIM="true" OPEN_DIAG_DIPLO_SIM="false" LAST_SELECTED_MAIN_TAB="1" LAST_SELECTED_SUB_TAB="0">
+<TURTLEGMODELING version="3.0 beta" ANIMATE_INTERACTIVE_SIMULATION="true" ACTIVATE_PENALTIES="false" UPDATE_INFORMATION_DIPLO_SIM="false" ANIMATE_WITH_INFO_DIPLO_SIM="true" OPEN_DIAG_DIPLO_SIM="false" LAST_SELECTED_MAIN_TAB="1" LAST_SELECTED_SUB_TAB="0">
<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="1" >
+<TMLComponentTaskDiagramPanel name="TML Component Task Diagram" minX="10" maxX="2500" minY="10" maxY="1500" channels="true" events="true" requests="true" considerExecOperators="true" considerTimingOperators="true" zoom="1.0" >
+<CONNECTOR type="126" id="1" index="0" uid="8af87575-53c2-4120-b0db-84b500bea74d" >
<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="45" />
-<P2 x="514" y="364" id="56" />
+<P1 x="467" y="365" id="17" />
+<P2 x="514" y="364" id="6" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<CONNECTOR type="126" id="2" >
+<CONNECTOR type="126" id="2" index="1" uid="6eaa1d57-6f3e-4fb4-9953-fdfe00c4cd48" >
<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="6" />
-<P2 x="430" y="163" id="19" />
+<P1 x="564" y="164" id="65" />
+<P2 x="430" y="163" id="52" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<CONNECTOR type="126" id="3" >
+<CONNECTOR type="126" id="3" index="2" uid="9ae8855a-43d0-4675-8566-17bc075b216b" >
<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="21" />
-<P2 x="564" y="209" id="8" />
+<P1 x="430" y="208" id="50" />
+<P2 x="564" y="209" id="63" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<CONNECTOR type="126" id="4" >
+<CONNECTOR type="126" id="4" index="3" uid="5540bfdf-bfe6-4e77-bf70-be1228df1193" >
<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="32" />
-<P2 x="521" y="585" id="34" />
+<P1 x="424" y="585" id="30" />
+<P2 x="521" y="585" id="28" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<CONNECTOR type="126" id="5" >
+<CONNECTOR type="126" id="5" index="4" uid="62da8f8f-9a21-4d38-bf5f-53e5a1dcf114" >
<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="1144" y="348" id="87" />
-<P2 x="1144" y="405" id="85" />
+<P1 x="1144" y="348" id="85" />
+<P2 x="1144" y="405" id="87" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<COMPONENT type="1200" id="84" >
+<COMPONENT type="1200" id="84" index="5" uid="bdc6328e-613b-47e8-a65a-b0948d4795d7" >
<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" />
+<new d="false" />
<TGConnectingPoint num="0" id="76" />
<TGConnectingPoint num="1" id="77" />
<TGConnectingPoint num="2" id="78" />
@@ -62,35 +68,57 @@
<info hiddeni="false" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1202" id="18" >
+<SUBCOMPONENT type="1200" id="49" index="7" uid="e2d36680-1d0d-4df5-b752-a314076f7a03" >
<father id="84" num="0" />
-<cdparam x="577" y="116" />
+<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" />
+<new d="false" />
+<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="16" index="8" uid="e91ee19d-9fd5-436c-8bf0-d92cb50fd35d" >
+<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="472" minY="0" maxY="468" />
-<infoparam name="Primitive component" value="PrimitiveComp2" />
-<TGConnectingPoint num="0" id="10" />
-<TGConnectingPoint num="1" id="11" />
-<TGConnectingPoint num="2" id="12" />
-<TGConnectingPoint num="3" id="13" />
-<TGConnectingPoint num="4" id="14" />
-<TGConnectingPoint num="5" id="15" />
-<TGConnectingPoint num="6" id="16" />
-<TGConnectingPoint num="7" id="17" />
+<cdrectangleparam minX="0" maxX="271" minY="0" maxY="179" />
+<infoparam name="Primitive component" value="PrimitiveComp4" />
+<new d="false" />
+<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" daemon="false" Operation="" />
+<Data isAttacker="No" daemon="false" periodic="false" periodValue="" unit="" Operation="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="7" >
-<father id="18" num="0" />
-<cdparam x="564" y="151" />
+<SUBCOMPONENT type="1203" id="7" index="9" uid="e8486078-3d29-48a1-93bd-bf4ff700b99a" >
+<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 channel" />
+<infoparam name="Primitive port" value="Channel channel2" />
+<new d="false" />
<TGConnectingPoint num="0" id="6" />
<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" />
+<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="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -98,16 +126,37 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="9" >
-<father id="18" num="1" />
-<cdparam x="564" y="196" />
+<SUBCOMPONENT type="1202" id="27" index="10" uid="829825e5-abad-4218-a82c-61022d5419fb" >
+<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" />
+<new d="false" />
+<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" daemon="false" periodic="false" periodValue="" unit="" Operation="" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1203" id="18" index="11" uid="5d049a90-7016-48a4-ba97-4c0b85b08c47" >
+<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="187" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Event event" />
-<TGConnectingPoint num="0" id="8" />
+<cdrectangleparam minX="-13" maxX="156" minY="-13" maxY="137" />
+<infoparam name="Primitive port" value="Channel channel2" />
+<new d="false" />
+<TGConnectingPoint num="0" id="17" />
<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" />
+<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="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -115,35 +164,39 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1202" id="31" >
-<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" />
+<SUBCOMPONENT type="1202" id="40" index="12" uid="fc1a53f0-4458-4c59-b485-23612a03969a" >
+<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="472" minY="0" maxY="468" />
-<infoparam name="Primitive component" value="PrimitiveComp1" />
-<TGConnectingPoint num="0" id="23" />
-<TGConnectingPoint num="1" id="24" />
-<TGConnectingPoint num="2" id="25" />
-<TGConnectingPoint num="3" id="26" />
-<TGConnectingPoint num="4" id="27" />
-<TGConnectingPoint num="5" id="28" />
-<TGConnectingPoint num="6" id="29" />
-<TGConnectingPoint num="7" id="30" />
+<cdrectangleparam minX="0" maxX="302" minY="0" maxY="248" />
+<infoparam name="Primitive component" value="PrimitiveComp5" />
+<new d="false" />
+<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" daemon="false" Operation="" />
+<Data isAttacker="No" daemon="false" periodic="false" periodValue="" unit="" Operation="" />
+<Attribute access="2" id="attr1" value="" type="0" typeOther="" />
+<Attribute access="2" id="attr2" value="" type="4" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="20" >
-<father id="31" num="0" />
-<cdparam x="404" y="150" />
+<SUBCOMPONENT type="1203" id="29" index="13" uid="8e7f4945-423e-4b7d-acb7-06af8a5765d1" >
+<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="187" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Channel channel" />
-<TGConnectingPoint num="0" id="19" />
+<cdrectangleparam minX="-13" maxX="156" minY="-13" maxY="68" />
+<infoparam name="Primitive port" value="Channel channel3" />
+<new d="false" />
+<TGConnectingPoint num="0" id="28" />
<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" />
+<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="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -151,16 +204,17 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="22" >
-<father id="31" num="1" />
-<cdparam x="404" y="195" />
+<SUBCOMPONENT type="1203" id="31" index="14" uid="2087d163-0718-4d80-bc1f-1805b5cf2aeb" >
+<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="187" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Event event" />
-<TGConnectingPoint num="0" id="21" />
+<cdrectangleparam minX="-13" maxX="156" minY="-13" maxY="68" />
+<infoparam name="Primitive port" value="Channel channel3" />
+<new d="false" />
+<TGConnectingPoint num="0" id="30" />
<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" />
+<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="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -168,56 +222,37 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1200" id="75" >
-<father id="84" num="2" />
-<cdparam x="266" y="278" />
-<sizeparam width="471" height="329" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1202" id="62" index="15" uid="4db79aba-1ba9-4f33-9ac2-b3b612e98569" >
+<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="201" minY="0" maxY="289" />
-<infoparam name="Composite component" value="CompositeComp2" />
-<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" />
+<cdrectangleparam minX="0" maxX="472" minY="0" maxY="468" />
+<infoparam name="Primitive component" value="PrimitiveComp1" />
+<new d="false" />
+<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>
-<info hiddeni="false" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1202" id="44" >
-<father id="75" num="0" />
-<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="36" />
-<TGConnectingPoint num="1" id="37" />
-<TGConnectingPoint num="2" id="38" />
-<TGConnectingPoint num="3" id="39" />
-<TGConnectingPoint num="4" id="40" />
-<TGConnectingPoint num="5" id="41" />
-<TGConnectingPoint num="6" id="42" />
-<TGConnectingPoint num="7" id="43" />
-<extraparam>
-<Data isAttacker="No" daemon="false" Operation="" />
-<Attribute access="2" id="attr1" value="" type="0" typeOther="" />
-<Attribute access="2" id="attr2" value="" type="4" typeOther="" />
+<Data isAttacker="No" daemon="false" periodic="false" periodValue="" unit="" Operation="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="33" >
-<father id="44" num="0" />
-<cdparam x="411" y="559" />
+<SUBCOMPONENT type="1203" id="51" index="16" uid="e673fdfe-6070-4285-9c15-54bc5bc5201b" >
+<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="156" minY="-13" maxY="68" />
-<infoparam name="Primitive port" value="Channel channel3" />
-<TGConnectingPoint num="0" id="32" />
+<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
+<infoparam name="Primitive port" value="Event event" />
+<new d="false" />
+<TGConnectingPoint num="0" id="50" />
<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" />
+<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="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -225,16 +260,17 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="35" >
-<father id="44" num="1" />
-<cdparam x="508" y="559" />
+<SUBCOMPONENT type="1203" id="53" index="17" uid="f5076fbb-a6e2-4e8a-820b-3e3eb8f63fd1" >
+<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="156" minY="-13" maxY="68" />
-<infoparam name="Primitive port" value="Channel channel3" />
-<TGConnectingPoint num="0" id="34" />
+<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
+<infoparam name="Primitive port" value="Channel channel" />
+<new d="false" />
+<TGConnectingPoint num="0" id="52" />
<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" />
+<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="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -242,35 +278,37 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1202" id="55" >
-<father id="75" num="1" />
-<cdparam x="285" y="318" />
-<sizeparam width="169" height="150" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1202" id="75" index="18" uid="3c9e82b2-dd04-4497-adcf-5dcb8d880801" >
+<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="302" minY="0" maxY="179" />
-<infoparam name="Primitive component" value="PrimitiveComp3" />
-<TGConnectingPoint num="0" id="47" />
-<TGConnectingPoint num="1" id="48" />
-<TGConnectingPoint num="2" id="49" />
-<TGConnectingPoint num="3" id="50" />
-<TGConnectingPoint num="4" id="51" />
-<TGConnectingPoint num="5" id="52" />
-<TGConnectingPoint num="6" id="53" />
-<TGConnectingPoint num="7" id="54" />
+<cdrectangleparam minX="0" maxX="472" minY="0" maxY="468" />
+<infoparam name="Primitive component" value="PrimitiveComp2" />
+<new d="false" />
+<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" daemon="false" Operation="" />
+<Data isAttacker="No" daemon="false" periodic="false" periodValue="" unit="" Operation="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="46" >
-<father id="55" num="0" />
-<cdparam x="441" y="352" />
+<SUBCOMPONENT type="1203" id="64" index="19" uid="96e91aae-3fc4-4722-864f-2444780eae50" >
+<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="156" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Channel channel2" />
-<TGConnectingPoint num="0" id="45" />
+<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
+<infoparam name="Primitive port" value="Event event" />
+<new d="false" />
+<TGConnectingPoint num="0" id="63" />
<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" />
+<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="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -278,35 +316,17 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1202" id="66" >
-<father id="75" num="2" />
-<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="58" />
-<TGConnectingPoint num="1" id="59" />
-<TGConnectingPoint num="2" id="60" />
-<TGConnectingPoint num="3" id="61" />
-<TGConnectingPoint num="4" id="62" />
-<TGConnectingPoint num="5" id="63" />
-<TGConnectingPoint num="6" id="64" />
-<TGConnectingPoint num="7" id="65" />
-<extraparam>
-<Data isAttacker="No" daemon="false" Operation="" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="57" >
-<father id="66" num="0" />
-<cdparam x="514" y="351" />
+<SUBCOMPONENT type="1203" id="66" index="20" uid="6d581041-66af-4870-b447-b26a5243dc58" >
+<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 channel2" />
-<TGConnectingPoint num="0" id="56" />
+<infoparam name="Primitive port" value="Channel channel" />
+<new d="false" />
+<TGConnectingPoint num="0" id="65" />
<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" />
+<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="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -315,12 +335,13 @@
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1202" id="97" >
+<COMPONENT type="1202" id="97" index="6" uid="3a86c2ce-22bf-4998-8626-4ff0ed7588b8" >
<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="PrimitiveComp6" />
+<new d="false" />
<TGConnectingPoint num="0" id="89" />
<TGConnectingPoint num="1" id="90" />
<TGConnectingPoint num="2" id="91" />
@@ -330,19 +351,20 @@
<TGConnectingPoint num="6" id="95" />
<TGConnectingPoint num="7" id="96" />
<extraparam>
-<Data isAttacker="No" daemon="false" Operation="" />
+<Data isAttacker="No" daemon="false" periodic="false" periodValue="" unit="" Operation="" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1203" id="86" >
+<SUBCOMPONENT type="1203" id="86" index="21" uid="e4221584-3b2c-4de6-aefa-619498d06f4c" >
<father id="97" num="0" />
-<cdparam x="1118" y="392" />
+<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" />
+<new d="false" />
<TGConnectingPoint num="0" id="85" />
<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" />
+<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="" />
@@ -350,16 +372,17 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="88" >
+<SUBCOMPONENT type="1203" id="88" index="22" uid="65f1365b-f30f-4fe1-a019-0342eb1b2247" >
<father id="97" num="1" />
-<cdparam x="1118" y="335" />
+<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" />
+<new d="false" />
<TGConnectingPoint num="0" id="87" />
<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" />
+<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="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -371,32 +394,35 @@
</TMLComponentTaskDiagramPanel>
-<TMLActivityDiagramPanel name="PrimitiveComp2" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="1001" id="99" >
+<TMLActivityDiagramPanel name="PrimitiveComp2" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0" >
+<COMPONENT type="1001" id="99" index="0" uid="6da0a508-4dda-4300-b097-c077740eb33d" >
<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" />
+<new d="false" />
<TGConnectingPoint num="0" id="98" />
</COMPONENT>
-<COMPONENT type="1001" id="101" >
+<COMPONENT type="1001" id="101" index="1" uid="5052f597-5b12-491f-b6c0-a67435ee92c0" >
<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" />
+<new d="false" />
<TGConnectingPoint num="0" id="100" />
</COMPONENT>
-<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" />
+<COMPONENT type="1010" id="104" index="2" uid="606c5322-1c3f-49ca-852a-4f4145cff274" >
+<cdparam x="494" y="302" />
+<sizeparam width="73" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="wait event" value="event() " />
+<new d="false" />
<TGConnectingPoint num="0" id="102" />
<TGConnectingPoint num="1" id="103" />
<extraparam>
@@ -404,13 +430,14 @@
</extraparam>
</COMPONENT>
-<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" />
+<COMPONENT type="1009" id="107" index="3" uid="bfb5405c-d248-465c-b36d-5faa9e202e59" >
+<cdparam x="360" y="296" />
+<sizeparam width="94" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="read channel" value="channel(1) " />
+<new d="false" />
<TGConnectingPoint num="0" id="105" />
<TGConnectingPoint num="1" id="106" />
<extraparam>
@@ -418,52 +445,57 @@
</extraparam>
</COMPONENT>
-<COMPONENT type="1012" id="115" >
+<COMPONENT type="1012" id="115" index="4" uid="6ad3c6cd-468c-4d98-890c-aa5d527e6576" >
<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" />
+<new d="false" />
<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="108" >
+<SUBCOMPONENT type="-1" id="108" index="11" uid="dd4b5e53-45ec-41ad-b545-fd8bec711a48" >
<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" />
+<sizeparam width="12" 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="[ ]" />
+<new d="false" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="109" >
+<SUBCOMPONENT type="-1" id="109" index="12" uid="3929520b-7003-4dba-82d7-f71d0ece4581" >
<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" />
+<sizeparam width="12" 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="[ ]" />
+<new d="false" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="110" >
+<SUBCOMPONENT type="-1" id="110" index="13" uid="bec35e0a-6dca-4133-9301-ddb39dca0d0a" >
<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" />
+<sizeparam width="12" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
<infoparam name="guard 3" value="[ ]" />
+<new d="false" />
</SUBCOMPONENT>
-<COMPONENT type="1000" id="117" >
+<COMPONENT type="1000" id="117" index="5" uid="37dda326-c0b2-4496-b00d-0f9840e63091" >
<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" />
+<new d="false" />
<TGConnectingPoint num="0" id="116" />
</COMPONENT>
-<CONNECTOR type="115" id="119" >
+<CONNECTOR type="115" id="119" index="6" uid="5daf4b58-3419-4731-8c8f-b3c5e54f295e" >
<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" />
@@ -471,835 +503,920 @@
<P2 x="530" y="297" id="102" />
<Point x="530" y="243" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="118" >
+<new d="false" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="118" index="14" uid="64ecfa0e-7eae-4c39-8747-3a4e4417ebc6" >
<father id="119" num="0" />
<cdparam x="530" y="243" />
-<sizeparam width="1" height="1" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="8" 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="point " value="null" />
+<new d="false" />
</SUBCOMPONENT>
-<CONNECTOR type="115" id="120" >
+<CONNECTOR type="115" id="120" index="7" uid="59835080-28bc-41f5-8239-6da04e4c05cc" >
<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="116" />
-<P2 x="407" y="165" id="111" />
+<P1 x="407" y="70" id="116" />
+<P2 x="407" y="170" id="111" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<CONNECTOR type="115" id="121" >
+<CONNECTOR type="115" id="121" index="8" uid="e7ffdc40-14ff-4666-87bf-2d77c17a56ff" >
<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="114" />
<P2 x="407" y="291" id="105" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<CONNECTOR type="115" id="122" >
+<CONNECTOR type="115" id="122" index="9" uid="998308d3-a352-4605-9f98-afa91310ff1c" >
<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="106" />
<P2 x="407" y="413" id="100" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<CONNECTOR type="115" id="123" >
+<CONNECTOR type="115" id="123" index="10" uid="a955f4ea-3d8e-4a37-8402-31b754d059cb" >
<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="103" />
<P2 x="530" y="411" id="98" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
</TMLActivityDiagramPanel>
-<TMLActivityDiagramPanel name="PrimitiveComp1" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="1001" id="131" >
+<TMLActivityDiagramPanel name="PrimitiveComp1" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0" >
+<COMPONENT type="1001" id="125" index="0" uid="b88edb2d-2cb4-429b-9b78-e06c94723bb3" >
<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="130" />
+<new d="false" />
+<TGConnectingPoint num="0" id="124" />
</COMPONENT>
-<COMPONENT type="1001" id="133" >
+<COMPONENT type="1001" id="127" index="1" uid="03920b3d-811a-4c78-b49a-8b6443997d3f" >
<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="132" />
+<new d="false" />
+<TGConnectingPoint num="0" id="126" />
</COMPONENT>
-<COMPONENT type="1008" id="136" >
+<COMPONENT type="1008" id="130" index="2" uid="e5bf9c4e-c3a5-486a-8b3b-7313f4ec92c2" >
<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="134" />
-<TGConnectingPoint num="1" id="135" />
+<new d="false" />
+<TGConnectingPoint num="0" id="128" />
+<TGConnectingPoint num="1" id="129" />
<extraparam>
<Data eventName="event" nbOfParams="5" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1006" id="139" >
+<COMPONENT type="1006" id="133" index="3" uid="2c251e3c-2333-455f-8373-55ebfc48248e" >
<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="137" />
-<TGConnectingPoint num="1" id="138" />
+<new d="false" />
+<TGConnectingPoint num="0" id="131" />
+<TGConnectingPoint num="1" id="132" />
<extraparam>
<Data channelName="channel" nbOfSamples="1" secPattern="" isAttacker="Yes" isEncForm="Yes" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1012" id="147" >
+<COMPONENT type="1012" id="141" index="4" uid="1d7d565f-2054-4df3-a5d5-8159729b0f2a" >
<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="143" />
-<TGConnectingPoint num="1" id="144" />
-<TGConnectingPoint num="2" id="145" />
-<TGConnectingPoint num="3" id="146" />
+<new d="false" />
+<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="140" >
-<father id="147" num="0" />
+<SUBCOMPONENT type="-1" id="134" index="11" uid="0722c79d-59eb-4a46-bbea-bd98095edc0a" >
+<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="[ ]" />
+<new d="false" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="141" >
-<father id="147" num="1" />
+<SUBCOMPONENT type="-1" id="135" index="12" uid="579ec11e-4b31-40c7-af70-7a626d8705a8" >
+<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="[ ]" />
+<new d="false" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="142" >
-<father id="147" num="2" />
+<SUBCOMPONENT type="-1" id="136" index="13" uid="fac25b09-dc84-401e-bf7d-312bcd9ce5d2" >
+<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" />
<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
<infoparam name="guard 3" value="[ ]" />
+<new d="false" />
</SUBCOMPONENT>
-<COMPONENT type="1000" id="149" >
+<COMPONENT type="1000" id="143" index="5" uid="f47bee01-bd2b-493c-bcb2-baec2dc8aaf5" >
<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="148" />
+<new d="false" />
+<TGConnectingPoint num="0" id="142" />
</COMPONENT>
-<CONNECTOR type="115" id="151" >
+<CONNECTOR type="115" id="145" index="6" uid="1a3f837f-abc6-40b9-8208-a304dcc0e2a1" >
<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="144" />
-<P2 x="312" y="321" id="134" />
+<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="150" >
-<father id="151" num="0" />
+<new d="false" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="144" index="14" uid="de9f56b4-0d92-45b6-84d7-8071f286b56c" >
+<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" />
+<sizeparam width="8" height="8" 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="point " value="null" />
+<new d="false" />
</SUBCOMPONENT>
-<CONNECTOR type="115" id="152" >
+<CONNECTOR type="115" id="146" index="7" uid="f807f97c-2419-469b-9c39-4cc2419ae4c1" >
<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="148" />
-<P2 x="407" y="173" id="143" />
+<P1 x="407" y="70" id="142" />
+<P2 x="407" y="178" id="137" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<CONNECTOR type="115" id="153" >
+<CONNECTOR type="115" id="147" index="8" uid="4c4ed793-4c7b-4ea3-a9f4-961a872864b0" >
<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="146" />
-<P2 x="407" y="319" id="137" />
+<P1 x="407" y="238" id="140" />
+<P2 x="407" y="319" id="131" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<CONNECTOR type="115" id="154" >
+<CONNECTOR type="115" id="148" index="9" uid="1e31d99c-0a8c-44eb-9515-6358d140d447" >
<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="135" />
-<P2 x="312" y="439" id="132" />
+<P1 x="312" y="351" id="129" />
+<P2 x="312" y="439" id="126" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<CONNECTOR type="115" id="155" >
+<CONNECTOR type="115" id="149" index="10" uid="86d1ce02-8ce7-42f7-9c0b-975ef7be7f07" >
<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="138" />
-<P2 x="407" y="435" id="130" />
+<P1 x="407" y="349" id="132" />
+<P2 x="407" y="435" id="124" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
</TMLActivityDiagramPanel>
-<TMLActivityDiagramPanel name="PrimitiveComp3" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="1001" id="157" >
+<TMLActivityDiagramPanel name="PrimitiveComp3" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0" >
+<COMPONENT type="1001" id="151" index="0" uid="748c85f2-11f4-41bf-8fca-0998d2b100aa" >
<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="156" />
+<new d="false" />
+<TGConnectingPoint num="0" id="150" />
</COMPONENT>
-<COMPONENT type="1006" id="160" >
-<cdparam x="364" y="143" />
-<sizeparam width="86" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1006" id="154" index="1" uid="3acc3f6a-f36e-4913-8585-c907854f5095" >
+<cdparam x="358" y="143" />
+<sizeparam width="98" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="write channel" value="channel2(1)" />
-<TGConnectingPoint num="0" id="158" />
-<TGConnectingPoint num="1" id="159" />
+<new d="false" />
+<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="162" >
+<COMPONENT type="1000" id="156" index="2" uid="e61a5b8a-4861-43c8-b270-f5d40b49832e" >
<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="161" />
+<new d="false" />
+<TGConnectingPoint num="0" id="155" />
</COMPONENT>
-<CONNECTOR type="115" id="163" >
+<CONNECTOR type="115" id="157" index="3" uid="4187df15-8622-4d30-a967-56cc0af3b892" >
<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="159" />
-<P2 x="407" y="264" id="156" />
+<P1 x="407" y="168" id="153" />
+<P2 x="407" y="264" id="150" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<CONNECTOR type="115" id="164" >
+<CONNECTOR type="115" id="158" index="4" uid="2516b79f-9c25-4519-9541-bc17643230e6" >
<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="161" />
-<P2 x="407" y="138" id="158" />
+<P1 x="407" y="70" id="155" />
+<P2 x="407" y="138" id="152" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
</TMLActivityDiagramPanel>
-<TMLActivityDiagramPanel name="PrimitiveComp4" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="1001" id="166" >
+<TMLActivityDiagramPanel name="PrimitiveComp4" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0" >
+<COMPONENT type="1001" id="160" index="0" uid="dc3afcd5-2dea-40be-96d8-0993533d51cd" >
<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="165" />
+<new d="false" />
+<TGConnectingPoint num="0" id="159" />
</COMPONENT>
-<COMPONENT type="1009" id="169" >
-<cdparam x="362" y="162" />
-<sizeparam width="90" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1009" id="163" index="1" uid="3d77c356-82c1-4d0d-a965-be3618022238" >
+<cdparam x="356" y="162" />
+<sizeparam width="102" 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="167" />
-<TGConnectingPoint num="1" id="168" />
+<new d="false" />
+<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="171" >
+<COMPONENT type="1000" id="165" index="2" uid="1efd63ee-fe3e-49d8-9777-5c9d6370bbb2" >
<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="170" />
+<new d="false" />
+<TGConnectingPoint num="0" id="164" />
</COMPONENT>
-<CONNECTOR type="115" id="172" >
+<CONNECTOR type="115" id="166" index="3" uid="de551952-7094-4841-9a25-784a16240216" >
<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="170" />
-<P2 x="407" y="157" id="167" />
+<P1 x="407" y="70" id="164" />
+<P2 x="407" y="157" id="161" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<CONNECTOR type="115" id="173" >
+<CONNECTOR type="115" id="167" index="4" uid="1c70447b-972e-4e50-8121-11168bc05b1e" >
<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="168" />
-<P2 x="407" y="269" id="165" />
+<P1 x="407" y="187" id="162" />
+<P2 x="407" y="269" id="159" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
</TMLActivityDiagramPanel>
-<TMLActivityDiagramPanel name="PrimitiveComp5" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="1001" id="175" >
+<TMLActivityDiagramPanel name="PrimitiveComp5" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0" >
+<COMPONENT type="1001" id="169" index="0" uid="4dd6c087-0124-4af7-8bd7-afedb2cda2a7" >
<cdparam x="1077" y="1208" />
<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="174" />
+<new d="false" />
+<TGConnectingPoint num="0" id="168" />
</COMPONENT>
-<COMPONENT type="1013" id="179" >
+<COMPONENT type="1013" id="173" index="1" uid="4a7b86fc-c93a-4d2d-9e5e-60c4c0a7f577" >
<cdparam x="503" y="270" />
<sizeparam width="10" height="30" minWidth="1" 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="execI" value="null" />
-<TGConnectingPoint num="0" id="177" />
-<TGConnectingPoint num="1" id="178" />
+<new d="false" />
+<TGConnectingPoint num="0" id="171" />
+<TGConnectingPoint num="1" id="172" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="176" >
-<father id="179" num="0" />
+<SUBCOMPONENT type="-1" id="170" index="41" uid="a9395928-7ab7-4c99-9a96-a1226bc1c69f" >
+<father id="173" num="0" />
<cdparam x="518" y="290" />
<sizeparam width="16" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
<infoparam name="value of the delay" value="10" />
+<new d="false" />
</SUBCOMPONENT>
-<COMPONENT type="1015" id="183" >
+<COMPONENT type="1015" id="177" index="2" uid="d1cb7a98-47c3-4dbf-aeb1-20bdf60d50a6" >
<cdparam x="510" y="341" />
<sizeparam width="10" height="30" minWidth="1" 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="execIInterval" value="null" />
-<TGConnectingPoint num="0" id="181" />
-<TGConnectingPoint num="1" id="182" />
+<new d="false" />
+<TGConnectingPoint num="0" id="175" />
+<TGConnectingPoint num="1" id="176" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="180" >
-<father id="183" num="0" />
+<SUBCOMPONENT type="-1" id="174" index="42" uid="2c39bc8e-c011-4d3b-b1a7-5d2ccfb3a9cf" >
+<father id="177" num="0" />
<cdparam x="525" y="361" />
-<sizeparam width="51" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="49" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
<infoparam name="value of the time interval" value="[10, 20]" />
+<new d="false" />
<extraparam>
<Interval minDelay="10" maxDelay="20" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1026" id="187" >
+<COMPONENT type="1026" id="181" index="3" uid="f2fc4554-119e-48c1-a0b5-f5ed288f62dd" >
<cdparam x="508" y="413" />
<sizeparam width="10" height="30" minWidth="1" 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="delay" value="null" />
-<TGConnectingPoint num="0" id="185" />
-<TGConnectingPoint num="1" id="186" />
+<new d="false" />
+<TGConnectingPoint num="0" id="179" />
+<TGConnectingPoint num="1" id="180" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="184" >
-<father id="187" num="0" />
+<SUBCOMPONENT type="-1" id="178" index="43" uid="ec672f24-ef0e-40e9-8c0d-c672d12be32b" >
+<father id="181" num="0" />
<cdparam x="523" y="433" />
-<sizeparam width="39" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="38" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
<infoparam name="value of the delay" value="10 ms" />
+<new d="false" />
<extraparam>
-<TimeDelay minDelay="10" maxDelay="nope" hasMaxDelay="false" unit="ms" />
+<TimeDelay minDelay="10" maxDelay="nope" hasMaxDelay="false" isActiveDelay="false" unit="ms" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1028" id="191" >
+<COMPONENT type="1028" id="185" index="4" uid="a375bc23-03e4-4882-8695-bad0c7cce7ad" >
<cdparam x="496" y="677" />
<sizeparam width="10" height="30" minWidth="1" 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="delayInterval" value="null" />
-<TGConnectingPoint num="0" id="189" />
-<TGConnectingPoint num="1" id="190" />
+<new d="false" />
+<TGConnectingPoint num="0" id="183" />
+<TGConnectingPoint num="1" id="184" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="188" >
-<father id="191" num="0" />
+<SUBCOMPONENT type="-1" id="182" index="44" uid="8a634df0-f01d-4365-947c-d9467cf58f48" >
+<father id="185" num="0" />
<cdparam x="511" y="697" />
-<sizeparam width="73" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="70" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
<infoparam name="value of the interval delay" value="[10, 20] ms" />
+<new d="false" />
<extraparam>
-<TimeDelay minDelay="10" maxDelay="20" hasMaxDelay="true" unit="ms" />
+<TimeDelay minDelay="10" maxDelay="20" hasMaxDelay="true" isActiveDelay="false" unit="ms" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1032" id="199" >
+<COMPONENT type="1032" id="193" index="5" uid="e58dabce-58c7-4c85-ac91-4c84a66a375b" >
<cdparam x="969" y="1006" />
<sizeparam width="150" height="5" minWidth="1" 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="sequence" value="null" />
-<TGConnectingPoint num="0" id="193" />
-<TGConnectingPoint num="1" id="194" />
-<TGConnectingPoint num="2" id="195" />
-<TGConnectingPoint num="3" id="196" />
-<TGConnectingPoint num="4" id="197" />
-<TGConnectingPoint num="5" id="198" />
+<new d="false" />
+<TGConnectingPoint num="0" id="187" />
+<TGConnectingPoint num="1" id="188" />
+<TGConnectingPoint num="2" id="189" />
+<TGConnectingPoint num="3" id="190" />
+<TGConnectingPoint num="4" id="191" />
+<TGConnectingPoint num="5" id="192" />
</COMPONENT>
-<SUBCOMPONENT type="-1" id="192" >
-<father id="199" num="0" />
+<SUBCOMPONENT type="-1" id="186" index="45" uid="e51c6479-e48c-4817-8341-ef0e5dbb9ba8" >
+<father id="193" num="0" />
<cdparam x="1123" y="1013" />
<sizeparam width="20" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="154" maxX="154" minY="7" maxY="7" />
<infoparam name="Sequence information" value=">>" />
+<new d="false" />
</SUBCOMPONENT>
-<COMPONENT type="1001" id="201" >
+<COMPONENT type="1001" id="195" index="6" uid="0d9db5ee-5769-4744-a4fc-05c83af6c19a" >
<cdparam x="844" y="947" />
<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="200" />
+<new d="false" />
+<TGConnectingPoint num="0" id="194" />
</COMPONENT>
-<COMPONENT type="1001" id="203" >
+<COMPONENT type="1001" id="197" index="7" uid="01f577ad-968d-4dd2-bc13-7cf233f6909d" >
<cdparam x="981" y="1153" />
<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="202" />
+<new d="false" />
+<TGConnectingPoint num="0" id="196" />
</COMPONENT>
-<COMPONENT type="1011" id="206" >
+<COMPONENT type="1011" id="200" index="8" uid="28b31106-8c50-4f50-9e88-3477a7ba7f1a" >
<cdparam x="959" y="1053" />
<sizeparam width="67" 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="action state" value="attr1 = 2" />
-<TGConnectingPoint num="0" id="204" />
-<TGConnectingPoint num="1" id="205" />
+<new d="false" />
+<TGConnectingPoint num="0" id="198" />
+<TGConnectingPoint num="1" id="199" />
</COMPONENT>
-<COMPONENT type="1011" id="209" >
+<COMPONENT type="1011" id="203" index="9" uid="5b786f4b-c4fa-4d67-b27d-f1d5dfe5ad7a" >
<cdparam x="1041" y="1054" />
<sizeparam width="85" 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="action state" value="attr2 = true" />
-<TGConnectingPoint num="0" id="207" />
-<TGConnectingPoint num="1" id="208" />
+<new d="false" />
+<TGConnectingPoint num="0" id="201" />
+<TGConnectingPoint num="1" id="202" />
</COMPONENT>
-<COMPONENT type="1011" id="212" >
+<COMPONENT type="1011" id="206" index="10" uid="60502e05-249d-4977-8f52-fe68af94df81" >
<cdparam x="973" y="951" />
<sizeparam width="75" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="action state" value="attr1 = 10" />
-<TGConnectingPoint num="0" id="210" />
-<TGConnectingPoint num="1" id="211" />
+<new d="false" />
+<TGConnectingPoint num="0" id="204" />
+<TGConnectingPoint num="1" id="205" />
</COMPONENT>
-<COMPONENT type="1001" id="214" >
+<COMPONENT type="1001" id="208" index="11" uid="9385e349-ad4b-4f92-b124-aec93b5bf3cb" >
<cdparam x="682" y="897" />
<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="213" />
+<new d="false" />
+<TGConnectingPoint num="0" id="207" />
</COMPONENT>
-<COMPONENT type="1014" id="218" >
+<COMPONENT type="1014" id="212" index="12" uid="b340526a-1d7b-40ea-99d1-9af2a313ae08" >
<cdparam x="731" y="877" />
<sizeparam width="241" 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="for loop" value="for(attr1=0;attr1<5;attr1 = attr1+1)" />
-<TGConnectingPoint num="0" id="215" />
-<TGConnectingPoint num="1" id="216" />
-<TGConnectingPoint num="2" id="217" />
+<new d="false" />
+<TGConnectingPoint num="0" id="209" />
+<TGConnectingPoint num="1" id="210" />
+<TGConnectingPoint num="2" id="211" />
<extraparam>
<Data init="attr1=0" condition="attr1<5" increment="attr1 = attr1+1" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1020" id="222" >
+<COMPONENT type="1020" id="216" index="13" uid="a060ee3b-9ecc-4c32-b2fc-1497cd329990" >
<cdparam x="648" y="836" />
<sizeparam width="98" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="for loop" value="10" />
-<TGConnectingPoint num="0" id="219" />
-<TGConnectingPoint num="1" id="220" />
-<TGConnectingPoint num="2" id="221" />
+<new d="false" />
+<TGConnectingPoint num="0" id="213" />
+<TGConnectingPoint num="1" id="214" />
+<TGConnectingPoint num="2" id="215" />
</COMPONENT>
-<COMPONENT type="1030" id="225" >
+<COMPONENT type="1030" id="219" index="14" uid="e49001cc-afc1-43c8-befa-cf756f7c3f68" >
<cdparam x="456" y="799" />
<sizeparam width="92" 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="for ever loop" value="Loop for ever" />
-<TGConnectingPoint num="0" id="223" />
-<TGConnectingPoint num="1" id="224" />
+<new d="false" />
+<TGConnectingPoint num="0" id="217" />
+<TGConnectingPoint num="1" id="218" />
</COMPONENT>
-<COMPONENT type="1024" id="228" >
-<cdparam x="420" y="736" />
-<sizeparam width="162" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1024" id="222" index="15" uid="e1cf0ed8-b958-4340-918f-043c67b14b4a" >
+<cdparam x="413" y="736" />
+<sizeparam width="177" 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="TGComponent" value="null" />
-<TGConnectingPoint num="0" id="226" />
-<TGConnectingPoint num="1" id="227" />
+<infoparam name="TGComponent" value="0_10" />
+<new d="false" />
+<TGConnectingPoint num="0" id="220" />
+<TGConnectingPoint num="1" id="221" />
<extraparam>
<Data variable="attr1" minValue="0" maxValue="10" functionId="0" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1036" id="231" >
+<COMPONENT type="1036" id="225" index="16" uid="7326c586-2a3f-441e-a709-bae383610994" >
<cdparam x="499" y="597" />
<sizeparam width="15" height="35" minWidth="1" 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="decrypt" value="null" />
-<TGConnectingPoint num="0" id="229" />
-<TGConnectingPoint num="1" id="230" />
+<new d="false" />
+<TGConnectingPoint num="0" id="223" />
+<TGConnectingPoint num="1" id="224" />
<extraparam>
<Data secPattern="encryption1" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1035" id="234" >
+<COMPONENT type="1035" id="228" index="17" uid="60307767-348e-42ac-af44-27e8304b4b6a" >
<cdparam x="504" y="503" />
<sizeparam width="15" height="35" minWidth="1" 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="encrypt" value="null" />
-<TGConnectingPoint num="0" id="232" />
-<TGConnectingPoint num="1" id="233" />
+<new d="false" />
+<TGConnectingPoint num="0" id="226" />
+<TGConnectingPoint num="1" id="227" />
<extraparam>
-<Data secContext="encryption1" type="" overhead="" size="" encTime="100" decTime="100" nonce="" key="" algorithm="" />
+<Data secContext="encryption1" type="Symmetric Encryption" overhead="" size="" encTime="100" decTime="100" nonce="" key="" algorithm="" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1009" id="237" >
-<cdparam x="1037" y="1135" />
-<sizeparam width="90" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1009" id="231" index="18" uid="02b4cc18-dbdd-47fb-bc80-b0ca9eca8f49" >
+<cdparam x="1031" y="1135" />
+<sizeparam width="102" 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="235" />
-<TGConnectingPoint num="1" id="236" />
+<new d="false" />
+<TGConnectingPoint num="0" id="229" />
+<TGConnectingPoint num="1" id="230" />
<extraparam>
<Data channelName="channel3" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="Yes" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1006" id="240" >
-<cdparam x="468" y="200" />
-<sizeparam width="86" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1006" id="234" index="19" uid="2e1e9de5-8577-4903-a3f4-a74fc9006df4" >
+<cdparam x="462" y="200" />
+<sizeparam width="98" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="write channel" value="channel3(1)" />
-<TGConnectingPoint num="0" id="238" />
-<TGConnectingPoint num="1" id="239" />
+<new d="false" />
+<TGConnectingPoint num="0" id="232" />
+<TGConnectingPoint num="1" id="233" />
<extraparam>
<Data channelName="channel3" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="Yes" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1000" id="242" >
+<COMPONENT type="1000" id="236" index="20" uid="c13f48d1-011b-4fea-b633-01ff7b9d5865" >
<cdparam x="504" y="107" />
<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="241" />
+<new d="false" />
+<TGConnectingPoint num="0" id="235" />
</COMPONENT>
-<CONNECTOR type="115" id="244" >
+<CONNECTOR type="115" id="238" index="21" uid="c7a78092-c6e6-4351-a849-103c0d8c60ac" >
<cdparam x="746" y="850" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="746" y="850" id="220" />
-<P2 x="851" y="872" id="215" />
+<P1 x="746" y="850" id="214" />
+<P2 x="851" y="872" id="209" />
<Point x="859" y="844" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="243" >
-<father id="244" num="0" />
+<new d="false" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="237" index="46" uid="aed04d49-9b65-468d-808b-0b701d569463" >
+<father id="238" num="0" />
<cdparam x="859" y="844" />
-<sizeparam width="1" height="1" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="8" 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="point " value="null" />
+<new d="false" />
</SUBCOMPONENT>
-<CONNECTOR type="115" id="245" >
+<CONNECTOR type="115" id="239" index="22" uid="b4072db1-8090-41d3-974c-e3fc4ba4e000" >
<cdparam x="972" y="891" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="972" y="891" id="216" />
-<P2 x="1010" y="946" id="210" />
+<P1 x="972" y="891" id="210" />
+<P2 x="1010" y="946" id="204" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<CONNECTOR type="115" id="246" >
+<CONNECTOR type="115" id="240" index="23" uid="a60d6119-065d-4c52-9ced-180f65297a95" >
<cdparam x="1083" y="1079" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="1083" y="1079" id="208" />
-<P2 x="1082" y="1130" id="235" />
+<P1 x="1083" y="1079" id="202" />
+<P2 x="1082" y="1130" id="229" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<CONNECTOR type="115" id="247" >
+<CONNECTOR type="115" id="241" index="24" uid="829578dd-11ec-4345-9186-ca497cd43336" >
<cdparam x="511" y="122" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="511" y="122" id="241" />
-<P2 x="511" y="195" id="238" />
+<P1 x="511" y="127" id="235" />
+<P2 x="511" y="195" id="232" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<CONNECTOR type="115" id="248" >
+<CONNECTOR type="115" id="242" index="25" uid="d86e8966-c7f7-4d22-85e9-c479e264ed03" >
<cdparam x="511" y="225" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="511" y="225" id="239" />
-<P2 x="508" y="265" id="177" />
+<P1 x="511" y="225" id="233" />
+<P2 x="508" y="265" id="171" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<CONNECTOR type="115" id="249" >
+<CONNECTOR type="115" id="243" index="26" uid="0045651f-fe50-4732-9805-9e40c87d0a57" >
<cdparam x="508" y="305" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="508" y="305" id="178" />
-<P2 x="515" y="336" id="181" />
+<P1 x="508" y="305" id="172" />
+<P2 x="515" y="336" id="175" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<CONNECTOR type="115" id="250" >
+<CONNECTOR type="115" id="244" index="27" uid="ae91e09a-d0e1-4fb6-aeed-a9ba2b2c980c" >
<cdparam x="515" y="376" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="515" y="376" id="182" />
-<P2 x="513" y="408" id="185" />
+<P1 x="515" y="376" id="176" />
+<P2 x="513" y="408" id="179" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<CONNECTOR type="115" id="251" >
+<CONNECTOR type="115" id="245" index="28" uid="25aea873-0bcf-480b-8f8b-b0d9f93dc0ea" >
<cdparam x="513" y="448" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="513" y="448" id="186" />
-<P2 x="511" y="498" id="232" />
+<P1 x="513" y="448" id="180" />
+<P2 x="511" y="498" id="226" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<CONNECTOR type="115" id="252" >
+<CONNECTOR type="115" id="246" index="29" uid="b13c52ad-aa2c-4039-b31c-58af331fc962" >
<cdparam x="511" y="548" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="511" y="548" id="233" />
-<P2 x="506" y="592" id="229" />
+<P1 x="511" y="548" id="227" />
+<P2 x="506" y="592" id="223" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<CONNECTOR type="115" id="253" >
+<CONNECTOR type="115" id="247" index="30" uid="bc924aa4-e422-4329-b6f2-7479c8dfb87d" >
<cdparam x="506" y="642" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="506" y="642" id="230" />
-<P2 x="501" y="672" id="189" />
+<P1 x="506" y="642" id="224" />
+<P2 x="501" y="672" id="183" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<CONNECTOR type="115" id="254" >
+<CONNECTOR type="115" id="248" index="31" uid="e8e4ec0a-c5c3-45f0-bd83-c00b7996dd56" >
<cdparam x="501" y="712" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="501" y="712" id="190" />
-<P2 x="501" y="731" id="226" />
+<P1 x="501" y="712" id="184" />
+<P2 x="501" y="731" id="220" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<CONNECTOR type="115" id="255" >
+<CONNECTOR type="115" id="249" index="32" uid="3a200bb2-4a74-4f24-830e-df6605403c73" >
<cdparam x="501" y="761" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="501" y="761" id="227" />
-<P2 x="502" y="794" id="223" />
+<P1 x="501" y="761" id="221" />
+<P2 x="502" y="794" id="217" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<CONNECTOR type="115" id="256" >
+<CONNECTOR type="115" id="250" index="33" uid="82195d58-c84c-400d-a5e7-63c55dcd0872" >
<cdparam x="548" y="813" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="548" y="813" id="224" />
-<P2 x="697" y="831" id="219" />
+<P1 x="548" y="813" id="218" />
+<P2 x="697" y="831" id="213" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<CONNECTOR type="115" id="257" >
+<CONNECTOR type="115" id="251" index="34" uid="2ee7879b-61c0-411a-9d2a-07c99c8426a1" >
<cdparam x="697" y="861" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="697" y="861" id="221" />
-<P2 x="692" y="892" id="213" />
+<P1 x="697" y="861" id="215" />
+<P2 x="692" y="892" id="207" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<CONNECTOR type="115" id="258" >
+<CONNECTOR type="115" id="252" index="35" uid="44a6a419-dde6-45a2-94c4-106a3e1f9e68" >
<cdparam x="1010" y="976" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="1010" y="976" id="211" />
-<P2 x="1044" y="1006" id="193" />
+<P1 x="1010" y="976" id="205" />
+<P2 x="1044" y="1006" id="187" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<CONNECTOR type="115" id="259" >
+<CONNECTOR type="115" id="253" index="36" uid="e6ed31ef-552f-4e1e-9200-74b5cf4025c0" >
<cdparam x="1069" y="1011" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="1069" y="1011" id="197" />
-<P2 x="1083" y="1049" id="207" />
+<P1 x="1069" y="1011" id="191" />
+<P2 x="1083" y="1049" id="201" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<CONNECTOR type="115" id="260" >
+<CONNECTOR type="115" id="254" index="37" uid="f9ab3e90-8757-4336-9475-c9856f50c5f4" >
<cdparam x="994" y="1011" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="994" y="1011" id="194" />
-<P2 x="992" y="1048" id="204" />
+<P1 x="994" y="1011" id="188" />
+<P2 x="992" y="1048" id="198" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<CONNECTOR type="115" id="261" >
+<CONNECTOR type="115" id="255" index="38" uid="8ec9aa75-2422-41e6-977c-0d2b6478bc1c" >
<cdparam x="992" y="1078" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="992" y="1078" id="205" />
-<P2 x="991" y="1148" id="202" />
+<P1 x="992" y="1078" id="199" />
+<P2 x="991" y="1148" id="196" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<CONNECTOR type="115" id="262" >
+<CONNECTOR type="115" id="256" index="39" uid="d425350a-ee4d-47a0-b7c8-7f132d627d13" >
<cdparam x="851" y="902" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="851" y="902" id="217" />
-<P2 x="854" y="942" id="200" />
+<P1 x="851" y="902" id="211" />
+<P2 x="854" y="942" id="194" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<CONNECTOR type="115" id="263" >
+<CONNECTOR type="115" id="257" index="40" uid="9f5daf28-81e7-45f0-a4ed-c0bcb020283a" >
<cdparam x="1082" y="1160" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="1082" y="1160" id="236" />
-<P2 x="1087" y="1203" id="174" />
+<P1 x="1082" y="1160" id="230" />
+<P2 x="1087" y="1203" id="168" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
</TMLActivityDiagramPanel>
-<TMLActivityDiagramPanel name="PrimitiveComp6" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="1001" id="265" >
+<TMLActivityDiagramPanel name="PrimitiveComp6" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0" >
+<COMPONENT type="1001" id="259" index="0" uid="2621aa42-518e-4a0b-94c4-aa7107598605" >
<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="264" />
+<new d="false" />
+<TGConnectingPoint num="0" id="258" />
</COMPONENT>
-<COMPONENT type="1009" id="268" >
+<COMPONENT type="1009" id="262" index="1" uid="91f63691-65fd-46e4-93d1-887a0ebe8e80" >
<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="read channel" value="channel4(1) " />
-<TGConnectingPoint num="0" id="266" />
-<TGConnectingPoint num="1" id="267" />
+<new d="false" />
+<TGConnectingPoint num="0" id="260" />
+<TGConnectingPoint num="1" id="261" />
<extraparam>
<Data channelName="channel4" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="Yes" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1006" id="271" >
+<COMPONENT type="1006" id="265" index="2" uid="4e8cf9f1-9d96-4fb2-a43f-bcac6996cef0" >
<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="write channel" value="channel4(1)" />
-<TGConnectingPoint num="0" id="269" />
-<TGConnectingPoint num="1" id="270" />
+<new d="false" />
+<TGConnectingPoint num="0" id="263" />
+<TGConnectingPoint num="1" id="264" />
<extraparam>
<Data channelName="channel4" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="Yes" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1000" id="273" >
+<COMPONENT type="1000" id="267" index="3" uid="df20b9a2-6234-4454-b784-f56731010474" >
<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="272" />
+<new d="false" />
+<TGConnectingPoint num="0" id="266" />
</COMPONENT>
-<CONNECTOR type="115" id="274" >
+<CONNECTOR type="115" id="268" index="4" uid="ed62ecca-1c6b-4e06-874f-f6138794bd66" >
<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="272" />
-<P2 x="407" y="128" id="269" />
+<P1 x="407" y="70" id="266" />
+<P2 x="407" y="128" id="263" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<CONNECTOR type="115" id="275" >
+<CONNECTOR type="115" id="269" index="5" uid="f821d0b8-1b37-4b05-99db-1aa7d2bf07fb" >
<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="270" />
-<P2 x="407" y="228" id="266" />
+<P1 x="407" y="158" id="264" />
+<P2 x="407" y="228" id="260" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
-<CONNECTOR type="115" id="276" >
+<CONNECTOR type="115" id="270" index="6" uid="0bbf921c-3600-4393-819e-81e22f0261e5" >
<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="267" />
-<P2 x="407" y="326" id="264" />
+<P1 x="407" y="258" id="261" />
+<P2 x="407" y="326" id="258" />
<AutomaticDrawing data="true" />
+<new d="false" />
</CONNECTOR>
</TMLActivityDiagramPanel>
@@ -1310,764 +1427,896 @@
<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="1100" id="355" >
+<TMLArchiDiagramPanel name="DIPLODOCUS architecture and mapping Diagram" minX="10" maxX="2500" minY="10" maxY="1500" attributes="0" considerExecOperators="true" considerTimingOperators="true" masterClockFrequency="200" zoom="1.0" >
+<CONNECTOR type="125" id="737" index="0" uid="128953d6-b1b6-49d6-81d1-c20cedd9f684" >
+<cdparam x="1448" y="810" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="{info}" />
+<P1 x="1448" y="810" id="583" />
+<P2 x="1363" y="498" id="462" />
+<AutomaticDrawing data="true" />
+<new d="false" />
+<extraparam>
+<info priority="0" />
+<spy value="false" />
+</extraparam>
+</CONNECTOR>
+<CONNECTOR type="125" id="736" index="1" uid="44caf93c-5749-4b1b-af03-63a05dbbb2a4" >
+<cdparam x="1358" y="814" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="{info}" />
+<P1 x="1358" y="814" id="552" />
+<P2 x="1363" y="511" id="455" />
+<AutomaticDrawing data="true" />
+<new d="false" />
+<extraparam>
+<info priority="0" />
+<spy value="false" />
+</extraparam>
+</CONNECTOR>
+<CONNECTOR type="125" id="735" index="2" uid="523b68a7-a583-41c1-951f-85afa9aa390d" >
+<cdparam x="1575" y="568" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="{info}" />
+<P1 x="1611" y="569" id="501" />
+<P2 x="1488" y="511" id="456" />
+<AutomaticDrawing data="true" />
+<new d="false" />
+<extraparam>
+<info priority="0" />
+<spy value="false" />
+</extraparam>
+</CONNECTOR>
+<CONNECTOR type="125" id="734" index="3" uid="5af96185-98b6-471d-8e4e-510b8fe643e2" >
+<cdparam x="1315" y="629" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="{info}" />
+<P1 x="1315" y="629" id="661" />
+<P2 x="1425" y="511" id="464" />
+<AutomaticDrawing data="true" />
+<new d="false" />
+<extraparam>
+<info priority="0" />
+<spy value="false" />
+</extraparam>
+</CONNECTOR>
+<CONNECTOR type="125" id="733" index="4" uid="0ae72911-81ec-44cf-b23e-d5345461d01b" >
+<cdparam x="1309" y="454" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="{info}" />
+<P1 x="1309" y="454" id="629" />
+<P2 x="1363" y="486" id="453" />
+<AutomaticDrawing data="true" />
+<new d="false" />
+<extraparam>
+<info priority="0" />
+<spy value="false" />
+</extraparam>
+</CONNECTOR>
+<CONNECTOR type="125" id="732" index="5" uid="cd3821af-14ff-4f41-9e2e-2f018a2f15fa" >
+<cdparam x="1498" y="296" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="{info}" />
+<P1 x="1498" y="296" id="381" />
+<P2 x="1488" y="461" id="451" />
+<AutomaticDrawing data="true" />
+<new d="false" />
+<extraparam>
+<info priority="0" />
+<spy value="false" />
+</extraparam>
+</CONNECTOR>
+<COMPONENT type="1100" id="349" index="6" uid="4603200e-3f7f-4f0c-aa2a-95ac7d793206" >
<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="331" />
-<TGConnectingPoint num="1" id="332" />
-<TGConnectingPoint num="2" id="333" />
-<TGConnectingPoint num="3" id="334" />
-<TGConnectingPoint num="4" id="335" />
-<TGConnectingPoint num="5" id="336" />
-<TGConnectingPoint num="6" id="337" />
-<TGConnectingPoint num="7" id="338" />
-<TGConnectingPoint num="8" id="339" />
-<TGConnectingPoint num="9" id="340" />
-<TGConnectingPoint num="10" id="341" />
-<TGConnectingPoint num="11" id="342" />
-<TGConnectingPoint num="12" id="343" />
-<TGConnectingPoint num="13" id="344" />
-<TGConnectingPoint num="14" id="345" />
-<TGConnectingPoint num="15" id="346" />
-<TGConnectingPoint num="16" id="347" />
-<TGConnectingPoint num="17" id="348" />
-<TGConnectingPoint num="18" id="349" />
-<TGConnectingPoint num="19" id="350" />
-<TGConnectingPoint num="20" id="351" />
-<TGConnectingPoint num="21" id="352" />
-<TGConnectingPoint num="22" id="353" />
-<TGConnectingPoint num="23" id="354" />
+<new d="false" />
+<TGConnectingPoint num="0" id="325" />
+<TGConnectingPoint num="1" id="326" />
+<TGConnectingPoint num="2" id="327" />
+<TGConnectingPoint num="3" id="328" />
+<TGConnectingPoint num="4" id="329" />
+<TGConnectingPoint num="5" id="330" />
+<TGConnectingPoint num="6" id="331" />
+<TGConnectingPoint num="7" id="332" />
+<TGConnectingPoint num="8" id="333" />
+<TGConnectingPoint num="9" id="334" />
+<TGConnectingPoint num="10" id="335" />
+<TGConnectingPoint num="11" id="336" />
+<TGConnectingPoint num="12" id="337" />
+<TGConnectingPoint num="13" id="338" />
+<TGConnectingPoint num="14" id="339" />
+<TGConnectingPoint num="15" id="340" />
+<TGConnectingPoint num="16" id="341" />
+<TGConnectingPoint num="17" id="342" />
+<TGConnectingPoint num="18" id="343" />
+<TGConnectingPoint num="19" id="344" />
+<TGConnectingPoint num="20" id="345" />
+<TGConnectingPoint num="21" id="346" />
+<TGConnectingPoint num="22" id="347" />
+<TGConnectingPoint num="23" id="348" />
<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="285" >
-<father id="355" num="0" />
-<cdparam x="110" y="152" />
-<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::PrimitiveComp1" />
-<TGConnectingPoint num="0" id="277" />
-<TGConnectingPoint num="1" id="278" />
-<TGConnectingPoint num="2" id="279" />
-<TGConnectingPoint num="3" id="280" />
-<TGConnectingPoint num="4" id="281" />
-<TGConnectingPoint num="5" id="282" />
-<TGConnectingPoint num="6" id="283" />
-<TGConnectingPoint num="7" id="284" />
-<extraparam>
-<info value="Application::PrimitiveComp1" taskName="PrimitiveComp1" referenceTaskName="Application" priority="0" operationMEC="PrimitiveComp4" fatherComponentMECType="0" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1101" id="294" >
-<father id="355" num="1" />
-<cdparam x="111" y="201" />
-<sizeparam width="207" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1101" id="279" index="26" uid="475ad0c7-7f47-4b81-bb72-5d85dc0c6d92" >
+<father id="349" num="0" />
+<cdparam x="376" y="255" />
+<sizeparam width="198" 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::PrimitiveComp2" />
-<TGConnectingPoint num="0" id="286" />
-<TGConnectingPoint num="1" id="287" />
-<TGConnectingPoint num="2" id="288" />
-<TGConnectingPoint num="3" id="289" />
-<TGConnectingPoint num="4" id="290" />
-<TGConnectingPoint num="5" id="291" />
-<TGConnectingPoint num="6" id="292" />
-<TGConnectingPoint num="7" id="293" />
+<cdrectangleparam minX="0" maxX="354" minY="0" maxY="185" />
+<infoparam name="TGComponent" value="Application::PrimitiveComp6" />
+<new d="false" />
+<TGConnectingPoint num="0" id="271" />
+<TGConnectingPoint num="1" id="272" />
+<TGConnectingPoint num="2" id="273" />
+<TGConnectingPoint num="3" id="274" />
+<TGConnectingPoint num="4" id="275" />
+<TGConnectingPoint num="5" id="276" />
+<TGConnectingPoint num="6" id="277" />
+<TGConnectingPoint num="7" id="278" />
<extraparam>
-<info value="Application::PrimitiveComp2" taskName="PrimitiveComp2" referenceTaskName="Application" priority="0" operationMEC="PrimitiveComp4" fatherComponentMECType="0" />
+<info value="Application::PrimitiveComp6" taskName="PrimitiveComp6" referenceTaskName="Application" priority="0" operationMEC="PrimitiveComp6" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1101" id="303" >
-<father id="355" num="2" />
-<cdparam x="112" y="261" />
-<sizeparam width="207" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1101" id="288" index="27" uid="400b1d89-e1c3-45fc-9967-65ed7b055a79" >
+<father id="349" num="1" />
+<cdparam x="371" y="203" />
+<sizeparam width="198" 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="295" />
-<TGConnectingPoint num="1" id="296" />
-<TGConnectingPoint num="2" id="297" />
-<TGConnectingPoint num="3" id="298" />
-<TGConnectingPoint num="4" id="299" />
-<TGConnectingPoint num="5" id="300" />
-<TGConnectingPoint num="6" id="301" />
-<TGConnectingPoint num="7" id="302" />
+<cdrectangleparam minX="0" maxX="354" minY="0" maxY="185" />
+<infoparam name="TGComponent" value="Application::PrimitiveComp5" />
+<new d="false" />
+<TGConnectingPoint num="0" id="280" />
+<TGConnectingPoint num="1" id="281" />
+<TGConnectingPoint num="2" id="282" />
+<TGConnectingPoint num="3" id="283" />
+<TGConnectingPoint num="4" id="284" />
+<TGConnectingPoint num="5" id="285" />
+<TGConnectingPoint num="6" id="286" />
+<TGConnectingPoint num="7" id="287" />
<extraparam>
-<info value="Application::PrimitiveComp3" taskName="PrimitiveComp3" referenceTaskName="Application" priority="0" operationMEC="PrimitiveComp4" fatherComponentMECType="0" />
+<info value="Application::PrimitiveComp5" taskName="PrimitiveComp5" referenceTaskName="Application" priority="0" operationMEC="PrimitiveComp5" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1101" id="312" >
-<father id="355" num="3" />
+<SUBCOMPONENT type="1101" id="297" index="28" uid="ea5cb2f2-971f-4556-bb97-3fada947b2dd" >
+<father id="349" num="2" />
<cdparam x="393" y="144" />
-<sizeparam width="207" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="198" 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" />
+<cdrectangleparam minX="0" maxX="354" minY="0" maxY="185" />
<infoparam name="TGComponent" value="Application::PrimitiveComp4" />
-<TGConnectingPoint num="0" id="304" />
-<TGConnectingPoint num="1" id="305" />
-<TGConnectingPoint num="2" id="306" />
-<TGConnectingPoint num="3" id="307" />
-<TGConnectingPoint num="4" id="308" />
-<TGConnectingPoint num="5" id="309" />
-<TGConnectingPoint num="6" id="310" />
-<TGConnectingPoint num="7" id="311" />
+<new d="false" />
+<TGConnectingPoint num="0" id="289" />
+<TGConnectingPoint num="1" id="290" />
+<TGConnectingPoint num="2" id="291" />
+<TGConnectingPoint num="3" id="292" />
+<TGConnectingPoint num="4" id="293" />
+<TGConnectingPoint num="5" id="294" />
+<TGConnectingPoint num="6" id="295" />
+<TGConnectingPoint num="7" id="296" />
<extraparam>
<info value="Application::PrimitiveComp4" taskName="PrimitiveComp4" referenceTaskName="Application" priority="0" operationMEC="PrimitiveComp4" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1101" id="321" >
-<father id="355" num="4" />
-<cdparam x="371" y="203" />
-<sizeparam width="207" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1101" id="306" index="29" uid="51cc3679-d032-465f-90b5-cf1d05f57d0c" >
+<father id="349" num="3" />
+<cdparam x="112" y="261" />
+<sizeparam width="198" 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="313" />
-<TGConnectingPoint num="1" id="314" />
-<TGConnectingPoint num="2" id="315" />
-<TGConnectingPoint num="3" id="316" />
-<TGConnectingPoint num="4" id="317" />
-<TGConnectingPoint num="5" id="318" />
-<TGConnectingPoint num="6" id="319" />
-<TGConnectingPoint num="7" id="320" />
+<cdrectangleparam minX="0" maxX="354" minY="0" maxY="185" />
+<infoparam name="TGComponent" value="Application::PrimitiveComp3" />
+<new d="false" />
+<TGConnectingPoint num="0" id="298" />
+<TGConnectingPoint num="1" id="299" />
+<TGConnectingPoint num="2" id="300" />
+<TGConnectingPoint num="3" id="301" />
+<TGConnectingPoint num="4" id="302" />
+<TGConnectingPoint num="5" id="303" />
+<TGConnectingPoint num="6" id="304" />
+<TGConnectingPoint num="7" id="305" />
<extraparam>
-<info value="Application::PrimitiveComp5" taskName="PrimitiveComp5" referenceTaskName="Application" priority="0" operationMEC="PrimitiveComp5" fatherComponentMECType="0" />
+<info value="Application::PrimitiveComp3" taskName="PrimitiveComp3" referenceTaskName="Application" priority="0" operationMEC="PrimitiveComp4" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1101" id="330" >
-<father id="355" num="5" />
-<cdparam x="376" y="255" />
-<sizeparam width="207" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1101" id="315" index="30" uid="4c1fada3-5dca-465b-ba07-79b74fce6557" >
+<father id="349" num="4" />
+<cdparam x="111" y="201" />
+<sizeparam width="198" 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="322" />
-<TGConnectingPoint num="1" id="323" />
-<TGConnectingPoint num="2" id="324" />
-<TGConnectingPoint num="3" id="325" />
-<TGConnectingPoint num="4" id="326" />
-<TGConnectingPoint num="5" id="327" />
-<TGConnectingPoint num="6" id="328" />
-<TGConnectingPoint num="7" id="329" />
+<cdrectangleparam minX="0" maxX="354" minY="0" maxY="185" />
+<infoparam name="TGComponent" value="Application::PrimitiveComp2" />
+<new d="false" />
+<TGConnectingPoint num="0" id="307" />
+<TGConnectingPoint num="1" id="308" />
+<TGConnectingPoint num="2" id="309" />
+<TGConnectingPoint num="3" id="310" />
+<TGConnectingPoint num="4" id="311" />
+<TGConnectingPoint num="5" id="312" />
+<TGConnectingPoint num="6" id="313" />
+<TGConnectingPoint num="7" id="314" />
<extraparam>
-<info value="Application::PrimitiveComp6" taskName="PrimitiveComp6" referenceTaskName="Application" priority="0" operationMEC="PrimitiveComp6" fatherComponentMECType="0" />
+<info value="Application::PrimitiveComp2" taskName="PrimitiveComp2" referenceTaskName="Application" priority="0" operationMEC="PrimitiveComp4" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-
-<COMPONENT type="1100" id="380" >
-<cdparam x="1276" y="110" />
-<sizeparam width="250" height="200" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1101" id="324" index="31" uid="ab929319-77ae-4ccc-9f8e-5e5f3ebe09c9" >
+<father id="349" num="5" />
+<cdparam x="110" y="152" />
+<sizeparam width="198" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="CPU2" value="name" />
-<TGConnectingPoint num="0" id="356" />
-<TGConnectingPoint num="1" id="357" />
-<TGConnectingPoint num="2" id="358" />
-<TGConnectingPoint num="3" id="359" />
-<TGConnectingPoint num="4" id="360" />
-<TGConnectingPoint num="5" id="361" />
-<TGConnectingPoint num="6" id="362" />
-<TGConnectingPoint num="7" id="363" />
-<TGConnectingPoint num="8" id="364" />
-<TGConnectingPoint num="9" id="365" />
-<TGConnectingPoint num="10" id="366" />
-<TGConnectingPoint num="11" id="367" />
-<TGConnectingPoint num="12" id="368" />
-<TGConnectingPoint num="13" id="369" />
-<TGConnectingPoint num="14" id="370" />
-<TGConnectingPoint num="15" id="371" />
-<TGConnectingPoint num="16" id="372" />
-<TGConnectingPoint num="17" id="373" />
-<TGConnectingPoint num="18" id="374" />
-<TGConnectingPoint num="19" id="375" />
-<TGConnectingPoint num="20" id="376" />
-<TGConnectingPoint num="21" id="377" />
-<TGConnectingPoint num="22" id="378" />
-<TGConnectingPoint num="23" id="379" />
-<extraparam>
-<info stereotype="CPURR" nodeName="CPU2" />
-<attributes nbOfCores="1" byteDataSize="4" schedulingPolicy="0" sliceTime="10000" goIdleTime="10" maxConsecutiveIdleCycles="10" pipelineSize="5" taskSwitchingTime="20" branchingPredictionPenalty="2" cacheMiss="5" execiTime="1" execcTime="1" clockRatio="1" operation="" MECType="0" encryption="0"/>
+<cdrectangleparam minX="0" maxX="354" minY="0" maxY="185" />
+<infoparam name="TGComponent" value="Application::PrimitiveComp1" />
+<new d="false" />
+<TGConnectingPoint num="0" id="316" />
+<TGConnectingPoint num="1" id="317" />
+<TGConnectingPoint num="2" id="318" />
+<TGConnectingPoint num="3" id="319" />
+<TGConnectingPoint num="4" id="320" />
+<TGConnectingPoint num="5" id="321" />
+<TGConnectingPoint num="6" id="322" />
+<TGConnectingPoint num="7" id="323" />
+<extraparam>
+<info value="Application::PrimitiveComp1" taskName="PrimitiveComp1" referenceTaskName="Application" priority="0" operationMEC="PrimitiveComp4" fatherComponentMECType="0" />
</extraparam>
-</COMPONENT>
+</SUBCOMPONENT>
-<COMPONENT type="1100" id="405" >
-<cdparam x="991" y="100" />
+<COMPONENT type="1100" id="399" index="7" uid="6388bda7-c702-4ec2-ba88-8f1e9ad8fcf5" >
+<cdparam x="1373" y="96" />
<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="381" />
-<TGConnectingPoint num="1" id="382" />
-<TGConnectingPoint num="2" id="383" />
-<TGConnectingPoint num="3" id="384" />
-<TGConnectingPoint num="4" id="385" />
-<TGConnectingPoint num="5" id="386" />
-<TGConnectingPoint num="6" id="387" />
-<TGConnectingPoint num="7" id="388" />
-<TGConnectingPoint num="8" id="389" />
-<TGConnectingPoint num="9" id="390" />
-<TGConnectingPoint num="10" id="391" />
-<TGConnectingPoint num="11" id="392" />
-<TGConnectingPoint num="12" id="393" />
-<TGConnectingPoint num="13" id="394" />
-<TGConnectingPoint num="14" id="395" />
-<TGConnectingPoint num="15" id="396" />
-<TGConnectingPoint num="16" id="397" />
-<TGConnectingPoint num="17" id="398" />
-<TGConnectingPoint num="18" id="399" />
-<TGConnectingPoint num="19" id="400" />
-<TGConnectingPoint num="20" id="401" />
-<TGConnectingPoint num="21" id="402" />
-<TGConnectingPoint num="22" id="403" />
-<TGConnectingPoint num="23" id="404" />
+<new d="false" />
+<TGConnectingPoint num="0" id="375" />
+<TGConnectingPoint num="1" id="376" />
+<TGConnectingPoint num="2" id="377" />
+<TGConnectingPoint num="3" id="378" />
+<TGConnectingPoint num="4" id="379" />
+<TGConnectingPoint num="5" id="380" />
+<TGConnectingPoint num="6" id="381" />
+<TGConnectingPoint num="7" id="382" />
+<TGConnectingPoint num="8" id="383" />
+<TGConnectingPoint num="9" id="384" />
+<TGConnectingPoint num="10" id="385" />
+<TGConnectingPoint num="11" id="386" />
+<TGConnectingPoint num="12" id="387" />
+<TGConnectingPoint num="13" id="388" />
+<TGConnectingPoint num="14" id="389" />
+<TGConnectingPoint num="15" id="390" />
+<TGConnectingPoint num="16" id="391" />
+<TGConnectingPoint num="17" id="392" />
+<TGConnectingPoint num="18" id="393" />
+<TGConnectingPoint num="19" id="394" />
+<TGConnectingPoint num="20" id="395" />
+<TGConnectingPoint num="21" id="396" />
+<TGConnectingPoint num="22" id="397" />
+<TGConnectingPoint num="23" id="398" />
<extraparam>
<info stereotype="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="1107" id="430" >
+<COMPONENT type="1107" id="424" index="8" uid="b776642b-5b85-474c-bdba-f9967100b729" >
<cdparam x="699" y="398" />
<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="406" />
-<TGConnectingPoint num="1" id="407" />
-<TGConnectingPoint num="2" id="408" />
-<TGConnectingPoint num="3" id="409" />
-<TGConnectingPoint num="4" id="410" />
-<TGConnectingPoint num="5" id="411" />
-<TGConnectingPoint num="6" id="412" />
-<TGConnectingPoint num="7" id="413" />
-<TGConnectingPoint num="8" id="414" />
-<TGConnectingPoint num="9" id="415" />
-<TGConnectingPoint num="10" id="416" />
-<TGConnectingPoint num="11" id="417" />
-<TGConnectingPoint num="12" id="418" />
-<TGConnectingPoint num="13" id="419" />
-<TGConnectingPoint num="14" id="420" />
-<TGConnectingPoint num="15" id="421" />
-<TGConnectingPoint num="16" id="422" />
-<TGConnectingPoint num="17" id="423" />
-<TGConnectingPoint num="18" id="424" />
-<TGConnectingPoint num="19" id="425" />
-<TGConnectingPoint num="20" id="426" />
-<TGConnectingPoint num="21" id="427" />
-<TGConnectingPoint num="22" id="428" />
-<TGConnectingPoint num="23" id="429" />
+<new d="false" />
+<TGConnectingPoint num="0" id="400" />
+<TGConnectingPoint num="1" id="401" />
+<TGConnectingPoint num="2" id="402" />
+<TGConnectingPoint num="3" id="403" />
+<TGConnectingPoint num="4" id="404" />
+<TGConnectingPoint num="5" id="405" />
+<TGConnectingPoint num="6" id="406" />
+<TGConnectingPoint num="7" id="407" />
+<TGConnectingPoint num="8" id="408" />
+<TGConnectingPoint num="9" id="409" />
+<TGConnectingPoint num="10" id="410" />
+<TGConnectingPoint num="11" id="411" />
+<TGConnectingPoint num="12" id="412" />
+<TGConnectingPoint num="13" id="413" />
+<TGConnectingPoint num="14" id="414" />
+<TGConnectingPoint num="15" id="415" />
+<TGConnectingPoint num="16" id="416" />
+<TGConnectingPoint num="17" id="417" />
+<TGConnectingPoint num="18" id="418" />
+<TGConnectingPoint num="19" id="419" />
+<TGConnectingPoint num="20" id="420" />
+<TGConnectingPoint num="21" id="421" />
+<TGConnectingPoint num="22" id="422" />
+<TGConnectingPoint num="23" id="423" />
<extraparam>
<info stereotype="DMA" nodeName="DMA0" />
<attributes byteDataSize="4" nbOfChannels="1" clockRatio="1" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1105" id="455" >
+<COMPONENT type="1105" id="449" index="9" uid="83651822-6f1d-4197-ab61-bbf60a99dfa7" >
<cdparam x="344" y="601" />
-<sizeparam width="200" height="200" minWidth="100" minHeight="35" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="267" height="280" 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="431" />
-<TGConnectingPoint num="1" id="432" />
-<TGConnectingPoint num="2" id="433" />
-<TGConnectingPoint num="3" id="434" />
-<TGConnectingPoint num="4" id="435" />
-<TGConnectingPoint num="5" id="436" />
-<TGConnectingPoint num="6" id="437" />
-<TGConnectingPoint num="7" id="438" />
-<TGConnectingPoint num="8" id="439" />
-<TGConnectingPoint num="9" id="440" />
-<TGConnectingPoint num="10" id="441" />
-<TGConnectingPoint num="11" id="442" />
-<TGConnectingPoint num="12" id="443" />
-<TGConnectingPoint num="13" id="444" />
-<TGConnectingPoint num="14" id="445" />
-<TGConnectingPoint num="15" id="446" />
-<TGConnectingPoint num="16" id="447" />
-<TGConnectingPoint num="17" id="448" />
-<TGConnectingPoint num="18" id="449" />
-<TGConnectingPoint num="19" id="450" />
-<TGConnectingPoint num="20" id="451" />
-<TGConnectingPoint num="21" id="452" />
-<TGConnectingPoint num="22" id="453" />
-<TGConnectingPoint num="23" id="454" />
+<new d="false" />
+<TGConnectingPoint num="0" id="425" />
+<TGConnectingPoint num="1" id="426" />
+<TGConnectingPoint num="2" id="427" />
+<TGConnectingPoint num="3" id="428" />
+<TGConnectingPoint num="4" id="429" />
+<TGConnectingPoint num="5" id="430" />
+<TGConnectingPoint num="6" id="431" />
+<TGConnectingPoint num="7" id="432" />
+<TGConnectingPoint num="8" id="433" />
+<TGConnectingPoint num="9" id="434" />
+<TGConnectingPoint num="10" id="435" />
+<TGConnectingPoint num="11" id="436" />
+<TGConnectingPoint num="12" id="437" />
+<TGConnectingPoint num="13" id="438" />
+<TGConnectingPoint num="14" id="439" />
+<TGConnectingPoint num="15" id="440" />
+<TGConnectingPoint num="16" id="441" />
+<TGConnectingPoint num="17" id="442" />
+<TGConnectingPoint num="18" id="443" />
+<TGConnectingPoint num="19" id="444" />
+<TGConnectingPoint num="20" id="445" />
+<TGConnectingPoint num="21" id="446" />
+<TGConnectingPoint num="22" id="447" />
+<TGConnectingPoint num="23" id="448" />
<extraparam>
<info stereotype="MEMORY" nodeName="Memory0" />
<attributes byteDataSize="4" memorySize="1024" clockRatio="1" bufferType="0" />
</extraparam>
</COMPONENT>
+<SUBCOMPONENT type="1111" id="774" index="32" uid="e88326fc-e7ba-4af7-afac-714a0b559965" >
+<father id="449" num="0" />
+<cdparam x="455" y="832" />
+<sizeparam width="78" height="40" minWidth="75" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="192" minY="0" maxY="240" />
+<infoparam name="TGComponent" value="encryption1" />
+<new d="false" />
+<TGConnectingPoint num="0" id="775" />
+<TGConnectingPoint num="1" id="776" />
+<TGConnectingPoint num="2" id="777" />
+<TGConnectingPoint num="3" id="778" />
+<TGConnectingPoint num="4" id="779" />
+<TGConnectingPoint num="5" id="780" />
+<TGConnectingPoint num="6" id="781" />
+<TGConnectingPoint num="7" id="782" />
+<extraparam>
+<info value="encryption1" referenceKeyName="encryption1" priority="5" typeName="key" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1103" id="765" index="33" uid="376cf494-dee1-4217-a555-e2ce6458cd7e" >
+<father id="449" num="1" />
+<cdparam x="374" y="784" />
+<sizeparam width="159" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="108" minY="0" maxY="240" />
+<infoparam name="TGComponent" value="Application::channel4" />
+<new d="false" />
+<TGConnectingPoint num="0" id="766" />
+<TGConnectingPoint num="1" id="767" />
+<TGConnectingPoint num="2" id="768" />
+<TGConnectingPoint num="3" id="769" />
+<TGConnectingPoint num="4" id="770" />
+<TGConnectingPoint num="5" id="771" />
+<TGConnectingPoint num="6" id="772" />
+<TGConnectingPoint num="7" id="773" />
+<extraparam>
+<info value="Application::channel4" communicationName="channel4" referenceCommunicationName="Application" mappedElements="" priority="0" typeName="channel" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1103" id="756" index="34" uid="f37ccc05-dc3e-4fc4-82ad-e43c556f8c86" >
+<father id="449" num="2" />
+<cdparam x="371" y="735" />
+<sizeparam width="159" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="108" minY="0" maxY="240" />
+<infoparam name="TGComponent" value="Application::channel3" />
+<new d="false" />
+<TGConnectingPoint num="0" id="757" />
+<TGConnectingPoint num="1" id="758" />
+<TGConnectingPoint num="2" id="759" />
+<TGConnectingPoint num="3" id="760" />
+<TGConnectingPoint num="4" id="761" />
+<TGConnectingPoint num="5" id="762" />
+<TGConnectingPoint num="6" id="763" />
+<TGConnectingPoint num="7" id="764" />
+<extraparam>
+<info value="Application::channel3" communicationName="channel3" referenceCommunicationName="Application" mappedElements="" priority="0" typeName="channel" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1103" id="747" index="35" uid="7765fc58-c690-45ea-a216-e4096ee4dbd4" >
+<father id="449" num="3" />
+<cdparam x="371" y="689" />
+<sizeparam width="159" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="108" minY="0" maxY="240" />
+<infoparam name="TGComponent" value="Application::channel2" />
+<new d="false" />
+<TGConnectingPoint num="0" id="748" />
+<TGConnectingPoint num="1" id="749" />
+<TGConnectingPoint num="2" id="750" />
+<TGConnectingPoint num="3" id="751" />
+<TGConnectingPoint num="4" id="752" />
+<TGConnectingPoint num="5" id="753" />
+<TGConnectingPoint num="6" id="754" />
+<TGConnectingPoint num="7" id="755" />
+<extraparam>
+<info value="Application::channel2" communicationName="channel2" referenceCommunicationName="Application" mappedElements="" priority="0" typeName="channel" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1103" id="738" index="36" uid="beea57bc-ba8d-411c-a8fe-3c5e556f73f4" >
+<father id="449" num="4" />
+<cdparam x="369" y="641" />
+<sizeparam width="151" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="116" minY="0" maxY="240" />
+<infoparam name="TGComponent" value="Application::channel" />
+<new d="false" />
+<TGConnectingPoint num="0" id="739" />
+<TGConnectingPoint num="1" id="740" />
+<TGConnectingPoint num="2" id="741" />
+<TGConnectingPoint num="3" id="742" />
+<TGConnectingPoint num="4" id="743" />
+<TGConnectingPoint num="5" id="744" />
+<TGConnectingPoint num="6" id="745" />
+<TGConnectingPoint num="7" id="746" />
+<extraparam>
+<info value="Application::channel" communicationName="channel" referenceCommunicationName="Application" mappedElements="" priority="0" typeName="channel" />
+</extraparam>
+</SUBCOMPONENT>
-<COMPONENT type="1102" id="480" >
+<COMPONENT type="1102" id="474" index="10" uid="b3ac12d2-1f38-4f5b-b2cd-0ecb2c6f8561" >
<cdparam x="1363" y="461" />
<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="Bus1" value="name" />
-<TGConnectingPoint num="0" id="456" />
-<TGConnectingPoint num="1" id="457" />
-<TGConnectingPoint num="2" id="458" />
-<TGConnectingPoint num="3" id="459" />
-<TGConnectingPoint num="4" id="460" />
-<TGConnectingPoint num="5" id="461" />
-<TGConnectingPoint num="6" id="462" />
-<TGConnectingPoint num="7" id="463" />
-<TGConnectingPoint num="8" id="464" />
-<TGConnectingPoint num="9" id="465" />
-<TGConnectingPoint num="10" id="466" />
-<TGConnectingPoint num="11" id="467" />
-<TGConnectingPoint num="12" id="468" />
-<TGConnectingPoint num="13" id="469" />
-<TGConnectingPoint num="14" id="470" />
-<TGConnectingPoint num="15" id="471" />
-<TGConnectingPoint num="16" id="472" />
-<TGConnectingPoint num="17" id="473" />
-<TGConnectingPoint num="18" id="474" />
-<TGConnectingPoint num="19" id="475" />
-<TGConnectingPoint num="20" id="476" />
-<TGConnectingPoint num="21" id="477" />
-<TGConnectingPoint num="22" id="478" />
-<TGConnectingPoint num="23" id="479" />
+<new d="false" />
+<TGConnectingPoint num="0" id="450" />
+<TGConnectingPoint num="1" id="451" />
+<TGConnectingPoint num="2" id="452" />
+<TGConnectingPoint num="3" id="453" />
+<TGConnectingPoint num="4" id="454" />
+<TGConnectingPoint num="5" id="455" />
+<TGConnectingPoint num="6" id="456" />
+<TGConnectingPoint num="7" id="457" />
+<TGConnectingPoint num="8" id="458" />
+<TGConnectingPoint num="9" id="459" />
+<TGConnectingPoint num="10" id="460" />
+<TGConnectingPoint num="11" id="461" />
+<TGConnectingPoint num="12" id="462" />
+<TGConnectingPoint num="13" id="463" />
+<TGConnectingPoint num="14" id="464" />
+<TGConnectingPoint num="15" id="465" />
+<TGConnectingPoint num="16" id="466" />
+<TGConnectingPoint num="17" id="467" />
+<TGConnectingPoint num="18" id="468" />
+<TGConnectingPoint num="19" id="469" />
+<TGConnectingPoint num="20" id="470" />
+<TGConnectingPoint num="21" id="471" />
+<TGConnectingPoint num="22" id="472" />
+<TGConnectingPoint num="23" id="473" />
<extraparam>
<info stereotype="BUS-RR" nodeName="Bus1" />
-<attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" clockRatio="1" privacy="0" referenceAttack="null" />
+<attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" burstSize="100" clockRatio="1" privacy="0" referenceAttack="null" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1102" id="505" >
+<COMPONENT type="1102" id="499" index="11" uid="d159b8a1-fa92-4737-aafd-b54e73b4a6b5" >
<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="481" />
-<TGConnectingPoint num="1" id="482" />
-<TGConnectingPoint num="2" id="483" />
-<TGConnectingPoint num="3" id="484" />
-<TGConnectingPoint num="4" id="485" />
-<TGConnectingPoint num="5" id="486" />
-<TGConnectingPoint num="6" id="487" />
-<TGConnectingPoint num="7" id="488" />
-<TGConnectingPoint num="8" id="489" />
-<TGConnectingPoint num="9" id="490" />
-<TGConnectingPoint num="10" id="491" />
-<TGConnectingPoint num="11" id="492" />
-<TGConnectingPoint num="12" id="493" />
-<TGConnectingPoint num="13" id="494" />
-<TGConnectingPoint num="14" id="495" />
-<TGConnectingPoint num="15" id="496" />
-<TGConnectingPoint num="16" id="497" />
-<TGConnectingPoint num="17" id="498" />
-<TGConnectingPoint num="18" id="499" />
-<TGConnectingPoint num="19" id="500" />
-<TGConnectingPoint num="20" id="501" />
-<TGConnectingPoint num="21" id="502" />
-<TGConnectingPoint num="22" id="503" />
-<TGConnectingPoint num="23" id="504" />
+<new d="false" />
+<TGConnectingPoint num="0" id="475" />
+<TGConnectingPoint num="1" id="476" />
+<TGConnectingPoint num="2" id="477" />
+<TGConnectingPoint num="3" id="478" />
+<TGConnectingPoint num="4" id="479" />
+<TGConnectingPoint num="5" id="480" />
+<TGConnectingPoint num="6" id="481" />
+<TGConnectingPoint num="7" id="482" />
+<TGConnectingPoint num="8" id="483" />
+<TGConnectingPoint num="9" id="484" />
+<TGConnectingPoint num="10" id="485" />
+<TGConnectingPoint num="11" id="486" />
+<TGConnectingPoint num="12" id="487" />
+<TGConnectingPoint num="13" id="488" />
+<TGConnectingPoint num="14" id="489" />
+<TGConnectingPoint num="15" id="490" />
+<TGConnectingPoint num="16" id="491" />
+<TGConnectingPoint num="17" id="492" />
+<TGConnectingPoint num="18" id="493" />
+<TGConnectingPoint num="19" id="494" />
+<TGConnectingPoint num="20" id="495" />
+<TGConnectingPoint num="21" id="496" />
+<TGConnectingPoint num="22" id="497" />
+<TGConnectingPoint num="23" id="498" />
<extraparam>
<info stereotype="BUS-RR" nodeName="Bus0" />
-<attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" clockRatio="1" privacy="0" referenceAttack="null" />
+<attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" burstSize="100" clockRatio="1" privacy="0" referenceAttack="null" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1116" id="530" >
-<cdparam x="1355" y="573" />
+<COMPONENT type="1116" id="524" index="12" uid="92730563-e44f-472c-9fd3-5d004532ee45" >
+<cdparam x="1486" y="569" />
<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="FPGA1" value="name" />
-<TGConnectingPoint num="0" id="506" />
-<TGConnectingPoint num="1" id="507" />
-<TGConnectingPoint num="2" id="508" />
-<TGConnectingPoint num="3" id="509" />
-<TGConnectingPoint num="4" id="510" />
-<TGConnectingPoint num="5" id="511" />
-<TGConnectingPoint num="6" id="512" />
-<TGConnectingPoint num="7" id="513" />
-<TGConnectingPoint num="8" id="514" />
-<TGConnectingPoint num="9" id="515" />
-<TGConnectingPoint num="10" id="516" />
-<TGConnectingPoint num="11" id="517" />
-<TGConnectingPoint num="12" id="518" />
-<TGConnectingPoint num="13" id="519" />
-<TGConnectingPoint num="14" id="520" />
-<TGConnectingPoint num="15" id="521" />
-<TGConnectingPoint num="16" id="522" />
-<TGConnectingPoint num="17" id="523" />
-<TGConnectingPoint num="18" id="524" />
-<TGConnectingPoint num="19" id="525" />
-<TGConnectingPoint num="20" id="526" />
-<TGConnectingPoint num="21" id="527" />
-<TGConnectingPoint num="22" id="528" />
-<TGConnectingPoint num="23" id="529" />
+<new d="false" />
+<TGConnectingPoint num="0" id="500" />
+<TGConnectingPoint num="1" id="501" />
+<TGConnectingPoint num="2" id="502" />
+<TGConnectingPoint num="3" id="503" />
+<TGConnectingPoint num="4" id="504" />
+<TGConnectingPoint num="5" id="505" />
+<TGConnectingPoint num="6" id="506" />
+<TGConnectingPoint num="7" id="507" />
+<TGConnectingPoint num="8" id="508" />
+<TGConnectingPoint num="9" id="509" />
+<TGConnectingPoint num="10" id="510" />
+<TGConnectingPoint num="11" id="511" />
+<TGConnectingPoint num="12" id="512" />
+<TGConnectingPoint num="13" id="513" />
+<TGConnectingPoint num="14" id="514" />
+<TGConnectingPoint num="15" id="515" />
+<TGConnectingPoint num="16" id="516" />
+<TGConnectingPoint num="17" id="517" />
+<TGConnectingPoint num="18" id="518" />
+<TGConnectingPoint num="19" id="519" />
+<TGConnectingPoint num="20" id="520" />
+<TGConnectingPoint num="21" id="521" />
+<TGConnectingPoint num="22" id="522" />
+<TGConnectingPoint num="23" id="523" />
<extraparam>
<info stereotype="FPGA" nodeName="FPGA1" />
<attributes capacity="100" byteDataSize="4" mappingPenalty="0" reconfigurationTime="50" goIdleTime="10" maxConsecutiveIdleCycles="10" execiTime="1" execcTime="1" clockRatio="1" operation ="" scheduling ="" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1116" id="555" >
+<COMPONENT type="1116" id="549" index="13" uid="01bcb2cd-8d59-4465-a940-c424365d342f" >
<cdparam x="74" y="596" />
<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="FPGA0" value="name" />
-<TGConnectingPoint num="0" id="531" />
-<TGConnectingPoint num="1" id="532" />
-<TGConnectingPoint num="2" id="533" />
-<TGConnectingPoint num="3" id="534" />
-<TGConnectingPoint num="4" id="535" />
-<TGConnectingPoint num="5" id="536" />
-<TGConnectingPoint num="6" id="537" />
-<TGConnectingPoint num="7" id="538" />
-<TGConnectingPoint num="8" id="539" />
-<TGConnectingPoint num="9" id="540" />
-<TGConnectingPoint num="10" id="541" />
-<TGConnectingPoint num="11" id="542" />
-<TGConnectingPoint num="12" id="543" />
-<TGConnectingPoint num="13" id="544" />
-<TGConnectingPoint num="14" id="545" />
-<TGConnectingPoint num="15" id="546" />
-<TGConnectingPoint num="16" id="547" />
-<TGConnectingPoint num="17" id="548" />
-<TGConnectingPoint num="18" id="549" />
-<TGConnectingPoint num="19" id="550" />
-<TGConnectingPoint num="20" id="551" />
-<TGConnectingPoint num="21" id="552" />
-<TGConnectingPoint num="22" id="553" />
-<TGConnectingPoint num="23" id="554" />
+<new d="false" />
+<TGConnectingPoint num="0" id="525" />
+<TGConnectingPoint num="1" id="526" />
+<TGConnectingPoint num="2" id="527" />
+<TGConnectingPoint num="3" id="528" />
+<TGConnectingPoint num="4" id="529" />
+<TGConnectingPoint num="5" id="530" />
+<TGConnectingPoint num="6" id="531" />
+<TGConnectingPoint num="7" id="532" />
+<TGConnectingPoint num="8" id="533" />
+<TGConnectingPoint num="9" id="534" />
+<TGConnectingPoint num="10" id="535" />
+<TGConnectingPoint num="11" id="536" />
+<TGConnectingPoint num="12" id="537" />
+<TGConnectingPoint num="13" id="538" />
+<TGConnectingPoint num="14" id="539" />
+<TGConnectingPoint num="15" id="540" />
+<TGConnectingPoint num="16" id="541" />
+<TGConnectingPoint num="17" id="542" />
+<TGConnectingPoint num="18" id="543" />
+<TGConnectingPoint num="19" id="544" />
+<TGConnectingPoint num="20" id="545" />
+<TGConnectingPoint num="21" id="546" />
+<TGConnectingPoint num="22" id="547" />
+<TGConnectingPoint num="23" id="548" />
<extraparam>
<info stereotype="FPGA" nodeName="FPGA0" />
<attributes capacity="100" byteDataSize="4" mappingPenalty="0" reconfigurationTime="50" goIdleTime="10" maxConsecutiveIdleCycles="10" execiTime="1" execcTime="1" clockRatio="1" operation ="" scheduling ="" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1106" id="580" >
+<COMPONENT type="1106" id="574" index="14" uid="1f9e5367-d296-41b8-8a69-480519572200" >
<cdparam x="1108" y="814" />
<sizeparam width="250" height="100" 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="Bridge1" value="name" />
-<TGConnectingPoint num="0" id="556" />
-<TGConnectingPoint num="1" id="557" />
-<TGConnectingPoint num="2" id="558" />
-<TGConnectingPoint num="3" id="559" />
-<TGConnectingPoint num="4" id="560" />
-<TGConnectingPoint num="5" id="561" />
-<TGConnectingPoint num="6" id="562" />
-<TGConnectingPoint num="7" id="563" />
-<TGConnectingPoint num="8" id="564" />
-<TGConnectingPoint num="9" id="565" />
-<TGConnectingPoint num="10" id="566" />
-<TGConnectingPoint num="11" id="567" />
-<TGConnectingPoint num="12" id="568" />
-<TGConnectingPoint num="13" id="569" />
-<TGConnectingPoint num="14" id="570" />
-<TGConnectingPoint num="15" id="571" />
-<TGConnectingPoint num="16" id="572" />
-<TGConnectingPoint num="17" id="573" />
-<TGConnectingPoint num="18" id="574" />
-<TGConnectingPoint num="19" id="575" />
-<TGConnectingPoint num="20" id="576" />
-<TGConnectingPoint num="21" id="577" />
-<TGConnectingPoint num="22" id="578" />
-<TGConnectingPoint num="23" id="579" />
+<new d="false" />
+<TGConnectingPoint num="0" id="550" />
+<TGConnectingPoint num="1" id="551" />
+<TGConnectingPoint num="2" id="552" />
+<TGConnectingPoint num="3" id="553" />
+<TGConnectingPoint num="4" id="554" />
+<TGConnectingPoint num="5" id="555" />
+<TGConnectingPoint num="6" id="556" />
+<TGConnectingPoint num="7" id="557" />
+<TGConnectingPoint num="8" id="558" />
+<TGConnectingPoint num="9" id="559" />
+<TGConnectingPoint num="10" id="560" />
+<TGConnectingPoint num="11" id="561" />
+<TGConnectingPoint num="12" id="562" />
+<TGConnectingPoint num="13" id="563" />
+<TGConnectingPoint num="14" id="564" />
+<TGConnectingPoint num="15" id="565" />
+<TGConnectingPoint num="16" id="566" />
+<TGConnectingPoint num="17" id="567" />
+<TGConnectingPoint num="18" id="568" />
+<TGConnectingPoint num="19" id="569" />
+<TGConnectingPoint num="20" id="570" />
+<TGConnectingPoint num="21" id="571" />
+<TGConnectingPoint num="22" id="572" />
+<TGConnectingPoint num="23" id="573" />
<extraparam>
<info stereotype="BRIDGE" nodeName="Bridge1" />
<attributes bufferByteDataSize="4" clockRatio="1" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1104" id="605" >
-<cdparam x="1393" y="804" />
+<COMPONENT type="1104" id="599" index="15" uid="4ba45209-d7c2-47e0-b7a2-543345790c71" >
+<cdparam x="1398" y="810" />
<sizeparam width="200" height="200" minWidth="100" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="HWA1" value="name" />
-<TGConnectingPoint num="0" id="581" />
-<TGConnectingPoint num="1" id="582" />
-<TGConnectingPoint num="2" id="583" />
-<TGConnectingPoint num="3" id="584" />
-<TGConnectingPoint num="4" id="585" />
-<TGConnectingPoint num="5" id="586" />
-<TGConnectingPoint num="6" id="587" />
-<TGConnectingPoint num="7" id="588" />
-<TGConnectingPoint num="8" id="589" />
-<TGConnectingPoint num="9" id="590" />
-<TGConnectingPoint num="10" id="591" />
-<TGConnectingPoint num="11" id="592" />
-<TGConnectingPoint num="12" id="593" />
-<TGConnectingPoint num="13" id="594" />
-<TGConnectingPoint num="14" id="595" />
-<TGConnectingPoint num="15" id="596" />
-<TGConnectingPoint num="16" id="597" />
-<TGConnectingPoint num="17" id="598" />
-<TGConnectingPoint num="18" id="599" />
-<TGConnectingPoint num="19" id="600" />
-<TGConnectingPoint num="20" id="601" />
-<TGConnectingPoint num="21" id="602" />
-<TGConnectingPoint num="22" id="603" />
-<TGConnectingPoint num="23" id="604" />
+<new d="false" />
+<TGConnectingPoint num="0" id="575" />
+<TGConnectingPoint num="1" id="576" />
+<TGConnectingPoint num="2" id="577" />
+<TGConnectingPoint num="3" id="578" />
+<TGConnectingPoint num="4" id="579" />
+<TGConnectingPoint num="5" id="580" />
+<TGConnectingPoint num="6" id="581" />
+<TGConnectingPoint num="7" id="582" />
+<TGConnectingPoint num="8" id="583" />
+<TGConnectingPoint num="9" id="584" />
+<TGConnectingPoint num="10" id="585" />
+<TGConnectingPoint num="11" id="586" />
+<TGConnectingPoint num="12" id="587" />
+<TGConnectingPoint num="13" id="588" />
+<TGConnectingPoint num="14" id="589" />
+<TGConnectingPoint num="15" id="590" />
+<TGConnectingPoint num="16" id="591" />
+<TGConnectingPoint num="17" id="592" />
+<TGConnectingPoint num="18" id="593" />
+<TGConnectingPoint num="19" id="594" />
+<TGConnectingPoint num="20" id="595" />
+<TGConnectingPoint num="21" id="596" />
+<TGConnectingPoint num="22" id="597" />
+<TGConnectingPoint num="23" id="598" />
<extraparam>
<info stereotype="HWA" nodeName="HWA1" />
-<attributes byteDataSize="4" execiTime="1" clockRatio="1" operation="" />
+<attributes byteDataSize="4" execiTime="1" execcTime="1" clockRatio="1" operation="" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1104" id="630" >
+<COMPONENT type="1104" id="624" index="16" uid="b09ab224-8365-42d2-9ef1-aa1474d5ecdf" >
<cdparam x="672" y="681" />
<sizeparam width="200" height="200" minWidth="100" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="HWA0" value="name" />
-<TGConnectingPoint num="0" id="606" />
-<TGConnectingPoint num="1" id="607" />
-<TGConnectingPoint num="2" id="608" />
-<TGConnectingPoint num="3" id="609" />
-<TGConnectingPoint num="4" id="610" />
-<TGConnectingPoint num="5" id="611" />
-<TGConnectingPoint num="6" id="612" />
-<TGConnectingPoint num="7" id="613" />
-<TGConnectingPoint num="8" id="614" />
-<TGConnectingPoint num="9" id="615" />
-<TGConnectingPoint num="10" id="616" />
-<TGConnectingPoint num="11" id="617" />
-<TGConnectingPoint num="12" id="618" />
-<TGConnectingPoint num="13" id="619" />
-<TGConnectingPoint num="14" id="620" />
-<TGConnectingPoint num="15" id="621" />
-<TGConnectingPoint num="16" id="622" />
-<TGConnectingPoint num="17" id="623" />
-<TGConnectingPoint num="18" id="624" />
-<TGConnectingPoint num="19" id="625" />
-<TGConnectingPoint num="20" id="626" />
-<TGConnectingPoint num="21" id="627" />
-<TGConnectingPoint num="22" id="628" />
-<TGConnectingPoint num="23" id="629" />
+<new d="false" />
+<TGConnectingPoint num="0" id="600" />
+<TGConnectingPoint num="1" id="601" />
+<TGConnectingPoint num="2" id="602" />
+<TGConnectingPoint num="3" id="603" />
+<TGConnectingPoint num="4" id="604" />
+<TGConnectingPoint num="5" id="605" />
+<TGConnectingPoint num="6" id="606" />
+<TGConnectingPoint num="7" id="607" />
+<TGConnectingPoint num="8" id="608" />
+<TGConnectingPoint num="9" id="609" />
+<TGConnectingPoint num="10" id="610" />
+<TGConnectingPoint num="11" id="611" />
+<TGConnectingPoint num="12" id="612" />
+<TGConnectingPoint num="13" id="613" />
+<TGConnectingPoint num="14" id="614" />
+<TGConnectingPoint num="15" id="615" />
+<TGConnectingPoint num="16" id="616" />
+<TGConnectingPoint num="17" id="617" />
+<TGConnectingPoint num="18" id="618" />
+<TGConnectingPoint num="19" id="619" />
+<TGConnectingPoint num="20" id="620" />
+<TGConnectingPoint num="21" id="621" />
+<TGConnectingPoint num="22" id="622" />
+<TGConnectingPoint num="23" id="623" />
<extraparam>
<info stereotype="HWA" nodeName="HWA0" />
-<attributes byteDataSize="4" execiTime="1" clockRatio="1" operation="" />
+<attributes byteDataSize="4" execiTime="1" execcTime="1" clockRatio="1" operation="" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1107" id="655" >
+<COMPONENT type="1107" id="649" index="17" uid="7918eb56-90be-4ef4-b6f1-ce4d56df6824" >
<cdparam x="1109" y="354" />
<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="DMA1" value="name" />
-<TGConnectingPoint num="0" id="631" />
-<TGConnectingPoint num="1" id="632" />
-<TGConnectingPoint num="2" id="633" />
-<TGConnectingPoint num="3" id="634" />
-<TGConnectingPoint num="4" id="635" />
-<TGConnectingPoint num="5" id="636" />
-<TGConnectingPoint num="6" id="637" />
-<TGConnectingPoint num="7" id="638" />
-<TGConnectingPoint num="8" id="639" />
-<TGConnectingPoint num="9" id="640" />
-<TGConnectingPoint num="10" id="641" />
-<TGConnectingPoint num="11" id="642" />
-<TGConnectingPoint num="12" id="643" />
-<TGConnectingPoint num="13" id="644" />
-<TGConnectingPoint num="14" id="645" />
-<TGConnectingPoint num="15" id="646" />
-<TGConnectingPoint num="16" id="647" />
-<TGConnectingPoint num="17" id="648" />
-<TGConnectingPoint num="18" id="649" />
-<TGConnectingPoint num="19" id="650" />
-<TGConnectingPoint num="20" id="651" />
-<TGConnectingPoint num="21" id="652" />
-<TGConnectingPoint num="22" id="653" />
-<TGConnectingPoint num="23" id="654" />
+<new d="false" />
+<TGConnectingPoint num="0" id="625" />
+<TGConnectingPoint num="1" id="626" />
+<TGConnectingPoint num="2" id="627" />
+<TGConnectingPoint num="3" id="628" />
+<TGConnectingPoint num="4" id="629" />
+<TGConnectingPoint num="5" id="630" />
+<TGConnectingPoint num="6" id="631" />
+<TGConnectingPoint num="7" id="632" />
+<TGConnectingPoint num="8" id="633" />
+<TGConnectingPoint num="9" id="634" />
+<TGConnectingPoint num="10" id="635" />
+<TGConnectingPoint num="11" id="636" />
+<TGConnectingPoint num="12" id="637" />
+<TGConnectingPoint num="13" id="638" />
+<TGConnectingPoint num="14" id="639" />
+<TGConnectingPoint num="15" id="640" />
+<TGConnectingPoint num="16" id="641" />
+<TGConnectingPoint num="17" id="642" />
+<TGConnectingPoint num="18" id="643" />
+<TGConnectingPoint num="19" id="644" />
+<TGConnectingPoint num="20" id="645" />
+<TGConnectingPoint num="21" id="646" />
+<TGConnectingPoint num="22" id="647" />
+<TGConnectingPoint num="23" id="648" />
<extraparam>
<info stereotype="DMA" nodeName="DMA1" />
<attributes byteDataSize="4" nbOfChannels="1" clockRatio="1" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1105" id="680" >
+<COMPONENT type="1105" id="674" index="18" uid="63224e11-0df8-4c59-a569-a2a51aeb6f61" >
<cdparam x="1115" y="579" />
<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="Memory1" value="name" />
-<TGConnectingPoint num="0" id="656" />
-<TGConnectingPoint num="1" id="657" />
-<TGConnectingPoint num="2" id="658" />
-<TGConnectingPoint num="3" id="659" />
-<TGConnectingPoint num="4" id="660" />
-<TGConnectingPoint num="5" id="661" />
-<TGConnectingPoint num="6" id="662" />
-<TGConnectingPoint num="7" id="663" />
-<TGConnectingPoint num="8" id="664" />
-<TGConnectingPoint num="9" id="665" />
-<TGConnectingPoint num="10" id="666" />
-<TGConnectingPoint num="11" id="667" />
-<TGConnectingPoint num="12" id="668" />
-<TGConnectingPoint num="13" id="669" />
-<TGConnectingPoint num="14" id="670" />
-<TGConnectingPoint num="15" id="671" />
-<TGConnectingPoint num="16" id="672" />
-<TGConnectingPoint num="17" id="673" />
-<TGConnectingPoint num="18" id="674" />
-<TGConnectingPoint num="19" id="675" />
-<TGConnectingPoint num="20" id="676" />
-<TGConnectingPoint num="21" id="677" />
-<TGConnectingPoint num="22" id="678" />
-<TGConnectingPoint num="23" id="679" />
+<new d="false" />
+<TGConnectingPoint num="0" id="650" />
+<TGConnectingPoint num="1" id="651" />
+<TGConnectingPoint num="2" id="652" />
+<TGConnectingPoint num="3" id="653" />
+<TGConnectingPoint num="4" id="654" />
+<TGConnectingPoint num="5" id="655" />
+<TGConnectingPoint num="6" id="656" />
+<TGConnectingPoint num="7" id="657" />
+<TGConnectingPoint num="8" id="658" />
+<TGConnectingPoint num="9" id="659" />
+<TGConnectingPoint num="10" id="660" />
+<TGConnectingPoint num="11" id="661" />
+<TGConnectingPoint num="12" id="662" />
+<TGConnectingPoint num="13" id="663" />
+<TGConnectingPoint num="14" id="664" />
+<TGConnectingPoint num="15" id="665" />
+<TGConnectingPoint num="16" id="666" />
+<TGConnectingPoint num="17" id="667" />
+<TGConnectingPoint num="18" id="668" />
+<TGConnectingPoint num="19" id="669" />
+<TGConnectingPoint num="20" id="670" />
+<TGConnectingPoint num="21" id="671" />
+<TGConnectingPoint num="22" id="672" />
+<TGConnectingPoint num="23" id="673" />
<extraparam>
<info stereotype="MEMORY" nodeName="Memory1" />
<attributes byteDataSize="4" memorySize="1024" clockRatio="1" bufferType="0" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1106" id="705" >
+<COMPONENT type="1106" id="699" index="19" uid="ae4dc07f-22d8-4adc-81ab-e2cf7c455129" >
<cdparam x="13" y="416" />
<sizeparam width="250" height="100" 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="Bridge0" value="name" />
-<TGConnectingPoint num="0" id="681" />
-<TGConnectingPoint num="1" id="682" />
-<TGConnectingPoint num="2" id="683" />
-<TGConnectingPoint num="3" id="684" />
-<TGConnectingPoint num="4" id="685" />
-<TGConnectingPoint num="5" id="686" />
-<TGConnectingPoint num="6" id="687" />
-<TGConnectingPoint num="7" id="688" />
-<TGConnectingPoint num="8" id="689" />
-<TGConnectingPoint num="9" id="690" />
-<TGConnectingPoint num="10" id="691" />
-<TGConnectingPoint num="11" id="692" />
-<TGConnectingPoint num="12" id="693" />
-<TGConnectingPoint num="13" id="694" />
-<TGConnectingPoint num="14" id="695" />
-<TGConnectingPoint num="15" id="696" />
-<TGConnectingPoint num="16" id="697" />
-<TGConnectingPoint num="17" id="698" />
-<TGConnectingPoint num="18" id="699" />
-<TGConnectingPoint num="19" id="700" />
-<TGConnectingPoint num="20" id="701" />
-<TGConnectingPoint num="21" id="702" />
-<TGConnectingPoint num="22" id="703" />
-<TGConnectingPoint num="23" id="704" />
+<new d="false" />
+<TGConnectingPoint num="0" id="675" />
+<TGConnectingPoint num="1" id="676" />
+<TGConnectingPoint num="2" id="677" />
+<TGConnectingPoint num="3" id="678" />
+<TGConnectingPoint num="4" id="679" />
+<TGConnectingPoint num="5" id="680" />
+<TGConnectingPoint num="6" id="681" />
+<TGConnectingPoint num="7" id="682" />
+<TGConnectingPoint num="8" id="683" />
+<TGConnectingPoint num="9" id="684" />
+<TGConnectingPoint num="10" id="685" />
+<TGConnectingPoint num="11" id="686" />
+<TGConnectingPoint num="12" id="687" />
+<TGConnectingPoint num="13" id="688" />
+<TGConnectingPoint num="14" id="689" />
+<TGConnectingPoint num="15" id="690" />
+<TGConnectingPoint num="16" id="691" />
+<TGConnectingPoint num="17" id="692" />
+<TGConnectingPoint num="18" id="693" />
+<TGConnectingPoint num="19" id="694" />
+<TGConnectingPoint num="20" id="695" />
+<TGConnectingPoint num="21" id="696" />
+<TGConnectingPoint num="22" id="697" />
+<TGConnectingPoint num="23" id="698" />
<extraparam>
<info stereotype="BRIDGE" nodeName="Bridge0" />
<attributes bufferByteDataSize="4" clockRatio="1" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1117" id="730" >
-<cdparam x="686" y="230" />
-<sizeparam width="250" height="100" 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="NoC0" value="name" />
-<TGConnectingPoint num="0" id="706" />
-<TGConnectingPoint num="1" id="707" />
-<TGConnectingPoint num="2" id="708" />
-<TGConnectingPoint num="3" id="709" />
-<TGConnectingPoint num="4" id="710" />
-<TGConnectingPoint num="5" id="711" />
-<TGConnectingPoint num="6" id="712" />
-<TGConnectingPoint num="7" id="713" />
-<TGConnectingPoint num="8" id="714" />
-<TGConnectingPoint num="9" id="715" />
-<TGConnectingPoint num="10" id="716" />
-<TGConnectingPoint num="11" id="717" />
-<TGConnectingPoint num="12" id="718" />
-<TGConnectingPoint num="13" id="719" />
-<TGConnectingPoint num="14" id="720" />
-<TGConnectingPoint num="15" id="721" />
-<TGConnectingPoint num="16" id="722" />
-<TGConnectingPoint num="17" id="723" />
-<TGConnectingPoint num="18" id="724" />
-<TGConnectingPoint num="19" id="725" />
-<TGConnectingPoint num="20" id="726" />
-<TGConnectingPoint num="21" id="727" />
-<TGConnectingPoint num="22" id="728" />
-<TGConnectingPoint num="23" id="729" />
-<extraparam>
-<info stereotype="NoC" nodeName="NoC0" />
-<attributes bufferByteDataSize="4" size="2" placement="CPU1 1 0" clockRatio="1" />
-</extraparam>
-</COMPONENT>
-
-<CONNECTOR type="125" id="731" >
+<CONNECTOR type="125" id="725" index="20" uid="f6250e04-dcfe-408a-9430-ba1cd605f234" >
<cdparam x="199" y="596" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="{info}" />
-<P1 x="199" y="596" id="532" />
-<P2 x="378" y="466" id="495" />
+<P1 x="199" y="596" id="526" />
+<P2 x="378" y="466" id="489" />
<AutomaticDrawing data="true" />
+<new d="false" />
<extraparam>
<info priority="0" />
<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="732" >
+<CONNECTOR type="125" id="726" index="21" uid="d5714674-eb01-4e20-a055-5a5ee12033b4" >
<cdparam x="262" y="461" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="{info}" />
-<P1 x="263" y="466" id="685" />
-<P2 x="316" y="441" id="484" />
+<P1 x="263" y="466" id="679" />
+<P2 x="316" y="441" id="478" />
<AutomaticDrawing data="true" />
+<new d="false" />
<extraparam>
<info priority="0" />
<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="733" >
+<CONNECTOR type="125" id="727" index="22" uid="66406a52-7714-49c2-ac5c-477dddc50aad" >
<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="699" y="448" id="416" />
-<P2 x="566" y="441" id="485" />
+<P1 x="699" y="448" id="410" />
+<P2 x="566" y="441" id="479" />
<AutomaticDrawing data="true" />
+<new d="false" />
<extraparam>
<info priority="0" />
<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="734" >
+<CONNECTOR type="125" id="728" index="23" uid="1033cf37-b847-41d4-8fa6-67bda2618f3b" >
<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="444" y="601" id="432" />
-<P2 x="441" y="466" id="487" />
+<P1 x="477" y="601" id="426" />
+<P2 x="441" y="466" id="481" />
<AutomaticDrawing data="true" />
+<new d="false" />
<extraparam>
<info priority="0" />
<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="735" >
+<CONNECTOR type="125" id="729" index="24" uid="5df9b60c-acea-47e2-9e6b-50b40c2846ec" >
<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="337" />
-<P2 x="441" y="416" id="482" />
+<P1 x="359" y="353" id="331" />
+<P2 x="441" y="416" id="476" />
<AutomaticDrawing data="true" />
+<new d="false" />
<extraparam>
<info priority="0" />
<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="736" >
+<CONNECTOR type="125" id="730" index="25" uid="ce19f018-0572-45c5-af55-cb6a0bb4fe82" >
<cdparam x="759" y="623" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="{info}" />
-<P1 x="722" y="681" id="614" />
-<P2 x="503" y="466" id="496" />
+<P1 x="722" y="681" id="608" />
+<P2 x="503" y="466" id="490" />
<AutomaticDrawing data="true" />
+<new d="false" />
<extraparam>
<info priority="0" />
<spy value="false" />
diff --git a/ttool/src/test/resources/ui/diagram2tml/input/CloneCompositeComponentTest.xml b/ttool/src/test/resources/ui/diagram2tml/input/CloneCompositeComponentTest.xml
index d7d2d43639cfa9d4d626a48e6e93d82728ec0528..576193ac752ef325fb1b2ef40782e1d99ac1bc96 100644
--- a/ttool/src/test/resources/ui/diagram2tml/input/CloneCompositeComponentTest.xml
+++ b/ttool/src/test/resources/ui/diagram2tml/input/CloneCompositeComponentTest.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<TURTLEGMODELING version="3.0 beta" ANIMATE_INTERACTIVE_SIMULATION="true" ACTIVATE_PENALTIES="false" UPDATE_INFORMATION_DIPLO_SIM="false" ANIMATE_WITH_INFO_DIPLO_SIM="true" OPEN_DIAG_DIPLO_SIM="false" LAST_SELECTED_MAIN_TAB="0" LAST_SELECTED_SUB_TAB="0">
+<TURTLEGMODELING version="3.0 beta" ANIMATE_INTERACTIVE_SIMULATION="true" ACTIVATE_PENALTIES="false" UPDATE_INFORMATION_DIPLO_SIM="false" ANIMATE_WITH_INFO_DIPLO_SIM="true" OPEN_DIAG_DIPLO_SIM="false" LAST_SELECTED_MAIN_TAB="1" LAST_SELECTED_SUB_TAB="0">
<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" considerExecOperators="true" considerTimingOperators="true" zoom="1.0" >
@@ -8,8 +8,8 @@
<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="17" />
-<P2 x="514" y="364" id="6" />
+<P1 x="467" y="365" id="45" />
+<P2 x="514" y="364" id="56" />
<AutomaticDrawing data="true" />
<new d="false" />
</CONNECTOR>
@@ -17,8 +17,8 @@
<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="65" />
-<P2 x="430" y="163" id="52" />
+<P1 x="564" y="164" id="6" />
+<P2 x="430" y="163" id="19" />
<AutomaticDrawing data="true" />
<new d="false" />
</CONNECTOR>
@@ -26,8 +26,8 @@
<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="50" />
-<P2 x="564" y="209" id="63" />
+<P1 x="430" y="208" id="21" />
+<P2 x="564" y="209" id="8" />
<AutomaticDrawing data="true" />
<new d="false" />
</CONNECTOR>
@@ -35,8 +35,8 @@
<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="30" />
-<P2 x="521" y="585" id="28" />
+<P1 x="424" y="585" id="32" />
+<P2 x="521" y="585" id="34" />
<AutomaticDrawing data="true" />
<new d="false" />
</CONNECTOR>
@@ -44,8 +44,8 @@
<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="1144" y="348" id="85" />
-<P2 x="1144" y="405" id="87" />
+<P1 x="1144" y="348" id="87" />
+<P2 x="1144" y="405" id="85" />
<AutomaticDrawing data="true" />
<new d="false" />
</CONNECTOR>
@@ -68,57 +68,37 @@
<info hiddeni="false" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1200" id="49" index="7" uid="fa608369-ff64-4b12-8b0f-7c6da178f79e" >
+<SUBCOMPONENT type="1202" id="18" index="7" uid="35c4939c-38d1-47a1-b006-613944f2f885" >
<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" />
-<new d="false" />
-<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="16" index="8" uid="d5af42cd-aaeb-4fb9-8371-fef423051975" >
-<father id="49" num="0" />
-<cdparam x="527" y="316" />
+<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="271" minY="0" maxY="179" />
-<infoparam name="Primitive component" value="PrimitiveComp4" />
+<cdrectangleparam minX="0" maxX="472" minY="0" maxY="468" />
+<infoparam name="Primitive component" value="PrimitiveComp2" />
<new d="false" />
-<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" />
+<TGConnectingPoint num="0" id="10" />
+<TGConnectingPoint num="1" id="11" />
+<TGConnectingPoint num="2" id="12" />
+<TGConnectingPoint num="3" id="13" />
+<TGConnectingPoint num="4" id="14" />
+<TGConnectingPoint num="5" id="15" />
+<TGConnectingPoint num="6" id="16" />
+<TGConnectingPoint num="7" id="17" />
<extraparam>
<Data isAttacker="No" daemon="false" periodic="false" periodValue="" unit="" Operation="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="7" index="9" uid="0ed01ee0-d206-413a-a6a6-084865e95784" >
-<father id="16" num="0" />
-<cdparam x="514" y="351" />
+<SUBCOMPONENT type="1203" id="7" index="8" uid="ddecd86e-4901-4709-91c6-defbef233aa6" >
+<father id="18" num="0" />
+<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 channel2" />
+<infoparam name="Primitive port" value="Channel channel" />
<new d="false" />
<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" />
+<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="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -126,37 +106,17 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1202" id="27" index="10" uid="59b57c53-361d-4d0b-ad9f-57e6896d8134" >
-<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" />
-<new d="false" />
-<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" daemon="false" periodic="false" periodValue="" unit="" Operation="" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="18" index="11" uid="b299d365-3c3c-4763-89fa-c4acc3b57fb7" >
-<father id="27" num="0" />
-<cdparam x="441" y="352" />
+<SUBCOMPONENT type="1203" id="9" index="9" uid="f0a79524-a384-4ff6-8aa4-09cf80840d14" >
+<father id="18" num="1" />
+<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="156" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Channel channel2" />
+<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
+<infoparam name="Primitive port" value="Event event" />
<new d="false" />
-<TGConnectingPoint num="0" id="17" />
+<TGConnectingPoint num="0" id="8" />
<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" />
+<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="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -164,39 +124,37 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1202" id="40" index="12" uid="0e802cc8-bbff-4d8f-b8b3-050d6942614d" >
-<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" />
+<SUBCOMPONENT type="1202" id="31" index="10" uid="9be27848-9755-4443-b29b-a2064e01473e" >
+<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="302" minY="0" maxY="248" />
-<infoparam name="Primitive component" value="PrimitiveComp5" />
+<cdrectangleparam minX="0" maxX="472" minY="0" maxY="468" />
+<infoparam name="Primitive component" value="PrimitiveComp1" />
<new d="false" />
-<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" />
+<TGConnectingPoint num="0" id="23" />
+<TGConnectingPoint num="1" id="24" />
+<TGConnectingPoint num="2" id="25" />
+<TGConnectingPoint num="3" id="26" />
+<TGConnectingPoint num="4" id="27" />
+<TGConnectingPoint num="5" id="28" />
+<TGConnectingPoint num="6" id="29" />
+<TGConnectingPoint num="7" id="30" />
<extraparam>
<Data isAttacker="No" daemon="false" periodic="false" periodValue="" unit="" Operation="" />
-<Attribute access="2" id="attr1" value="" type="0" typeOther="" />
-<Attribute access="2" id="attr2" value="" type="4" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="29" index="13" uid="9d86a4e4-c3f5-493e-903c-326b65065817" >
-<father id="40" num="0" />
-<cdparam x="508" y="559" />
+<SUBCOMPONENT type="1203" id="20" index="11" uid="9be66e5d-5680-4389-9a3f-0206b75ac2e0" >
+<father id="31" num="0" />
+<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="156" minY="-13" maxY="68" />
-<infoparam name="Primitive port" value="Channel channel3" />
+<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
+<infoparam name="Primitive port" value="Channel channel" />
<new d="false" />
-<TGConnectingPoint num="0" id="28" />
+<TGConnectingPoint num="0" id="19" />
<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" />
+<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="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -204,17 +162,17 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="31" index="14" uid="be53d99f-b7cb-493b-9fb8-223fda29c23f" >
-<father id="40" num="1" />
-<cdparam x="411" y="559" />
+<SUBCOMPONENT type="1203" id="22" index="12" uid="3c5a5c05-1d84-4042-9bb7-1a21b0e951f2" >
+<father id="31" num="1" />
+<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="156" minY="-13" maxY="68" />
-<infoparam name="Primitive port" value="Channel channel3" />
+<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
+<infoparam name="Primitive port" value="Event event" />
<new d="false" />
-<TGConnectingPoint num="0" id="30" />
+<TGConnectingPoint num="0" id="21" />
<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" />
+<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="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -222,37 +180,59 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1202" id="62" index="15" uid="9be27848-9755-4443-b29b-a2064e01473e" >
-<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" />
+<SUBCOMPONENT type="1200" id="75" index="13" uid="fa608369-ff64-4b12-8b0f-7c6da178f79e" >
+<father id="84" num="2" />
+<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="472" minY="0" maxY="468" />
-<infoparam name="Primitive component" value="PrimitiveComp1" />
+<cdrectangleparam minX="0" maxX="201" minY="0" maxY="289" />
+<infoparam name="Composite component" value="CompositeComp2" />
<new d="false" />
-<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" />
+<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>
+<info hiddeni="false" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1202" id="44" index="14" uid="0e802cc8-bbff-4d8f-b8b3-050d6942614d" >
+<father id="75" num="0" />
+<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" />
+<new d="false" />
+<TGConnectingPoint num="0" id="36" />
+<TGConnectingPoint num="1" id="37" />
+<TGConnectingPoint num="2" id="38" />
+<TGConnectingPoint num="3" id="39" />
+<TGConnectingPoint num="4" id="40" />
+<TGConnectingPoint num="5" id="41" />
+<TGConnectingPoint num="6" id="42" />
+<TGConnectingPoint num="7" id="43" />
<extraparam>
<Data isAttacker="No" daemon="false" periodic="false" periodValue="" unit="" Operation="" />
+<Attribute access="2" id="attr1" value="" type="0" typeOther="" />
+<Attribute access="2" id="attr2" value="" type="4" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="51" index="16" uid="3c5a5c05-1d84-4042-9bb7-1a21b0e951f2" >
-<father id="62" num="0" />
-<cdparam x="404" y="195" />
+<SUBCOMPONENT type="1203" id="33" index="15" uid="be53d99f-b7cb-493b-9fb8-223fda29c23f" >
+<father id="44" num="0" />
+<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="187" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Event event" />
+<cdrectangleparam minX="-13" maxX="156" minY="-13" maxY="68" />
+<infoparam name="Primitive port" value="Channel channel3" />
<new d="false" />
-<TGConnectingPoint num="0" id="50" />
+<TGConnectingPoint num="0" id="32" />
<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" />
+<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="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -260,17 +240,17 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="53" index="17" uid="9be66e5d-5680-4389-9a3f-0206b75ac2e0" >
-<father id="62" num="1" />
-<cdparam x="404" y="150" />
+<SUBCOMPONENT type="1203" id="35" index="16" uid="9d86a4e4-c3f5-493e-903c-326b65065817" >
+<father id="44" num="1" />
+<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="187" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Channel channel" />
+<cdrectangleparam minX="-13" maxX="156" minY="-13" maxY="68" />
+<infoparam name="Primitive port" value="Channel channel3" />
<new d="false" />
-<TGConnectingPoint num="0" id="52" />
+<TGConnectingPoint num="0" id="34" />
<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" />
+<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="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -278,37 +258,37 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1202" id="75" index="18" uid="35c4939c-38d1-47a1-b006-613944f2f885" >
-<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" />
+<SUBCOMPONENT type="1202" id="55" index="17" uid="59b57c53-361d-4d0b-ad9f-57e6896d8134" >
+<father id="75" 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="472" minY="0" maxY="468" />
-<infoparam name="Primitive component" value="PrimitiveComp2" />
+<cdrectangleparam minX="0" maxX="302" minY="0" maxY="179" />
+<infoparam name="Primitive component" value="PrimitiveComp3" />
<new d="false" />
-<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" />
+<TGConnectingPoint num="0" id="47" />
+<TGConnectingPoint num="1" id="48" />
+<TGConnectingPoint num="2" id="49" />
+<TGConnectingPoint num="3" id="50" />
+<TGConnectingPoint num="4" id="51" />
+<TGConnectingPoint num="5" id="52" />
+<TGConnectingPoint num="6" id="53" />
+<TGConnectingPoint num="7" id="54" />
<extraparam>
<Data isAttacker="No" daemon="false" periodic="false" periodValue="" unit="" Operation="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="64" index="19" uid="f0a79524-a384-4ff6-8aa4-09cf80840d14" >
-<father id="75" num="0" />
-<cdparam x="564" y="196" />
+<SUBCOMPONENT type="1203" id="46" index="18" uid="b299d365-3c3c-4763-89fa-c4acc3b57fb7" >
+<father id="55" 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="187" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Event event" />
+<cdrectangleparam minX="-13" maxX="156" minY="-13" maxY="137" />
+<infoparam name="Primitive port" value="Channel channel2" />
<new d="false" />
-<TGConnectingPoint num="0" id="63" />
+<TGConnectingPoint num="0" id="45" />
<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" />
+<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="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -316,17 +296,37 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="66" index="20" uid="ddecd86e-4901-4709-91c6-defbef233aa6" >
-<father id="75" num="1" />
-<cdparam x="564" y="151" />
+<SUBCOMPONENT type="1202" id="66" index="19" uid="d5af42cd-aaeb-4fb9-8371-fef423051975" >
+<father id="75" num="2" />
+<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" />
+<new d="false" />
+<TGConnectingPoint num="0" id="58" />
+<TGConnectingPoint num="1" id="59" />
+<TGConnectingPoint num="2" id="60" />
+<TGConnectingPoint num="3" id="61" />
+<TGConnectingPoint num="4" id="62" />
+<TGConnectingPoint num="5" id="63" />
+<TGConnectingPoint num="6" id="64" />
+<TGConnectingPoint num="7" id="65" />
+<extraparam>
+<Data isAttacker="No" daemon="false" periodic="false" periodValue="" unit="" Operation="" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1203" id="57" index="20" uid="0ed01ee0-d206-413a-a6a6-084865e95784" >
+<father id="66" 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 channel" />
+<infoparam name="Primitive port" value="Channel channel2" />
<new d="false" />
-<TGConnectingPoint num="0" id="65" />
+<TGConnectingPoint num="0" id="56" />
<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" />
+<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="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -354,9 +354,9 @@
<Data isAttacker="No" daemon="false" periodic="false" periodValue="" unit="" Operation="" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1203" id="86" index="21" uid="20e189ea-c0cb-4eaa-89f8-848ab0580101" >
+<SUBCOMPONENT type="1203" id="86" index="21" uid="9019dfe4-1635-43c0-ba4b-71c20fba6654" >
<father id="97" num="0" />
-<cdparam x="1118" y="335" />
+<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" />
@@ -364,7 +364,7 @@
<new d="false" />
<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" />
+<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="" />
<Type type="0" typeOther="" />
<Type type="0" typeOther="" />
@@ -372,9 +372,9 @@
<Type type="0" typeOther="" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="88" index="22" uid="9019dfe4-1635-43c0-ba4b-71c20fba6654" >
+<SUBCOMPONENT type="1203" id="88" index="22" uid="20e189ea-c0cb-4eaa-89f8-848ab0580101" >
<father id="97" num="1" />
-<cdparam x="1118" y="392" />
+<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" />
@@ -382,7 +382,7 @@
<new d="false" />
<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" />
+<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="" />
@@ -1464,13 +1464,13 @@
<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="279" index="15" uid="36898c44-6f45-4a1c-b0d2-9c548d25d9f4" >
+<SUBCOMPONENT type="1101" id="279" index="13" uid="6a4f0c1d-e492-4a15-b14f-8f38af9f80d4" >
<father id="349" num="0" />
-<cdparam x="376" y="255" />
-<sizeparam width="207" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="110" y="152" />
+<sizeparam width="198" 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" />
+<cdrectangleparam minX="0" maxX="354" minY="0" maxY="185" />
+<infoparam name="TGComponent" value="Application::PrimitiveComp1" />
<new d="false" />
<TGConnectingPoint num="0" id="271" />
<TGConnectingPoint num="1" id="272" />
@@ -1481,16 +1481,16 @@
<TGConnectingPoint num="6" id="277" />
<TGConnectingPoint num="7" id="278" />
<extraparam>
-<info value="Application::PrimitiveComp6" taskName="PrimitiveComp6" referenceTaskName="Application" priority="0" operationMEC="PrimitiveComp6" fatherComponentMECType="0" />
+<info value="Application::PrimitiveComp1" taskName="PrimitiveComp1" referenceTaskName="Application" priority="0" operationMEC="PrimitiveComp4" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1101" id="288" index="16" uid="6771df13-5a2d-4df0-81df-3a43e5cc00e5" >
+<SUBCOMPONENT type="1101" id="288" index="14" uid="39fff73a-8d03-4f01-badd-7758efd84065" >
<father id="349" num="1" />
-<cdparam x="371" y="203" />
-<sizeparam width="207" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="111" y="201" />
+<sizeparam width="198" 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" />
+<cdrectangleparam minX="0" maxX="354" minY="0" maxY="185" />
+<infoparam name="TGComponent" value="Application::PrimitiveComp2" />
<new d="false" />
<TGConnectingPoint num="0" id="280" />
<TGConnectingPoint num="1" id="281" />
@@ -1501,16 +1501,16 @@
<TGConnectingPoint num="6" id="286" />
<TGConnectingPoint num="7" id="287" />
<extraparam>
-<info value="Application::PrimitiveComp5" taskName="PrimitiveComp5" referenceTaskName="Application" priority="0" operationMEC="PrimitiveComp5" fatherComponentMECType="0" />
+<info value="Application::PrimitiveComp2" taskName="PrimitiveComp2" referenceTaskName="Application" priority="0" operationMEC="PrimitiveComp4" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1101" id="297" index="17" uid="348009d2-735e-4954-9e0e-c8fdf3138bff" >
+<SUBCOMPONENT type="1101" id="297" index="15" uid="3f6e51d4-bdb4-4a88-9bfe-6c303449b749" >
<father id="349" num="2" />
-<cdparam x="393" y="144" />
-<sizeparam width="207" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="112" y="261" />
+<sizeparam width="198" 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" />
+<cdrectangleparam minX="0" maxX="354" minY="0" maxY="185" />
+<infoparam name="TGComponent" value="Application::PrimitiveComp3" />
<new d="false" />
<TGConnectingPoint num="0" id="289" />
<TGConnectingPoint num="1" id="290" />
@@ -1521,16 +1521,16 @@
<TGConnectingPoint num="6" id="295" />
<TGConnectingPoint num="7" id="296" />
<extraparam>
-<info value="Application::PrimitiveComp4" taskName="PrimitiveComp4" referenceTaskName="Application" priority="0" operationMEC="PrimitiveComp4" fatherComponentMECType="0" />
+<info value="Application::PrimitiveComp3" taskName="PrimitiveComp3" referenceTaskName="Application" priority="0" operationMEC="PrimitiveComp4" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1101" id="306" index="18" uid="3f6e51d4-bdb4-4a88-9bfe-6c303449b749" >
+<SUBCOMPONENT type="1101" id="306" index="16" uid="348009d2-735e-4954-9e0e-c8fdf3138bff" >
<father id="349" num="3" />
-<cdparam x="112" y="261" />
-<sizeparam width="207" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="393" y="144" />
+<sizeparam width="198" 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" />
+<cdrectangleparam minX="0" maxX="354" minY="0" maxY="185" />
+<infoparam name="TGComponent" value="Application::PrimitiveComp4" />
<new d="false" />
<TGConnectingPoint num="0" id="298" />
<TGConnectingPoint num="1" id="299" />
@@ -1541,16 +1541,16 @@
<TGConnectingPoint num="6" id="304" />
<TGConnectingPoint num="7" id="305" />
<extraparam>
-<info value="Application::PrimitiveComp3" taskName="PrimitiveComp3" referenceTaskName="Application" priority="0" operationMEC="PrimitiveComp4" fatherComponentMECType="0" />
+<info value="Application::PrimitiveComp4" taskName="PrimitiveComp4" referenceTaskName="Application" priority="0" operationMEC="PrimitiveComp4" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1101" id="315" index="19" uid="39fff73a-8d03-4f01-badd-7758efd84065" >
+<SUBCOMPONENT type="1101" id="315" index="17" uid="6771df13-5a2d-4df0-81df-3a43e5cc00e5" >
<father id="349" num="4" />
-<cdparam x="111" y="201" />
-<sizeparam width="207" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="371" y="203" />
+<sizeparam width="198" 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::PrimitiveComp2" />
+<cdrectangleparam minX="0" maxX="354" minY="0" maxY="185" />
+<infoparam name="TGComponent" value="Application::PrimitiveComp5" />
<new d="false" />
<TGConnectingPoint num="0" id="307" />
<TGConnectingPoint num="1" id="308" />
@@ -1561,16 +1561,16 @@
<TGConnectingPoint num="6" id="313" />
<TGConnectingPoint num="7" id="314" />
<extraparam>
-<info value="Application::PrimitiveComp2" taskName="PrimitiveComp2" referenceTaskName="Application" priority="0" operationMEC="PrimitiveComp4" fatherComponentMECType="0" />
+<info value="Application::PrimitiveComp5" taskName="PrimitiveComp5" referenceTaskName="Application" priority="0" operationMEC="PrimitiveComp5" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1101" id="324" index="20" uid="6a4f0c1d-e492-4a15-b14f-8f38af9f80d4" >
+<SUBCOMPONENT type="1101" id="324" index="18" uid="36898c44-6f45-4a1c-b0d2-9c548d25d9f4" >
<father id="349" num="5" />
-<cdparam x="110" y="152" />
-<sizeparam width="207" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="376" y="255" />
+<sizeparam width="198" 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::PrimitiveComp1" />
+<cdrectangleparam minX="0" maxX="354" minY="0" maxY="185" />
+<infoparam name="TGComponent" value="Application::PrimitiveComp6" />
<new d="false" />
<TGConnectingPoint num="0" id="316" />
<TGConnectingPoint num="1" id="317" />
@@ -1581,49 +1581,12 @@
<TGConnectingPoint num="6" id="322" />
<TGConnectingPoint num="7" id="323" />
<extraparam>
-<info value="Application::PrimitiveComp1" taskName="PrimitiveComp1" referenceTaskName="Application" priority="0" operationMEC="PrimitiveComp4" fatherComponentMECType="0" />
+<info value="Application::PrimitiveComp6" taskName="PrimitiveComp6" referenceTaskName="Application" priority="0" operationMEC="PrimitiveComp6" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1100" id="374" index="1" uid="4a1faa36-2017-4ca8-a8c7-4266fba9e293" >
-<cdparam x="991" y="100" />
-<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" />
-<new d="false" />
-<TGConnectingPoint num="0" id="350" />
-<TGConnectingPoint num="1" id="351" />
-<TGConnectingPoint num="2" id="352" />
-<TGConnectingPoint num="3" id="353" />
-<TGConnectingPoint num="4" id="354" />
-<TGConnectingPoint num="5" id="355" />
-<TGConnectingPoint num="6" id="356" />
-<TGConnectingPoint num="7" id="357" />
-<TGConnectingPoint num="8" id="358" />
-<TGConnectingPoint num="9" id="359" />
-<TGConnectingPoint num="10" id="360" />
-<TGConnectingPoint num="11" id="361" />
-<TGConnectingPoint num="12" id="362" />
-<TGConnectingPoint num="13" id="363" />
-<TGConnectingPoint num="14" id="364" />
-<TGConnectingPoint num="15" id="365" />
-<TGConnectingPoint num="16" id="366" />
-<TGConnectingPoint num="17" id="367" />
-<TGConnectingPoint num="18" id="368" />
-<TGConnectingPoint num="19" id="369" />
-<TGConnectingPoint num="20" id="370" />
-<TGConnectingPoint num="21" id="371" />
-<TGConnectingPoint num="22" id="372" />
-<TGConnectingPoint num="23" id="373" />
-<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="1107" id="399" index="2" uid="93a76056-6fc0-498f-a49d-d329c3e624ec" >
-<cdparam x="699" y="398" />
+<COMPONENT type="1107" id="399" index="1" uid="93a76056-6fc0-498f-a49d-d329c3e624ec" >
+<cdparam x="868" y="390" />
<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" />
@@ -1659,9 +1622,9 @@
</extraparam>
</COMPONENT>
-<COMPONENT type="1105" id="424" index="3" uid="4ecdf5d5-1dcd-4170-9d35-372d61cb4f7b" >
+<COMPONENT type="1105" id="424" index="2" uid="4ecdf5d5-1dcd-4170-9d35-372d61cb4f7b" >
<cdparam x="344" y="601" />
-<sizeparam width="200" height="200" minWidth="100" minHeight="35" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="453" height="303" 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" />
@@ -1695,8 +1658,108 @@
<attributes byteDataSize="4" memorySize="1024" clockRatio="1" bufferType="0" />
</extraparam>
</COMPONENT>
+<SUBCOMPONENT type="1111" id="645" index="19" uid="a32a3295-0efe-4b57-a608-50f57ba3d815" >
+<father id="424" num="0" />
+<cdparam x="629" y="685" />
+<sizeparam width="78" height="40" minWidth="75" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="378" minY="0" maxY="263" />
+<infoparam name="TGComponent" value="encryption1" />
+<new d="false" />
+<TGConnectingPoint num="0" id="646" />
+<TGConnectingPoint num="1" id="647" />
+<TGConnectingPoint num="2" id="648" />
+<TGConnectingPoint num="3" id="649" />
+<TGConnectingPoint num="4" id="650" />
+<TGConnectingPoint num="5" id="651" />
+<TGConnectingPoint num="6" id="652" />
+<TGConnectingPoint num="7" id="653" />
+<extraparam>
+<info value="encryption1" referenceKeyName="encryption1" priority="5" typeName="key" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1103" id="636" index="20" uid="8965f59a-7431-4124-b159-45f050ab0fb1" >
+<father id="424" num="1" />
+<cdparam x="424" y="840" />
+<sizeparam width="159" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="294" minY="0" maxY="263" />
+<infoparam name="TGComponent" value="Application::channel4" />
+<new d="false" />
+<TGConnectingPoint num="0" id="637" />
+<TGConnectingPoint num="1" id="638" />
+<TGConnectingPoint num="2" id="639" />
+<TGConnectingPoint num="3" id="640" />
+<TGConnectingPoint num="4" id="641" />
+<TGConnectingPoint num="5" id="642" />
+<TGConnectingPoint num="6" id="643" />
+<TGConnectingPoint num="7" id="644" />
+<extraparam>
+<info value="Application::channel4" communicationName="channel4" referenceCommunicationName="Application" mappedElements="Bus0" priority="0" typeName="channel" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1103" id="627" index="21" uid="5e016d70-42a6-4126-a500-5c322db275e7" >
+<father id="424" num="2" />
+<cdparam x="417" y="772" />
+<sizeparam width="159" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="294" minY="0" maxY="263" />
+<infoparam name="TGComponent" value="Application::channel3" />
+<new d="false" />
+<TGConnectingPoint num="0" id="628" />
+<TGConnectingPoint num="1" id="629" />
+<TGConnectingPoint num="2" id="630" />
+<TGConnectingPoint num="3" id="631" />
+<TGConnectingPoint num="4" id="632" />
+<TGConnectingPoint num="5" id="633" />
+<TGConnectingPoint num="6" id="634" />
+<TGConnectingPoint num="7" id="635" />
+<extraparam>
+<info value="Application::channel3" communicationName="channel3" referenceCommunicationName="Application" mappedElements="Bus0" priority="0" typeName="channel" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1103" id="618" index="22" uid="cc2904ff-bc52-42b6-b87f-a8821c3d2e6b" >
+<father id="424" num="3" />
+<cdparam x="415" y="709" />
+<sizeparam width="159" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="294" minY="0" maxY="263" />
+<infoparam name="TGComponent" value="Application::channel2" />
+<new d="false" />
+<TGConnectingPoint num="0" id="619" />
+<TGConnectingPoint num="1" id="620" />
+<TGConnectingPoint num="2" id="621" />
+<TGConnectingPoint num="3" id="622" />
+<TGConnectingPoint num="4" id="623" />
+<TGConnectingPoint num="5" id="624" />
+<TGConnectingPoint num="6" id="625" />
+<TGConnectingPoint num="7" id="626" />
+<extraparam>
+<info value="Application::channel2" communicationName="channel2" referenceCommunicationName="Application" mappedElements="Bus0" priority="0" typeName="channel" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1103" id="609" index="23" uid="5d13353d-f5d8-4257-9803-fa354216bb3c" >
+<father id="424" num="4" />
+<cdparam x="413" y="654" />
+<sizeparam width="151" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="302" minY="0" maxY="263" />
+<infoparam name="TGComponent" value="Application::channel" />
+<new d="false" />
+<TGConnectingPoint num="0" id="610" />
+<TGConnectingPoint num="1" id="611" />
+<TGConnectingPoint num="2" id="612" />
+<TGConnectingPoint num="3" id="613" />
+<TGConnectingPoint num="4" id="614" />
+<TGConnectingPoint num="5" id="615" />
+<TGConnectingPoint num="6" id="616" />
+<TGConnectingPoint num="7" id="617" />
+<extraparam>
+<info value="Application::channel" communicationName="channel" referenceCommunicationName="Application" mappedElements="Bus0" priority="0" typeName="channel" />
+</extraparam>
+</SUBCOMPONENT>
-<COMPONENT type="1102" id="449" index="4" uid="dd2d9143-9d10-4642-98c4-e86464b87c48" >
+<COMPONENT type="1102" id="449" index="3" uid="dd2d9143-9d10-4642-98c4-e86464b87c48" >
<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" />
@@ -1733,7 +1796,7 @@
</extraparam>
</COMPONENT>
-<COMPONENT type="1116" id="474" index="5" uid="2b132fe1-d097-4c6f-80a7-45c64804a361" >
+<COMPONENT type="1116" id="474" index="4" uid="2b132fe1-d097-4c6f-80a7-45c64804a361" >
<cdparam x="74" y="596" />
<sizeparam width="250" height="200" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -1770,8 +1833,8 @@
</extraparam>
</COMPONENT>
-<COMPONENT type="1104" id="499" index="6" uid="404cc939-1c43-468f-8c5e-fc73e9c4705d" >
-<cdparam x="672" y="681" />
+<COMPONENT type="1104" id="499" index="5" uid="404cc939-1c43-468f-8c5e-fc73e9c4705d" >
+<cdparam x="883" y="624" />
<sizeparam width="200" height="200" minWidth="100" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
@@ -1807,8 +1870,8 @@
</extraparam>
</COMPONENT>
-<COMPONENT type="1106" id="524" index="7" uid="db06ab28-3174-4247-8cee-726e80b1dd43" >
-<cdparam x="13" y="416" />
+<COMPONENT type="1106" id="524" index="6" uid="db06ab28-3174-4247-8cee-726e80b1dd43" >
+<cdparam x="806" y="227" />
<sizeparam width="250" height="100" minWidth="100" minHeight="35" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
@@ -1844,44 +1907,7 @@
</extraparam>
</COMPONENT>
-<COMPONENT type="1117" id="549" index="8" uid="be2e77f3-a26b-477a-ad2b-1b2bba8680f6" >
-<cdparam x="686" y="230" />
-<sizeparam width="250" height="100" 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="NoC0" value="name" />
-<new d="false" />
-<TGConnectingPoint num="0" id="525" />
-<TGConnectingPoint num="1" id="526" />
-<TGConnectingPoint num="2" id="527" />
-<TGConnectingPoint num="3" id="528" />
-<TGConnectingPoint num="4" id="529" />
-<TGConnectingPoint num="5" id="530" />
-<TGConnectingPoint num="6" id="531" />
-<TGConnectingPoint num="7" id="532" />
-<TGConnectingPoint num="8" id="533" />
-<TGConnectingPoint num="9" id="534" />
-<TGConnectingPoint num="10" id="535" />
-<TGConnectingPoint num="11" id="536" />
-<TGConnectingPoint num="12" id="537" />
-<TGConnectingPoint num="13" id="538" />
-<TGConnectingPoint num="14" id="539" />
-<TGConnectingPoint num="15" id="540" />
-<TGConnectingPoint num="16" id="541" />
-<TGConnectingPoint num="17" id="542" />
-<TGConnectingPoint num="18" id="543" />
-<TGConnectingPoint num="19" id="544" />
-<TGConnectingPoint num="20" id="545" />
-<TGConnectingPoint num="21" id="546" />
-<TGConnectingPoint num="22" id="547" />
-<TGConnectingPoint num="23" id="548" />
-<extraparam>
-<info stereotype="NoC" nodeName="NoC0" />
-<attributes bufferByteDataSize="4" size="2" placement="CPU1 1 0" clockRatio="1" />
-</extraparam>
-</COMPONENT>
-
-<CONNECTOR type="125" id="550" index="9" uid="85054cb4-6611-429e-8159-2e4cd4a8fade" >
+<CONNECTOR type="125" id="550" index="7" uid="85054cb4-6611-429e-8159-2e4cd4a8fade" >
<cdparam x="199" y="596" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="{info}" />
@@ -1894,11 +1920,11 @@
<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="551" index="10" uid="cfd81448-4fc3-4756-90ce-7c54ac45a969" >
+<CONNECTOR type="125" id="551" index="8" uid="cfd81448-4fc3-4756-90ce-7c54ac45a969" >
<cdparam x="262" y="461" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="{info}" />
-<P1 x="263" y="466" id="504" />
+<P1 x="1056" y="277" id="504" />
<P2 x="316" y="441" id="428" />
<AutomaticDrawing data="true" />
<new d="false" />
@@ -1907,11 +1933,11 @@
<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="552" index="11" uid="660bc149-89a7-4e30-9681-81175982b4fe" >
+<CONNECTOR type="125" id="552" index="9" uid="660bc149-89a7-4e30-9681-81175982b4fe" >
<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="699" y="448" id="385" />
+<P1 x="868" y="440" id="385" />
<P2 x="566" y="441" id="429" />
<AutomaticDrawing data="true" />
<new d="false" />
@@ -1920,11 +1946,11 @@
<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="553" index="12" uid="71bfe2a4-9928-49ed-93cc-f626d227a7e7" >
+<CONNECTOR type="125" id="553" index="10" uid="71bfe2a4-9928-49ed-93cc-f626d227a7e7" >
<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="444" y="601" id="401" />
+<P1 x="570" y="601" id="401" />
<P2 x="441" y="466" id="431" />
<AutomaticDrawing data="true" />
<new d="false" />
@@ -1933,7 +1959,7 @@
<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="554" index="13" uid="ab183948-ca5f-4609-acb8-0626992f702a" >
+<CONNECTOR type="125" id="554" index="11" uid="ab183948-ca5f-4609-acb8-0626992f702a" >
<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}" />
@@ -1946,11 +1972,11 @@
<spy value="false" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="125" id="555" index="14" uid="f9884ba6-40a9-48b1-b7bf-90cb8396184c" >
+<CONNECTOR type="125" id="555" index="12" uid="f9884ba6-40a9-48b1-b7bf-90cb8396184c" >
<cdparam x="759" y="623" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="{info}" />
-<P1 x="722" y="681" id="483" />
+<P1 x="933" y="624" id="483" />
<P2 x="503" y="466" id="440" />
<AutomaticDrawing data="true" />
<new d="false" />