diff --git a/ttool/src/test/java/tmltranslator/MulticoreCrossCpuSchedulingTest.java b/ttool/src/test/java/tmltranslator/MulticoreCrossCpuSchedulingTest.java
index 4ce7614aeca1939b0176f877e410017127f03061..28cc74eb2b4f00c1a09629f6bab9dec0118f2ae3 100644
--- a/ttool/src/test/java/tmltranslator/MulticoreCrossCpuSchedulingTest.java
+++ b/ttool/src/test/java/tmltranslator/MulticoreCrossCpuSchedulingTest.java
@@ -27,23 +27,32 @@ import static org.junit.Assert.assertTrue;
public class MulticoreCrossCpuSchedulingTest extends AbstractUITest {
final String DIR_GEN = "test_diplo_simulator/";
- final String [] MODELS_CPU_CROSS = {"testMultiCore"};
+ final String [] MODELS_CPU_CROSS = {"testMultiCoreRRPB", "testMultiCoreRR"};
private String SIM_DIR;
- final int [] NB_OF_CS_STATES = {9};
- final int [] NB_OF_CS_TRANSTIONS = {8};
- final int [] MIN_CS_CYCLES = {57};
- final int [] MAX_CS_CYCLES = {57};
- static final String EXPECTED =
+ final int [] NB_OF_CS_STATES = {9, 9};
+ final int [] NB_OF_CS_TRANSTIONS = {8, 8};
+ final int [] MIN_CS_CYCLES = {57, 58};
+ final int [] MAX_CS_CYCLES = {57, 58};
+ static final String [] EXPECTED = {
"MULTICORE: assign transaction Application__C1: Execi 15 t:0 l:15 (vl:15) params: to core 0\n" +
"MULTICORE: assign transaction Application__S: Execi 16 t:0 l:16 (vl:16) params: to core 1\n" +
"MULTICORE: assign transaction Application__S: Send Application__evt__Application__evt(evtFB) len:8 content:0 params: t:16 l:1 (vl:1) params: Ch: Application__evt__Application__evt to core 1\n" +
"MULTICORE: assign transaction Application__C0: Execi 10 t:15 l:10 (vl:10) params: to core 0\n" +
"MULTICORE: assign transaction Application__C0: Wait Application__evt__Application__evt params: t:25 l:1 (vl:1) params: Ch: Application__evt__Application__evt to core 0\n" +
"MULTICORE: assign transaction Application__C0: Execi 15 t:26 l:15 (vl:15) params: to core 0\n" +
- "MULTICORE: assign transaction Application__C3: Execi 40 t:17 l:40 (vl:40) params: to core 1\n";
+ "MULTICORE: assign transaction Application__C3: Execi 40 t:17 l:40 (vl:40) params: to core 1\n",
+
+ "MULTICORE: assign transaction Application__C3: Execi 40 t:0 l:40 (vl:40) params: to core 0\n" +
+ "MULTICORE: assign transaction Application__C0: Execi 10 t:0 l:10 (vl:10) params: to core 1\n" +
+ "MULTICORE: assign transaction Application__C1: Execi 15 t:10 l:15 (vl:15) params: to core 1\n" +
+ "MULTICORE: assign transaction Application__S: Execi 16 t:25 l:16 (vl:16) params: to core 1\n" +
+ "MULTICORE: assign transaction Application__S: Send Application__evt__Application__evt(evtFB) len:8 content:0 params: t:41 l:1 (vl:1) params: Ch: Application__evt__Application__evt to core 1\n" +
+ "MULTICORE: assign transaction Application__C0: Wait Application__evt__Application__evt params: t:42 l:1 (vl:1) params: Ch: Application__evt__Application__evt to core 0\n" +
+ "MULTICORE: assign transaction Application__C0: Execi 15 t:43 l:15 (vl:15) params: to core 0\n"
+ };
static String CPP_DIR = "../../../../simulators/c++2/";
static String mappingName = "Architecture";
- private String actualResult = "";
+ private String actualResult;
private TMLArchiDiagramPanel currTdp;
@BeforeClass
@@ -63,6 +72,7 @@ public class MulticoreCrossCpuSchedulingTest extends AbstractUITest {
@Test(timeout = 600000)
public void testMulticoreNotHangingWhenSaveTrace() throws Exception {
for (int i = 0; i < MODELS_CPU_CROSS.length; i++) {
+ actualResult = "";
String s = MODELS_CPU_CROSS[i];
SIM_DIR = DIR_GEN + s + "/";
System.out.println("executing: checking syntax " + s);
@@ -210,8 +220,8 @@ public class MulticoreCrossCpuSchedulingTest extends AbstractUITest {
assertTrue(MAX_CS_CYCLES[i] == maxValue);
// compare which transaction belong to which core
- System.out.println(actualResult);
- assertTrue(EXPECTED.equals(actualResult));
+ System.out.println("Scheduling on " + s + "\n" + actualResult);
+ assertTrue(EXPECTED[i].equals(actualResult));
}
}
}
diff --git a/ttool/src/test/resources/tmltranslator/simulator/testMultiCoreRR.xml b/ttool/src/test/resources/tmltranslator/simulator/testMultiCoreRR.xml
new file mode 100644
index 0000000000000000000000000000000000000000..10dabf491223ebafe8490507ebe5090b4ce36d5b
--- /dev/null
+++ b/ttool/src/test/resources/tmltranslator/simulator/testMultiCoreRR.xml
@@ -0,0 +1,570 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<TURTLEGMODELING version="1.0beta" ANIMATE_INTERACTIVE_SIMULATION="true" ACTIVATE_PENALTIES="false" UPDATE_INFORMATION_DIPLO_SIM="false" ANIMATE_WITH_INFO_DIPLO_SIM="true" OPEN_DIAG_DIPLO_SIM="false" LAST_SELECTED_MAIN_TAB="1" LAST_SELECTED_SUB_TAB="0">
+
+<Modeling type="TML Component Design" nameTab="Application" tabs="TML Component Task Diagram$C0$S$C1$C3" >
+<TMLComponentTaskDiagramPanel name="TML Component Task Diagram" minX="10" maxX="2500" minY="10" maxY="1500" channels="true" events="true" requests="true" zoom="1.0" >
+<CONNECTOR type="126" id="1" >
+<cdparam x="750" y="200" />
+<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="759" y="208" id="2" />
+<P2 x="406" y="214" id="13" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<COMPONENT type="1202" id="12" >
+<cdparam x="759" y="154" />
+<sizeparam width="200" height="150" 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="Primitive component" value="S" />
+<custom data="LE||DSP||BRAM||WCET||" />
+<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="false" periodic="false" periodValue="" unit="ms" Operation="" />
+</extraparam>
+</COMPONENT>
+<SUBCOMPONENT type="1203" id="3" >
+<father id="12" num="0" />
+<cdparam x="746" y="208" />
+<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
+<infoparam name="Primitive port" value="Event evt" />
+<TGConnectingPoint num="0" id="2" />
+<extraparam>
+<Prop commName="evt" commType="1" origin="true" finite="true" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
+</extraparam>
+</SUBCOMPONENT>
+
+<COMPONENT type="1202" id="23" >
+<cdparam x="206" y="140" />
+<sizeparam width="200" height="150" 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="Primitive component" value="C0" />
+<custom data="LE||DSP||BRAM||WCET||" />
+<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="false" periodValue="" unit="ms" Operation="" />
+</extraparam>
+</COMPONENT>
+<SUBCOMPONENT type="1203" id="14" >
+<father id="23" num="0" />
+<cdparam x="393" y="214" />
+<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="13" />
+<extraparam>
+<Prop commName="evt" commType="1" origin="false" finite="true" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
+</extraparam>
+</SUBCOMPONENT>
+
+<COMPONENT type="1202" id="32" >
+<cdparam x="504" y="411" />
+<sizeparam width="200" height="150" 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="Primitive component" value="C3" />
+<custom data="LE||DSP||BRAM||WCET||" />
+<TGConnectingPoint num="0" id="24" />
+<TGConnectingPoint num="1" id="25" />
+<TGConnectingPoint num="2" id="26" />
+<TGConnectingPoint num="3" id="27" />
+<TGConnectingPoint num="4" id="28" />
+<TGConnectingPoint num="5" id="29" />
+<TGConnectingPoint num="6" id="30" />
+<TGConnectingPoint num="7" id="31" />
+<extraparam>
+<Data isAttacker="No" daemon="false" periodic="false" periodValue="" unit="ms" Operation="" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1202" id="41" >
+<cdparam x="203" y="407" />
+<sizeparam width="200" height="150" 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="Primitive component" value="C1" />
+<custom data="LE||DSP||BRAM||WCET||" />
+<TGConnectingPoint num="0" id="33" />
+<TGConnectingPoint num="1" id="34" />
+<TGConnectingPoint num="2" id="35" />
+<TGConnectingPoint num="3" id="36" />
+<TGConnectingPoint num="4" id="37" />
+<TGConnectingPoint num="5" id="38" />
+<TGConnectingPoint num="6" id="39" />
+<TGConnectingPoint num="7" id="40" />
+<extraparam>
+<Data isAttacker="No" daemon="false" periodic="false" periodValue="" unit="ms" Operation="" />
+</extraparam>
+</COMPONENT>
+
+
+</TMLComponentTaskDiagramPanel>
+
+<TMLActivityDiagramPanel name="C0" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0" >
+<COMPONENT type="1001" id="43" >
+<cdparam x="399" y="281" />
+<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="42" />
+</COMPONENT>
+
+<COMPONENT type="1015" id="47" >
+<cdparam x="401" y="220" />
+<sizeparam width="10" height="30" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<enabled value="true" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="execIInterval" value="null" />
+<TGConnectingPoint num="0" id="45" />
+<TGConnectingPoint num="1" id="46" />
+</COMPONENT>
+<SUBCOMPONENT type="-1" id="44" >
+<father id="47" num="0" />
+<cdparam x="416" y="240" />
+<sizeparam width="51" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
+<infoparam name="value of the time interval" value="[15, 15]" />
+<extraparam>
+<Interval minDelay="15" maxDelay="15" />
+</extraparam>
+</SUBCOMPONENT>
+
+<COMPONENT type="1010" id="50" >
+<cdparam x="374" y="168" />
+<sizeparam width="63" 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() " />
+<TGConnectingPoint num="0" id="48" />
+<TGConnectingPoint num="1" id="49" />
+<extraparam>
+<Data eventName="evt" nbOfParams="5" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1013" id="54" >
+<cdparam x="401" y="105" />
+<sizeparam width="10" height="30" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<enabled value="true" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="execI" value="null" />
+<TGConnectingPoint num="0" id="52" />
+<TGConnectingPoint num="1" id="53" />
+</COMPONENT>
+<SUBCOMPONENT type="-1" id="51" >
+<father id="54" num="0" />
+<cdparam x="416" y="125" />
+<sizeparam width="16" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
+<infoparam name="value of the delay" value="10" />
+</SUBCOMPONENT>
+
+<COMPONENT type="1000" id="56" >
+<cdparam x="400" y="50" />
+<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="start state" value="null" />
+<TGConnectingPoint num="0" id="55" />
+</COMPONENT>
+
+<CONNECTOR type="115" id="57" >
+<cdparam x="407" y="70" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1 x="407" y="70" id="55" />
+<P2 x="406" y="100" id="52" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="58" >
+<cdparam x="406" y="140" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1 x="406" y="140" id="53" />
+<P2 x="405" y="163" id="48" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="59" >
+<cdparam x="405" y="193" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1 x="405" y="193" id="49" />
+<P2 x="406" y="215" id="45" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="60" >
+<cdparam x="406" y="255" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1 x="406" y="255" id="46" />
+<P2 x="409" y="276" id="42" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+
+</TMLActivityDiagramPanel>
+
+<TMLActivityDiagramPanel name="S" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0" >
+<COMPONENT type="1001" id="62" >
+<cdparam x="461" y="239" />
+<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="61" />
+</COMPONENT>
+
+<COMPONENT type="1008" id="65" >
+<cdparam x="437" y="186" />
+<sizeparam width="59" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<enabled value="true" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="send event" value="evt()" />
+<TGConnectingPoint num="0" id="63" />
+<TGConnectingPoint num="1" id="64" />
+<extraparam>
+<Data eventName="evt" nbOfParams="5" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1015" id="69" >
+<cdparam x="448" y="121" />
+<sizeparam width="10" height="30" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<enabled value="true" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="execIInterval" value="null" />
+<TGConnectingPoint num="0" id="67" />
+<TGConnectingPoint num="1" id="68" />
+</COMPONENT>
+<SUBCOMPONENT type="-1" id="66" >
+<father id="69" num="0" />
+<cdparam x="464" y="141" />
+<sizeparam width="51" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
+<infoparam name="value of the time interval" value="[16, 16]" />
+<extraparam>
+<Interval minDelay="16" maxDelay="16" />
+</extraparam>
+</SUBCOMPONENT>
+
+<COMPONENT type="1000" id="71" >
+<cdparam x="440" y="64" />
+<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="70" />
+</COMPONENT>
+
+<CONNECTOR type="115" id="72" >
+<cdparam x="447" y="84" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1 x="447" y="84" id="70" />
+<P2 x="453" y="116" id="67" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="73" >
+<cdparam x="453" y="156" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1 x="453" y="156" id="68" />
+<P2 x="466" y="181" id="63" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="74" >
+<cdparam x="466" y="211" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1 x="466" y="211" id="64" />
+<P2 x="471" y="234" id="61" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+
+</TMLActivityDiagramPanel>
+
+<TMLActivityDiagramPanel name="C1" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0" >
+<COMPONENT type="1001" id="76" >
+<cdparam x="399" y="281" />
+<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="75" />
+</COMPONENT>
+
+<COMPONENT type="1015" id="80" >
+<cdparam x="401" y="220" />
+<sizeparam width="10" height="30" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<enabled value="true" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="execIInterval" value="null" />
+<TGConnectingPoint num="0" id="78" />
+<TGConnectingPoint num="1" id="79" />
+</COMPONENT>
+<SUBCOMPONENT type="-1" id="77" >
+<father id="80" num="0" />
+<cdparam x="416" y="240" />
+<sizeparam width="51" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
+<infoparam name="value of the time interval" value="[15, 15]" />
+<extraparam>
+<Interval minDelay="15" maxDelay="15" />
+</extraparam>
+</SUBCOMPONENT>
+
+<COMPONENT type="1000" id="82" >
+<cdparam x="400" y="50" />
+<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="start state" value="null" />
+<TGConnectingPoint num="0" id="81" />
+</COMPONENT>
+
+<CONNECTOR type="115" id="83" >
+<cdparam x="407" y="70" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1 x="407" y="70" id="81" />
+<P2 x="406" y="215" id="78" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="84" >
+<cdparam x="406" y="255" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1 x="406" y="255" id="79" />
+<P2 x="409" y="276" id="75" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+
+</TMLActivityDiagramPanel>
+
+<TMLActivityDiagramPanel name="C3" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0" >
+<COMPONENT type="1001" id="86" >
+<cdparam x="399" y="281" />
+<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="85" />
+</COMPONENT>
+
+<COMPONENT type="1015" id="90" >
+<cdparam x="401" y="220" />
+<sizeparam width="10" height="30" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<enabled value="true" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="execIInterval" value="null" />
+<TGConnectingPoint num="0" id="88" />
+<TGConnectingPoint num="1" id="89" />
+</COMPONENT>
+<SUBCOMPONENT type="-1" id="87" >
+<father id="90" num="0" />
+<cdparam x="416" y="240" />
+<sizeparam width="51" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
+<infoparam name="value of the time interval" value="[40, 40]" />
+<extraparam>
+<Interval minDelay="40" maxDelay="40" />
+</extraparam>
+</SUBCOMPONENT>
+
+<COMPONENT type="1000" id="92" >
+<cdparam x="400" y="50" />
+<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="start state" value="null" />
+<TGConnectingPoint num="0" id="91" />
+</COMPONENT>
+
+<CONNECTOR type="115" id="93" >
+<cdparam x="407" y="70" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1 x="407" y="70" id="91" />
+<P2 x="406" y="215" id="88" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="94" >
+<cdparam x="406" y="255" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1 x="406" y="255" id="89" />
+<P2 x="409" y="276" id="85" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+
+</TMLActivityDiagramPanel>
+
+</Modeling>
+
+
+
+
+<Modeling type="TML Architecture" nameTab="Architecture" >
+<TMLArchiDiagramPanel name="DIPLODOCUS architecture and mapping Diagram" minX="10" maxX="2500" minY="10" maxY="1500" attributes="1" masterClockFrequency="200" zoom="1.0" >
+<COMPONENT type="1100" id="155" >
+<cdparam x="173" y="174" />
+<sizeparam width="372" height="311" 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="131" />
+<TGConnectingPoint num="1" id="132" />
+<TGConnectingPoint num="2" id="133" />
+<TGConnectingPoint num="3" id="134" />
+<TGConnectingPoint num="4" id="135" />
+<TGConnectingPoint num="5" id="136" />
+<TGConnectingPoint num="6" id="137" />
+<TGConnectingPoint num="7" id="138" />
+<TGConnectingPoint num="8" id="139" />
+<TGConnectingPoint num="9" id="140" />
+<TGConnectingPoint num="10" id="141" />
+<TGConnectingPoint num="11" id="142" />
+<TGConnectingPoint num="12" id="143" />
+<TGConnectingPoint num="13" id="144" />
+<TGConnectingPoint num="14" id="145" />
+<TGConnectingPoint num="15" id="146" />
+<TGConnectingPoint num="16" id="147" />
+<TGConnectingPoint num="17" id="148" />
+<TGConnectingPoint num="18" id="149" />
+<TGConnectingPoint num="19" id="150" />
+<TGConnectingPoint num="20" id="151" />
+<TGConnectingPoint num="21" id="152" />
+<TGConnectingPoint num="22" id="153" />
+<TGConnectingPoint num="23" id="154" />
+<extraparam>
+<info stereotype="CPURR" nodeName="CPU0" />
+<attributes nbOfCores="2" 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="103" >
+<father id="155" num="0" />
+<cdparam x="254" y="252" />
+<sizeparam width="120" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="252" minY="0" maxY="271" />
+<infoparam name="TGComponent" value="Application::S" />
+<TGConnectingPoint num="0" id="95" />
+<TGConnectingPoint num="1" id="96" />
+<TGConnectingPoint num="2" id="97" />
+<TGConnectingPoint num="3" id="98" />
+<TGConnectingPoint num="4" id="99" />
+<TGConnectingPoint num="5" id="100" />
+<TGConnectingPoint num="6" id="101" />
+<TGConnectingPoint num="7" id="102" />
+<extraparam>
+<info value="Application::S" taskName="S" referenceTaskName="Application" priority="1" operationMEC="S" fatherComponentMECType="0" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1101" id="112" >
+<father id="155" num="1" />
+<cdparam x="281" y="322" />
+<sizeparam width="128" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="244" minY="0" maxY="271" />
+<infoparam name="TGComponent" value="Application::C1" />
+<TGConnectingPoint num="0" id="104" />
+<TGConnectingPoint num="1" id="105" />
+<TGConnectingPoint num="2" id="106" />
+<TGConnectingPoint num="3" id="107" />
+<TGConnectingPoint num="4" id="108" />
+<TGConnectingPoint num="5" id="109" />
+<TGConnectingPoint num="6" id="110" />
+<TGConnectingPoint num="7" id="111" />
+<extraparam>
+<info value="Application::C1" taskName="C1" referenceTaskName="Application" priority="0" operationMEC="C1" fatherComponentMECType="0" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1101" id="121" >
+<father id="155" num="2" />
+<cdparam x="326" y="396" />
+<sizeparam width="128" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="244" minY="0" maxY="271" />
+<infoparam name="TGComponent" value="Application::C0" />
+<TGConnectingPoint num="0" id="113" />
+<TGConnectingPoint num="1" id="114" />
+<TGConnectingPoint num="2" id="115" />
+<TGConnectingPoint num="3" id="116" />
+<TGConnectingPoint num="4" id="117" />
+<TGConnectingPoint num="5" id="118" />
+<TGConnectingPoint num="6" id="119" />
+<TGConnectingPoint num="7" id="120" />
+<extraparam>
+<info value="Application::C0" taskName="C0" referenceTaskName="Application" priority="1" operationMEC="C0" fatherComponentMECType="0" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1101" id="130" >
+<father id="155" num="3" />
+<cdparam x="410" y="259" />
+<sizeparam width="128" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="244" minY="0" maxY="271" />
+<infoparam name="TGComponent" value="Application::C3" />
+<TGConnectingPoint num="0" id="122" />
+<TGConnectingPoint num="1" id="123" />
+<TGConnectingPoint num="2" id="124" />
+<TGConnectingPoint num="3" id="125" />
+<TGConnectingPoint num="4" id="126" />
+<TGConnectingPoint num="5" id="127" />
+<TGConnectingPoint num="6" id="128" />
+<TGConnectingPoint num="7" id="129" />
+<extraparam>
+<info value="Application::C3" taskName="C3" referenceTaskName="Application" priority="5" operationMEC="C3" fatherComponentMECType="0" />
+</extraparam>
+</SUBCOMPONENT>
+
+
+</TMLArchiDiagramPanel>
+
+</Modeling>
+
+
+
+
+</TURTLEGMODELING>
\ No newline at end of file
diff --git a/ttool/src/test/resources/tmltranslator/simulator/testMultiCore.xml b/ttool/src/test/resources/tmltranslator/simulator/testMultiCoreRRPB.xml
similarity index 100%
rename from ttool/src/test/resources/tmltranslator/simulator/testMultiCore.xml
rename to ttool/src/test/resources/tmltranslator/simulator/testMultiCoreRRPB.xml