diff --git a/modeling/DIPLODOCUS/testDiplodocusPeriod.xml b/modeling/DIPLODOCUS/testDiplodocusPeriod.xml index 78b0767eeb71a20e5dc1c4dc79ccf70937f3d7f5..849e1d377db9cfd824b7b6cba890bf545624cf0d 100644 --- a/modeling/DIPLODOCUS/testDiplodocusPeriod.xml +++ b/modeling/DIPLODOCUS/testDiplodocusPeriod.xml @@ -2,50 +2,42 @@ <TURTLEGMODELING version="1.0beta" ANIMATE_INTERACTIVE_SIMULATION="true" ACTIVATE_PENALTIES="false" UPDATE_INFORMATION_DIPLO_SIM="true" ANIMATE_WITH_INFO_DIPLO_SIM="true" OPEN_DIAG_DIPLO_SIM="false" LAST_SELECTED_MAIN_TAB="0" LAST_SELECTED_SUB_TAB="0"> -<Modeling type="TML Component Design" nameTab="FVWithRequest" tabs="TML Component Task Diagram$AnotherTask$ManagerOfPeriodicTask$PeriodicTask" > +<Modeling type="TML Component Design" nameTab="FVWithRequest" tabs="TML Component Task Diagram$AnotherTask$PeriodicTask" > <TMLComponentTaskDiagramPanel name="TML Component Task Diagram" minX="10" maxX="2500" minY="10" maxY="1500" channels="true" events="true" requests="true" zoom="1.0000000000000007" > <CONNECTOR type="126" id="1" > <cdparam x="966" y="410" /> <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="910" y="383" id="25" /> -<P2 x="978" y="608" id="3" /> +<P1 x="910" y="383" id="13" /> +<P2 x="978" y="608" id="2" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="126" id="2" > -<cdparam x="558" y="328" /> -<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="577" y="288" id="14" /> -<P2 x="785" y="288" id="27" /> -<AutomaticDrawing data="true" /> -</CONNECTOR> -<COMPONENT type="1202" id="13" > +<COMPONENT type="1202" id="12" > <cdparam x="890" y="621" /> -<sizeparam width="200" height="150" minWidth="-36" minHeight="-23" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<sizeparam width="200" height="150" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> <cdrectangleparam minX="9" maxX="2499" minY="9" maxY="1499" /> <infoparam name="Primitive component" value="AnotherTask" /> -<TGConnectingPoint num="0" id="5" /> -<TGConnectingPoint num="1" id="6" /> -<TGConnectingPoint num="2" id="7" /> -<TGConnectingPoint num="3" id="8" /> -<TGConnectingPoint num="4" id="9" /> -<TGConnectingPoint num="5" id="10" /> -<TGConnectingPoint num="6" id="11" /> -<TGConnectingPoint num="7" id="12" /> +<TGConnectingPoint num="0" id="4" /> +<TGConnectingPoint num="1" id="5" /> +<TGConnectingPoint num="2" id="6" /> +<TGConnectingPoint num="3" id="7" /> +<TGConnectingPoint num="4" id="8" /> +<TGConnectingPoint num="5" id="9" /> +<TGConnectingPoint num="6" id="10" /> +<TGConnectingPoint num="7" id="11" /> <extraparam> -<Data isAttacker="No" daemon="true" periodic="false" periodValue="" unit="ns" Operation="" /> +<Data isAttacker="No" daemon="false" periodic="false" periodValue="" unit="ns" Operation="" /> </extraparam> </COMPONENT> -<SUBCOMPONENT type="1203" id="4" > -<father id="13" num="0" /> +<SUBCOMPONENT type="1203" id="3" > +<father id="12" num="0" /> <cdparam x="965" y="608" /> <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> <cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" /> <infoparam name="Primitive port" value="Channel comm" /> -<TGConnectingPoint num="0" id="3" /> +<TGConnectingPoint num="0" id="2" /> <extraparam> <Prop commName="comm" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="32" 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="0" /> <Type type="0" typeOther="" /> @@ -56,72 +48,34 @@ </extraparam> </SUBCOMPONENT> -<COMPONENT type="1202" id="24" > -<cdparam x="232" y="216" /> -<sizeparam width="332" height="176" minWidth="-36" minHeight="-23" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> -<hidden value="false" /> -<cdrectangleparam minX="9" maxX="2499" minY="9" maxY="1499" /> -<infoparam name="Primitive component" value="ManagerOfPeriodicTask" /> -<TGConnectingPoint num="0" id="16" /> -<TGConnectingPoint num="1" id="17" /> -<TGConnectingPoint num="2" id="18" /> -<TGConnectingPoint num="3" id="19" /> -<TGConnectingPoint num="4" id="20" /> -<TGConnectingPoint num="5" id="21" /> -<TGConnectingPoint num="6" id="22" /> -<TGConnectingPoint num="7" id="23" /> -<extraparam> -<Data isAttacker="No" daemon="false" periodic="false" periodValue="" unit="ns" Operation="" /> -<Attribute access="2" id="startTime" value="10" type="0" typeOther="" /> -<Attribute access="2" id="period" value="5" type="0" typeOther="" /> -</extraparam> -</COMPONENT> -<SUBCOMPONENT type="1203" id="15" > -<father id="24" num="0" /> -<cdparam x="551" y="275" /> -<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> -<hidden value="false" /> -<cdrectangleparam minX="-13" maxX="319" minY="-13" maxY="163" /> -<infoparam name="Primitive port" value="Request req" /> -<TGConnectingPoint num="0" id="14" /> -<extraparam> -<Prop commName="req" commType="2" origin="true" finite="false" blocking="false" 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="0" /> -<Type type="1" typeOther="" /> -<Type type="1" typeOther="" /> -<Type type="0" typeOther="" /> -<Type type="0" typeOther="" /> -<Type type="0" typeOther="" /> -</extraparam> -</SUBCOMPONENT> - -<COMPONENT type="1202" id="37" > +<COMPONENT type="1202" id="23" > <cdparam x="798" y="220" /> -<sizeparam width="200" height="150" minWidth="-36" minHeight="-23" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<sizeparam width="200" height="150" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> <cdrectangleparam minX="9" maxX="2499" minY="9" maxY="1499" /> <infoparam name="Primitive component" value="PeriodicTask" /> -<TGConnectingPoint num="0" id="29" /> -<TGConnectingPoint num="1" id="30" /> -<TGConnectingPoint num="2" id="31" /> -<TGConnectingPoint num="3" id="32" /> -<TGConnectingPoint num="4" id="33" /> -<TGConnectingPoint num="5" id="34" /> -<TGConnectingPoint num="6" id="35" /> -<TGConnectingPoint num="7" id="36" /> -<extraparam> -<Data isAttacker="No" daemon="true" periodic="true" periodValue="10" unit="ms" Operation="" /> +<TGConnectingPoint num="0" id="15" /> +<TGConnectingPoint num="1" id="16" /> +<TGConnectingPoint num="2" id="17" /> +<TGConnectingPoint num="3" id="18" /> +<TGConnectingPoint num="4" id="19" /> +<TGConnectingPoint num="5" id="20" /> +<TGConnectingPoint num="6" id="21" /> +<TGConnectingPoint num="7" id="22" /> +<extraparam> +<Data isAttacker="No" daemon="false" periodic="true" periodValue="10" unit="us" Operation="" /> <Attribute access="2" id="x" value="" type="0" typeOther="" /> <Attribute access="2" id="y" value="" type="0" typeOther="" /> </extraparam> </COMPONENT> -<SUBCOMPONENT type="1203" id="26" > -<father id="37" num="0" /> +<SUBCOMPONENT type="1203" id="14" > +<father id="23" num="0" /> <cdparam x="897" y="357" /> <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 comm1" /> -<TGConnectingPoint num="0" id="25" /> +<TGConnectingPoint num="0" id="13" /> <extraparam> <Prop commName="comm1" commType="0" origin="true" finite="false" blocking="false" maxSamples="200" widthSamples="32" 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="0" /> <Type type="0" typeOther="" /> @@ -131,303 +85,147 @@ <Type type="0" typeOther="" /> </extraparam> </SUBCOMPONENT> -<SUBCOMPONENT type="1203" id="28" > -<father id="37" num="1" /> -<cdparam x="785" y="275" /> -<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="Request req" /> -<TGConnectingPoint num="0" id="27" /> -<extraparam> -<Prop commName="req" commType="2" 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="0" /> -<Type type="1" typeOther="" /> -<Type type="1" typeOther="" /> -<Type type="0" typeOther="" /> -<Type type="0" typeOther="" /> -<Type type="0" typeOther="" /> -</extraparam> -</SUBCOMPONENT> </TMLComponentTaskDiagramPanel> <TMLActivityDiagramPanel name="AnotherTask" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0" > -<COMPONENT type="1000" id="39" > -<cdparam x="597" 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="38" /> -</COMPONENT> - -<COMPONENT type="1030" id="42" > -<cdparam x="569" y="152" /> -<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="40" /> -<TGConnectingPoint num="1" id="41" /> -</COMPONENT> - -<COMPONENT type="1001" id="44" > -<cdparam x="669" y="278" /> +<COMPONENT type="1001" id="25" > +<cdparam x="568" y="193" /> <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="43" /> +<TGConnectingPoint num="0" id="24" /> </COMPONENT> -<COMPONENT type="1009" id="47" > -<cdparam x="622" y="215" /> -<sizeparam width="105" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<COMPONENT type="1020" id="29" > +<cdparam x="542" y="156" /> +<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="read channel" value="comm(100) " /> -<TGConnectingPoint num="0" id="45" /> -<TGConnectingPoint num="1" id="46" /> -<extraparam> -<Data channelName="comm" nbOfSamples="100" secPattern="" isAttacker="No" isEncForm="No" /> -</extraparam> +<infoparam name="for loop" value="10" /> +<TGConnectingPoint num="0" id="26" /> +<TGConnectingPoint num="1" id="27" /> +<TGConnectingPoint num="2" id="28" /> </COMPONENT> -<CONNECTOR type="115" id="48" > -<cdparam x="663" y="207" /> -<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> -<infoparam name="connector" value="null" /> -<P1 x="661" y="166" id="41" /> -<P2 x="674" y="210" id="45" /> -<AutomaticDrawing data="true" /> -</CONNECTOR> -<CONNECTOR type="115" id="49" > -<cdparam x="674" y="240" /> -<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> -<infoparam name="connector" value="null" /> -<P1 x="674" y="240" id="46" /> -<P2 x="679" y="273" id="43" /> -<AutomaticDrawing data="true" /> -</CONNECTOR> -<CONNECTOR type="115" id="50" > -<cdparam x="604" y="133" /> -<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> -<infoparam name="connector" value="null" /> -<P1 x="604" y="127" id="38" /> -<P2 x="615" y="147" id="40" /> -<AutomaticDrawing data="true" /> -</CONNECTOR> - -</TMLActivityDiagramPanel> - -<TMLActivityDiagramPanel name="ManagerOfPeriodicTask" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0" > -<COMPONENT type="1007" id="53" > -<cdparam x="634" y="353" /> -<sizeparam width="85" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<COMPONENT type="1000" id="31" > +<cdparam x="597" y="107" /> +<sizeparam width="15" height="15" 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="send request" value="req(1, 2)" /> -<TGConnectingPoint num="0" id="51" /> -<TGConnectingPoint num="1" id="52" /> -<extraparam> -<Data requestName="req" nbOfParams="5" /> -<Param index="0" value="1" /> -<Param index="1" value="2" /> -</extraparam> +<infoparam name="start state" value="null" /> +<TGConnectingPoint num="0" id="30" /> </COMPONENT> -<COMPONENT type="1001" id="55" > -<cdparam x="691" y="484" /> +<COMPONENT type="1001" id="33" > +<cdparam x="669" y="278" /> <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="54" /> +<TGConnectingPoint num="0" id="32" /> </COMPONENT> -<COMPONENT type="1026" id="59" > -<cdparam x="698" y="422" /> -<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="57" /> -<TGConnectingPoint num="1" id="58" /> -</COMPONENT> -<SUBCOMPONENT type="-1" id="56" > -<father id="59" num="0" /> -<cdparam x="713" y="442" /> -<sizeparam width="63" 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="period ms" /> -<extraparam> -<TimeDelay minDelay="period" maxDelay="nope" hasMaxDelay="false" isActiveDelay="false" unit="ms" /> -</extraparam> -</SUBCOMPONENT> - -<COMPONENT type="1030" id="62" > -<cdparam x="529" y="308" /> -<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="60" /> -<TGConnectingPoint num="1" id="61" /> -</COMPONENT> - -<COMPONENT type="1026" id="66" > -<cdparam x="567" y="244" /> -<sizeparam width="10" height="30" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<COMPONENT type="1009" id="36" > +<cdparam x="622" y="215" /> +<sizeparam width="105" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> <enabled value="true" /> <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" /> -<infoparam name="delay" value="null" /> -<TGConnectingPoint num="0" id="64" /> -<TGConnectingPoint num="1" id="65" /> -</COMPONENT> -<SUBCOMPONENT type="-1" id="63" > -<father id="66" num="0" /> -<cdparam x="582" y="264" /> -<sizeparam width="82" 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="startTime ms" /> +<infoparam name="read channel" value="comm(10) " /> +<TGConnectingPoint num="0" id="34" /> +<TGConnectingPoint num="1" id="35" /> <extraparam> -<TimeDelay minDelay="startTime" maxDelay="nope" hasMaxDelay="false" isActiveDelay="false" unit="ms" /> +<Data channelName="comm" nbOfSamples="10" secPattern="" isAttacker="No" isEncForm="No" /> </extraparam> -</SUBCOMPONENT> - -<COMPONENT type="1000" id="68" > -<cdparam x="564" y="186" /> -<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="67" /> </COMPONENT> -<CONNECTOR type="115" id="69" > -<cdparam x="571" y="206" /> -<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> -<infoparam name="connector" value="null" /> -<P1 x="571" y="206" id="67" /> -<P2 x="572" y="239" id="64" /> -<AutomaticDrawing data="true" /> -</CONNECTOR> -<CONNECTOR type="115" id="70" > -<cdparam x="572" y="279" /> +<CONNECTOR type="115" id="37" > +<cdparam x="674" y="240" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> -<P1 x="572" y="279" id="65" /> -<P2 x="575" y="303" id="60" /> +<P1 x="674" y="240" id="35" /> +<P2 x="679" y="273" id="32" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="115" id="71" > -<cdparam x="703" y="457" /> +<CONNECTOR type="115" id="38" > +<cdparam x="604" y="127" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> -<P1 x="703" y="457" id="58" /> -<P2 x="701" y="479" id="54" /> +<P1 x="604" y="127" id="30" /> +<P2 x="591" y="151" id="26" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="115" id="72" > -<cdparam x="621" y="322" /> +<CONNECTOR type="115" id="39" > +<cdparam x="647" y="164" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> -<P1 x="621" y="322" id="61" /> -<P2 x="676" y="348" id="51" /> +<P1 x="640" y="170" id="27" /> +<P2 x="674" y="210" id="34" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="115" id="73" > -<cdparam x="676" y="378" /> +<CONNECTOR type="115" id="40" > +<cdparam x="591" y="181" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> -<P1 x="676" y="378" id="52" /> -<P2 x="703" y="417" id="57" /> +<P1 x="591" y="181" id="28" /> +<P2 x="578" y="188" id="24" /> <AutomaticDrawing data="true" /> </CONNECTOR> </TMLActivityDiagramPanel> <TMLActivityDiagramPanel name="PeriodicTask" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0" > -<COMPONENT type="1034" id="76" > -<cdparam x="605" y="88" /> -<sizeparam width="126" 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 args" value="getReqArg(x, y)" /> -<TGConnectingPoint num="0" id="74" /> -<TGConnectingPoint num="1" id="75" /> -<extraparam> -<Data nbOfParams="5" /> -<Param index="0" value="x" /> -<Param index="1" value="y" /> -</extraparam> -</COMPONENT> - -<COMPONENT type="1000" id="78" > +<COMPONENT type="1000" id="42" > <cdparam x="638" y="42" /> <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="77" /> +<TGConnectingPoint num="0" id="41" /> </COMPONENT> -<COMPONENT type="1001" id="80" > +<COMPONENT type="1001" id="44" > <cdparam x="666" y="226" /> <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="79" /> +<TGConnectingPoint num="0" id="43" /> </COMPONENT> -<COMPONENT type="1006" id="83" > +<COMPONENT type="1006" id="47" > <cdparam x="622" y="149" /> <sizeparam width="109" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> <enabled value="true" /> <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" /> -<infoparam name="write channel" value="comm1(100)" /> -<TGConnectingPoint num="0" id="81" /> -<TGConnectingPoint num="1" id="82" /> +<infoparam name="write channel" value="comm1(10)" /> +<TGConnectingPoint num="0" id="45" /> +<TGConnectingPoint num="1" id="46" /> <breakpoint /> <extraparam> -<Data channelName="comm1" nbOfSamples="100" secPattern="" isAttacker="No" isEncForm="No" /> +<Data channelName="comm1" nbOfSamples="10" secPattern="" isAttacker="No" isEncForm="No" /> </extraparam> </COMPONENT> -<CONNECTOR type="115" id="84" > -<cdparam x="668" y="113" /> +<CONNECTOR type="115" id="48" > +<cdparam x="645" y="62" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> -<P1 x="668" y="113" id="75" /> -<P2 x="676" y="144" id="81" /> +<P1 x="645" y="62" id="41" /> +<P2 x="676" y="144" id="45" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="115" id="85" > +<CONNECTOR type="115" id="49" > <cdparam x="704" y="174" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> -<P1 x="676" y="174" id="82" /> -<P2 x="676" y="221" id="79" /> -<AutomaticDrawing data="true" /> -</CONNECTOR> -<CONNECTOR type="115" id="86" > -<cdparam x="645" y="62" /> -<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> -<infoparam name="connector" value="null" /> -<P1 x="645" y="62" id="77" /> -<P2 x="668" y="83" id="74" /> +<P1 x="676" y="174" id="46" /> +<P2 x="676" y="221" id="43" /> <AutomaticDrawing data="true" /> </CONNECTOR> @@ -440,275 +238,275 @@ <Modeling type="TML Architecture" nameTab="ArchitectureWithRequest" > <TMLArchiDiagramPanel name="DIPLODOCUS architecture and mapping Diagram" minX="10" maxX="2500" minY="10" maxY="1500" attributes="0" masterClockFrequency="200" zoom="1.0" > -<COMPONENT type="1100" id="129" > +<COMPONENT type="1100" id="92" > <cdparam x="221" y="592" /> <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="105" /> -<TGConnectingPoint num="1" id="106" /> -<TGConnectingPoint num="2" id="107" /> -<TGConnectingPoint num="3" id="108" /> -<TGConnectingPoint num="4" id="109" /> -<TGConnectingPoint num="5" id="110" /> -<TGConnectingPoint num="6" id="111" /> -<TGConnectingPoint num="7" id="112" /> -<TGConnectingPoint num="8" id="113" /> -<TGConnectingPoint num="9" id="114" /> -<TGConnectingPoint num="10" id="115" /> -<TGConnectingPoint num="11" id="116" /> -<TGConnectingPoint num="12" id="117" /> -<TGConnectingPoint num="13" id="118" /> -<TGConnectingPoint num="14" id="119" /> -<TGConnectingPoint num="15" id="120" /> -<TGConnectingPoint num="16" id="121" /> -<TGConnectingPoint num="17" id="122" /> -<TGConnectingPoint num="18" id="123" /> -<TGConnectingPoint num="19" id="124" /> -<TGConnectingPoint num="20" id="125" /> -<TGConnectingPoint num="21" id="126" /> -<TGConnectingPoint num="22" id="127" /> -<TGConnectingPoint num="23" id="128" /> +<TGConnectingPoint num="0" id="68" /> +<TGConnectingPoint num="1" id="69" /> +<TGConnectingPoint num="2" id="70" /> +<TGConnectingPoint num="3" id="71" /> +<TGConnectingPoint num="4" id="72" /> +<TGConnectingPoint num="5" id="73" /> +<TGConnectingPoint num="6" id="74" /> +<TGConnectingPoint num="7" id="75" /> +<TGConnectingPoint num="8" id="76" /> +<TGConnectingPoint num="9" id="77" /> +<TGConnectingPoint num="10" id="78" /> +<TGConnectingPoint num="11" id="79" /> +<TGConnectingPoint num="12" id="80" /> +<TGConnectingPoint num="13" id="81" /> +<TGConnectingPoint num="14" id="82" /> +<TGConnectingPoint num="15" id="83" /> +<TGConnectingPoint num="16" id="84" /> +<TGConnectingPoint num="17" id="85" /> +<TGConnectingPoint num="18" id="86" /> +<TGConnectingPoint num="19" id="87" /> +<TGConnectingPoint num="20" id="88" /> +<TGConnectingPoint num="21" id="89" /> +<TGConnectingPoint num="22" id="90" /> +<TGConnectingPoint num="23" id="91" /> <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> -<SUBCOMPONENT type="1101" id="95" > -<father id="129" num="0" /> +<SUBCOMPONENT type="1101" id="58" > +<father id="92" num="0" /> <cdparam x="239" y="702" /> <sizeparam width="216" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> <cdrectangleparam minX="0" maxX="34" minY="0" maxY="160" /> <infoparam name="TGComponent" value="FVWithRequest::PeriodicTask" /> -<TGConnectingPoint num="0" id="87" /> -<TGConnectingPoint num="1" id="88" /> -<TGConnectingPoint num="2" id="89" /> -<TGConnectingPoint num="3" id="90" /> -<TGConnectingPoint num="4" id="91" /> -<TGConnectingPoint num="5" id="92" /> -<TGConnectingPoint num="6" id="93" /> -<TGConnectingPoint num="7" id="94" /> +<TGConnectingPoint num="0" id="50" /> +<TGConnectingPoint num="1" id="51" /> +<TGConnectingPoint num="2" id="52" /> +<TGConnectingPoint num="3" id="53" /> +<TGConnectingPoint num="4" id="54" /> +<TGConnectingPoint num="5" id="55" /> +<TGConnectingPoint num="6" id="56" /> +<TGConnectingPoint num="7" id="57" /> <extraparam> <info value="FVWithRequest::PeriodicTask" taskName="PeriodicTask" referenceTaskName="FVWithRequest" priority="0" operationMEC="PeriodicTask" fatherComponentMECType="0" /> </extraparam> </SUBCOMPONENT> -<SUBCOMPONENT type="1101" id="104" > -<father id="129" num="1" /> +<SUBCOMPONENT type="1101" id="67" > +<father id="92" num="1" /> <cdparam x="245" y="641" /> <sizeparam width="216" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> <cdrectangleparam minX="0" maxX="34" minY="0" maxY="160" /> <infoparam name="TGComponent" value="FVWithRequest::AnotherTask" /> -<TGConnectingPoint num="0" id="96" /> -<TGConnectingPoint num="1" id="97" /> -<TGConnectingPoint num="2" id="98" /> -<TGConnectingPoint num="3" id="99" /> -<TGConnectingPoint num="4" id="100" /> -<TGConnectingPoint num="5" id="101" /> -<TGConnectingPoint num="6" id="102" /> -<TGConnectingPoint num="7" id="103" /> +<TGConnectingPoint num="0" id="59" /> +<TGConnectingPoint num="1" id="60" /> +<TGConnectingPoint num="2" id="61" /> +<TGConnectingPoint num="3" id="62" /> +<TGConnectingPoint num="4" id="63" /> +<TGConnectingPoint num="5" id="64" /> +<TGConnectingPoint num="6" id="65" /> +<TGConnectingPoint num="7" id="66" /> <extraparam> <info value="FVWithRequest::AnotherTask" taskName="AnotherTask" referenceTaskName="FVWithRequest" priority="0" operationMEC="AnotherTask" fatherComponentMECType="0" /> </extraparam> </SUBCOMPONENT> -<COMPONENT type="1105" id="163" > +<COMPONENT type="1105" id="126" > <cdparam x="933" y="170" /> <sizeparam width="445" height="270" 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="139" /> -<TGConnectingPoint num="1" id="140" /> -<TGConnectingPoint num="2" id="141" /> -<TGConnectingPoint num="3" id="142" /> -<TGConnectingPoint num="4" id="143" /> -<TGConnectingPoint num="5" id="144" /> -<TGConnectingPoint num="6" id="145" /> -<TGConnectingPoint num="7" id="146" /> -<TGConnectingPoint num="8" id="147" /> -<TGConnectingPoint num="9" id="148" /> -<TGConnectingPoint num="10" id="149" /> -<TGConnectingPoint num="11" id="150" /> -<TGConnectingPoint num="12" id="151" /> -<TGConnectingPoint num="13" id="152" /> -<TGConnectingPoint num="14" id="153" /> -<TGConnectingPoint num="15" id="154" /> -<TGConnectingPoint num="16" id="155" /> -<TGConnectingPoint num="17" id="156" /> -<TGConnectingPoint num="18" id="157" /> -<TGConnectingPoint num="19" id="158" /> -<TGConnectingPoint num="20" id="159" /> -<TGConnectingPoint num="21" id="160" /> -<TGConnectingPoint num="22" id="161" /> -<TGConnectingPoint num="23" id="162" /> +<TGConnectingPoint num="0" id="102" /> +<TGConnectingPoint num="1" id="103" /> +<TGConnectingPoint num="2" id="104" /> +<TGConnectingPoint num="3" id="105" /> +<TGConnectingPoint num="4" id="106" /> +<TGConnectingPoint num="5" id="107" /> +<TGConnectingPoint num="6" id="108" /> +<TGConnectingPoint num="7" id="109" /> +<TGConnectingPoint num="8" id="110" /> +<TGConnectingPoint num="9" id="111" /> +<TGConnectingPoint num="10" id="112" /> +<TGConnectingPoint num="11" id="113" /> +<TGConnectingPoint num="12" id="114" /> +<TGConnectingPoint num="13" id="115" /> +<TGConnectingPoint num="14" id="116" /> +<TGConnectingPoint num="15" id="117" /> +<TGConnectingPoint num="16" id="118" /> +<TGConnectingPoint num="17" id="119" /> +<TGConnectingPoint num="18" id="120" /> +<TGConnectingPoint num="19" id="121" /> +<TGConnectingPoint num="20" id="122" /> +<TGConnectingPoint num="21" id="123" /> +<TGConnectingPoint num="22" id="124" /> +<TGConnectingPoint num="23" id="125" /> <extraparam> <info stereotype="MEMORY" nodeName="Memory0" /> <attributes byteDataSize="4" memorySize="1024" clockRatio="1" bufferType="0" /> </extraparam> </COMPONENT> -<SUBCOMPONENT type="1103" id="138" > -<father id="163" num="0" /> +<SUBCOMPONENT type="1103" id="101" > +<father id="126" num="0" /> <cdparam x="979" y="238" /> <sizeparam width="231" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> <cdrectangleparam minX="0" maxX="214" minY="0" maxY="230" /> <infoparam name="TGComponent" value="FVWithRequest::comm1__comm" /> -<TGConnectingPoint num="0" id="130" /> -<TGConnectingPoint num="1" id="131" /> -<TGConnectingPoint num="2" id="132" /> -<TGConnectingPoint num="3" id="133" /> -<TGConnectingPoint num="4" id="134" /> -<TGConnectingPoint num="5" id="135" /> -<TGConnectingPoint num="6" id="136" /> -<TGConnectingPoint num="7" id="137" /> +<TGConnectingPoint num="0" id="93" /> +<TGConnectingPoint num="1" id="94" /> +<TGConnectingPoint num="2" id="95" /> +<TGConnectingPoint num="3" id="96" /> +<TGConnectingPoint num="4" id="97" /> +<TGConnectingPoint num="5" id="98" /> +<TGConnectingPoint num="6" id="99" /> +<TGConnectingPoint num="7" id="100" /> <extraparam> <info value="FVWithRequest::comm1__comm" communicationName="comm1__comm" referenceCommunicationName="FVWithRequest" priority="0" typeName="channel" /> </extraparam> </SUBCOMPONENT> -<COMPONENT type="1102" id="197" > +<COMPONENT type="1102" id="160" > <cdparam x="582" y="492" /> <sizeparam width="453" height="113" 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="173" /> -<TGConnectingPoint num="1" id="174" /> -<TGConnectingPoint num="2" id="175" /> -<TGConnectingPoint num="3" id="176" /> -<TGConnectingPoint num="4" id="177" /> -<TGConnectingPoint num="5" id="178" /> -<TGConnectingPoint num="6" id="179" /> -<TGConnectingPoint num="7" id="180" /> -<TGConnectingPoint num="8" id="181" /> -<TGConnectingPoint num="9" id="182" /> -<TGConnectingPoint num="10" id="183" /> -<TGConnectingPoint num="11" id="184" /> -<TGConnectingPoint num="12" id="185" /> -<TGConnectingPoint num="13" id="186" /> -<TGConnectingPoint num="14" id="187" /> -<TGConnectingPoint num="15" id="188" /> -<TGConnectingPoint num="16" id="189" /> -<TGConnectingPoint num="17" id="190" /> -<TGConnectingPoint num="18" id="191" /> -<TGConnectingPoint num="19" id="192" /> -<TGConnectingPoint num="20" id="193" /> -<TGConnectingPoint num="21" id="194" /> -<TGConnectingPoint num="22" id="195" /> -<TGConnectingPoint num="23" id="196" /> +<TGConnectingPoint num="0" id="136" /> +<TGConnectingPoint num="1" id="137" /> +<TGConnectingPoint num="2" id="138" /> +<TGConnectingPoint num="3" id="139" /> +<TGConnectingPoint num="4" id="140" /> +<TGConnectingPoint num="5" id="141" /> +<TGConnectingPoint num="6" id="142" /> +<TGConnectingPoint num="7" id="143" /> +<TGConnectingPoint num="8" id="144" /> +<TGConnectingPoint num="9" id="145" /> +<TGConnectingPoint num="10" id="146" /> +<TGConnectingPoint num="11" id="147" /> +<TGConnectingPoint num="12" id="148" /> +<TGConnectingPoint num="13" id="149" /> +<TGConnectingPoint num="14" id="150" /> +<TGConnectingPoint num="15" id="151" /> +<TGConnectingPoint num="16" id="152" /> +<TGConnectingPoint num="17" id="153" /> +<TGConnectingPoint num="18" id="154" /> +<TGConnectingPoint num="19" id="155" /> +<TGConnectingPoint num="20" id="156" /> +<TGConnectingPoint num="21" id="157" /> +<TGConnectingPoint num="22" id="158" /> +<TGConnectingPoint num="23" id="159" /> <extraparam> <info stereotype="BUS-RR" nodeName="Bus0" /> <attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" clockRatio="1" privacy="0" referenceAttack="null" /> </extraparam> </COMPONENT> -<SUBCOMPONENT type="1103" id="172" > -<father id="197" num="0" /> +<SUBCOMPONENT type="1103" id="135" > +<father id="160" num="0" /> <cdparam x="662" y="551" /> <sizeparam width="231" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> <cdrectangleparam minX="0" maxX="222" minY="0" maxY="73" /> <infoparam name="TGComponent" value="FVWithRequest::comm1__comm" /> -<TGConnectingPoint num="0" id="164" /> -<TGConnectingPoint num="1" id="165" /> -<TGConnectingPoint num="2" id="166" /> -<TGConnectingPoint num="3" id="167" /> -<TGConnectingPoint num="4" id="168" /> -<TGConnectingPoint num="5" id="169" /> -<TGConnectingPoint num="6" id="170" /> -<TGConnectingPoint num="7" id="171" /> +<TGConnectingPoint num="0" id="127" /> +<TGConnectingPoint num="1" id="128" /> +<TGConnectingPoint num="2" id="129" /> +<TGConnectingPoint num="3" id="130" /> +<TGConnectingPoint num="4" id="131" /> +<TGConnectingPoint num="5" id="132" /> +<TGConnectingPoint num="6" id="133" /> +<TGConnectingPoint num="7" id="134" /> <extraparam> <info value="FVWithRequest::comm1__comm" communicationName="comm1__comm" referenceCommunicationName="FVWithRequest" priority="0" typeName="channel" /> </extraparam> </SUBCOMPONENT> -<COMPONENT type="1100" id="231" > +<COMPONENT type="1100" id="194" > <cdparam x="192" y="175" /> <sizeparam width="428" height="260" 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="207" /> -<TGConnectingPoint num="1" id="208" /> -<TGConnectingPoint num="2" id="209" /> -<TGConnectingPoint num="3" id="210" /> -<TGConnectingPoint num="4" id="211" /> -<TGConnectingPoint num="5" id="212" /> -<TGConnectingPoint num="6" id="213" /> -<TGConnectingPoint num="7" id="214" /> -<TGConnectingPoint num="8" id="215" /> -<TGConnectingPoint num="9" id="216" /> -<TGConnectingPoint num="10" id="217" /> -<TGConnectingPoint num="11" id="218" /> -<TGConnectingPoint num="12" id="219" /> -<TGConnectingPoint num="13" id="220" /> -<TGConnectingPoint num="14" id="221" /> -<TGConnectingPoint num="15" id="222" /> -<TGConnectingPoint num="16" id="223" /> -<TGConnectingPoint num="17" id="224" /> -<TGConnectingPoint num="18" id="225" /> -<TGConnectingPoint num="19" id="226" /> -<TGConnectingPoint num="20" id="227" /> -<TGConnectingPoint num="21" id="228" /> -<TGConnectingPoint num="22" id="229" /> -<TGConnectingPoint num="23" id="230" /> +<TGConnectingPoint num="0" id="170" /> +<TGConnectingPoint num="1" id="171" /> +<TGConnectingPoint num="2" id="172" /> +<TGConnectingPoint num="3" id="173" /> +<TGConnectingPoint num="4" id="174" /> +<TGConnectingPoint num="5" id="175" /> +<TGConnectingPoint num="6" id="176" /> +<TGConnectingPoint num="7" id="177" /> +<TGConnectingPoint num="8" id="178" /> +<TGConnectingPoint num="9" id="179" /> +<TGConnectingPoint num="10" id="180" /> +<TGConnectingPoint num="11" id="181" /> +<TGConnectingPoint num="12" id="182" /> +<TGConnectingPoint num="13" id="183" /> +<TGConnectingPoint num="14" id="184" /> +<TGConnectingPoint num="15" id="185" /> +<TGConnectingPoint num="16" id="186" /> +<TGConnectingPoint num="17" id="187" /> +<TGConnectingPoint num="18" id="188" /> +<TGConnectingPoint num="19" id="189" /> +<TGConnectingPoint num="20" id="190" /> +<TGConnectingPoint num="21" id="191" /> +<TGConnectingPoint num="22" id="192" /> +<TGConnectingPoint num="23" id="193" /> <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="206" > -<father id="231" num="0" /> +<SUBCOMPONENT type="1101" id="169" > +<father id="194" num="0" /> <cdparam x="214" y="209" /> <sizeparam width="284" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> <cdrectangleparam minX="0" maxX="144" minY="0" maxY="220" /> <infoparam name="TGComponent" value="FVWithRequest::ManagerOfPeriodicTask" /> -<TGConnectingPoint num="0" id="198" /> -<TGConnectingPoint num="1" id="199" /> -<TGConnectingPoint num="2" id="200" /> -<TGConnectingPoint num="3" id="201" /> -<TGConnectingPoint num="4" id="202" /> -<TGConnectingPoint num="5" id="203" /> -<TGConnectingPoint num="6" id="204" /> -<TGConnectingPoint num="7" id="205" /> +<TGConnectingPoint num="0" id="161" /> +<TGConnectingPoint num="1" id="162" /> +<TGConnectingPoint num="2" id="163" /> +<TGConnectingPoint num="3" id="164" /> +<TGConnectingPoint num="4" id="165" /> +<TGConnectingPoint num="5" id="166" /> +<TGConnectingPoint num="6" id="167" /> +<TGConnectingPoint num="7" id="168" /> <extraparam> <info value="FVWithRequest::ManagerOfPeriodicTask" taskName="ManagerOfPeriodicTask" referenceTaskName="FVWithRequest" priority="0" operationMEC="AnotherTask" fatherComponentMECType="0" /> </extraparam> </SUBCOMPONENT> -<CONNECTOR type="125" id="232" > +<CONNECTOR type="125" id="195" > <cdparam x="471" y="642" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="{info}" /> -<P1 x="471" y="642" id="116" /> -<P2 x="582" y="605" id="178" /> +<P1 x="471" y="642" id="79" /> +<P2 x="582" y="605" id="141" /> <AutomaticDrawing data="true" /> <extraparam> <info priority="0" /> <spy value="false" /> </extraparam> </CONNECTOR> -<CONNECTOR type="125" id="233" > +<CONNECTOR type="125" id="196" > <cdparam x="983" y="440" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="{info}" /> -<P1 x="1044" y="440" id="153" /> -<P2 x="921" y="492" id="182" /> +<P1 x="1044" y="440" id="116" /> +<P2 x="921" y="492" id="145" /> <AutomaticDrawing data="true" /> <extraparam> <info priority="0" /> <spy value="false" /> </extraparam> </CONNECTOR> -<CONNECTOR type="125" id="234" > +<CONNECTOR type="125" id="197" > <cdparam x="620" y="385" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="{info}" /> -<P1 x="620" y="370" id="220" /> -<P2 x="695" y="492" id="181" /> +<P1 x="620" y="370" id="183" /> +<P2 x="695" y="492" id="144" /> <AutomaticDrawing data="true" /> <extraparam> <info priority="0" /> @@ -725,48 +523,48 @@ <Modeling type="TML Component Design" nameTab="FVWithEvent" tabs="TML Component Task Diagram$AnotherTask$ManagerOfPeriodicTask$PeriodicTask" > <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="235" > +<CONNECTOR type="126" id="198" > <cdparam x="967" y="411" /> <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="933" y="385" id="261" /> -<P2 x="978" y="609" id="237" /> +<P1 x="933" y="385" id="224" /> +<P2 x="978" y="609" id="200" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="126" id="236" > +<CONNECTOR type="126" id="199" > <cdparam x="559" y="329" /> <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="566" y="302" id="248" /> -<P2 x="821" y="302" id="259" /> +<P1 x="566" y="302" id="211" /> +<P2 x="821" y="302" id="222" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<COMPONENT type="1202" id="247" > +<COMPONENT type="1202" id="210" > <cdparam x="891" y="622" /> <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="AnotherTask" /> -<TGConnectingPoint num="0" id="239" /> -<TGConnectingPoint num="1" id="240" /> -<TGConnectingPoint num="2" id="241" /> -<TGConnectingPoint num="3" id="242" /> -<TGConnectingPoint num="4" id="243" /> -<TGConnectingPoint num="5" id="244" /> -<TGConnectingPoint num="6" id="245" /> -<TGConnectingPoint num="7" id="246" /> +<TGConnectingPoint num="0" id="202" /> +<TGConnectingPoint num="1" id="203" /> +<TGConnectingPoint num="2" id="204" /> +<TGConnectingPoint num="3" id="205" /> +<TGConnectingPoint num="4" id="206" /> +<TGConnectingPoint num="5" id="207" /> +<TGConnectingPoint num="6" id="208" /> +<TGConnectingPoint num="7" id="209" /> <extraparam> <Data isAttacker="No" daemon="false" periodic="false" periodValue="" unit="" Operation="" /> </extraparam> </COMPONENT> -<SUBCOMPONENT type="1203" id="238" > -<father id="247" num="0" /> +<SUBCOMPONENT type="1203" id="201" > +<father id="210" num="0" /> <cdparam x="965" y="609" /> <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> <cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" /> <infoparam name="Primitive port" value="Channel comm" /> -<TGConnectingPoint num="0" id="237" /> +<TGConnectingPoint num="0" id="200" /> <extraparam> <Prop commName="comm" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="32" 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="0" /> <Type type="0" typeOther="" /> @@ -777,20 +575,20 @@ </extraparam> </SUBCOMPONENT> -<COMPONENT type="1202" id="258" > +<COMPONENT type="1202" id="221" > <cdparam x="366" y="244" /> <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="ManagerOfPeriodicTask" /> -<TGConnectingPoint num="0" id="250" /> -<TGConnectingPoint num="1" id="251" /> -<TGConnectingPoint num="2" id="252" /> -<TGConnectingPoint num="3" id="253" /> -<TGConnectingPoint num="4" id="254" /> -<TGConnectingPoint num="5" id="255" /> -<TGConnectingPoint num="6" id="256" /> -<TGConnectingPoint num="7" id="257" /> +<TGConnectingPoint num="0" id="213" /> +<TGConnectingPoint num="1" id="214" /> +<TGConnectingPoint num="2" id="215" /> +<TGConnectingPoint num="3" id="216" /> +<TGConnectingPoint num="4" id="217" /> +<TGConnectingPoint num="5" id="218" /> +<TGConnectingPoint num="6" id="219" /> +<TGConnectingPoint num="7" id="220" /> <extraparam> <Data isAttacker="No" daemon="false" periodic="false" periodValue="" unit="" Operation="" /> <Attribute access="2" id="startTime" value="10" type="0" typeOther="" /> @@ -798,14 +596,14 @@ <Attribute access="2" id="x" value="1" type="0" typeOther="" /> </extraparam> </COMPONENT> -<SUBCOMPONENT type="1203" id="249" > -<father id="258" num="0" /> +<SUBCOMPONENT type="1203" id="212" > +<father id="221" num="0" /> <cdparam x="553" y="302" /> <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 evt" /> -<TGConnectingPoint num="0" id="248" /> +<TGConnectingPoint num="0" id="211" /> <extraparam> <Prop commName="evt" commType="1" origin="true" finite="true" blocking="false" maxSamples="1" 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="0" /> <Type type="1" typeOther="" /> @@ -816,33 +614,33 @@ </extraparam> </SUBCOMPONENT> -<COMPONENT type="1202" id="271" > +<COMPONENT type="1202" id="234" > <cdparam x="821" y="248" /> <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="PeriodicTask" /> -<TGConnectingPoint num="0" id="263" /> -<TGConnectingPoint num="1" id="264" /> -<TGConnectingPoint num="2" id="265" /> -<TGConnectingPoint num="3" id="266" /> -<TGConnectingPoint num="4" id="267" /> -<TGConnectingPoint num="5" id="268" /> -<TGConnectingPoint num="6" id="269" /> -<TGConnectingPoint num="7" id="270" /> +<TGConnectingPoint num="0" id="226" /> +<TGConnectingPoint num="1" id="227" /> +<TGConnectingPoint num="2" id="228" /> +<TGConnectingPoint num="3" id="229" /> +<TGConnectingPoint num="4" id="230" /> +<TGConnectingPoint num="5" id="231" /> +<TGConnectingPoint num="6" id="232" /> +<TGConnectingPoint num="7" id="233" /> <extraparam> <Data isAttacker="No" daemon="false" periodic="false" periodValue="" unit="" Operation="" /> <Attribute access="2" id="x" value="" type="0" typeOther="" /> </extraparam> </COMPONENT> -<SUBCOMPONENT type="1203" id="260" > -<father id="271" num="0" /> +<SUBCOMPONENT type="1203" id="223" > +<father id="234" num="0" /> <cdparam x="808" y="302" /> <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 evt" /> -<TGConnectingPoint num="0" id="259" /> +<TGConnectingPoint num="0" id="222" /> <extraparam> <Prop commName="evt" 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="0" /> <Type type="1" typeOther="" /> @@ -852,14 +650,14 @@ <Type type="0" typeOther="" /> </extraparam> </SUBCOMPONENT> -<SUBCOMPONENT type="1203" id="262" > -<father id="271" num="1" /> +<SUBCOMPONENT type="1203" id="225" > +<father id="234" num="1" /> <cdparam x="920" y="385" /> <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 comm1" /> -<TGConnectingPoint num="0" id="261" /> +<TGConnectingPoint num="0" id="224" /> <extraparam> <Prop commName="comm1" commType="0" origin="true" finite="false" blocking="false" maxSamples="200" widthSamples="32" 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="0" /> <Type type="0" typeOther="" /> @@ -874,128 +672,128 @@ </TMLComponentTaskDiagramPanel> <TMLActivityDiagramPanel name="AnotherTask" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0" > -<COMPONENT type="1000" id="273" > +<COMPONENT type="1000" id="236" > <cdparam x="603" y="105" /> <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" /> +<TGConnectingPoint num="0" id="235" /> </COMPONENT> -<COMPONENT type="1030" id="276" > +<COMPONENT type="1030" id="239" > <cdparam x="569" y="150" /> <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="274" /> -<TGConnectingPoint num="1" id="275" /> +<TGConnectingPoint num="0" id="237" /> +<TGConnectingPoint num="1" id="238" /> </COMPONENT> -<COMPONENT type="1001" id="278" > +<COMPONENT type="1001" id="241" > <cdparam x="670" y="320" /> <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="277" /> +<TGConnectingPoint num="0" id="240" /> </COMPONENT> -<COMPONENT type="1009" id="281" > +<COMPONENT type="1009" id="244" > <cdparam x="633" y="257" /> <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="read channel" value="comm(100) " /> -<TGConnectingPoint num="0" id="279" /> -<TGConnectingPoint num="1" id="280" /> +<TGConnectingPoint num="0" id="242" /> +<TGConnectingPoint num="1" id="243" /> <extraparam> <Data channelName="comm" nbOfSamples="100" secPattern="" isAttacker="No" isEncForm="No" /> </extraparam> </COMPONENT> -<CONNECTOR type="115" id="282" > +<CONNECTOR type="115" id="245" > <cdparam x="661" y="164" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> -<P1 x="661" y="164" id="275" /> -<P2 x="675" y="252" id="279" /> +<P1 x="661" y="164" id="238" /> +<P2 x="675" y="252" id="242" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="115" id="283" > +<CONNECTOR type="115" id="246" > <cdparam x="675" y="282" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> -<P1 x="675" y="282" id="280" /> -<P2 x="680" y="315" id="277" /> +<P1 x="675" y="282" id="243" /> +<P2 x="680" y="315" id="240" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="115" id="284" > +<CONNECTOR type="115" id="247" > <cdparam x="610" y="125" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> -<P1 x="610" y="125" id="272" /> -<P2 x="615" y="145" id="274" /> +<P1 x="610" y="125" id="235" /> +<P2 x="615" y="145" id="237" /> <AutomaticDrawing data="true" /> </CONNECTOR> </TMLActivityDiagramPanel> <TMLActivityDiagramPanel name="ManagerOfPeriodicTask" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0" > -<COMPONENT type="1008" id="287" > +<COMPONENT type="1008" id="250" > <cdparam x="550" y="305" /> <sizeparam width="45" 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="evt(x)" /> -<TGConnectingPoint num="0" id="285" /> -<TGConnectingPoint num="1" id="286" /> +<TGConnectingPoint num="0" id="248" /> +<TGConnectingPoint num="1" id="249" /> <extraparam> <Data eventName="evt" nbOfParams="5" /> <Param index="0" value="x" /> </extraparam> </COMPONENT> -<COMPONENT type="1008" id="290" > +<COMPONENT type="1008" id="253" > <cdparam x="726" y="596" /> <sizeparam width="45" 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="evt(x)" /> -<TGConnectingPoint num="0" id="288" /> -<TGConnectingPoint num="1" id="289" /> +<TGConnectingPoint num="0" id="251" /> +<TGConnectingPoint num="1" id="252" /> <extraparam> <Data eventName="evt" nbOfParams="5" /> <Param index="0" value="x" /> </extraparam> </COMPONENT> -<COMPONENT type="1001" id="292" > +<COMPONENT type="1001" id="255" > <cdparam x="739" y="766" /> <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="291" /> +<TGConnectingPoint num="0" id="254" /> </COMPONENT> -<COMPONENT type="1026" id="296" > +<COMPONENT type="1026" id="259" > <cdparam x="743" y="530" /> <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="294" /> -<TGConnectingPoint num="1" id="295" /> +<TGConnectingPoint num="0" id="257" /> +<TGConnectingPoint num="1" id="258" /> </COMPONENT> -<SUBCOMPONENT type="-1" id="293" > -<father id="296" num="0" /> +<SUBCOMPONENT type="-1" id="256" > +<father id="259" num="0" /> <cdparam x="758" y="550" /> <sizeparam width="63" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> @@ -1006,29 +804,29 @@ </extraparam> </SUBCOMPONENT> -<COMPONENT type="1030" id="299" > +<COMPONENT type="1030" id="262" > <cdparam x="526" y="364" /> <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="297" /> -<TGConnectingPoint num="1" id="298" /> +<TGConnectingPoint num="0" id="260" /> +<TGConnectingPoint num="1" id="261" /> </COMPONENT> -<COMPONENT type="1026" id="303" > +<COMPONENT type="1026" id="266" > <cdparam x="567" y="244" /> <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="301" /> -<TGConnectingPoint num="1" id="302" /> +<TGConnectingPoint num="0" id="264" /> +<TGConnectingPoint num="1" id="265" /> </COMPONENT> -<SUBCOMPONENT type="-1" id="300" > -<father id="303" num="0" /> +<SUBCOMPONENT type="-1" id="263" > +<father id="266" num="0" /> <cdparam x="582" y="264" /> <sizeparam width="82" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> @@ -1039,156 +837,156 @@ </extraparam> </SUBCOMPONENT> -<COMPONENT type="1000" id="305" > +<COMPONENT type="1000" id="268" > <cdparam x="540" y="125" /> <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="304" /> +<TGConnectingPoint num="0" id="267" /> </COMPONENT> -<CONNECTOR type="115" id="306" > +<CONNECTOR type="115" id="269" > <cdparam x="618" y="378" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> -<P1 x="618" y="378" id="298" /> -<P2 x="748" y="525" id="294" /> +<P1 x="618" y="378" id="261" /> +<P2 x="748" y="525" id="257" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="115" id="307" > +<CONNECTOR type="115" id="270" > <cdparam x="547" y="145" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> -<P1 x="547" y="145" id="304" /> -<P2 x="572" y="239" id="301" /> +<P1 x="547" y="145" id="267" /> +<P2 x="572" y="239" id="264" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="115" id="308" > +<CONNECTOR type="115" id="271" > <cdparam x="625" y="325" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> -<P1 x="572" y="330" id="286" /> -<P2 x="572" y="359" id="297" /> +<P1 x="572" y="330" id="249" /> +<P2 x="572" y="359" id="260" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="115" id="309" > +<CONNECTOR type="115" id="272" > <cdparam x="572" y="279" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> -<P1 x="572" y="279" id="302" /> -<P2 x="572" y="300" id="285" /> +<P1 x="572" y="279" id="265" /> +<P2 x="572" y="300" id="248" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="115" id="310" > +<CONNECTOR type="115" id="273" > <cdparam x="748" y="565" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> -<P1 x="748" y="565" id="295" /> -<P2 x="748" y="591" id="288" /> +<P1 x="748" y="565" id="258" /> +<P2 x="748" y="591" id="251" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="115" id="311" > +<CONNECTOR type="115" id="274" > <cdparam x="760" y="621" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> -<P1 x="748" y="621" id="289" /> -<P2 x="749" y="761" id="291" /> +<P1 x="748" y="621" id="252" /> +<P2 x="749" y="761" id="254" /> <AutomaticDrawing data="true" /> </CONNECTOR> </TMLActivityDiagramPanel> <TMLActivityDiagramPanel name="PeriodicTask" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0" > -<COMPONENT type="1010" id="314" > +<COMPONENT type="1010" id="277" > <cdparam x="738" y="125" /> <sizeparam width="49" 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="evt(x) " /> -<TGConnectingPoint num="0" id="312" /> -<TGConnectingPoint num="1" id="313" /> +<TGConnectingPoint num="0" id="275" /> +<TGConnectingPoint num="1" id="276" /> <extraparam> <Data eventName="evt" nbOfParams="5" /> <Param index="0" value="x" /> </extraparam> </COMPONENT> -<COMPONENT type="1030" id="317" > +<COMPONENT type="1030" id="280" > <cdparam x="618" y="90" /> <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="315" /> -<TGConnectingPoint num="1" id="316" /> +<TGConnectingPoint num="0" id="278" /> +<TGConnectingPoint num="1" id="279" /> </COMPONENT> -<COMPONENT type="1000" id="319" > +<COMPONENT type="1000" id="282" > <cdparam x="621" y="39" /> <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="318" /> +<TGConnectingPoint num="0" id="281" /> </COMPONENT> -<COMPONENT type="1001" id="321" > +<COMPONENT type="1001" id="284" > <cdparam x="762" y="324" /> <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="320" /> +<TGConnectingPoint num="0" id="283" /> </COMPONENT> -<COMPONENT type="1006" id="324" > +<COMPONENT type="1006" id="287" > <cdparam x="730" y="180" /> <sizeparam width="89" 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="comm1(100)" /> -<TGConnectingPoint num="0" id="322" /> -<TGConnectingPoint num="1" id="323" /> +<TGConnectingPoint num="0" id="285" /> +<TGConnectingPoint num="1" id="286" /> <breakpoint /> <extraparam> <Data channelName="comm1" nbOfSamples="100" secPattern="" isAttacker="No" isEncForm="No" /> </extraparam> </COMPONENT> -<CONNECTOR type="115" id="325" > +<CONNECTOR type="115" id="288" > <cdparam x="774" y="205" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> -<P1 x="774" y="205" id="323" /> -<P2 x="772" y="319" id="320" /> +<P1 x="774" y="205" id="286" /> +<P2 x="772" y="319" id="283" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="115" id="326" > +<CONNECTOR type="115" id="289" > <cdparam x="645" y="62" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> -<P1 x="628" y="59" id="318" /> -<P2 x="664" y="85" id="315" /> +<P1 x="628" y="59" id="281" /> +<P2 x="664" y="85" id="278" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="115" id="327" > +<CONNECTOR type="115" id="290" > <cdparam x="710" y="104" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> -<P1 x="710" y="104" id="316" /> -<P2 x="762" y="120" id="312" /> +<P1 x="710" y="104" id="279" /> +<P2 x="762" y="120" id="275" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="115" id="328" > +<CONNECTOR type="115" id="291" > <cdparam x="762" y="150" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> -<P1 x="762" y="150" id="313" /> -<P2 x="774" y="175" id="322" /> +<P1 x="762" y="150" id="276" /> +<P2 x="774" y="175" id="285" /> <AutomaticDrawing data="true" /> </CONNECTOR> @@ -1201,227 +999,227 @@ <Modeling type="TML Architecture" nameTab="ArchitectureWithEvent" > <TMLArchiDiagramPanel name="DIPLODOCUS architecture and mapping Diagram" minX="10" maxX="2500" minY="10" maxY="1500" attributes="0" masterClockFrequency="200" zoom="1.0" > -<COMPONENT type="1105" id="362" > +<COMPONENT type="1105" id="325" > <cdparam x="946" y="59" /> <sizeparam width="445" height="270" 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="338" /> -<TGConnectingPoint num="1" id="339" /> -<TGConnectingPoint num="2" id="340" /> -<TGConnectingPoint num="3" id="341" /> -<TGConnectingPoint num="4" id="342" /> -<TGConnectingPoint num="5" id="343" /> -<TGConnectingPoint num="6" id="344" /> -<TGConnectingPoint num="7" id="345" /> -<TGConnectingPoint num="8" id="346" /> -<TGConnectingPoint num="9" id="347" /> -<TGConnectingPoint num="10" id="348" /> -<TGConnectingPoint num="11" id="349" /> -<TGConnectingPoint num="12" id="350" /> -<TGConnectingPoint num="13" id="351" /> -<TGConnectingPoint num="14" id="352" /> -<TGConnectingPoint num="15" id="353" /> -<TGConnectingPoint num="16" id="354" /> -<TGConnectingPoint num="17" id="355" /> -<TGConnectingPoint num="18" id="356" /> -<TGConnectingPoint num="19" id="357" /> -<TGConnectingPoint num="20" id="358" /> -<TGConnectingPoint num="21" id="359" /> -<TGConnectingPoint num="22" id="360" /> -<TGConnectingPoint num="23" id="361" /> +<TGConnectingPoint num="0" id="301" /> +<TGConnectingPoint num="1" id="302" /> +<TGConnectingPoint num="2" id="303" /> +<TGConnectingPoint num="3" id="304" /> +<TGConnectingPoint num="4" id="305" /> +<TGConnectingPoint num="5" id="306" /> +<TGConnectingPoint num="6" id="307" /> +<TGConnectingPoint num="7" id="308" /> +<TGConnectingPoint num="8" id="309" /> +<TGConnectingPoint num="9" id="310" /> +<TGConnectingPoint num="10" id="311" /> +<TGConnectingPoint num="11" id="312" /> +<TGConnectingPoint num="12" id="313" /> +<TGConnectingPoint num="13" id="314" /> +<TGConnectingPoint num="14" id="315" /> +<TGConnectingPoint num="15" id="316" /> +<TGConnectingPoint num="16" id="317" /> +<TGConnectingPoint num="17" id="318" /> +<TGConnectingPoint num="18" id="319" /> +<TGConnectingPoint num="19" id="320" /> +<TGConnectingPoint num="20" id="321" /> +<TGConnectingPoint num="21" id="322" /> +<TGConnectingPoint num="22" id="323" /> +<TGConnectingPoint num="23" id="324" /> <extraparam> <info stereotype="MEMORY" nodeName="Memory0" /> <attributes byteDataSize="4" memorySize="1024" clockRatio="1" bufferType="0" /> </extraparam> </COMPONENT> -<SUBCOMPONENT type="1103" id="337" > -<father id="362" num="0" /> +<SUBCOMPONENT type="1103" id="300" > +<father id="325" num="0" /> <cdparam x="992" y="127" /> <sizeparam width="214" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> <cdrectangleparam minX="0" maxX="231" minY="0" maxY="230" /> <infoparam name="TGComponent" value="FVWithEvent::comm1__comm" /> -<TGConnectingPoint num="0" id="329" /> -<TGConnectingPoint num="1" id="330" /> -<TGConnectingPoint num="2" id="331" /> -<TGConnectingPoint num="3" id="332" /> -<TGConnectingPoint num="4" id="333" /> -<TGConnectingPoint num="5" id="334" /> -<TGConnectingPoint num="6" id="335" /> -<TGConnectingPoint num="7" id="336" /> +<TGConnectingPoint num="0" id="292" /> +<TGConnectingPoint num="1" id="293" /> +<TGConnectingPoint num="2" id="294" /> +<TGConnectingPoint num="3" id="295" /> +<TGConnectingPoint num="4" id="296" /> +<TGConnectingPoint num="5" id="297" /> +<TGConnectingPoint num="6" id="298" /> +<TGConnectingPoint num="7" id="299" /> <extraparam> <info value="FVWithEvent::comm1__comm" communicationName="comm1__comm" referenceCommunicationName="FVWithEvent" priority="0" typeName="channel" /> </extraparam> </SUBCOMPONENT> -<COMPONENT type="1102" id="396" > +<COMPONENT type="1102" id="359" > <cdparam x="595" y="452" /> <sizeparam width="453" height="113" 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="372" /> -<TGConnectingPoint num="1" id="373" /> -<TGConnectingPoint num="2" id="374" /> -<TGConnectingPoint num="3" id="375" /> -<TGConnectingPoint num="4" id="376" /> -<TGConnectingPoint num="5" id="377" /> -<TGConnectingPoint num="6" id="378" /> -<TGConnectingPoint num="7" id="379" /> -<TGConnectingPoint num="8" id="380" /> -<TGConnectingPoint num="9" id="381" /> -<TGConnectingPoint num="10" id="382" /> -<TGConnectingPoint num="11" id="383" /> -<TGConnectingPoint num="12" id="384" /> -<TGConnectingPoint num="13" id="385" /> -<TGConnectingPoint num="14" id="386" /> -<TGConnectingPoint num="15" id="387" /> -<TGConnectingPoint num="16" id="388" /> -<TGConnectingPoint num="17" id="389" /> -<TGConnectingPoint num="18" id="390" /> -<TGConnectingPoint num="19" id="391" /> -<TGConnectingPoint num="20" id="392" /> -<TGConnectingPoint num="21" id="393" /> -<TGConnectingPoint num="22" id="394" /> -<TGConnectingPoint num="23" id="395" /> +<TGConnectingPoint num="0" id="335" /> +<TGConnectingPoint num="1" id="336" /> +<TGConnectingPoint num="2" id="337" /> +<TGConnectingPoint num="3" id="338" /> +<TGConnectingPoint num="4" id="339" /> +<TGConnectingPoint num="5" id="340" /> +<TGConnectingPoint num="6" id="341" /> +<TGConnectingPoint num="7" id="342" /> +<TGConnectingPoint num="8" id="343" /> +<TGConnectingPoint num="9" id="344" /> +<TGConnectingPoint num="10" id="345" /> +<TGConnectingPoint num="11" id="346" /> +<TGConnectingPoint num="12" id="347" /> +<TGConnectingPoint num="13" id="348" /> +<TGConnectingPoint num="14" id="349" /> +<TGConnectingPoint num="15" id="350" /> +<TGConnectingPoint num="16" id="351" /> +<TGConnectingPoint num="17" id="352" /> +<TGConnectingPoint num="18" id="353" /> +<TGConnectingPoint num="19" id="354" /> +<TGConnectingPoint num="20" id="355" /> +<TGConnectingPoint num="21" id="356" /> +<TGConnectingPoint num="22" id="357" /> +<TGConnectingPoint num="23" id="358" /> <extraparam> <info stereotype="BUS-RR" nodeName="Bus0" /> <attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" clockRatio="1" privacy="0" referenceAttack="null" /> </extraparam> </COMPONENT> -<SUBCOMPONENT type="1103" id="371" > -<father id="396" num="0" /> +<SUBCOMPONENT type="1103" id="334" > +<father id="359" num="0" /> <cdparam x="822" y="501" /> <sizeparam width="214" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> <cdrectangleparam minX="0" maxX="239" minY="0" maxY="73" /> <infoparam name="TGComponent" value="FVWithEvent::comm1__comm" /> -<TGConnectingPoint num="0" id="363" /> -<TGConnectingPoint num="1" id="364" /> -<TGConnectingPoint num="2" id="365" /> -<TGConnectingPoint num="3" id="366" /> -<TGConnectingPoint num="4" id="367" /> -<TGConnectingPoint num="5" id="368" /> -<TGConnectingPoint num="6" id="369" /> -<TGConnectingPoint num="7" id="370" /> +<TGConnectingPoint num="0" id="326" /> +<TGConnectingPoint num="1" id="327" /> +<TGConnectingPoint num="2" id="328" /> +<TGConnectingPoint num="3" id="329" /> +<TGConnectingPoint num="4" id="330" /> +<TGConnectingPoint num="5" id="331" /> +<TGConnectingPoint num="6" id="332" /> +<TGConnectingPoint num="7" id="333" /> <extraparam> <info value="FVWithEvent::comm1__comm" communicationName="comm1__comm" referenceCommunicationName="FVWithEvent" priority="0" typeName="channel" /> </extraparam> </SUBCOMPONENT> -<COMPONENT type="1100" id="448" > +<COMPONENT type="1100" id="411" > <cdparam x="69" y="103" /> <sizeparam width="428" height="260" 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="424" /> -<TGConnectingPoint num="1" id="425" /> -<TGConnectingPoint num="2" id="426" /> -<TGConnectingPoint num="3" id="427" /> -<TGConnectingPoint num="4" id="428" /> -<TGConnectingPoint num="5" id="429" /> -<TGConnectingPoint num="6" id="430" /> -<TGConnectingPoint num="7" id="431" /> -<TGConnectingPoint num="8" id="432" /> -<TGConnectingPoint num="9" id="433" /> -<TGConnectingPoint num="10" id="434" /> -<TGConnectingPoint num="11" id="435" /> -<TGConnectingPoint num="12" id="436" /> -<TGConnectingPoint num="13" id="437" /> -<TGConnectingPoint num="14" id="438" /> -<TGConnectingPoint num="15" id="439" /> -<TGConnectingPoint num="16" id="440" /> -<TGConnectingPoint num="17" id="441" /> -<TGConnectingPoint num="18" id="442" /> -<TGConnectingPoint num="19" id="443" /> -<TGConnectingPoint num="20" id="444" /> -<TGConnectingPoint num="21" id="445" /> -<TGConnectingPoint num="22" id="446" /> -<TGConnectingPoint num="23" id="447" /> +<TGConnectingPoint num="0" id="387" /> +<TGConnectingPoint num="1" id="388" /> +<TGConnectingPoint num="2" id="389" /> +<TGConnectingPoint num="3" id="390" /> +<TGConnectingPoint num="4" id="391" /> +<TGConnectingPoint num="5" id="392" /> +<TGConnectingPoint num="6" id="393" /> +<TGConnectingPoint num="7" id="394" /> +<TGConnectingPoint num="8" id="395" /> +<TGConnectingPoint num="9" id="396" /> +<TGConnectingPoint num="10" id="397" /> +<TGConnectingPoint num="11" id="398" /> +<TGConnectingPoint num="12" id="399" /> +<TGConnectingPoint num="13" id="400" /> +<TGConnectingPoint num="14" id="401" /> +<TGConnectingPoint num="15" id="402" /> +<TGConnectingPoint num="16" id="403" /> +<TGConnectingPoint num="17" id="404" /> +<TGConnectingPoint num="18" id="405" /> +<TGConnectingPoint num="19" id="406" /> +<TGConnectingPoint num="20" id="407" /> +<TGConnectingPoint num="21" id="408" /> +<TGConnectingPoint num="22" id="409" /> +<TGConnectingPoint num="23" id="410" /> <extraparam> <info stereotype="CPURRPB" nodeName="CPU0" /> <attributes nbOfCores="1" byteDataSize="4" schedulingPolicy="1" 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="405" > -<father id="448" num="0" /> +<SUBCOMPONENT type="1101" id="368" > +<father id="411" num="0" /> <cdparam x="198" y="279" /> <sizeparam width="199" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> <cdrectangleparam minX="0" maxX="229" minY="0" maxY="220" /> <infoparam name="TGComponent" value="FVWithEvent::PeriodicTask" /> -<TGConnectingPoint num="0" id="397" /> -<TGConnectingPoint num="1" id="398" /> -<TGConnectingPoint num="2" id="399" /> -<TGConnectingPoint num="3" id="400" /> -<TGConnectingPoint num="4" id="401" /> -<TGConnectingPoint num="5" id="402" /> -<TGConnectingPoint num="6" id="403" /> -<TGConnectingPoint num="7" id="404" /> +<TGConnectingPoint num="0" id="360" /> +<TGConnectingPoint num="1" id="361" /> +<TGConnectingPoint num="2" id="362" /> +<TGConnectingPoint num="3" id="363" /> +<TGConnectingPoint num="4" id="364" /> +<TGConnectingPoint num="5" id="365" /> +<TGConnectingPoint num="6" id="366" /> +<TGConnectingPoint num="7" id="367" /> <extraparam> <info value="FVWithEvent::PeriodicTask" taskName="PeriodicTask" referenceTaskName="FVWithEvent" priority="5" operationMEC="PeriodicTask" fatherComponentMECType="0" /> </extraparam> </SUBCOMPONENT> -<SUBCOMPONENT type="1101" id="414" > -<father id="448" num="1" /> +<SUBCOMPONENT type="1101" id="377" > +<father id="411" num="1" /> <cdparam x="226" y="219" /> <sizeparam width="199" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> <cdrectangleparam minX="0" maxX="229" minY="0" maxY="220" /> <infoparam name="TGComponent" value="FVWithEvent::AnotherTask" /> -<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="0" id="369" /> +<TGConnectingPoint num="1" id="370" /> +<TGConnectingPoint num="2" id="371" /> +<TGConnectingPoint num="3" id="372" /> +<TGConnectingPoint num="4" id="373" /> +<TGConnectingPoint num="5" id="374" /> +<TGConnectingPoint num="6" id="375" /> +<TGConnectingPoint num="7" id="376" /> <extraparam> <info value="FVWithEvent::AnotherTask" taskName="AnotherTask" referenceTaskName="FVWithEvent" priority="1" operationMEC="AnotherTask" fatherComponentMECType="0" /> </extraparam> </SUBCOMPONENT> -<SUBCOMPONENT type="1101" id="423" > -<father id="448" num="2" /> +<SUBCOMPONENT type="1101" id="386" > +<father id="411" num="2" /> <cdparam x="121" y="160" /> <sizeparam width="267" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> <cdrectangleparam minX="0" maxX="161" minY="0" maxY="220" /> <infoparam name="TGComponent" value="FVWithEvent::ManagerOfPeriodicTask" /> -<TGConnectingPoint num="0" id="415" /> -<TGConnectingPoint num="1" id="416" /> -<TGConnectingPoint num="2" id="417" /> -<TGConnectingPoint num="3" id="418" /> -<TGConnectingPoint num="4" id="419" /> -<TGConnectingPoint num="5" id="420" /> -<TGConnectingPoint num="6" id="421" /> -<TGConnectingPoint num="7" id="422" /> +<TGConnectingPoint num="0" id="378" /> +<TGConnectingPoint num="1" id="379" /> +<TGConnectingPoint num="2" id="380" /> +<TGConnectingPoint num="3" id="381" /> +<TGConnectingPoint num="4" id="382" /> +<TGConnectingPoint num="5" id="383" /> +<TGConnectingPoint num="6" id="384" /> +<TGConnectingPoint num="7" id="385" /> <extraparam> <info value="FVWithEvent::ManagerOfPeriodicTask" taskName="ManagerOfPeriodicTask" referenceTaskName="FVWithEvent" priority="2" operationMEC="ManagerOfPeriodicTask" fatherComponentMECType="0" /> </extraparam> </SUBCOMPONENT> -<CONNECTOR type="125" id="449" > +<CONNECTOR type="125" id="412" > <cdparam x="983" y="440" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="{info}" /> -<P1 x="1057" y="329" id="352" /> -<P2 x="934" y="452" id="381" /> +<P1 x="1057" y="329" id="315" /> +<P2 x="934" y="452" id="344" /> <AutomaticDrawing data="true" /> <extraparam> <info priority="0" /> <spy value="false" /> </extraparam> </CONNECTOR> -<CONNECTOR type="125" id="450" > +<CONNECTOR type="125" id="413" > <cdparam x="620" y="385" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="{info}" /> -<P1 x="497" y="298" id="437" /> -<P2 x="708" y="452" id="380" /> +<P1 x="497" y="298" id="400" /> +<P2 x="708" y="452" id="343" /> <AutomaticDrawing data="true" /> <extraparam> <info priority="0" /> @@ -1438,56 +1236,56 @@ <Modeling type="TML Component Design" nameTab="FVWithEventFeedback" tabs="TML Component Task Diagram$AnotherTask$ManagerOfPeriodicTask$PeriodicTask" > <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="451" > +<CONNECTOR type="126" id="414" > <cdparam x="808" y="364" /> <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="821" y="351" id="482" /> -<P2 x="566" y="357" id="467" /> +<P1 x="821" y="351" id="445" /> +<P2 x="566" y="357" id="430" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="126" id="452" > +<CONNECTOR type="126" id="415" > <cdparam x="967" y="411" /> <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="933" y="385" id="478" /> -<P2 x="978" y="609" id="454" /> +<P1 x="933" y="385" id="441" /> +<P2 x="978" y="609" id="417" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="126" id="453" > +<CONNECTOR type="126" id="416" > <cdparam x="559" y="329" /> <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="566" y="302" id="465" /> -<P2 x="821" y="302" id="480" /> +<P1 x="566" y="302" id="428" /> +<P2 x="821" y="302" id="443" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<COMPONENT type="1202" id="464" > +<COMPONENT type="1202" id="427" > <cdparam x="891" y="622" /> <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="AnotherTask" /> -<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="0" id="419" /> +<TGConnectingPoint num="1" id="420" /> +<TGConnectingPoint num="2" id="421" /> +<TGConnectingPoint num="3" id="422" /> +<TGConnectingPoint num="4" id="423" /> +<TGConnectingPoint num="5" id="424" /> +<TGConnectingPoint num="6" id="425" /> +<TGConnectingPoint num="7" id="426" /> <extraparam> <Data isAttacker="No" daemon="false" periodic="false" periodValue="" unit="" Operation="" /> </extraparam> </COMPONENT> -<SUBCOMPONENT type="1203" id="455" > -<father id="464" num="0" /> +<SUBCOMPONENT type="1203" id="418" > +<father id="427" num="0" /> <cdparam x="965" y="609" /> <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> <cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" /> <infoparam name="Primitive port" value="Channel comm" /> -<TGConnectingPoint num="0" id="454" /> +<TGConnectingPoint num="0" id="417" /> <extraparam> <Prop commName="comm" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="32" 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="0" /> <Type type="0" typeOther="" /> @@ -1498,34 +1296,34 @@ </extraparam> </SUBCOMPONENT> -<COMPONENT type="1202" id="477" > +<COMPONENT type="1202" id="440" > <cdparam x="366" y="244" /> <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="ManagerOfPeriodicTask" /> -<TGConnectingPoint num="0" id="469" /> -<TGConnectingPoint num="1" id="470" /> -<TGConnectingPoint num="2" id="471" /> -<TGConnectingPoint num="3" id="472" /> -<TGConnectingPoint num="4" id="473" /> -<TGConnectingPoint num="5" id="474" /> -<TGConnectingPoint num="6" id="475" /> -<TGConnectingPoint num="7" id="476" /> +<TGConnectingPoint num="0" id="432" /> +<TGConnectingPoint num="1" id="433" /> +<TGConnectingPoint num="2" id="434" /> +<TGConnectingPoint num="3" id="435" /> +<TGConnectingPoint num="4" id="436" /> +<TGConnectingPoint num="5" id="437" /> +<TGConnectingPoint num="6" id="438" /> +<TGConnectingPoint num="7" id="439" /> <extraparam> <Data isAttacker="No" daemon="false" periodic="false" periodValue="" unit="" Operation="" /> <Attribute access="2" id="startTime" value="10" type="0" typeOther="" /> <Attribute access="2" id="period" value="5" type="0" typeOther="" /> </extraparam> </COMPONENT> -<SUBCOMPONENT type="1203" id="466" > -<father id="477" num="0" /> +<SUBCOMPONENT type="1203" id="429" > +<father id="440" num="0" /> <cdparam x="553" y="302" /> <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 evt" /> -<TGConnectingPoint num="0" id="465" /> +<TGConnectingPoint num="0" id="428" /> <extraparam> <Prop commName="evt" commType="1" origin="true" finite="false" blocking="false" 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="0" /> <Type type="1" typeOther="" /> @@ -1535,14 +1333,14 @@ <Type type="0" typeOther="" /> </extraparam> </SUBCOMPONENT> -<SUBCOMPONENT type="1203" id="468" > -<father id="477" num="1" /> +<SUBCOMPONENT type="1203" id="431" > +<father id="440" num="1" /> <cdparam x="553" y="357" /> <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 end" /> -<TGConnectingPoint num="0" id="467" /> +<TGConnectingPoint num="0" id="430" /> <extraparam> <Prop commName="end" 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="0" /> <Type type="0" typeOther="" /> @@ -1553,33 +1351,33 @@ </extraparam> </SUBCOMPONENT> -<COMPONENT type="1202" id="492" > +<COMPONENT type="1202" id="455" > <cdparam x="821" y="248" /> <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="PeriodicTask" /> -<TGConnectingPoint num="0" id="484" /> -<TGConnectingPoint num="1" id="485" /> -<TGConnectingPoint num="2" id="486" /> -<TGConnectingPoint num="3" id="487" /> -<TGConnectingPoint num="4" id="488" /> -<TGConnectingPoint num="5" id="489" /> -<TGConnectingPoint num="6" id="490" /> -<TGConnectingPoint num="7" id="491" /> +<TGConnectingPoint num="0" id="447" /> +<TGConnectingPoint num="1" id="448" /> +<TGConnectingPoint num="2" id="449" /> +<TGConnectingPoint num="3" id="450" /> +<TGConnectingPoint num="4" id="451" /> +<TGConnectingPoint num="5" id="452" /> +<TGConnectingPoint num="6" id="453" /> +<TGConnectingPoint num="7" id="454" /> <extraparam> <Data isAttacker="No" daemon="false" periodic="false" periodValue="" unit="" Operation="" /> <Attribute access="2" id="x" value="" type="0" typeOther="" /> </extraparam> </COMPONENT> -<SUBCOMPONENT type="1203" id="479" > -<father id="492" num="0" /> +<SUBCOMPONENT type="1203" id="442" > +<father id="455" num="0" /> <cdparam x="920" y="385" /> <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 comm1" /> -<TGConnectingPoint num="0" id="478" /> +<TGConnectingPoint num="0" id="441" /> <extraparam> <Prop commName="comm1" commType="0" origin="true" finite="false" blocking="false" maxSamples="200" widthSamples="32" 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="0" /> <Type type="0" typeOther="" /> @@ -1589,14 +1387,14 @@ <Type type="0" typeOther="" /> </extraparam> </SUBCOMPONENT> -<SUBCOMPONENT type="1203" id="481" > -<father id="492" num="1" /> +<SUBCOMPONENT type="1203" id="444" > +<father id="455" num="1" /> <cdparam x="808" y="302" /> <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 evt" /> -<TGConnectingPoint num="0" id="480" /> +<TGConnectingPoint num="0" id="443" /> <extraparam> <Prop commName="evt" 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="0" /> <Type type="1" typeOther="" /> @@ -1606,14 +1404,14 @@ <Type type="0" typeOther="" /> </extraparam> </SUBCOMPONENT> -<SUBCOMPONENT type="1203" id="483" > -<father id="492" num="2" /> +<SUBCOMPONENT type="1203" id="446" > +<father id="455" num="2" /> <cdparam x="808" 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="Event end" /> -<TGConnectingPoint num="0" id="482" /> +<TGConnectingPoint num="0" id="445" /> <extraparam> <Prop commName="end" commType="1" origin="true" finite="false" blocking="false" 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="0" /> <Type type="0" typeOther="" /> @@ -1628,127 +1426,127 @@ </TMLComponentTaskDiagramPanel> <TMLActivityDiagramPanel name="AnotherTask" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0" > -<COMPONENT type="1000" id="494" > +<COMPONENT type="1000" id="457" > <cdparam x="603" y="105" /> <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="493" /> +<TGConnectingPoint num="0" id="456" /> </COMPONENT> -<COMPONENT type="1030" id="497" > +<COMPONENT type="1030" id="460" > <cdparam x="569" y="150" /> <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="495" /> -<TGConnectingPoint num="1" id="496" /> +<TGConnectingPoint num="0" id="458" /> +<TGConnectingPoint num="1" id="459" /> </COMPONENT> -<COMPONENT type="1001" id="499" > +<COMPONENT type="1001" id="462" > <cdparam x="670" y="320" /> <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="498" /> +<TGConnectingPoint num="0" id="461" /> </COMPONENT> -<COMPONENT type="1009" id="502" > +<COMPONENT type="1009" id="465" > <cdparam x="633" y="257" /> <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="read channel" value="comm(100) " /> -<TGConnectingPoint num="0" id="500" /> -<TGConnectingPoint num="1" id="501" /> +<TGConnectingPoint num="0" id="463" /> +<TGConnectingPoint num="1" id="464" /> <extraparam> <Data channelName="comm" nbOfSamples="100" secPattern="" isAttacker="No" isEncForm="No" /> </extraparam> </COMPONENT> -<CONNECTOR type="115" id="503" > +<CONNECTOR type="115" id="466" > <cdparam x="661" y="164" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> -<P1 x="661" y="164" id="496" /> -<P2 x="675" y="252" id="500" /> +<P1 x="661" y="164" id="459" /> +<P2 x="675" y="252" id="463" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="115" id="504" > +<CONNECTOR type="115" id="467" > <cdparam x="675" y="282" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> -<P1 x="675" y="282" id="501" /> -<P2 x="680" y="315" id="498" /> +<P1 x="675" y="282" id="464" /> +<P2 x="680" y="315" id="461" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="115" id="505" > +<CONNECTOR type="115" id="468" > <cdparam x="610" y="125" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> -<P1 x="610" y="125" id="493" /> -<P2 x="615" y="145" id="495" /> +<P1 x="610" y="125" id="456" /> +<P2 x="615" y="145" id="458" /> <AutomaticDrawing data="true" /> </CONNECTOR> </TMLActivityDiagramPanel> <TMLActivityDiagramPanel name="ManagerOfPeriodicTask" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0" > -<COMPONENT type="1010" id="508" > +<COMPONENT type="1010" id="471" > <cdparam x="667" y="448" /> <sizeparam width="48" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> <enabled value="true" /> <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" /> <infoparam name="wait event" value="end() " /> -<TGConnectingPoint num="0" id="506" /> -<TGConnectingPoint num="1" id="507" /> +<TGConnectingPoint num="0" id="469" /> +<TGConnectingPoint num="1" id="470" /> <extraparam> <Data eventName="end" nbOfParams="5" /> </extraparam> </COMPONENT> -<COMPONENT type="1008" id="511" > +<COMPONENT type="1008" id="474" > <cdparam x="643" y="336" /> <sizeparam width="47" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> <enabled value="true" /> <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" /> <infoparam name="send event" value="evt(1)" /> -<TGConnectingPoint num="0" id="509" /> -<TGConnectingPoint num="1" id="510" /> +<TGConnectingPoint num="0" id="472" /> +<TGConnectingPoint num="1" id="473" /> <extraparam> <Data eventName="evt" nbOfParams="5" /> <Param index="0" value="1" /> </extraparam> </COMPONENT> -<COMPONENT type="1001" id="513" > +<COMPONENT type="1001" id="476" > <cdparam x="678" y="496" /> <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="512" /> +<TGConnectingPoint num="0" id="475" /> </COMPONENT> -<COMPONENT type="1026" id="517" > +<COMPONENT type="1026" id="480" > <cdparam x="679" y="380" /> <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="515" /> -<TGConnectingPoint num="1" id="516" /> +<TGConnectingPoint num="0" id="478" /> +<TGConnectingPoint num="1" id="479" /> </COMPONENT> -<SUBCOMPONENT type="-1" id="514" > -<father id="517" num="0" /> +<SUBCOMPONENT type="-1" id="477" > +<father id="480" num="0" /> <cdparam x="694" y="400" /> <sizeparam width="63" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> @@ -1759,29 +1557,29 @@ </extraparam> </SUBCOMPONENT> -<COMPONENT type="1030" id="520" > +<COMPONENT type="1030" id="483" > <cdparam x="529" y="308" /> <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="518" /> -<TGConnectingPoint num="1" id="519" /> +<TGConnectingPoint num="0" id="481" /> +<TGConnectingPoint num="1" id="482" /> </COMPONENT> -<COMPONENT type="1026" id="524" > +<COMPONENT type="1026" id="487" > <cdparam x="567" y="244" /> <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="522" /> -<TGConnectingPoint num="1" id="523" /> +<TGConnectingPoint num="0" id="485" /> +<TGConnectingPoint num="1" id="486" /> </COMPONENT> -<SUBCOMPONENT type="-1" id="521" > -<father id="524" num="0" /> +<SUBCOMPONENT type="-1" id="484" > +<father id="487" num="0" /> <cdparam x="582" y="264" /> <sizeparam width="82" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> @@ -1792,178 +1590,178 @@ </extraparam> </SUBCOMPONENT> -<COMPONENT type="1000" id="526" > +<COMPONENT type="1000" id="489" > <cdparam x="564" y="186" /> <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="525" /> +<TGConnectingPoint num="0" id="488" /> </COMPONENT> -<CONNECTOR type="115" id="527" > +<CONNECTOR type="115" id="490" > <cdparam x="691" y="473" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> -<P1 x="691" y="473" id="507" /> -<P2 x="688" y="491" id="512" /> +<P1 x="691" y="473" id="470" /> +<P2 x="688" y="491" id="475" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="115" id="528" > +<CONNECTOR type="115" id="491" > <cdparam x="571" y="206" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> -<P1 x="571" y="206" id="525" /> -<P2 x="572" y="239" id="522" /> +<P1 x="571" y="206" id="488" /> +<P2 x="572" y="239" id="485" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="115" id="529" > +<CONNECTOR type="115" id="492" > <cdparam x="572" y="279" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> -<P1 x="572" y="279" id="523" /> -<P2 x="575" y="303" id="518" /> +<P1 x="572" y="279" id="486" /> +<P2 x="575" y="303" id="481" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="115" id="530" > +<CONNECTOR type="115" id="493" > <cdparam x="684" y="415" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> -<P1 x="684" y="415" id="516" /> -<P2 x="691" y="443" id="506" /> +<P1 x="684" y="415" id="479" /> +<P2 x="691" y="443" id="469" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="115" id="531" > +<CONNECTOR type="115" id="494" > <cdparam x="621" y="322" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> -<P1 x="621" y="322" id="519" /> -<P2 x="666" y="331" id="509" /> +<P1 x="621" y="322" id="482" /> +<P2 x="666" y="331" id="472" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="115" id="532" > +<CONNECTOR type="115" id="495" > <cdparam x="666" y="361" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> -<P1 x="666" y="361" id="510" /> -<P2 x="684" y="375" id="515" /> +<P1 x="666" y="361" id="473" /> +<P2 x="684" y="375" id="478" /> <AutomaticDrawing data="true" /> </CONNECTOR> </TMLActivityDiagramPanel> <TMLActivityDiagramPanel name="PeriodicTask" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0" > -<COMPONENT type="1008" id="535" > +<COMPONENT type="1008" id="498" > <cdparam x="759" y="243" /> <sizeparam width="44" 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="end()" /> -<TGConnectingPoint num="0" id="533" /> -<TGConnectingPoint num="1" id="534" /> +<TGConnectingPoint num="0" id="496" /> +<TGConnectingPoint num="1" id="497" /> <extraparam> <Data eventName="end" nbOfParams="5" /> </extraparam> </COMPONENT> -<COMPONENT type="1010" id="538" > +<COMPONENT type="1010" id="501" > <cdparam x="738" y="125" /> <sizeparam width="49" 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="evt(x) " /> -<TGConnectingPoint num="0" id="536" /> -<TGConnectingPoint num="1" id="537" /> +<TGConnectingPoint num="0" id="499" /> +<TGConnectingPoint num="1" id="500" /> <extraparam> <Data eventName="evt" nbOfParams="5" /> <Param index="0" value="x" /> </extraparam> </COMPONENT> -<COMPONENT type="1030" id="541" > +<COMPONENT type="1030" id="504" > <cdparam x="618" y="90" /> <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="539" /> -<TGConnectingPoint num="1" id="540" /> +<TGConnectingPoint num="0" id="502" /> +<TGConnectingPoint num="1" id="503" /> </COMPONENT> -<COMPONENT type="1000" id="543" > +<COMPONENT type="1000" id="506" > <cdparam x="621" y="39" /> <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="542" /> +<TGConnectingPoint num="0" id="505" /> </COMPONENT> -<COMPONENT type="1001" id="545" > +<COMPONENT type="1001" id="508" > <cdparam x="762" y="324" /> <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="544" /> +<TGConnectingPoint num="0" id="507" /> </COMPONENT> -<COMPONENT type="1006" id="548" > +<COMPONENT type="1006" id="511" > <cdparam x="730" y="180" /> <sizeparam width="89" 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="comm1(100)" /> -<TGConnectingPoint num="0" id="546" /> -<TGConnectingPoint num="1" id="547" /> +<TGConnectingPoint num="0" id="509" /> +<TGConnectingPoint num="1" id="510" /> <breakpoint /> <extraparam> <Data channelName="comm1" nbOfSamples="100" secPattern="" isAttacker="No" isEncForm="No" /> </extraparam> </COMPONENT> -<CONNECTOR type="115" id="549" > +<CONNECTOR type="115" id="512" > <cdparam x="781" y="268" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> -<P1 x="781" y="268" id="534" /> -<P2 x="772" y="319" id="544" /> +<P1 x="781" y="268" id="497" /> +<P2 x="772" y="319" id="507" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="115" id="550" > +<CONNECTOR type="115" id="513" > <cdparam x="802" y="205" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> -<P1 x="774" y="205" id="547" /> -<P2 x="781" y="238" id="533" /> +<P1 x="774" y="205" id="510" /> +<P2 x="781" y="238" id="496" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="115" id="551" > +<CONNECTOR type="115" id="514" > <cdparam x="645" y="62" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> -<P1 x="628" y="59" id="542" /> -<P2 x="664" y="85" id="539" /> +<P1 x="628" y="59" id="505" /> +<P2 x="664" y="85" id="502" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="115" id="552" > +<CONNECTOR type="115" id="515" > <cdparam x="710" y="104" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> -<P1 x="710" y="104" id="540" /> -<P2 x="762" y="120" id="536" /> +<P1 x="710" y="104" id="503" /> +<P2 x="762" y="120" id="499" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="115" id="553" > +<CONNECTOR type="115" id="516" > <cdparam x="762" y="150" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> -<P1 x="762" y="150" id="537" /> -<P2 x="774" y="175" id="546" /> +<P1 x="762" y="150" id="500" /> +<P2 x="774" y="175" id="509" /> <AutomaticDrawing data="true" /> </CONNECTOR> @@ -1976,227 +1774,227 @@ <Modeling type="TML Architecture" nameTab="ArchitectureWithEventFeedback" > <TMLArchiDiagramPanel name="DIPLODOCUS architecture and mapping Diagram" minX="10" maxX="2500" minY="10" maxY="1500" attributes="0" masterClockFrequency="200" zoom="1.0" > -<COMPONENT type="1105" id="587" > +<COMPONENT type="1105" id="550" > <cdparam x="933" y="170" /> <sizeparam width="445" height="270" 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="563" /> -<TGConnectingPoint num="1" id="564" /> -<TGConnectingPoint num="2" id="565" /> -<TGConnectingPoint num="3" id="566" /> -<TGConnectingPoint num="4" id="567" /> -<TGConnectingPoint num="5" id="568" /> -<TGConnectingPoint num="6" id="569" /> -<TGConnectingPoint num="7" id="570" /> -<TGConnectingPoint num="8" id="571" /> -<TGConnectingPoint num="9" id="572" /> -<TGConnectingPoint num="10" id="573" /> -<TGConnectingPoint num="11" id="574" /> -<TGConnectingPoint num="12" id="575" /> -<TGConnectingPoint num="13" id="576" /> -<TGConnectingPoint num="14" id="577" /> -<TGConnectingPoint num="15" id="578" /> -<TGConnectingPoint num="16" id="579" /> -<TGConnectingPoint num="17" id="580" /> -<TGConnectingPoint num="18" id="581" /> -<TGConnectingPoint num="19" id="582" /> -<TGConnectingPoint num="20" id="583" /> -<TGConnectingPoint num="21" id="584" /> -<TGConnectingPoint num="22" id="585" /> -<TGConnectingPoint num="23" id="586" /> +<TGConnectingPoint num="0" id="526" /> +<TGConnectingPoint num="1" id="527" /> +<TGConnectingPoint num="2" id="528" /> +<TGConnectingPoint num="3" id="529" /> +<TGConnectingPoint num="4" id="530" /> +<TGConnectingPoint num="5" id="531" /> +<TGConnectingPoint num="6" id="532" /> +<TGConnectingPoint num="7" id="533" /> +<TGConnectingPoint num="8" id="534" /> +<TGConnectingPoint num="9" id="535" /> +<TGConnectingPoint num="10" id="536" /> +<TGConnectingPoint num="11" id="537" /> +<TGConnectingPoint num="12" id="538" /> +<TGConnectingPoint num="13" id="539" /> +<TGConnectingPoint num="14" id="540" /> +<TGConnectingPoint num="15" id="541" /> +<TGConnectingPoint num="16" id="542" /> +<TGConnectingPoint num="17" id="543" /> +<TGConnectingPoint num="18" id="544" /> +<TGConnectingPoint num="19" id="545" /> +<TGConnectingPoint num="20" id="546" /> +<TGConnectingPoint num="21" id="547" /> +<TGConnectingPoint num="22" id="548" /> +<TGConnectingPoint num="23" id="549" /> <extraparam> <info stereotype="MEMORY" nodeName="Memory0" /> <attributes byteDataSize="4" memorySize="1024" clockRatio="1" bufferType="0" /> </extraparam> </COMPONENT> -<SUBCOMPONENT type="1103" id="562" > -<father id="587" num="0" /> +<SUBCOMPONENT type="1103" id="525" > +<father id="550" num="0" /> <cdparam x="979" y="238" /> <sizeparam width="275" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> <cdrectangleparam minX="0" maxX="170" minY="0" maxY="230" /> <infoparam name="TGComponent" value="FVWithEventFeedback::comm1__comm" /> -<TGConnectingPoint num="0" id="554" /> -<TGConnectingPoint num="1" id="555" /> -<TGConnectingPoint num="2" id="556" /> -<TGConnectingPoint num="3" id="557" /> -<TGConnectingPoint num="4" id="558" /> -<TGConnectingPoint num="5" id="559" /> -<TGConnectingPoint num="6" id="560" /> -<TGConnectingPoint num="7" id="561" /> +<TGConnectingPoint num="0" id="517" /> +<TGConnectingPoint num="1" id="518" /> +<TGConnectingPoint num="2" id="519" /> +<TGConnectingPoint num="3" id="520" /> +<TGConnectingPoint num="4" id="521" /> +<TGConnectingPoint num="5" id="522" /> +<TGConnectingPoint num="6" id="523" /> +<TGConnectingPoint num="7" id="524" /> <extraparam> <info value="FVWithEventFeedback::comm1__comm" communicationName="comm1__comm" referenceCommunicationName="FVWithEventFeedback" priority="0" typeName="channel" /> </extraparam> </SUBCOMPONENT> -<COMPONENT type="1102" id="621" > +<COMPONENT type="1102" id="584" > <cdparam x="582" y="492" /> <sizeparam width="453" height="113" 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="597" /> -<TGConnectingPoint num="1" id="598" /> -<TGConnectingPoint num="2" id="599" /> -<TGConnectingPoint num="3" id="600" /> -<TGConnectingPoint num="4" id="601" /> -<TGConnectingPoint num="5" id="602" /> -<TGConnectingPoint num="6" id="603" /> -<TGConnectingPoint num="7" id="604" /> -<TGConnectingPoint num="8" id="605" /> -<TGConnectingPoint num="9" id="606" /> -<TGConnectingPoint num="10" id="607" /> -<TGConnectingPoint num="11" id="608" /> -<TGConnectingPoint num="12" id="609" /> -<TGConnectingPoint num="13" id="610" /> -<TGConnectingPoint num="14" id="611" /> -<TGConnectingPoint num="15" id="612" /> -<TGConnectingPoint num="16" id="613" /> -<TGConnectingPoint num="17" id="614" /> -<TGConnectingPoint num="18" id="615" /> -<TGConnectingPoint num="19" id="616" /> -<TGConnectingPoint num="20" id="617" /> -<TGConnectingPoint num="21" id="618" /> -<TGConnectingPoint num="22" id="619" /> -<TGConnectingPoint num="23" id="620" /> +<TGConnectingPoint num="0" id="560" /> +<TGConnectingPoint num="1" id="561" /> +<TGConnectingPoint num="2" id="562" /> +<TGConnectingPoint num="3" id="563" /> +<TGConnectingPoint num="4" id="564" /> +<TGConnectingPoint num="5" id="565" /> +<TGConnectingPoint num="6" id="566" /> +<TGConnectingPoint num="7" id="567" /> +<TGConnectingPoint num="8" id="568" /> +<TGConnectingPoint num="9" id="569" /> +<TGConnectingPoint num="10" id="570" /> +<TGConnectingPoint num="11" id="571" /> +<TGConnectingPoint num="12" id="572" /> +<TGConnectingPoint num="13" id="573" /> +<TGConnectingPoint num="14" id="574" /> +<TGConnectingPoint num="15" id="575" /> +<TGConnectingPoint num="16" id="576" /> +<TGConnectingPoint num="17" id="577" /> +<TGConnectingPoint num="18" id="578" /> +<TGConnectingPoint num="19" id="579" /> +<TGConnectingPoint num="20" id="580" /> +<TGConnectingPoint num="21" id="581" /> +<TGConnectingPoint num="22" id="582" /> +<TGConnectingPoint num="23" id="583" /> <extraparam> <info stereotype="BUS-RR" nodeName="Bus0" /> <attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" clockRatio="1" privacy="0" referenceAttack="null" /> </extraparam> </COMPONENT> -<SUBCOMPONENT type="1103" id="596" > -<father id="621" num="0" /> +<SUBCOMPONENT type="1103" id="559" > +<father id="584" num="0" /> <cdparam x="662" y="551" /> <sizeparam width="275" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> <cdrectangleparam minX="0" maxX="178" minY="0" maxY="73" /> <infoparam name="TGComponent" value="FVWithEventFeedback::comm1__comm" /> -<TGConnectingPoint num="0" id="588" /> -<TGConnectingPoint num="1" id="589" /> -<TGConnectingPoint num="2" id="590" /> -<TGConnectingPoint num="3" id="591" /> -<TGConnectingPoint num="4" id="592" /> -<TGConnectingPoint num="5" id="593" /> -<TGConnectingPoint num="6" id="594" /> -<TGConnectingPoint num="7" id="595" /> +<TGConnectingPoint num="0" id="551" /> +<TGConnectingPoint num="1" id="552" /> +<TGConnectingPoint num="2" id="553" /> +<TGConnectingPoint num="3" id="554" /> +<TGConnectingPoint num="4" id="555" /> +<TGConnectingPoint num="5" id="556" /> +<TGConnectingPoint num="6" id="557" /> +<TGConnectingPoint num="7" id="558" /> <extraparam> <info value="FVWithEventFeedback::comm1__comm" communicationName="comm1__comm" referenceCommunicationName="FVWithEventFeedback" priority="0" typeName="channel" /> </extraparam> </SUBCOMPONENT> -<COMPONENT type="1100" id="673" > +<COMPONENT type="1100" id="636" > <cdparam x="192" y="175" /> <sizeparam width="428" height="260" 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="649" /> -<TGConnectingPoint num="1" id="650" /> -<TGConnectingPoint num="2" id="651" /> -<TGConnectingPoint num="3" id="652" /> -<TGConnectingPoint num="4" id="653" /> -<TGConnectingPoint num="5" id="654" /> -<TGConnectingPoint num="6" id="655" /> -<TGConnectingPoint num="7" id="656" /> -<TGConnectingPoint num="8" id="657" /> -<TGConnectingPoint num="9" id="658" /> -<TGConnectingPoint num="10" id="659" /> -<TGConnectingPoint num="11" id="660" /> -<TGConnectingPoint num="12" id="661" /> -<TGConnectingPoint num="13" id="662" /> -<TGConnectingPoint num="14" id="663" /> -<TGConnectingPoint num="15" id="664" /> -<TGConnectingPoint num="16" id="665" /> -<TGConnectingPoint num="17" id="666" /> -<TGConnectingPoint num="18" id="667" /> -<TGConnectingPoint num="19" id="668" /> -<TGConnectingPoint num="20" id="669" /> -<TGConnectingPoint num="21" id="670" /> -<TGConnectingPoint num="22" id="671" /> -<TGConnectingPoint num="23" id="672" /> +<TGConnectingPoint num="0" id="612" /> +<TGConnectingPoint num="1" id="613" /> +<TGConnectingPoint num="2" id="614" /> +<TGConnectingPoint num="3" id="615" /> +<TGConnectingPoint num="4" id="616" /> +<TGConnectingPoint num="5" id="617" /> +<TGConnectingPoint num="6" id="618" /> +<TGConnectingPoint num="7" id="619" /> +<TGConnectingPoint num="8" id="620" /> +<TGConnectingPoint num="9" id="621" /> +<TGConnectingPoint num="10" id="622" /> +<TGConnectingPoint num="11" id="623" /> +<TGConnectingPoint num="12" id="624" /> +<TGConnectingPoint num="13" id="625" /> +<TGConnectingPoint num="14" id="626" /> +<TGConnectingPoint num="15" id="627" /> +<TGConnectingPoint num="16" id="628" /> +<TGConnectingPoint num="17" id="629" /> +<TGConnectingPoint num="18" id="630" /> +<TGConnectingPoint num="19" id="631" /> +<TGConnectingPoint num="20" id="632" /> +<TGConnectingPoint num="21" id="633" /> +<TGConnectingPoint num="22" id="634" /> +<TGConnectingPoint num="23" id="635" /> <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="630" > -<father id="673" num="0" /> +<SUBCOMPONENT type="1101" id="593" > +<father id="636" num="0" /> <cdparam x="214" y="209" /> <sizeparam width="260" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> <cdrectangleparam minX="0" maxX="168" minY="0" maxY="220" /> <infoparam name="TGComponent" value="FVWithEventFeedback::AnotherTask" /> -<TGConnectingPoint num="0" id="622" /> -<TGConnectingPoint num="1" id="623" /> -<TGConnectingPoint num="2" id="624" /> -<TGConnectingPoint num="3" id="625" /> -<TGConnectingPoint num="4" id="626" /> -<TGConnectingPoint num="5" id="627" /> -<TGConnectingPoint num="6" id="628" /> -<TGConnectingPoint num="7" id="629" /> +<TGConnectingPoint num="0" id="585" /> +<TGConnectingPoint num="1" id="586" /> +<TGConnectingPoint num="2" id="587" /> +<TGConnectingPoint num="3" id="588" /> +<TGConnectingPoint num="4" id="589" /> +<TGConnectingPoint num="5" id="590" /> +<TGConnectingPoint num="6" id="591" /> +<TGConnectingPoint num="7" id="592" /> <extraparam> <info value="FVWithEventFeedback::AnotherTask" taskName="AnotherTask" referenceTaskName="FVWithEventFeedback" priority="0" operationMEC="AnotherTask" fatherComponentMECType="0" /> </extraparam> </SUBCOMPONENT> -<SUBCOMPONENT type="1101" id="639" > -<father id="673" num="1" /> +<SUBCOMPONENT type="1101" id="602" > +<father id="636" num="1" /> <cdparam x="266" y="268" /> <sizeparam width="328" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> <cdrectangleparam minX="0" maxX="100" minY="0" maxY="220" /> <infoparam name="TGComponent" value="FVWithEventFeedback::ManagerOfPeriodicTask" /> -<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="0" id="594" /> +<TGConnectingPoint num="1" id="595" /> +<TGConnectingPoint num="2" id="596" /> +<TGConnectingPoint num="3" id="597" /> +<TGConnectingPoint num="4" id="598" /> +<TGConnectingPoint num="5" id="599" /> +<TGConnectingPoint num="6" id="600" /> +<TGConnectingPoint num="7" id="601" /> <extraparam> <info value="FVWithEventFeedback::ManagerOfPeriodicTask" taskName="ManagerOfPeriodicTask" referenceTaskName="FVWithEventFeedback" priority="0" operationMEC="ManagerOfPeriodicTask" fatherComponentMECType="0" /> </extraparam> </SUBCOMPONENT> -<SUBCOMPONENT type="1101" id="648" > -<father id="673" num="2" /> +<SUBCOMPONENT type="1101" id="611" > +<father id="636" num="2" /> <cdparam x="295" y="331" /> <sizeparam width="260" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> <cdrectangleparam minX="0" maxX="168" minY="0" maxY="220" /> <infoparam name="TGComponent" value="FVWithEventFeedback::PeriodicTask" /> -<TGConnectingPoint num="0" id="640" /> -<TGConnectingPoint num="1" id="641" /> -<TGConnectingPoint num="2" id="642" /> -<TGConnectingPoint num="3" id="643" /> -<TGConnectingPoint num="4" id="644" /> -<TGConnectingPoint num="5" id="645" /> -<TGConnectingPoint num="6" id="646" /> -<TGConnectingPoint num="7" id="647" /> +<TGConnectingPoint num="0" id="603" /> +<TGConnectingPoint num="1" id="604" /> +<TGConnectingPoint num="2" id="605" /> +<TGConnectingPoint num="3" id="606" /> +<TGConnectingPoint num="4" id="607" /> +<TGConnectingPoint num="5" id="608" /> +<TGConnectingPoint num="6" id="609" /> +<TGConnectingPoint num="7" id="610" /> <extraparam> <info value="FVWithEventFeedback::PeriodicTask" taskName="PeriodicTask" referenceTaskName="FVWithEventFeedback" priority="0" operationMEC="PeriodicTask" fatherComponentMECType="0" /> </extraparam> </SUBCOMPONENT> -<CONNECTOR type="125" id="674" > +<CONNECTOR type="125" id="637" > <cdparam x="983" y="440" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="{info}" /> -<P1 x="1044" y="440" id="577" /> -<P2 x="921" y="492" id="606" /> +<P1 x="1044" y="440" id="540" /> +<P2 x="921" y="492" id="569" /> <AutomaticDrawing data="true" /> <extraparam> <info priority="0" /> <spy value="false" /> </extraparam> </CONNECTOR> -<CONNECTOR type="125" id="675" > +<CONNECTOR type="125" id="638" > <cdparam x="620" y="385" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="{info}" /> -<P1 x="620" y="370" id="662" /> -<P2 x="695" y="492" id="605" /> +<P1 x="620" y="370" id="625" /> +<P2 x="695" y="492" id="568" /> <AutomaticDrawing data="true" /> <extraparam> <info priority="0" /> @@ -2213,41 +2011,41 @@ <Modeling type="TML Component Design" nameTab="DIPLODOCUS_C_Design" tabs="TML Component Task Diagram$TMLComp_0" > <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="676" > +<CONNECTOR type="126" id="639" > <cdparam x="588" y="235" /> <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="575" y="222" id="679" /> -<P2 x="575" y="329" id="677" /> +<P1 x="575" y="222" id="642" /> +<P2 x="575" y="329" id="640" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<COMPONENT type="1202" id="689" > +<COMPONENT type="1202" id="652" > <cdparam x="178" y="159" /> <sizeparam width="397" height="332" 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="TMLComp_0" /> -<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="0" id="644" /> +<TGConnectingPoint num="1" id="645" /> +<TGConnectingPoint num="2" id="646" /> +<TGConnectingPoint num="3" id="647" /> +<TGConnectingPoint num="4" id="648" /> +<TGConnectingPoint num="5" id="649" /> +<TGConnectingPoint num="6" id="650" /> +<TGConnectingPoint num="7" id="651" /> <extraparam> <Data isAttacker="No" daemon="false" periodic="false" periodValue="" unit="" Operation="" /> <Attribute access="2" id="b" value="" type="4" typeOther="" /> </extraparam> </COMPONENT> -<SUBCOMPONENT type="1203" id="678" > -<father id="689" num="0" /> +<SUBCOMPONENT type="1203" id="641" > +<father id="652" num="0" /> <cdparam x="562" y="329" /> <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> <cdrectangleparam minX="-13" maxX="384" minY="-13" maxY="319" /> <infoparam name="Primitive port" value="Channel comm" /> -<TGConnectingPoint num="0" id="677" /> +<TGConnectingPoint num="0" id="640" /> <extraparam> <Prop commName="comm" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" /> <Type type="0" typeOther="" /> @@ -2257,14 +2055,14 @@ <Type type="0" typeOther="" /> </extraparam> </SUBCOMPONENT> -<SUBCOMPONENT type="1203" id="680" > -<father id="689" num="1" /> +<SUBCOMPONENT type="1203" id="643" > +<father id="652" num="1" /> <cdparam x="562" y="222" /> <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> <cdrectangleparam minX="-13" maxX="384" minY="-13" maxY="319" /> <infoparam name="Primitive port" value="Channel comm" /> -<TGConnectingPoint num="0" id="679" /> +<TGConnectingPoint num="0" id="642" /> <extraparam> <Prop commName="comm" commType="0" origin="true" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" /> <Type type="0" typeOther="" /> @@ -2279,70 +2077,70 @@ </TMLComponentTaskDiagramPanel> <TMLActivityDiagramPanel name="TMLComp_0" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0" > -<COMPONENT type="1001" id="691" > +<COMPONENT type="1001" id="654" > <cdparam x="580" y="278" /> <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="690" /> +<TGConnectingPoint num="0" id="653" /> </COMPONENT> -<COMPONENT type="1009" id="694" > +<COMPONENT type="1009" id="657" > <cdparam x="553" y="218" /> <sizeparam width="69" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> <enabled value="true" /> <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" /> <infoparam name="read channel" value="comm(1) " /> -<TGConnectingPoint num="0" id="692" /> -<TGConnectingPoint num="1" id="693" /> +<TGConnectingPoint num="0" id="655" /> +<TGConnectingPoint num="1" id="656" /> <accessibility /> <extraparam> <Data channelName="comm" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" /> </extraparam> </COMPONENT> -<COMPONENT type="1006" id="697" > +<COMPONENT type="1006" id="660" > <cdparam x="554" y="158" /> <sizeparam width="65" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> <enabled value="true" /> <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" /> <infoparam name="write channel" value="comm(1)" /> -<TGConnectingPoint num="0" id="695" /> -<TGConnectingPoint num="1" id="696" /> +<TGConnectingPoint num="0" id="658" /> +<TGConnectingPoint num="1" id="659" /> <accessibility /> <extraparam> <Data channelName="comm" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" /> </extraparam> </COMPONENT> -<COMPONENT type="1001" id="699" > +<COMPONENT type="1001" id="662" > <cdparam x="468" y="243" /> <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="698" /> +<TGConnectingPoint num="0" id="661" /> </COMPONENT> -<COMPONENT type="1016" id="707" > +<COMPONENT type="1016" id="670" > <cdparam x="403" y="90" /> <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="701" /> -<TGConnectingPoint num="1" id="702" /> -<TGConnectingPoint num="2" id="703" /> -<TGConnectingPoint num="3" id="704" /> -<TGConnectingPoint num="4" id="705" /> -<TGConnectingPoint num="5" id="706" /> -</COMPONENT> -<SUBCOMPONENT type="-1" id="700" > -<father id="707" num="0" /> +<TGConnectingPoint num="0" id="664" /> +<TGConnectingPoint num="1" id="665" /> +<TGConnectingPoint num="2" id="666" /> +<TGConnectingPoint num="3" id="667" /> +<TGConnectingPoint num="4" id="668" /> +<TGConnectingPoint num="5" id="669" /> +</COMPONENT> +<SUBCOMPONENT type="-1" id="663" > +<father id="670" num="0" /> <cdparam x="557" y="97" /> <sizeparam width="20" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> @@ -2350,28 +2148,28 @@ <infoparam name="Sequence" value=">>" /> </SUBCOMPONENT> -<COMPONENT type="1001" id="709" > +<COMPONENT type="1001" id="672" > <cdparam x="325" y="248" /> <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="708" /> +<TGConnectingPoint num="0" id="671" /> </COMPONENT> -<COMPONENT type="1012" id="717" > +<COMPONENT type="1012" id="680" > <cdparam x="400" y="153" /> <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="713" /> -<TGConnectingPoint num="1" id="714" /> -<TGConnectingPoint num="2" id="715" /> -<TGConnectingPoint num="3" id="716" /> +<TGConnectingPoint num="0" id="676" /> +<TGConnectingPoint num="1" id="677" /> +<TGConnectingPoint num="2" id="678" /> +<TGConnectingPoint num="3" id="679" /> </COMPONENT> -<SUBCOMPONENT type="-1" id="710" > -<father id="717" num="0" /> +<SUBCOMPONENT type="-1" id="673" > +<father id="680" num="0" /> <cdparam x="325" y="188" /> <sizeparam width="80" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> @@ -2379,8 +2177,8 @@ <cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" /> <infoparam name="guard 1" value="[ b == false]" /> </SUBCOMPONENT> -<SUBCOMPONENT type="-1" id="711" > -<father id="717" num="1" /> +<SUBCOMPONENT type="-1" id="674" > +<father id="680" num="1" /> <cdparam x="435" y="163" /> <sizeparam width="80" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> @@ -2388,8 +2186,8 @@ <cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" /> <infoparam name="guard 2" value="[ b == true ]" /> </SUBCOMPONENT> -<SUBCOMPONENT type="-1" id="712" > -<father id="717" num="2" /> +<SUBCOMPONENT type="-1" id="675" > +<father id="680" num="2" /> <cdparam x="420" y="198" /> <sizeparam width="14" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> @@ -2397,69 +2195,69 @@ <infoparam name="guard 3" value="[ ]" /> </SUBCOMPONENT> -<COMPONENT type="1000" id="719" > +<COMPONENT type="1000" id="682" > <cdparam x="301" y="36" /> <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="718" /> +<TGConnectingPoint num="0" id="681" /> </COMPONENT> -<CONNECTOR type="115" id="720" > +<CONNECTOR type="115" id="683" > <cdparam x="452" y="95" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> -<P1 x="452" y="95" id="703" /> -<P2 x="415" y="148" id="713" /> +<P1 x="452" y="95" id="666" /> +<P2 x="415" y="148" id="676" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="115" id="721" > +<CONNECTOR type="115" id="684" > <cdparam x="375" 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="375" y="168" id="714" /> -<P2 x="335" y="243" id="708" /> +<P1 x="375" y="168" id="677" /> +<P2 x="335" y="243" id="671" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="115" id="722" > +<CONNECTOR type="115" id="685" > <cdparam x="407" y="70" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> -<P1 x="308" y="56" id="718" /> -<P2 x="478" y="90" id="701" /> +<P1 x="308" y="56" id="681" /> +<P2 x="478" y="90" id="664" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="115" id="723" > +<CONNECTOR type="115" id="686" > <cdparam x="455" 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="455" y="168" id="715" /> -<P2 x="478" y="238" id="698" /> +<P1 x="455" y="168" id="678" /> +<P2 x="478" y="238" id="661" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="115" id="724" > +<CONNECTOR type="115" id="687" > <cdparam x="527" y="95" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> -<P1 x="527" y="95" id="706" /> -<P2 x="586" y="153" id="695" /> +<P1 x="527" y="95" id="669" /> +<P2 x="586" y="153" id="658" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="115" id="725" > +<CONNECTOR type="115" id="688" > <cdparam x="586" y="183" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> -<P1 x="586" y="183" id="696" /> -<P2 x="587" y="213" id="692" /> +<P1 x="586" y="183" id="659" /> +<P2 x="587" y="213" id="655" /> <AutomaticDrawing data="true" /> </CONNECTOR> -<CONNECTOR type="115" id="726" > +<CONNECTOR type="115" id="689" > <cdparam x="587" y="243" /> <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> -<P1 x="587" y="243" id="693" /> -<P2 x="590" y="273" id="690" /> +<P1 x="587" y="243" id="656" /> +<P2 x="590" y="273" id="653" /> <AutomaticDrawing data="true" /> </CONNECTOR> diff --git a/src/main/java/tmltranslator/TMLMapping.java b/src/main/java/tmltranslator/TMLMapping.java index 51a94a6029574b46f4944a87736bca8593012dc7..2c09cc7fe0c3bd3a52e3000b91953216769143fe 100755 --- a/src/main/java/tmltranslator/TMLMapping.java +++ b/src/main/java/tmltranslator/TMLMapping.java @@ -817,6 +817,22 @@ public class TMLMapping<E> { return tmla.getArchitectureComplexity(); } + public void removePeriodicTasks() { + TMLTask[] addedTasks = tmlm.removePeriodicTasks(); + // First tasks is the new task, the second one is the original periodic task + + for(int i=0; i<addedTasks.length; i = i + 2) { + // mapping tasks to the same execution node as the controlled tasks + TMLTask originTask = addedTasks[i+1]; + ArrayList<HwExecutionNode> nodes = getAllHwExecutionNodesOfTask(originTask); + for(HwExecutionNode node: nodes) { + onnodes.add(node); + mappedtasks.add(addedTasks[i]); + } + } + } + + public void removeForksAndJoins() { TraceManager.addDev("\n\nRemove fork and join in MAPPING. Current nb of tasks:" + tmlm.getTasks().size()); if (tmlm != null) { diff --git a/src/main/java/tmltranslator/TMLModeling.java b/src/main/java/tmltranslator/TMLModeling.java index 592204508d1208c20afbb5fc93a905728b832699..c692a327259088f92e0d70d64b86742ee949c8c3 100755 --- a/src/main/java/tmltranslator/TMLModeling.java +++ b/src/main/java/tmltranslator/TMLModeling.java @@ -2162,8 +2162,9 @@ public class TMLModeling<E> { /** * Replaces periodic task by two tasks and an event */ - public Vector<TMLTask> removePeriodicTasks() { + public TMLTask[] removePeriodicTasks() { Vector<TMLTask> addedTasks = new Vector<>(); + Vector<TMLTask> allTasks = new Vector<>(); for(TMLTask t: tasks) { @@ -2172,7 +2173,12 @@ public class TMLModeling<E> { // Create a new Task TMLTask startingTask = new TMLTask("StarterOf" + t.getTaskName(), t.getReferenceObject(), t.getActivityDiagram().getReferenceObject()); + if (t.isDaemon()) { + startingTask.setDaemon(true); + } + allTasks.add(startingTask); addedTasks.add(startingTask); + addedTasks.add(t); // Create an event between the 2 TMLEvent evt = new TMLEvent("PERIODIC_EVT_" + t.getNameExtension(), t.getReferenceObject(), 1, false); @@ -2212,7 +2218,9 @@ public class TMLModeling<E> { TMLDelay delay = new TMLDelay("periodDelay", startingTask.getReferenceObject()); delay.setUnit(t.getPeriodUnit()); - delay.setValue(t.getPeriodValue()); + TraceManager.addDev("Setting delay for Periodic tasks:" + t.getPeriodValue()); + delay.setMinDelay(t.getPeriodValue()); + delay.setMaxDelay(t.getPeriodValue()); activity.addElement(delay); tmlse.addNext(delay); @@ -2227,7 +2235,18 @@ public class TMLModeling<E> { } - return addedTasks; + for(TMLTask t: allTasks) { + tasks.add(t); + } + + TMLTask[] returnedTasks = new TMLTask[addedTasks.size()]; + + int cpt; + for(cpt=0; cpt<addedTasks.size(); cpt++) { + returnedTasks[cpt] = addedTasks.get(cpt); + } + + return returnedTasks; } diff --git a/src/main/java/tmltranslator/TMLTask.java b/src/main/java/tmltranslator/TMLTask.java index 2180d08920f2642325db7465f70f485352b6a5b0..ea431d73b734a358f321da3982d5de2d000663e1 100755 --- a/src/main/java/tmltranslator/TMLTask.java +++ b/src/main/java/tmltranslator/TMLTask.java @@ -467,7 +467,13 @@ public class TMLTask extends TMLElement { } public String toXML() { - String s = new String("<TASK name=\"" + name + "\" priority=\"" + priority + "\" >\n"); + String s = new String("<TASK name=\"" + name); + s += "\" priority=\"" + priority + "\" "; + s += "\" isDaemon=\"" + isDaemon() + "\" "; + s += "\" isPeriodic=\"" + isPeriodic() + "\" "; + s += "\" periodValue=\"" + getPeriodValue() + "\" "; + s += "\" periodUnit=\"" + getPeriodUnit() + "\" "; + s += ">\n"; for (TMLAttribute attr : attributes) { s += attr.toXML(); } @@ -539,6 +545,9 @@ public class TMLTask extends TMLElement { return false; return operationType == tmlTask.operationType && isDaemon == tmlTask.isDaemon && + isPeriodic == tmlTask.isPeriodic && + periodValue.compareTo(tmlTask.getPeriodValue()) == 0 && + periodUnit.compareTo(tmlTask.getPeriodUnit()) == 0 && isRequested == tmlTask.isRequested() && isAttacker == tmlTask.isAttacker && priority == tmlTask.getPriority() && diff --git a/src/main/java/tmltranslator/tomappingsystemc2/DiploSimulatorCodeGenerator.java b/src/main/java/tmltranslator/tomappingsystemc2/DiploSimulatorCodeGenerator.java index 997be5698c6333e7fce1f8bc31116a1d3a87850c..bcb99f76edf187445b1dee08013a58cadb69045d 100644 --- a/src/main/java/tmltranslator/tomappingsystemc2/DiploSimulatorCodeGenerator.java +++ b/src/main/java/tmltranslator/tomappingsystemc2/DiploSimulatorCodeGenerator.java @@ -89,6 +89,7 @@ public class DiploSimulatorCodeGenerator implements IDiploSimulatorCodeGenerator tmlmodeling = _tmlm; tmlmodeling.removeForksAndJoins(); + tmlmodeling.removePeriodicTasks(); // tmlmapping = tmlmodeling.getDefaultMapping(); // tepeTranslator = new SystemCTEPE(new ArrayList<TEPE>(), this); } @@ -119,6 +120,7 @@ public class DiploSimulatorCodeGenerator implements IDiploSimulatorCodeGenerator tmlmapping.handleCPs(); tmlmapping.removeForksAndJoins(); + tmlmapping.removePeriodicTasks(); tmlmapping.makeMinimumMapping(); tepeTranslator = new SystemCTEPE(_tepes, this); namesGen = NamesGenerationHelper.INSTANCE;