From 079e659d0628734856135df06a5d999a2a5b6f4d Mon Sep 17 00:00:00 2001
From: Ludovic Apvrille <ludovic.apvrille@telecom-paristech.fr>
Date: Tue, 19 Nov 2019 18:02:22 +0100
Subject: [PATCH] Revert "Merge branch 'revert-c7faf42b' into 'master'"
This reverts merge request !261
---
.../src_simulator/app/TMLDelayCommand.cpp | 70 +--
.../c++2/src_simulator/app/TMLDelayCommand.h | 3 +-
.../TMLActivityElementWithIntervalAction.java | 9 +-
src/main/java/tmltranslator/TMLDelay.java | 2 +-
.../tmltranslator/TMLTextSpecification.java | 20 +-
.../tomappingsystemc2/MappedSystemCTask.java | 15 +-
.../ui/ActivityDiagram2TMLTranslator.java | 2 -
src/main/java/ui/TGCTimeDelay.java | 18 +-
src/main/java/ui/tmlad/TMLADDelay.java | 4 +-
.../java/ui/tmlad/TMLADDelayInterval.java | 4 +-
.../ui/window/JDialogTimeIntervalUnit.java | 37 +-
src/main/resources/help/activedelay.html | 22 -
src/main/resources/help/activedelay.md | 2 -
src/main/resources/help/helpTable.txt | 1 -
.../tmltranslator/DiplodocusDelayTest.java | 215 +-------
.../tmltranslator/expected/expected_spec1.tml | 12 +-
.../tmltranslator/expected/expected_spec2.tml | 12 +-
.../tmltranslator/expected/expected_spec3.tml | 12 +-
.../tmltranslator/expected/expected_spec4.tml | 8 +-
.../expected/expected_specdelay_readwrite.tml | 36 --
.../simulator/delay-idle-penalty.xml | 488 ------------------
.../tmltranslator/simulator/delay-idle.xml | 488 ------------------
.../simulator/delay-readwrite.xml | 488 ------------------
.../tmltranslator/simulator/delayRW.tarchi | 36 --
.../tmltranslator/simulator/delayRW.tmap | 14 -
.../tmltranslator/simulator/delayRW.tml | 36 --
.../simulator/fpgaTest-penalty.xml | 234 ++++-----
.../tmltranslator/simulator/fpgaTest.xml | 234 ++++-----
.../simulator/mono-RR-penalty.xml | 14 +-
.../tmltranslator/simulator/mono-RR.xml | 14 +-
.../simulator/mono-RRPB-penalty.xml | 16 +-
.../tmltranslator/simulator/mono-RRPB.xml | 16 +-
.../simulator/multi-RR-penalty.xml | 16 +-
.../tmltranslator/simulator/multi-RR.xml | 16 +-
.../simulator/multi-RRPB-penalty.xml | 130 ++---
.../tmltranslator/simulator/multi-RRPB.xml | 130 ++---
36 files changed, 491 insertions(+), 2383 deletions(-)
delete mode 100644 src/main/resources/help/activedelay.html
delete mode 100644 src/main/resources/help/activedelay.md
delete mode 100644 ttool/src/test/resources/tmltranslator/expected/expected_specdelay_readwrite.tml
delete mode 100644 ttool/src/test/resources/tmltranslator/simulator/delay-idle-penalty.xml
delete mode 100644 ttool/src/test/resources/tmltranslator/simulator/delay-idle.xml
delete mode 100644 ttool/src/test/resources/tmltranslator/simulator/delay-readwrite.xml
delete mode 100644 ttool/src/test/resources/tmltranslator/simulator/delayRW.tarchi
delete mode 100644 ttool/src/test/resources/tmltranslator/simulator/delayRW.tmap
delete mode 100644 ttool/src/test/resources/tmltranslator/simulator/delayRW.tml
diff --git a/simulators/c++2/src_simulator/app/TMLDelayCommand.cpp b/simulators/c++2/src_simulator/app/TMLDelayCommand.cpp
index b5b4b59aa5..1da3a61c76 100755
--- a/simulators/c++2/src_simulator/app/TMLDelayCommand.cpp
+++ b/simulators/c++2/src_simulator/app/TMLDelayCommand.cpp
@@ -43,13 +43,9 @@ Ludovic Apvrille, Renaud Pacalet
#include <TMLTransaction.h>
#include <SimComponents.h>
//#include <CommandListener.h>
-TMLDelayCommand::TMLDelayCommand(ID iID, TMLTask* iTask,TMLLength iStatLength, ActionFuncPointer iActionFunc, const char* iLiveVarList, bool iCheckpoint, bool isActiveDelay):TMLCommand(iID, iTask, 1, 1, iLiveVarList, iCheckpoint),_actionFunc(iActionFunc){
- if (!isActiveDelay){
- _isActiveDelay = false;
- }else {
- _length = iStatLength;
- _isActiveDelay = true;
- }
+
+TMLDelayCommand::TMLDelayCommand(ID iID, TMLTask* iTask,TMLLength iStatLength, ActionFuncPointer iActionFunc, const char* iLiveVarList, bool iCheckpoint):TMLCommand(iID, iTask, 1, 1, iLiveVarList, iCheckpoint),_actionFunc(iActionFunc){
+ _length = iStatLength;
_type=ACT;
}
void TMLDelayCommand::execute(){
@@ -66,46 +62,28 @@ TMLCommand* TMLDelayCommand::prepareNextTransaction(){
_task->setCurrCommand(this);
return this; //for command which generates transactions this is returned anyway by prepareTransaction
}
- if(_isActiveDelay){
- if (_progress==0){
- (_task->*_actionFunc)();
- _execTimes++;
- if (_length==0){
- //std::cout << "ExeciCommand len==0 " << std::endl;
- TMLCommand* aNextCommand=getNextCommand();
- #ifdef STATE_HASH_ENABLED
- if (_liveVarList!=0) _task->refreshStateHash(_liveVarList);
- #endif
- _task->setCurrCommand(aNextCommand);
- //FOR_EACH_CMDLISTENER (*i)->commandFinished(this);
- #ifdef LISTENERS_ENABLED
- NOTIFY_CMD_FINISHED(this);
- //NOTIFY_CMD_FINISHED(0);
- #endif
- if (aNextCommand!=0) return aNextCommand->prepare(false);
- }
- }
- _currTransaction = new TMLTransaction(this, _length-_progress,_task->getEndLastTransaction());
- return this;
- }
- else {
- TMLCommand* aNextCommand=getNextCommand();
- (_task->*_actionFunc)();
- _execTimes++;
- #ifdef STATE_HASH_ENABLED
- if (_liveVarList!=0) _task->refreshStateHash(_liveVarList);
- #endif
- _task->setCurrCommand(aNextCommand);
- //FOR_EACH_CMDLISTENER (*i)->commandFinished(this);
- #ifdef LISTENERS_ENABLED
- NOTIFY_CMD_FINISHED(this);
- //NOTIFY_CMD_FINISHED(0);
- #endif
- if (aNextCommand!=0) return aNextCommand->prepare(false);
- return 0;
- }
-// return 0;
+ if (_progress==0){
+ (_task->*_actionFunc)();
+ _execTimes++;
+ if (_length==0){
+ //std::cout << "ExeciCommand len==0 " << std::endl;
+ TMLCommand* aNextCommand=getNextCommand();
+ #ifdef STATE_HASH_ENABLED
+ if (_liveVarList!=0) _task->refreshStateHash(_liveVarList);
+ #endif
+ _task->setCurrCommand(aNextCommand);
+ //FOR_EACH_CMDLISTENER (*i)->commandFinished(this);
+ #ifdef LISTENERS_ENABLED
+ NOTIFY_CMD_FINISHED(this);
+ //NOTIFY_CMD_FINISHED(0);
+ #endif
+ if (aNextCommand!=0) return aNextCommand->prepare(false);
+ }
+ }
+
+ _currTransaction = new TMLTransaction(this, _length-_progress,_task->getEndLastTransaction());
+ return this;
}
std::string TMLDelayCommand::toString() const{
diff --git a/simulators/c++2/src_simulator/app/TMLDelayCommand.h b/simulators/c++2/src_simulator/app/TMLDelayCommand.h
index 842aadbb2b..e5cfa4fa2b 100755
--- a/simulators/c++2/src_simulator/app/TMLDelayCommand.h
+++ b/simulators/c++2/src_simulator/app/TMLDelayCommand.h
@@ -56,8 +56,7 @@ public:
\param iLiveVarList Bitmap of live variables
\param iCheckpoint Checkpoint Flag
*/
- bool _isActiveDelay;
- TMLDelayCommand(ID iID, TMLTask* iTask, TMLLength iStatLength, ActionFuncPointer iActionFunc, const char* iLiveVarList, bool iCheckpoint, bool isActiveDelay);
+ TMLDelayCommand(ID iID, TMLTask* iTask, TMLLength iStatLength, ActionFuncPointer iActionFunc, const char* iLiveVarList, bool iCheckpoint);
void execute();
//TMLTask* getDependentTask() const;
std::string toString() const;
diff --git a/src/main/java/tmltranslator/TMLActivityElementWithIntervalAction.java b/src/main/java/tmltranslator/TMLActivityElementWithIntervalAction.java
index b2347ee0a4..b948d772e9 100755
--- a/src/main/java/tmltranslator/TMLActivityElementWithIntervalAction.java
+++ b/src/main/java/tmltranslator/TMLActivityElementWithIntervalAction.java
@@ -52,7 +52,6 @@ import java.util.Objects;
*/
public class TMLActivityElementWithIntervalAction extends TMLActivityElement {
protected String minDelay, maxDelay;
- protected boolean isActiveDelay = false;
public TMLActivityElementWithIntervalAction(String _name, Object _referenceObject) {
super(_name, _referenceObject);
@@ -75,20 +74,16 @@ public class TMLActivityElementWithIntervalAction extends TMLActivityElement {
}
public String customExtraToXML() {
- return " min=\"" + minDelay + "\" max=\"" + maxDelay + "\" " + "isActiveDelay=\"" + isActiveDelay + "\" ";
+ return " min=\"" + minDelay + "\" max=\"" + maxDelay + "\" ";
}
- public void setActiveDelay(boolean _b){
- isActiveDelay = _b;}
- public boolean getActiveDelay(){return isActiveDelay;}
public boolean equalSpec(Object o) {
if (!(o instanceof TMLActivityElementWithIntervalAction)) return false;
if (!super.equalSpec(o)) return false;
TMLActivityElementWithIntervalAction tmlAEIAction = (TMLActivityElementWithIntervalAction) o;
return Objects.equals(minDelay, tmlAEIAction.getMinDelay()) &&
- Objects.equals(maxDelay, tmlAEIAction.getMaxDelay()) &&
- Objects.equals(isActiveDelay, tmlAEIAction.getActiveDelay());
+ Objects.equals(maxDelay, tmlAEIAction.getMaxDelay());
}
diff --git a/src/main/java/tmltranslator/TMLDelay.java b/src/main/java/tmltranslator/TMLDelay.java
index 1e07a7b950..06d6a781fd 100755
--- a/src/main/java/tmltranslator/TMLDelay.java
+++ b/src/main/java/tmltranslator/TMLDelay.java
@@ -53,7 +53,7 @@ import java.util.Objects;
public class TMLDelay extends TMLActivityElementWithIntervalAction {
private String timeUnit = "ns"; // Shall be either "ns" or "us" or "ms" or "s"
-
+
public TMLDelay(String _name, Object _referenceObject) {
super(_name, _referenceObject);
}
diff --git a/src/main/java/tmltranslator/TMLTextSpecification.java b/src/main/java/tmltranslator/TMLTextSpecification.java
index 28b02dc593..7d915caa9b 100755
--- a/src/main/java/tmltranslator/TMLTextSpecification.java
+++ b/src/main/java/tmltranslator/TMLTextSpecification.java
@@ -432,9 +432,9 @@ public class TMLTextSpecification<E> {
tmp1 = ((TMLDelay) elt).getMinDelay();
tmp2 = ((TMLDelay) elt).getMaxDelay();
if (tmp1.compareTo(tmp2) == 0) {
- code = "DELAY" + SP + modifyString(((TMLDelay) elt).getMinDelay()) + SP + modifyString(((TMLDelay) elt).getUnit()) + SP + "isActiveDelay" + SP + ((TMLDelay) elt).getActiveDelay() + CR;
+ code = "DELAY" + SP + modifyString(((TMLDelay) elt).getMinDelay()) + SP + modifyString(((TMLDelay) elt).getUnit()) + CR;
} else {
- code = "DELAY" + SP + modifyString(((TMLDelay) elt).getMinDelay()) + SP + modifyString(((TMLDelay) elt).getMaxDelay()) + SP + modifyString(((TMLDelay) elt).getUnit()) + SP + "isActiveDelay" + SP + ((TMLDelay) elt).getActiveDelay() + CR;
+ code = "DELAY" + SP + modifyString(((TMLDelay) elt).getMinDelay()) + SP + modifyString(((TMLDelay) elt).getMaxDelay()) + SP + modifyString(((TMLDelay) elt).getUnit()) + CR;
}
return code + makeBehavior(task, elt.getNextElement(0));
@@ -2643,13 +2643,13 @@ public class TMLTextSpecification<E> {
inTaskDec = false;
// inTaskBehavior = true;
- if ((_split.length < 3) || (_split.length > 6)) {
- error = "A DELAY operation must be declared with 2, 3, 4 or 5 parameters, and not " + (_split.length - 1);
+ if ((_split.length < 3) || (_split.length > 5)) {
+ error = "A DELAY operation must be declared with 2 or 3 parameters, and not " + (_split.length - 1);
addError(0, _lineNb, 0, error);
return -1;
}
- if (_split.length == 3 || _split.length == 5) {
+ if (_split.length == 3) {
if (!checkParameter("DELAY", _split, 2, 0, _lineNb)) {
error = "A DELAY operation must be specified with a valid time unit (ns, us, ms, s))";
addError(0, _lineNb, 0, error);
@@ -2657,7 +2657,7 @@ public class TMLTextSpecification<E> {
}
}
- if (_split.length == 4 || _split.length == 6) {
+ if (_split.length == 4) {
if (!checkParameter("DELAY", _split, 3, 0, _lineNb)) {
error = "A DELAY operation must be specified with a valid time unit (ns, us, ms, s))";
addError(0, _lineNb, 0, error);
@@ -2668,19 +2668,11 @@ public class TMLTextSpecification<E> {
TMLDelay delay = new TMLDelay("delay", null);
delay.setMinDelay(_split[1]);
if (_split.length == 3) {
- delay.setMaxDelay(_split[1]);
- delay.setUnit(_split[2]); // DELAY min unit - this is for old format
- } else if (_split.length == 4) {
- delay.setMaxDelay(_split[2]);
- delay.setUnit(_split[3]); // DELAY min max unit - this is for old format
- } else if (_split.length == 5) {
delay.setMaxDelay(_split[1]);
delay.setUnit(_split[2]);
- delay.setActiveDelay(Boolean.valueOf(_split[4])); // DELAY min unit isActivedelay boolean
} else {
delay.setMaxDelay(_split[2]);
delay.setUnit(_split[3]);
- delay.setActiveDelay(Boolean.valueOf(_split[5])); // DELAY min max unit isActivedelay boolean
}
diff --git a/src/main/java/tmltranslator/tomappingsystemc2/MappedSystemCTask.java b/src/main/java/tmltranslator/tomappingsystemc2/MappedSystemCTask.java
index 6229a61ab6..0b68b8574f 100644
--- a/src/main/java/tmltranslator/tomappingsystemc2/MappedSystemCTask.java
+++ b/src/main/java/tmltranslator/tomappingsystemc2/MappedSystemCTask.java
@@ -557,20 +557,11 @@ public class MappedSystemCTask {
comment = action;
action += "\nif (tmpDelayxy==0) tmpDelayxy=1;\n";
if (delay.getMinDelay().equals(delay.getMaxDelay())) {
- if (!delay.getActiveDelay()){
- action += "_endLastTransaction+=tmpDelayxy"; // Take all delay totally idle for x units of time
- } else {
- action += "_endLastTransaction+=0"; //consumes cycles
- }
-
+ action += "_endLastTransaction+=0";
delayLen = delay.getMaxDelay() + "*" + masterClockFreq + delay.getMasterClockFactor();
} else {
action += "TMLTime tmpDelayxx = " + delay.getMinDelay() + "*" + masterClockFreq + delay.getMasterClockFactor() + ";\nif (tmpDelayxx==0) tmpDelayxx=1;\n";
- if (!delay.getActiveDelay()){
- action += "_endLastTransaction+= myrand(tmpDelayxx,tmpDelayxy)"; // Take all delay totally idle for x units of time
- } else {
- action += "_endLastTransaction+=0"; //consumes cycles
- }
+ action += "_endLastTransaction+= 0";
delayLen = delay.getMinDelay() + "*" + masterClockFreq + delay.getMasterClockFactor();
}
String elemName = currElem.getName(), idString;
@@ -584,7 +575,7 @@ public class MappedSystemCTask {
idString = String.valueOf(currElem.getID());
}
hcode += "TMLDelayCommand " + cmdName + SCCR;
- initCommand += "," + cmdName + "(" + idString + ",this,"+ delayLen +",(ActionFuncPointer)&" + reference + "::" + cmdName + "_func, " + getFormattedLiveVarStr(currElem) + ", " + delay.getActiveDelay() + ")" + CR;
+ initCommand += "," + cmdName + "(" + idString + ",this,"+ delayLen +",(ActionFuncPointer)&" + reference + "::" + cmdName + "_func, " + getFormattedLiveVarStr(currElem) + ")" + CR;
nextCommand = cmdName + ".setNextCommand(array(1,(TMLCommand*)" + makeCommands(currElem.getNextElement(0), false, retElement, null) + "));\n";
functions += "void " + reference + "::" + cmdName + "_func(){\n#ifdef ADD_COMMENTS\naddComment(new Comment(_endLastTransaction,0," + commentNum + "));\n#endif\n" + modifyString(addSemicolonIfNecessary(action)) + CR;
//functions+="return 0"+ SCCR;
diff --git a/src/main/java/ui/ActivityDiagram2TMLTranslator.java b/src/main/java/ui/ActivityDiagram2TMLTranslator.java
index 7ba7e9446c..61a42b0174 100644
--- a/src/main/java/ui/ActivityDiagram2TMLTranslator.java
+++ b/src/main/java/ui/ActivityDiagram2TMLTranslator.java
@@ -291,7 +291,6 @@ public class ActivityDiagram2TMLTranslator {
tmldelay.setMinDelay(modifyString(((TMLADDelay)tgc).getDelayValue()));
tmldelay.setMaxDelay(modifyString(((TMLADDelay)tgc).getDelayValue()));
tmldelay.setUnit(((TMLADDelay)tgc).getUnit());
- tmldelay.setActiveDelay(((TMLADDelay)tgc).getActiveDelayEnable());
activity.addElement(tmldelay);
((BasicErrorHighlight)tgc).setStateAction(ErrorHighlight.OK);
corrTgElement.addCor(tmldelay, tgc);
@@ -301,7 +300,6 @@ public class ActivityDiagram2TMLTranslator {
tmldelay.setMinDelay(modifyString(((TMLADDelayInterval)tgc).getMinDelayValue()));
tmldelay.setMaxDelay(modifyString(((TMLADDelayInterval)tgc).getMaxDelayValue()));
tmldelay.setUnit(((TMLADDelayInterval)tgc).getUnit());
- tmldelay.setActiveDelay(((TMLADDelayInterval)tgc).getActiveDelayEnableValue());
activity.addElement(tmldelay);
((BasicErrorHighlight)tgc).setStateAction(ErrorHighlight.OK);
corrTgElement.addCor(tmldelay, tgc);
diff --git a/src/main/java/ui/TGCTimeDelay.java b/src/main/java/ui/TGCTimeDelay.java
index 2f423e842a..30d060411b 100644
--- a/src/main/java/ui/TGCTimeDelay.java
+++ b/src/main/java/ui/TGCTimeDelay.java
@@ -66,7 +66,6 @@ public class TGCTimeDelay extends TGCWithoutInternalComponent{
private String maxDelay = "";
private String unit = "ns"; // can be "ns" or "us" or "ms" or "s";
private boolean hasMaxDelay;
- private boolean isActiveDelay;
public TGCTimeDelay(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp) {
super(_x, _y, _minX, _maxX, _minY, _maxY, _pos, _father, _tdp);
@@ -145,13 +144,11 @@ public class TGCTimeDelay extends TGCWithoutInternalComponent{
}
array[0] = getMinDelay(); array[1] = getMaxDelay(); array[2] = getUnit();
- JDialogTimeIntervalUnit jdti = new JDialogTimeIntervalUnit(getTDiagramPanel().getMainGUI(), frame, array, hasMaxDelay, isActiveDelay,
- "Setting time parameters", ind,
- "max");
+ JDialogTimeIntervalUnit jdti = new JDialogTimeIntervalUnit(frame, array, hasMaxDelay, "Setting time parameters", ind, "max");
//jdti.setSize(350, 250);
GraphicLib.centerOnParent(jdti, 350, 250);
jdti.setVisible( true ); // blocked until dialog has been closed
- isActiveDelay = jdti.isActiveDelay();
+
minDelay = array[0]; maxDelay = array[1]; unit = array[2];
if (hasMaxDelay) {
@@ -183,12 +180,6 @@ public class TGCTimeDelay extends TGCWithoutInternalComponent{
public void setHasMaxValue(boolean b) {
hasMaxDelay = b;
}
- public void setActiveDelay(boolean b) {
- isActiveDelay = b;
- }
- public boolean getActiveDelay() {
- return isActiveDelay;
- }
public void setMinDelay(String del) {
minDelay = del;
@@ -216,8 +207,6 @@ public class TGCTimeDelay extends TGCWithoutInternalComponent{
sb.append(getMaxDelay());
sb.append("\" hasMaxDelay=\"");
sb.append(hasMaxDelay);
- sb.append("\" isActiveDelay=\"");
- sb.append(isActiveDelay);
sb.append("\" unit=\"");
sb.append(getUnit());
sb.append("\" />\n");
@@ -247,9 +236,6 @@ public class TGCTimeDelay extends TGCWithoutInternalComponent{
if (elt.getAttribute("hasMaxDelay") != null) {
hasMaxDelay = elt.getAttribute("hasMaxDelay").compareTo("true") == 0;
}
- if (elt.getAttribute("isActiveDelay") != null) {
- isActiveDelay = elt.getAttribute("isActiveDelay").compareTo("true") == 0;
- }
unit = elt.getAttribute("unit");
}
}
diff --git a/src/main/java/ui/tmlad/TMLADDelay.java b/src/main/java/ui/tmlad/TMLADDelay.java
index 1ab0518c6b..4a936c36df 100755
--- a/src/main/java/ui/tmlad/TMLADDelay.java
+++ b/src/main/java/ui/tmlad/TMLADDelay.java
@@ -81,7 +81,6 @@ public class TMLADDelay extends TADComponentWithSubcomponents /* Issue #69 TGCWi
tgc.setMinDelay("10");
tgc.setMaxDelay("nope");
tgc.setHasMaxValue(false);
- tgc.setActiveDelay(false);
tgc.setUnit("ms");
tgc.setName("value of the delay");
tgc.makeValue();
@@ -140,8 +139,7 @@ public class TMLADDelay extends TADComponentWithSubcomponents /* Issue #69 TGCWi
public String getUnit() {
return ((TGCTimeDelay)tgcomponent[0]).getUnit();
}
-
- public boolean getActiveDelayEnable(){return ((TGCTimeDelay)tgcomponent[0]).getActiveDelay(); }
+
@Override
public int getType() {
return TGComponentManager.TMLAD_DELAY;
diff --git a/src/main/java/ui/tmlad/TMLADDelayInterval.java b/src/main/java/ui/tmlad/TMLADDelayInterval.java
index 8581ff1991..d7234a8439 100755
--- a/src/main/java/ui/tmlad/TMLADDelayInterval.java
+++ b/src/main/java/ui/tmlad/TMLADDelayInterval.java
@@ -156,9 +156,7 @@ public class TMLADDelayInterval extends TADComponentWithSubcomponents /* Issue #
public void setMaxValue(String val) {
((TGCTimeDelay)(tgcomponent[0])).setMaxDelay(val);
}
-
- public boolean getActiveDelayEnableValue(){return ((TGCTimeDelay)tgcomponent[0]).getActiveDelay(); }
-
+
@Override
public int getType() {
return TGComponentManager.TMLAD_INTERVAL_DELAY;
diff --git a/src/main/java/ui/window/JDialogTimeIntervalUnit.java b/src/main/java/ui/window/JDialogTimeIntervalUnit.java
index 340520ee5f..1233d7eaf6 100644
--- a/src/main/java/ui/window/JDialogTimeIntervalUnit.java
+++ b/src/main/java/ui/window/JDialogTimeIntervalUnit.java
@@ -41,9 +41,6 @@
package ui.window;
-import help.HelpManager;
-import ui.MainGUI;
-import ui.TGHelpButton;
import ui.util.IconManager;
import javax.swing.*;
@@ -62,17 +59,15 @@ public class JDialogTimeIntervalUnit extends JDialogBase implements ActionListen
private String[] arrayDelay;
private boolean hasMaxDelay;
- private boolean isActiveDelay;
private JPanel panel1;
// Panel1
private JTextField text1, text2;
private JComboBox<String> unit;
- private JCheckBox wait_delay;
+
private String id1, id2;
- private MainGUI mgui;
- public TGHelpButton myButton;
+
/* Creates new form */
// arrayDelay: [0] -> minDelay ; [1] -> maxDelay
public JDialogTimeIntervalUnit(Frame f, String[] _arrayDelay, boolean _hasMaxDelay, String title) {
@@ -85,26 +80,17 @@ public class JDialogTimeIntervalUnit extends JDialogBase implements ActionListen
pack();
}
- public JDialogTimeIntervalUnit(MainGUI _mgui, Frame f, String[] _arrayDelay, boolean _hasMaxDelay, boolean _isActiveDelay, String title,
- String _id1,
- String _id2) {
+ public JDialogTimeIntervalUnit(Frame f, String[] _arrayDelay, boolean _hasMaxDelay, String title, String _id1, String _id2) {
super(f, title, true);
- mgui =_mgui;
arrayDelay = _arrayDelay;
hasMaxDelay = _hasMaxDelay;
- isActiveDelay = _isActiveDelay;
id1 = _id1;
id2 = _id2;
initComponents();
myInitComponents();
pack();
}
- private void makeEndHelpButton(String helpWord, MainGUI mgui, HelpManager hm, JPanel panel, GridBagConstraints c) {
- Icon myIcon = IconManager.imgic32;
- myButton = new TGHelpButton(myIcon, helpWord, mgui, hm);
- myButton.addToPanel(panel, c);
- }
private void myInitComponents() {
}
@@ -129,7 +115,7 @@ public class JDialogTimeIntervalUnit extends JDialogBase implements ActionListen
panel1.setBorder(new javax.swing.border.TitledBorder("setting min and max delays"));
}
panel1.setPreferredSize(new Dimension(300, 150));
-
+
// first line panel1
c1.weighty = 1.0;
c1.weightx = 1.0;
@@ -137,7 +123,7 @@ public class JDialogTimeIntervalUnit extends JDialogBase implements ActionListen
c1.fill = GridBagConstraints.BOTH;
c1.gridheight = 1;
panel1.add(new JLabel(" "), c1);
-
+
// second line panel1
c1.gridwidth = 1;
c1.gridheight = 1;
@@ -180,14 +166,7 @@ public class JDialogTimeIntervalUnit extends JDialogBase implements ActionListen
unit.addItem("s");
unit.setSelectedItem(arrayDelay[2]);
panel1.add(unit, c1);
- c1.gridwidth = 1;
- if ((id1 != null) && (id2 != null)){
- wait_delay = new JCheckBox("Active Delay");
- wait_delay.setSelected(isActiveDelay);
- panel1.add(wait_delay,c1);
- c1.gridwidth = GridBagConstraints.REMAINDER; //end row
- makeEndHelpButton("activedelay.html", mgui, mgui.getHelpManager(), panel1, c1);
- }
+
// main panel;
c0.gridwidth = 1;
c0.gridheight = 10;
@@ -203,9 +182,7 @@ public class JDialogTimeIntervalUnit extends JDialogBase implements ActionListen
initButtons(c0, c, this);
}
- public boolean isActiveDelay() {
- return wait_delay.isSelected();
- }
+
public void actionPerformed(ActionEvent evt) {
String command = evt.getActionCommand();
diff --git a/src/main/resources/help/activedelay.html b/src/main/resources/help/activedelay.html
deleted file mode 100644
index c9bc7cb511..0000000000
--- a/src/main/resources/help/activedelay.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" lang="" xml:lang="">
-<head>
- <meta charset="utf-8" />
- <meta name="generator" content="pandoc" />
- <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
- <title>TTool help</title>
- <style>
- code{white-space: pre-wrap;}
- span.smallcaps{font-variant: small-caps;}
- span.underline{text-decoration: underline;}
- div.column{display: inline-block; vertical-align: top; width: 50%;}
- </style>
- <!--[if lt IE 9]>
- <script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv-printshiv.min.js"></script>
- <![endif]-->
-</head>
-<body>
-<h1 id="active-delay">active delay</h1>
-<p>The delay transaction “wait x” will consume x cycles when the box is checked, if not the task should be totally idle for x units of time.</p>
-</body>
-</html>
diff --git a/src/main/resources/help/activedelay.md b/src/main/resources/help/activedelay.md
deleted file mode 100644
index 6be6c6d757..0000000000
--- a/src/main/resources/help/activedelay.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# active delay
-The delay transaction "wait x" will consume x cycles when the box is checked, if not the task should be totally idle for x units of time.
diff --git a/src/main/resources/help/helpTable.txt b/src/main/resources/help/helpTable.txt
index fc5b294df9..5293e8e4ba 100644
--- a/src/main/resources/help/helpTable.txt
+++ b/src/main/resources/help/helpTable.txt
@@ -6,7 +6,6 @@
----fork fork channel functional view diplodocus
----join join channel functional view diplodocus
--- activitydiagram activity_diagram activity diagram function view tasks
-----activedelay active_delay delay consumes cycles
-- architecture architecture hardware os operating system
--- cpu cpu processor cpu os
----cpuname cpu_name cpu name
diff --git a/ttool/src/test/java/tmltranslator/DiplodocusDelayTest.java b/ttool/src/test/java/tmltranslator/DiplodocusDelayTest.java
index f7bf25e10a..f721dbbf3d 100644
--- a/ttool/src/test/java/tmltranslator/DiplodocusDelayTest.java
+++ b/ttool/src/test/java/tmltranslator/DiplodocusDelayTest.java
@@ -9,7 +9,6 @@ import org.junit.BeforeClass;
import org.junit.Test;
import req.ebrdd.EBRDD;
import tepe.TEPE;
-import tmltranslator.compareTMLTest.CompareTML;
import tmltranslator.tomappingsystemc2.DiploSimulatorFactory;
import tmltranslator.tomappingsystemc2.IDiploSimulatorCodeGenerator;
import tmltranslator.tomappingsystemc2.Penalties;
@@ -31,24 +30,19 @@ public class DiplodocusDelayTest extends AbstractUITest {
final String DIR_GEN = "test_diplo_simulator/";
//model for Delay task without penalties
- final String [] MODELS_DELAY = {"mono-RR", "mono-RRPB","multi-RR","multi-RRPB","fpgaTest","delay-idle"};
- final int [] NB_Of_DELAY_STATES = {42, 42, 42, 42, 32, 22};
- final int [] NB_Of_DELAY_TRANSTIONS = {41, 41, 41, 41, 31, 21};
- final int [] MIN_DELAY_CYCLES = {2020, 2020, 2010, 2010, 2010, 1820};
- final int [] MAX_DELAY_CYCLES = {2020, 2020, 2010, 2010, 2010, 1820};
+ final String [] MODELS_DELAY = {"mono-RR", "mono-RRPB","multi-RR","multi-RRPB","fpgaTest"};
+ final int [] NB_Of_DELAY_STATES = {402, 402, 402, 402, 302};
+ final int [] NB_Of_DELAY_TRANSTIONS = {401, 401, 401, 401, 301};
+ final int [] MIN_DELAY_CYCLES = {20200, 20200, 20100, 20100, 20100};
+ final int [] MAX_DELAY_CYCLES = {20200, 20200, 20100, 20100, 20100};
//model for Delay task with penalties
- final int [] NB_Of_DELAY_STATES_PENALTIES = {42, 42, 42, 42, 32, 22};
- final int [] NB_Of_DELAY_TRANSTIONS_PENALTIES = {41, 41, 41, 41, 31, 21};
- final int [] MIN_DELAY_CYCLES_PENALTIES = {2590, 2590, 2670, 2670, 2010, 1950};
- final int [] MAX_DELAY_CYCLES_PENALTIES = {2590, 2590, 2670, 2670, 2010, 1950};
- // test for read and write active delay parameter
- final String [] MODELS_DELAY_READ_WRITE = {"delayRW"};
- final static String EXPECTED_FILE1 = getBaseResourcesDir() + "tmltranslator/expected/expected_specdelay_readwrite.tml";
- final int [] NB_Of_DELAY_RW_STATES = {42};
- final int [] NB_Of_DELAY_RW_TRANSTIONS = {41};
- final int [] MIN_DELAY_RW_CYCLES = {2020};
- final int [] MAX_DELAY_RW_CYCLES = {2020};
+ final int [] NB_Of_DELAY_STATES_PENALTIES = {410, 410, 410, 410, 302};
+ final int [] NB_Of_DELAY_TRANSTIONS_PENALTIES = {409, 409, 409, 409, 301};
+ final int [] MIN_DELAY_CYCLES_PENALTIES = {25718, 25718, 26588, 26588, 20100};
+ final int [] MAX_DELAY_CYCLES_PENALTIES = {25718, 25718, 26588, 26588, 20100};
+
+
private String SIM_DIR;
@@ -378,192 +372,5 @@ public class DiplodocusDelayTest extends AbstractUITest {
assertTrue(MAX_DELAY_CYCLES_PENALTIES[i] == maxValue);
}
}
- @Test
- public void testGenerateTML() throws Exception {
- CompareTML compTML = new CompareTML();
- mainGUI.openProjectFromFile(new File(RESOURCES_DIR + "delay-readwrite.xml"));
- for(TURTLEPanel _tab : mainGUI.getTabs()) {
- if(_tab instanceof TMLArchiPanel) {
- for (TDiagramPanel tdp : _tab.getPanels()) {
- if (tdp instanceof TMLArchiDiagramPanel) {
- mainGUI.selectTab(tdp);
- break;
- }
- }
- break;
- }
- }
- mainGUI.checkModelingSyntax(true);
- mainGUI.generateTMLTxt();
- File f1 = new File(EXPECTED_FILE1);
- File f2 = new File("spec.tml"); // Generated file after executing "TML generation"
- assertTrue(compTML.compareTML(f1,f2));
- }
-
- @Test
- public void testActiveDelayReadAndWrite() throws Exception {
- for(int i=0; i<MODELS_DELAY_READ_WRITE.length; i++) {
- String s = MODELS_DELAY_READ_WRITE[i];
- SIM_DIR = DIR_GEN + s + "/";
- // Load the TML
- System.out.println("executing: loading " + s);
- TMLMappingTextSpecification tmts = new TMLMappingTextSpecification(s);
- File f = new File(RESOURCES_DIR + s + ".tmap");
- System.out.println("executing: new file loaded " + s);
- String spec = null;
- try {
- spec = FileUtils.loadFileData(f);
- } catch (Exception e) {
- System.out.println("Exception executing: loading " + s);
- assertTrue(false);
- }
- System.out.println("executing: testing spec " + s);
- assertTrue(spec != null);
- System.out.println("executing: testing parsed " + s);
- boolean parsed = tmts.makeTMLMapping(spec, RESOURCES_DIR);
- assertTrue(parsed);
-
-
- System.out.println("executing: checking syntax " + s);
- // Checking syntax
- TMLMapping tmap = tmts.getTMLMapping();
-
- TMLSyntaxChecking syntax = new TMLSyntaxChecking(tmap);
- syntax.checkSyntax();
-
- assertTrue(syntax.hasErrors() == 0);
-
- // Generate SystemC code
- System.out.println("executing: sim code gen for " + s);
- final IDiploSimulatorCodeGenerator tml2systc;
- List<EBRDD> al = new ArrayList<EBRDD>();
- List<TEPE> alTepe = new ArrayList<TEPE>();
- tml2systc = DiploSimulatorFactory.INSTANCE.createCodeGenerator(tmap, al, alTepe);
- tml2systc.setModelName(s);
- String error = tml2systc.generateSystemC(false, true);
- assertTrue(error == null);
-
- File directory = new File(SIM_DIR);
- if (! directory.exists()){
- directory.mkdirs();
- }
-
- // Putting sim files
- System.out.println("SIM executing: sim lib code copying for " + s);
- ConfigurationTTool.SystemCCodeDirectory = getBaseResourcesDir() + "../../../../simulators/c++2/";
- boolean simFiles = SpecConfigTTool.checkAndCreateSystemCDir(SIM_DIR);
-
- System.out.println("SIM executing: sim lib code copying done with result " + simFiles);
- assertTrue(simFiles);
-
- System.out.println("SIM Saving file in: " + SIM_DIR);
- tml2systc.saveFile(SIM_DIR, "appmodel");
-
-
- // Compile it
- System.out.println("executing: compile");
- Process proc;
- BufferedReader proc_in;
- String str;
- boolean mustRecompileAll;
- Penalties penalty = new Penalties(SIM_DIR + File.separator + "src_simulator");
- int changed = penalty.handlePenalties(false);
-
- if (changed == 1) {
- mustRecompileAll = true;
- } else {
- mustRecompileAll = false;
- }
-
- if (mustRecompileAll) {
- System.out.println("executing: " + "make -C " + SIM_DIR + " clean");
- try {
- proc = Runtime.getRuntime().exec("make -C " + SIM_DIR + " clean");
- proc_in = new BufferedReader( new InputStreamReader( proc.getInputStream() ) );
- while ( ( str = proc_in.readLine() ) != null ) {
- // TraceManager.addDev( "Sending " + str + " from " + port + " to client..." );
- System.out.println("executing: " + str);
- }
- } catch (Exception e) {
- // probably make is not installed
- System.out.println("FAILED: executing: " + "make -C " + SIM_DIR + " clean");
- return;
- }
- }
-
- System.out.println("executing: " + "make -C " + SIM_DIR);
- try {
-
- proc = Runtime.getRuntime().exec("make -C " + SIM_DIR + "");
- proc_in = new BufferedReader( new InputStreamReader( proc.getInputStream() ) );
-
- monitorError(proc);
-
- while ( ( str = proc_in.readLine() ) != null ) {
- // TraceManager.addDev( "Sending " + str + " from " + port + " to client..." );
- System.out.println("executing: " + str);
- }
- } catch (Exception e) {
- // Probably make is not installed
- System.out.println("FAILED: executing: " + "make -C " + SIM_DIR);
- return;
- }
- System.out.println("SUCCESS: executing: " + "make -C " + SIM_DIR);
-
- // Run the simulator
- String graphPath = SIM_DIR + "testgraph_" + s;
- try {
-
- String[] params = new String [3];
- params[0] = "./" + SIM_DIR + "run.x";
- params[1] = "-cmd";
- params[2] = "1 0; 1 7 100 100 " + graphPath;
- proc = Runtime.getRuntime().exec(params);
- //proc = Runtime.getRuntime().exec("./" + SIM_DIR + "run.x -explo -gname testgraph_" + s);
- proc_in = new BufferedReader( new InputStreamReader( proc.getInputStream() ) );
-
- monitorError(proc);
-
- while ( ( str = proc_in.readLine() ) != null ) {
- // TraceManager.addDev( "Sending " + str + " from " + port + " to client..." );
- System.out.println("executing: " + str);
- }
- } catch (Exception e) {
- // Probably make is not installed
- System.out.println("FAILED: executing simulation");
- return;
- }
-
- // Compare results with expected ones
- // Must load the graph
- File graphFile = new File(graphPath + ".aut");
- String graphData = "";
- try {
- graphData = FileUtils.loadFileData(graphFile);
- } catch (Exception e) {
- assertTrue(false);
- }
-
- AUTGraph graph = new AUTGraph();
- graph.buildGraph(graphData);
-
- // States and transitions
- System.out.println("executing: nb states of " + s + " " + graph.getNbOfStates());
- assertTrue(NB_Of_DELAY_RW_STATES[i] == graph.getNbOfStates());
- System.out.println("executing: nb transitions of " + s + " " + graph.getNbOfTransitions());
- assertTrue(NB_Of_DELAY_RW_TRANSTIONS[i] == graph.getNbOfTransitions());
-
- // Min and max cycles
- int minValue = graph.getMinValue("allCPUsFPGAsTerminated");
- System.out.println("executing: minvalue of " + s + " " + minValue);
- assertTrue(MIN_DELAY_RW_CYCLES[i] == minValue);
-
- int maxValue = graph.getMaxValue("allCPUsFPGAsTerminated");
- System.out.println("executing: maxvalue of " + s + " " + maxValue);
- assertTrue(MAX_DELAY_RW_CYCLES[i] == maxValue);
-
- }
-
- }
}
diff --git a/ttool/src/test/resources/tmltranslator/expected/expected_spec1.tml b/ttool/src/test/resources/tmltranslator/expected/expected_spec1.tml
index 1575d44d52..7cd34eab0b 100644
--- a/ttool/src/test/resources/tmltranslator/expected/expected_spec1.tml
+++ b/ttool/src/test/resources/tmltranslator/expected/expected_spec1.tml
@@ -1,6 +1,6 @@
// TML Application - FORMAT 0.1
-// Application: /home/levan/Desktop/TTool/ttool/src/test/resources/ui/diagram2tml/input/CloneCompositeComponentTest.xml
-// Generated: Fri Nov 15 15:15:40 CET 2019
+// Application: /home/pham/Documents/TToolDev/TTool/ttool/src/test/resources/ui/diagram2tml/input/CloneCompositeComponentTest.xml
+// Generated: Fri Sep 27 17:17:01 CEST 2019
// Channels
CHANNEL Application__channel BRBW 4 8 OUT Application__PrimitiveComp1 IN Application__PrimitiveComp2
@@ -120,10 +120,10 @@ TASK Application__PrimitiveComp5
WRITE Application__channel3 1
EXECI 10
EXECI 10 20
- DELAY 10 ms isActiveDelay false
+ DELAY 10 ms
EXECC 100 encryption1 ADV 100 100 0 0
EXECC 100 encryption1 ADV 100 100 0 0
- DELAY 10 20 ms isActiveDelay false
+ DELAY 10 20 ms
RANDOM 0 attr1 0 10
FOR( ; ; )
FOR(loop__0 = 0; loop__0<10; loop__0 = loop__0 + 1)
@@ -154,10 +154,10 @@ TASK Application__PrimitiveComp5_0
WRITE Application__channel3_0 1
EXECI 10
EXECI 10 20
- DELAY 10 ms isActiveDelay false
+ DELAY 10 ms
EXECC 100 encryption1 ADV 100 100 0 0
EXECC 100 encryption1 ADV 100 100 0 0
- DELAY 10 20 ms isActiveDelay false
+ DELAY 10 20 ms
RANDOM 0 attr1 0 10
FOR( ; ; )
FOR(loop__0 = 0; loop__0<10; loop__0 = loop__0 + 1)
diff --git a/ttool/src/test/resources/tmltranslator/expected/expected_spec2.tml b/ttool/src/test/resources/tmltranslator/expected/expected_spec2.tml
index 80a588d37f..fc9e712580 100644
--- a/ttool/src/test/resources/tmltranslator/expected/expected_spec2.tml
+++ b/ttool/src/test/resources/tmltranslator/expected/expected_spec2.tml
@@ -1,6 +1,6 @@
// TML Application - FORMAT 0.1
-// Application: /home/levan/Desktop/TTool/ttool/src/test/resources/ui/diagram2tml/input/CloneCompositeComponentTest.xml
-// Generated: Fri Nov 15 15:19:32 CET 2019
+// Application: /home/pham/Documents/TToolDev/TTool/ttool/src/test/resources/ui/diagram2tml/input/CloneCompositeComponentTest.xml
+// Generated: Fri Sep 27 17:18:23 CEST 2019
// Channels
CHANNEL Application__channel BRBW 4 8 OUT Application__PrimitiveComp1 IN Application__PrimitiveComp2
@@ -88,10 +88,10 @@ TASK Application__PrimitiveComp5
WRITE Application__channel3 1
EXECI 10
EXECI 10 20
- DELAY 10 ms isActiveDelay false
+ DELAY 10 ms
EXECC 100 encryption1 ADV 100 100 0 0
EXECC 100 encryption1 ADV 100 100 0 0
- DELAY 10 20 ms isActiveDelay false
+ DELAY 10 20 ms
RANDOM 0 attr1 0 10
FOR( ; ; )
FOR(loop__0 = 0; loop__0<10; loop__0 = loop__0 + 1)
@@ -122,10 +122,10 @@ TASK Application__PrimitiveComp5_0
WRITE Application__channel3_0 1
EXECI 10
EXECI 10 20
- DELAY 10 ms isActiveDelay false
+ DELAY 10 ms
EXECC 100 encryption1 ADV 100 100 0 0
EXECC 100 encryption1 ADV 100 100 0 0
- DELAY 10 20 ms isActiveDelay false
+ DELAY 10 20 ms
RANDOM 0 attr1 0 10
FOR( ; ; )
FOR(loop__0 = 0; loop__0<10; loop__0 = loop__0 + 1)
diff --git a/ttool/src/test/resources/tmltranslator/expected/expected_spec3.tml b/ttool/src/test/resources/tmltranslator/expected/expected_spec3.tml
index 48d0654728..75ba41ef40 100644
--- a/ttool/src/test/resources/tmltranslator/expected/expected_spec3.tml
+++ b/ttool/src/test/resources/tmltranslator/expected/expected_spec3.tml
@@ -1,6 +1,6 @@
// TML Application - FORMAT 0.1
-// Application: /home/levan/Desktop/TTool/ttool/src/test/resources/ui/diagram2tml/input/CloneCompositeComponentTest.xml
-// Generated: Fri Nov 15 15:20:48 CET 2019
+// Application: /home/pham/Documents/TToolDev/TTool/ttool/src/test/resources/ui/diagram2tml/input/CloneCompositeComponentTest.xml
+// Generated: Fri Sep 27 17:18:55 CEST 2019
// Channels
CHANNEL Application__channel BRBW 4 8 OUT Application__PrimitiveComp1 IN Application__PrimitiveComp2
@@ -71,10 +71,10 @@ TASK Application__PrimitiveComp5
WRITE Application__channel3 1
EXECI 10
EXECI 10 20
- DELAY 10 ms isActiveDelay false
+ DELAY 10 ms
EXECC 100 encryption1 ADV 100 100 0 0
EXECC 100 encryption1 ADV 100 100 0 0
- DELAY 10 20 ms isActiveDelay false
+ DELAY 10 20 ms
RANDOM 0 attr1 0 10
FOR( ; ; )
FOR(loop__0 = 0; loop__0<10; loop__0 = loop__0 + 1)
@@ -105,10 +105,10 @@ TASK Application__PrimitiveComp5_0
WRITE Application__channel3_0 1
EXECI 10
EXECI 10 20
- DELAY 10 ms isActiveDelay false
+ DELAY 10 ms
EXECC 100 encryption1 ADV 100 100 0 0
EXECC 100 encryption1 ADV 100 100 0 0
- DELAY 10 20 ms isActiveDelay false
+ DELAY 10 20 ms
RANDOM 0 attr1 0 10
FOR( ; ; )
FOR(loop__0 = 0; loop__0<10; loop__0 = loop__0 + 1)
diff --git a/ttool/src/test/resources/tmltranslator/expected/expected_spec4.tml b/ttool/src/test/resources/tmltranslator/expected/expected_spec4.tml
index 0c0473efbe..3e8fcfdc8b 100644
--- a/ttool/src/test/resources/tmltranslator/expected/expected_spec4.tml
+++ b/ttool/src/test/resources/tmltranslator/expected/expected_spec4.tml
@@ -1,6 +1,6 @@
// TML Application - FORMAT 0.1
-// Application: /home/levan/Desktop/TTool/ttool/src/test/resources/ui/diagram2tml/input/CloneCompositeComponentTest.xml
-// Generated: Fri Nov 15 15:21:23 CET 2019
+// Application: /home/pham/Documents/TToolDev/TTool/ttool/src/test/resources/ui/diagram2tml/input/CloneCompositeComponentTest.xml
+// Generated: Fri Sep 27 17:19:30 CEST 2019
// Channels
CHANNEL Application__channel BRBW 4 8 OUT Application__PrimitiveComp1 IN Application__PrimitiveComp2
@@ -71,10 +71,10 @@ TASK Application__PrimitiveComp5
WRITE Application__channel3 1
EXECI 10
EXECI 10 20
- DELAY 10 ms isActiveDelay false
+ DELAY 10 ms
EXECC 100 encryption1 ADV 100 100 0 0
EXECC 100 encryption1 ADV 100 100 0 0
- DELAY 10 20 ms isActiveDelay false
+ DELAY 10 20 ms
RANDOM 0 attr1 0 10
FOR( ; ; )
FOR(loop__0 = 0; loop__0<10; loop__0 = loop__0 + 1)
diff --git a/ttool/src/test/resources/tmltranslator/expected/expected_specdelay_readwrite.tml b/ttool/src/test/resources/tmltranslator/expected/expected_specdelay_readwrite.tml
deleted file mode 100644
index 950690add3..0000000000
--- a/ttool/src/test/resources/tmltranslator/expected/expected_specdelay_readwrite.tml
+++ /dev/null
@@ -1,36 +0,0 @@
-// TML Application - FORMAT 0.1
-// Application: /home/levan/Desktop/TTool/ttool/src/test/resources/tmltranslator/simulator/delay-readwrite.xml
-// Generated: Fri Nov 15 17:28:44 CET 2019
-
-// Channels
-
-// Events
-EVENT TestCycleEvt_wait__evt__TestCycleEvt_wait__evt(int) INF TestCycleEvt_wait__C0 TestCycleEvt_wait__C1
-
-// Requests
-
-TASK TestCycleEvt_wait__C0
- TASKOP
- //Local variables
- int x = 0
- int loop__0 = 0
-
- //Behavior
- FOR(loop__0 = 0; loop__0<10; loop__0 = loop__0 + 1)
- NOTIFY TestCycleEvt_wait__evt__TestCycleEvt_wait__evt x
- x=x+1
- DELAY 1 us isActiveDelay true
- ENDFOR
-ENDTASK
-
-TASK TestCycleEvt_wait__C1
- TASKOP
- //Local variables
- int x
-
- //Behavior
- FOR( ; ; )
- WAIT TestCycleEvt_wait__evt__TestCycleEvt_wait__evt x
- ENDFOR
-ENDTASK
-
diff --git a/ttool/src/test/resources/tmltranslator/simulator/delay-idle-penalty.xml b/ttool/src/test/resources/tmltranslator/simulator/delay-idle-penalty.xml
deleted file mode 100644
index 5184af76c9..0000000000
--- a/ttool/src/test/resources/tmltranslator/simulator/delay-idle-penalty.xml
+++ /dev/null
@@ -1,488 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<TURTLEGMODELING version="1.0beta" ANIMATE_INTERACTIVE_SIMULATION="true" ACTIVATE_PENALTIES="true" UPDATE_INFORMATION_DIPLO_SIM="false" ANIMATE_WITH_INFO_DIPLO_SIM="true" OPEN_DIAG_DIPLO_SIM="false" LAST_SELECTED_MAIN_TAB="0" LAST_SELECTED_SUB_TAB="2">
-
-<Modeling type="TML Component Design" nameTab="TestCycleEvt_wait" tabs="TML Component Task Diagram$C1$C0" >
-<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="442" y="295" />
-<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="443" y="245" id="13" />
-<P2 x="626" y="264" id="2" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<COMPONENT type="1202" id="12" >
-<cdparam x="626" y="195" />
-<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="C1" />
-<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" Operation="" />
-<Attribute access="2" id="x" value="" type="0" typeOther="" />
-</extraparam>
-</COMPONENT>
-<SUBCOMPONENT type="1203" id="3" >
-<father id="12" num="0" />
-<cdparam x="613" y="264" />
-<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="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="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-
-<COMPONENT type="1202" id="23" >
-<cdparam x="243" y="158" />
-<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="C0" />
-<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" Operation="" />
-<Attribute access="2" id="x" value="0" type="0" typeOther="" />
-</extraparam>
-</COMPONENT>
-<SUBCOMPONENT type="1203" id="14" >
-<father id="23" num="0" />
-<cdparam x="430" y="245" />
-<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="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="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-
-
-</TMLComponentTaskDiagramPanel>
-
-<TMLActivityDiagramPanel name="C1" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="1030" id="26" >
-<cdparam x="426" y="119" />
-<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="24" />
-<TGConnectingPoint num="1" id="25" />
-</COMPONENT>
-
-<COMPONENT type="1001" id="28" >
-<cdparam x="513" y="301" />
-<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="27" />
-</COMPONENT>
-
-<COMPONENT type="1010" id="31" >
-<cdparam x="496" y="185" />
-<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="29" />
-<TGConnectingPoint num="1" id="30" />
-<extraparam>
-<Data eventName="evt" nbOfParams="5" />
-<Param index="0" value="x" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1000" id="33" >
-<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="32" />
-</COMPONENT>
-
-<CONNECTOR type="115" id="34" >
-<cdparam x="500" 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="520" y="210" id="30" />
-<P2 x="523" y="296" id="27" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="35" >
-<cdparam x="407" y="65" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="407" y="65" id="32" />
-<P2 x="472" y="114" id="24" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="36" >
-<cdparam x="487" 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="518" y="133" id="25" />
-<P2 x="520" y="180" id="29" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-
-</TMLActivityDiagramPanel>
-
-<TMLActivityDiagramPanel name="C0" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="1001" id="161" >
-<cdparam x="425" y="135" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="162" />
-</COMPONENT>
-
-<COMPONENT type="1020" id="155" >
-<cdparam x="384" y="92" />
-<sizeparam width="98" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<enabled value="true" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="for loop" value="10" />
-<TGConnectingPoint num="0" id="156" />
-<TGConnectingPoint num="1" id="157" />
-<TGConnectingPoint num="2" id="158" />
-</COMPONENT>
-
-<COMPONENT type="1026" id="43" >
-<cdparam x="547" y="256" />
-<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="41" />
-<TGConnectingPoint num="1" id="42" />
-</COMPONENT>
-<SUBCOMPONENT type="-1" id="40" >
-<father id="43" num="0" />
-<cdparam x="562" y="276" />
-<sizeparam width="28" 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="1 us" />
-<extraparam>
-<TimeDelay minDelay="1" maxDelay="nope" hasMaxDelay="false" isActiveDelay="false" unit="us" />
-</extraparam>
-</SUBCOMPONENT>
-
-<COMPONENT type="1001" id="45" >
-<cdparam x="562" y="325" />
-<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="44" />
-</COMPONENT>
-
-<COMPONENT type="1011" id="48" >
-<cdparam x="494" y="170" />
-<sizeparam width="66" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<enabled value="true" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="action state" value="x = x + 1" />
-<TGConnectingPoint num="0" id="46" />
-<TGConnectingPoint num="1" id="47" />
-</COMPONENT>
-
-<COMPONENT type="1008" id="51" >
-<cdparam x="488" y="122" />
-<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="49" />
-<TGConnectingPoint num="1" id="50" />
-<extraparam>
-<Data eventName="evt" nbOfParams="5" />
-<Param index="0" value="x" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1000" id="53" >
-<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="52" />
-</COMPONENT>
-
-<CONNECTOR type="115" id="54" >
-<cdparam x="532" y="197" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="510" y="147" id="50" />
-<P2 x="527" y="165" id="46" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="55" >
-<cdparam x="527" y="195" />
-<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="195" id="47" />
-<P2 x="552" y="251" id="41" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="56" >
-<cdparam x="552" y="291" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="552" y="291" id="42" />
-<P2 x="572" y="320" id="44" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="159" >
-<cdparam x="407" y="65" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="407" y="65" id="52" />
-<P2 x="433" y="87" id="156" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="160" >
-<cdparam x="484" y="101" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="482" y="106" id="157" />
-<P2 x="510" y="117" id="49" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="163" >
-<cdparam x="433" y="117" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="433" y="117" id="158" />
-<P2 x="435" y="130" id="162" />
-<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="0" masterClockFrequency="200" >
-<COMPONENT type="1100" id="101" >
-<cdparam x="180" y="83" />
-<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="CPU0" value="name" />
-<TGConnectingPoint num="0" id="77" />
-<TGConnectingPoint num="1" id="78" />
-<TGConnectingPoint num="2" id="79" />
-<TGConnectingPoint num="3" id="80" />
-<TGConnectingPoint num="4" id="81" />
-<TGConnectingPoint num="5" id="82" />
-<TGConnectingPoint num="6" id="83" />
-<TGConnectingPoint num="7" id="84" />
-<TGConnectingPoint num="8" id="85" />
-<TGConnectingPoint num="9" id="86" />
-<TGConnectingPoint num="10" id="87" />
-<TGConnectingPoint num="11" id="88" />
-<TGConnectingPoint num="12" id="89" />
-<TGConnectingPoint num="13" id="90" />
-<TGConnectingPoint num="14" id="91" />
-<TGConnectingPoint num="15" id="92" />
-<TGConnectingPoint num="16" id="93" />
-<TGConnectingPoint num="17" id="94" />
-<TGConnectingPoint num="18" id="95" />
-<TGConnectingPoint num="19" id="96" />
-<TGConnectingPoint num="20" id="97" />
-<TGConnectingPoint num="21" id="98" />
-<TGConnectingPoint num="22" id="99" />
-<TGConnectingPoint num="23" id="100" />
-<extraparam>
-<info stereotype="CPURR" nodeName="CPU0" />
-<attributes nbOfCores="1" byteDataSize="4" schedulingPolicy="0" sliceTime="1" 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="67" >
-<father id="101" num="0" />
-<cdparam x="222" y="143" />
-<sizeparam width="168" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="82" minY="0" maxY="160" />
-<infoparam name="TGComponent" value="TestCycleEvt_wait::C0" />
-<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="TestCycleEvt_wait::C0" taskName="C0" referenceTaskName="TestCycleEvt_wait" priority="1" operationMEC="C0" fatherComponentMECType="0" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1101" id="76" >
-<father id="101" num="1" />
-<cdparam x="220" y="208" />
-<sizeparam width="168" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="82" minY="0" maxY="160" />
-<infoparam name="TGComponent" value="TestCycleEvt_wait::C1" />
-<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" />
-<extraparam>
-<info value="TestCycleEvt_wait::C1" taskName="C1" referenceTaskName="TestCycleEvt_wait" priority="9" operationMEC="C1" fatherComponentMECType="0" />
-</extraparam>
-</SUBCOMPONENT>
-
-<COMPONENT type="1102" id="126" >
-<cdparam x="496" y="341" />
-<sizeparam width="250" height="50" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="Bus0" value="name" />
-<TGConnectingPoint num="0" id="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="Bus" nodeName="Bus0" />
-<attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" clockRatio="1" privacy="0" referenceAttack="null" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1105" id="151" >
-<cdparam x="749" y="86" />
-<sizeparam width="200" height="200" minWidth="100" minHeight="35" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="Memory0" value="name" />
-<TGConnectingPoint num="0" id="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" />
-<TGConnectingPoint num="8" id="135" />
-<TGConnectingPoint num="9" id="136" />
-<TGConnectingPoint num="10" id="137" />
-<TGConnectingPoint num="11" id="138" />
-<TGConnectingPoint num="12" id="139" />
-<TGConnectingPoint num="13" id="140" />
-<TGConnectingPoint num="14" id="141" />
-<TGConnectingPoint num="15" id="142" />
-<TGConnectingPoint num="16" id="143" />
-<TGConnectingPoint num="17" id="144" />
-<TGConnectingPoint num="18" id="145" />
-<TGConnectingPoint num="19" id="146" />
-<TGConnectingPoint num="20" id="147" />
-<TGConnectingPoint num="21" id="148" />
-<TGConnectingPoint num="22" id="149" />
-<TGConnectingPoint num="23" id="150" />
-<extraparam>
-<info stereotype="MEMORY" nodeName="Memory0" />
-<attributes byteDataSize="4" memorySize="1024" clockRatio="1" bufferType="0" />
-</extraparam>
-</COMPONENT>
-
-<CONNECTOR type="125" id="152" >
-<cdparam x="430" y="233" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="{info}" />
-<P1 x="430" y="233" id="90" />
-<P2 x="558" y="341" id="110" />
-<AutomaticDrawing data="true" />
-<extraparam>
-<info priority="0" />
-<spy value="false" />
-</extraparam>
-</CONNECTOR>
-<CONNECTOR type="125" id="153" >
-<cdparam x="799" y="286" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="{info}" />
-<P1 x="799" y="286" id="141" />
-<P2 x="683" y="341" id="111" />
-<AutomaticDrawing data="true" />
-<extraparam>
-<info priority="0" />
-<spy value="false" />
-</extraparam>
-</CONNECTOR>
-
-</TMLArchiDiagramPanel>
-
-</Modeling>
-
-
-
-
-</TURTLEGMODELING>
\ No newline at end of file
diff --git a/ttool/src/test/resources/tmltranslator/simulator/delay-idle.xml b/ttool/src/test/resources/tmltranslator/simulator/delay-idle.xml
deleted file mode 100644
index 7c4f682100..0000000000
--- a/ttool/src/test/resources/tmltranslator/simulator/delay-idle.xml
+++ /dev/null
@@ -1,488 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<TURTLEGMODELING version="1.0beta" ANIMATE_INTERACTIVE_SIMULATION="true" ACTIVATE_PENALTIES="true" 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="TestCycleEvt_wait" tabs="TML Component Task Diagram$C1$C0" >
-<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="442" y="295" />
-<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="443" y="245" id="13" />
-<P2 x="626" y="264" id="2" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<COMPONENT type="1202" id="12" >
-<cdparam x="626" y="195" />
-<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="C1" />
-<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" Operation="" />
-<Attribute access="2" id="x" value="" type="0" typeOther="" />
-</extraparam>
-</COMPONENT>
-<SUBCOMPONENT type="1203" id="3" >
-<father id="12" num="0" />
-<cdparam x="613" y="264" />
-<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="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="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-
-<COMPONENT type="1202" id="23" >
-<cdparam x="243" y="158" />
-<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="C0" />
-<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" Operation="" />
-<Attribute access="2" id="x" value="0" type="0" typeOther="" />
-</extraparam>
-</COMPONENT>
-<SUBCOMPONENT type="1203" id="14" >
-<father id="23" num="0" />
-<cdparam x="430" y="245" />
-<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="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="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-
-
-</TMLComponentTaskDiagramPanel>
-
-<TMLActivityDiagramPanel name="C1" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="1030" id="26" >
-<cdparam x="426" y="119" />
-<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="24" />
-<TGConnectingPoint num="1" id="25" />
-</COMPONENT>
-
-<COMPONENT type="1001" id="28" >
-<cdparam x="513" y="301" />
-<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="27" />
-</COMPONENT>
-
-<COMPONENT type="1010" id="31" >
-<cdparam x="496" y="185" />
-<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="29" />
-<TGConnectingPoint num="1" id="30" />
-<extraparam>
-<Data eventName="evt" nbOfParams="5" />
-<Param index="0" value="x" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1000" id="33" >
-<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="32" />
-</COMPONENT>
-
-<CONNECTOR type="115" id="34" >
-<cdparam x="500" 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="520" y="210" id="30" />
-<P2 x="523" y="296" id="27" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="35" >
-<cdparam x="407" y="65" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="407" y="65" id="32" />
-<P2 x="472" y="114" id="24" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="36" >
-<cdparam x="487" 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="518" y="133" id="25" />
-<P2 x="520" y="180" id="29" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-
-</TMLActivityDiagramPanel>
-
-<TMLActivityDiagramPanel name="C0" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="1026" id="40" >
-<cdparam x="547" y="256" />
-<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="38" />
-<TGConnectingPoint num="1" id="39" />
-</COMPONENT>
-<SUBCOMPONENT type="-1" id="37" >
-<father id="40" num="0" />
-<cdparam x="562" y="276" />
-<sizeparam width="28" 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="1 us" />
-<extraparam>
-<TimeDelay minDelay="1" maxDelay="nope" hasMaxDelay="false" isActiveDelay="false" unit="us" />
-</extraparam>
-</SUBCOMPONENT>
-
-<COMPONENT type="1001" id="42" >
-<cdparam x="444" y="130" />
-<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="41" />
-</COMPONENT>
-
-<COMPONENT type="1020" id="46" >
-<cdparam x="400" y="89" />
-<sizeparam width="98" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<enabled value="true" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="for loop" value="10" />
-<TGConnectingPoint num="0" id="43" />
-<TGConnectingPoint num="1" id="44" />
-<TGConnectingPoint num="2" id="45" />
-</COMPONENT>
-
-<COMPONENT type="1001" id="48" >
-<cdparam x="562" y="325" />
-<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="47" />
-</COMPONENT>
-
-<COMPONENT type="1011" id="51" >
-<cdparam x="494" y="170" />
-<sizeparam width="66" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<enabled value="true" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="action state" value="x = x + 1" />
-<TGConnectingPoint num="0" id="49" />
-<TGConnectingPoint num="1" id="50" />
-</COMPONENT>
-
-<COMPONENT type="1008" id="54" >
-<cdparam x="488" y="122" />
-<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="52" />
-<TGConnectingPoint num="1" id="53" />
-<extraparam>
-<Data eventName="evt" nbOfParams="5" />
-<Param index="0" value="x" />
-</extraparam>
-</COMPONENT>
-
-<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="532" y="197" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="510" y="147" id="53" />
-<P2 x="527" y="165" id="49" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="58" >
-<cdparam x="407" y="65" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="407" y="65" id="55" />
-<P2 x="449" y="84" id="43" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="59" >
-<cdparam x="459" y="113" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="498" y="103" id="44" />
-<P2 x="510" y="117" id="52" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="60" >
-<cdparam x="449" y="114" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="449" y="114" id="45" />
-<P2 x="454" y="125" id="41" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="61" >
-<cdparam x="527" y="195" />
-<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="195" id="50" />
-<P2 x="552" y="251" id="38" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="62" >
-<cdparam x="552" y="291" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="552" y="291" id="39" />
-<P2 x="572" y="320" id="47" />
-<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="0" masterClockFrequency="200" >
-<COMPONENT type="1100" id="105" >
-<cdparam x="180" y="83" />
-<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="CPU0" value="name" />
-<TGConnectingPoint num="0" id="81" />
-<TGConnectingPoint num="1" id="82" />
-<TGConnectingPoint num="2" id="83" />
-<TGConnectingPoint num="3" id="84" />
-<TGConnectingPoint num="4" id="85" />
-<TGConnectingPoint num="5" id="86" />
-<TGConnectingPoint num="6" id="87" />
-<TGConnectingPoint num="7" id="88" />
-<TGConnectingPoint num="8" id="89" />
-<TGConnectingPoint num="9" id="90" />
-<TGConnectingPoint num="10" id="91" />
-<TGConnectingPoint num="11" id="92" />
-<TGConnectingPoint num="12" id="93" />
-<TGConnectingPoint num="13" id="94" />
-<TGConnectingPoint num="14" id="95" />
-<TGConnectingPoint num="15" id="96" />
-<TGConnectingPoint num="16" id="97" />
-<TGConnectingPoint num="17" id="98" />
-<TGConnectingPoint num="18" id="99" />
-<TGConnectingPoint num="19" id="100" />
-<TGConnectingPoint num="20" id="101" />
-<TGConnectingPoint num="21" id="102" />
-<TGConnectingPoint num="22" id="103" />
-<TGConnectingPoint num="23" id="104" />
-<extraparam>
-<info stereotype="CPURR" nodeName="CPU0" />
-<attributes nbOfCores="1" byteDataSize="4" schedulingPolicy="0" sliceTime="1" 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="71" >
-<father id="105" num="0" />
-<cdparam x="220" y="208" />
-<sizeparam width="168" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="82" minY="0" maxY="160" />
-<infoparam name="TGComponent" value="TestCycleEvt_wait::C1" />
-<TGConnectingPoint num="0" id="63" />
-<TGConnectingPoint num="1" id="64" />
-<TGConnectingPoint num="2" id="65" />
-<TGConnectingPoint num="3" id="66" />
-<TGConnectingPoint num="4" id="67" />
-<TGConnectingPoint num="5" id="68" />
-<TGConnectingPoint num="6" id="69" />
-<TGConnectingPoint num="7" id="70" />
-<extraparam>
-<info value="TestCycleEvt_wait::C1" taskName="C1" referenceTaskName="TestCycleEvt_wait" priority="9" operationMEC="C1" fatherComponentMECType="0" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1101" id="80" >
-<father id="105" num="1" />
-<cdparam x="222" y="143" />
-<sizeparam width="168" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="82" minY="0" maxY="160" />
-<infoparam name="TGComponent" value="TestCycleEvt_wait::C0" />
-<TGConnectingPoint num="0" id="72" />
-<TGConnectingPoint num="1" id="73" />
-<TGConnectingPoint num="2" id="74" />
-<TGConnectingPoint num="3" id="75" />
-<TGConnectingPoint num="4" id="76" />
-<TGConnectingPoint num="5" id="77" />
-<TGConnectingPoint num="6" id="78" />
-<TGConnectingPoint num="7" id="79" />
-<extraparam>
-<info value="TestCycleEvt_wait::C0" taskName="C0" referenceTaskName="TestCycleEvt_wait" priority="1" operationMEC="C0" fatherComponentMECType="0" />
-</extraparam>
-</SUBCOMPONENT>
-
-<COMPONENT type="1102" id="130" >
-<cdparam x="496" y="341" />
-<sizeparam width="250" height="50" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="Bus0" value="name" />
-<TGConnectingPoint num="0" id="106" />
-<TGConnectingPoint num="1" id="107" />
-<TGConnectingPoint num="2" id="108" />
-<TGConnectingPoint num="3" id="109" />
-<TGConnectingPoint num="4" id="110" />
-<TGConnectingPoint num="5" id="111" />
-<TGConnectingPoint num="6" id="112" />
-<TGConnectingPoint num="7" id="113" />
-<TGConnectingPoint num="8" id="114" />
-<TGConnectingPoint num="9" id="115" />
-<TGConnectingPoint num="10" id="116" />
-<TGConnectingPoint num="11" id="117" />
-<TGConnectingPoint num="12" id="118" />
-<TGConnectingPoint num="13" id="119" />
-<TGConnectingPoint num="14" id="120" />
-<TGConnectingPoint num="15" id="121" />
-<TGConnectingPoint num="16" id="122" />
-<TGConnectingPoint num="17" id="123" />
-<TGConnectingPoint num="18" id="124" />
-<TGConnectingPoint num="19" id="125" />
-<TGConnectingPoint num="20" id="126" />
-<TGConnectingPoint num="21" id="127" />
-<TGConnectingPoint num="22" id="128" />
-<TGConnectingPoint num="23" id="129" />
-<extraparam>
-<info stereotype="Bus" nodeName="Bus0" />
-<attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" clockRatio="1" privacy="0" referenceAttack="null" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1105" id="155" >
-<cdparam x="749" y="86" />
-<sizeparam width="200" height="200" minWidth="100" minHeight="35" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="Memory0" value="name" />
-<TGConnectingPoint num="0" id="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="MEMORY" nodeName="Memory0" />
-<attributes byteDataSize="4" memorySize="1024" clockRatio="1" bufferType="0" />
-</extraparam>
-</COMPONENT>
-
-<CONNECTOR type="125" id="156" >
-<cdparam x="430" y="233" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="{info}" />
-<P1 x="430" y="233" id="94" />
-<P2 x="558" y="341" id="114" />
-<AutomaticDrawing data="true" />
-<extraparam>
-<info priority="0" />
-<spy value="false" />
-</extraparam>
-</CONNECTOR>
-<CONNECTOR type="125" id="157" >
-<cdparam x="799" y="286" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="{info}" />
-<P1 x="799" y="286" id="145" />
-<P2 x="683" y="341" id="115" />
-<AutomaticDrawing data="true" />
-<extraparam>
-<info priority="0" />
-<spy value="false" />
-</extraparam>
-</CONNECTOR>
-
-</TMLArchiDiagramPanel>
-
-</Modeling>
-
-
-
-
-</TURTLEGMODELING>
\ No newline at end of file
diff --git a/ttool/src/test/resources/tmltranslator/simulator/delay-readwrite.xml b/ttool/src/test/resources/tmltranslator/simulator/delay-readwrite.xml
deleted file mode 100644
index 0215ca3de3..0000000000
--- a/ttool/src/test/resources/tmltranslator/simulator/delay-readwrite.xml
+++ /dev/null
@@ -1,488 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<TURTLEGMODELING version="1.0beta" ANIMATE_INTERACTIVE_SIMULATION="true" ACTIVATE_PENALTIES="true" 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="TestCycleEvt_wait" tabs="TML Component Task Diagram$C1$C0" >
-<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="442" y="295" />
-<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="456" y="258" id="13" />
-<P2 x="613" y="277" id="2" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<COMPONENT type="1202" id="12" >
-<cdparam x="626" y="195" />
-<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="C1" />
-<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" Operation="" />
-<Attribute access="2" id="x" value="" type="0" typeOther="" />
-</extraparam>
-</COMPONENT>
-<SUBCOMPONENT type="1203" id="3" >
-<father id="12" num="0" />
-<cdparam x="613" y="264" />
-<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="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="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-
-<COMPONENT type="1202" id="23" >
-<cdparam x="243" y="158" />
-<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="C0" />
-<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" Operation="" />
-<Attribute access="2" id="x" value="0" type="0" typeOther="" />
-</extraparam>
-</COMPONENT>
-<SUBCOMPONENT type="1203" id="14" >
-<father id="23" num="0" />
-<cdparam x="430" y="245" />
-<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="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="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-
-
-</TMLComponentTaskDiagramPanel>
-
-<TMLActivityDiagramPanel name="C1" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="1030" id="26" >
-<cdparam x="426" y="119" />
-<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="24" />
-<TGConnectingPoint num="1" id="25" />
-</COMPONENT>
-
-<COMPONENT type="1001" id="28" >
-<cdparam x="513" y="301" />
-<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="27" />
-</COMPONENT>
-
-<COMPONENT type="1010" id="31" >
-<cdparam x="496" y="185" />
-<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="29" />
-<TGConnectingPoint num="1" id="30" />
-<extraparam>
-<Data eventName="evt" nbOfParams="5" />
-<Param index="0" value="x" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1000" id="33" >
-<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="32" />
-</COMPONENT>
-
-<CONNECTOR type="115" id="34" >
-<cdparam x="500" 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="520" y="210" id="30" />
-<P2 x="523" y="296" id="27" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="35" >
-<cdparam x="407" y="65" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="407" y="65" id="32" />
-<P2 x="472" y="114" id="24" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="36" >
-<cdparam x="487" 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="518" y="133" id="25" />
-<P2 x="520" y="180" id="29" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-
-</TMLActivityDiagramPanel>
-
-<TMLActivityDiagramPanel name="C0" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="1026" id="40" >
-<cdparam x="547" y="256" />
-<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="38" />
-<TGConnectingPoint num="1" id="39" />
-</COMPONENT>
-<SUBCOMPONENT type="-1" id="37" >
-<father id="40" num="0" />
-<cdparam x="562" y="276" />
-<sizeparam width="28" 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="1 us" />
-<extraparam>
-<TimeDelay minDelay="1" maxDelay="nope" hasMaxDelay="false" isActiveDelay="true" unit="us" />
-</extraparam>
-</SUBCOMPONENT>
-
-<COMPONENT type="1001" id="42" >
-<cdparam x="444" y="130" />
-<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="41" />
-</COMPONENT>
-
-<COMPONENT type="1020" id="46" >
-<cdparam x="400" y="89" />
-<sizeparam width="98" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<enabled value="true" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="for loop" value="10" />
-<TGConnectingPoint num="0" id="43" />
-<TGConnectingPoint num="1" id="44" />
-<TGConnectingPoint num="2" id="45" />
-</COMPONENT>
-
-<COMPONENT type="1001" id="48" >
-<cdparam x="562" y="325" />
-<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="47" />
-</COMPONENT>
-
-<COMPONENT type="1011" id="51" >
-<cdparam x="494" y="170" />
-<sizeparam width="66" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<enabled value="true" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="action state" value="x = x + 1" />
-<TGConnectingPoint num="0" id="49" />
-<TGConnectingPoint num="1" id="50" />
-</COMPONENT>
-
-<COMPONENT type="1008" id="54" >
-<cdparam x="488" y="122" />
-<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="52" />
-<TGConnectingPoint num="1" id="53" />
-<extraparam>
-<Data eventName="evt" nbOfParams="5" />
-<Param index="0" value="x" />
-</extraparam>
-</COMPONENT>
-
-<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="532" y="197" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="510" y="147" id="53" />
-<P2 x="527" y="165" id="49" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="58" >
-<cdparam x="407" y="65" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="407" y="65" id="55" />
-<P2 x="449" y="84" id="43" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="59" >
-<cdparam x="459" y="113" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="498" y="103" id="44" />
-<P2 x="510" y="117" id="52" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="60" >
-<cdparam x="449" y="114" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="449" y="114" id="45" />
-<P2 x="454" y="125" id="41" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="61" >
-<cdparam x="527" y="195" />
-<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="195" id="50" />
-<P2 x="552" y="251" id="38" />
-<AutomaticDrawing data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="62" >
-<cdparam x="552" y="291" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1 x="552" y="291" id="39" />
-<P2 x="572" y="320" id="47" />
-<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="0" masterClockFrequency="200" >
-<COMPONENT type="1100" id="105" >
-<cdparam x="180" y="83" />
-<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="CPU0" value="name" />
-<TGConnectingPoint num="0" id="81" />
-<TGConnectingPoint num="1" id="82" />
-<TGConnectingPoint num="2" id="83" />
-<TGConnectingPoint num="3" id="84" />
-<TGConnectingPoint num="4" id="85" />
-<TGConnectingPoint num="5" id="86" />
-<TGConnectingPoint num="6" id="87" />
-<TGConnectingPoint num="7" id="88" />
-<TGConnectingPoint num="8" id="89" />
-<TGConnectingPoint num="9" id="90" />
-<TGConnectingPoint num="10" id="91" />
-<TGConnectingPoint num="11" id="92" />
-<TGConnectingPoint num="12" id="93" />
-<TGConnectingPoint num="13" id="94" />
-<TGConnectingPoint num="14" id="95" />
-<TGConnectingPoint num="15" id="96" />
-<TGConnectingPoint num="16" id="97" />
-<TGConnectingPoint num="17" id="98" />
-<TGConnectingPoint num="18" id="99" />
-<TGConnectingPoint num="19" id="100" />
-<TGConnectingPoint num="20" id="101" />
-<TGConnectingPoint num="21" id="102" />
-<TGConnectingPoint num="22" id="103" />
-<TGConnectingPoint num="23" id="104" />
-<extraparam>
-<info stereotype="CPURR" nodeName="CPU0" />
-<attributes nbOfCores="1" byteDataSize="4" schedulingPolicy="0" sliceTime="1" 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="71" >
-<father id="105" num="0" />
-<cdparam x="222" y="143" />
-<sizeparam width="168" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="82" minY="0" maxY="160" />
-<infoparam name="TGComponent" value="TestCycleEvt_wait::C0" />
-<TGConnectingPoint num="0" id="63" />
-<TGConnectingPoint num="1" id="64" />
-<TGConnectingPoint num="2" id="65" />
-<TGConnectingPoint num="3" id="66" />
-<TGConnectingPoint num="4" id="67" />
-<TGConnectingPoint num="5" id="68" />
-<TGConnectingPoint num="6" id="69" />
-<TGConnectingPoint num="7" id="70" />
-<extraparam>
-<info value="TestCycleEvt_wait::C0" taskName="C0" referenceTaskName="TestCycleEvt_wait" priority="1" operationMEC="C0" fatherComponentMECType="0" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1101" id="80" >
-<father id="105" num="1" />
-<cdparam x="220" y="208" />
-<sizeparam width="168" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="82" minY="0" maxY="160" />
-<infoparam name="TGComponent" value="TestCycleEvt_wait::C1" />
-<TGConnectingPoint num="0" id="72" />
-<TGConnectingPoint num="1" id="73" />
-<TGConnectingPoint num="2" id="74" />
-<TGConnectingPoint num="3" id="75" />
-<TGConnectingPoint num="4" id="76" />
-<TGConnectingPoint num="5" id="77" />
-<TGConnectingPoint num="6" id="78" />
-<TGConnectingPoint num="7" id="79" />
-<extraparam>
-<info value="TestCycleEvt_wait::C1" taskName="C1" referenceTaskName="TestCycleEvt_wait" priority="9" operationMEC="C1" fatherComponentMECType="0" />
-</extraparam>
-</SUBCOMPONENT>
-
-<COMPONENT type="1102" id="130" >
-<cdparam x="496" y="341" />
-<sizeparam width="250" height="50" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="Bus0" value="name" />
-<TGConnectingPoint num="0" id="106" />
-<TGConnectingPoint num="1" id="107" />
-<TGConnectingPoint num="2" id="108" />
-<TGConnectingPoint num="3" id="109" />
-<TGConnectingPoint num="4" id="110" />
-<TGConnectingPoint num="5" id="111" />
-<TGConnectingPoint num="6" id="112" />
-<TGConnectingPoint num="7" id="113" />
-<TGConnectingPoint num="8" id="114" />
-<TGConnectingPoint num="9" id="115" />
-<TGConnectingPoint num="10" id="116" />
-<TGConnectingPoint num="11" id="117" />
-<TGConnectingPoint num="12" id="118" />
-<TGConnectingPoint num="13" id="119" />
-<TGConnectingPoint num="14" id="120" />
-<TGConnectingPoint num="15" id="121" />
-<TGConnectingPoint num="16" id="122" />
-<TGConnectingPoint num="17" id="123" />
-<TGConnectingPoint num="18" id="124" />
-<TGConnectingPoint num="19" id="125" />
-<TGConnectingPoint num="20" id="126" />
-<TGConnectingPoint num="21" id="127" />
-<TGConnectingPoint num="22" id="128" />
-<TGConnectingPoint num="23" id="129" />
-<extraparam>
-<info stereotype="Bus" nodeName="Bus0" />
-<attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" clockRatio="1" privacy="0" referenceAttack="null" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1105" id="155" >
-<cdparam x="749" y="86" />
-<sizeparam width="200" height="200" minWidth="100" minHeight="35" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="Memory0" value="name" />
-<TGConnectingPoint num="0" id="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="MEMORY" nodeName="Memory0" />
-<attributes byteDataSize="4" memorySize="1024" clockRatio="1" bufferType="0" />
-</extraparam>
-</COMPONENT>
-
-<CONNECTOR type="125" id="156" >
-<cdparam x="430" y="233" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="{info}" />
-<P1 x="430" y="233" id="94" />
-<P2 x="558" y="341" id="114" />
-<AutomaticDrawing data="true" />
-<extraparam>
-<info priority="0" />
-<spy value="false" />
-</extraparam>
-</CONNECTOR>
-<CONNECTOR type="125" id="157" >
-<cdparam x="799" y="286" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="{info}" />
-<P1 x="799" y="286" id="145" />
-<P2 x="683" y="341" id="115" />
-<AutomaticDrawing data="true" />
-<extraparam>
-<info priority="0" />
-<spy value="false" />
-</extraparam>
-</CONNECTOR>
-
-</TMLArchiDiagramPanel>
-
-</Modeling>
-
-
-
-
-</TURTLEGMODELING>
\ No newline at end of file
diff --git a/ttool/src/test/resources/tmltranslator/simulator/delayRW.tarchi b/ttool/src/test/resources/tmltranslator/simulator/delayRW.tarchi
deleted file mode 100644
index 51eb42743e..0000000000
--- a/ttool/src/test/resources/tmltranslator/simulator/delayRW.tarchi
+++ /dev/null
@@ -1,36 +0,0 @@
-// Master clock frequency - in MHz
-MASTERCLOCKFREQUENCY 200
-
-NODE CPU CPU0
-SET CPU0 nbOfCores 1
-SET CPU0 byteDataSize 4
-SET CPU0 pipelineSize 5
-SET CPU0 goIdleTime 10
-SET CPU0 maxConsecutiveIdleCycles 10
-SET CPU0 taskSwitchingTime 20
-SET CPU0 branchingPredictionPenalty 2
-SET CPU0 cacheMiss 5
-SET CPU0 schedulingPolicy 0
-SET CPU0 sliceTime 1
-SET CPU0 execiTime 1
-SET CPU0 execcTime 1
-SET CPU0 clockDivider 1
-
-NODE BUS Bus0
-SET Bus0 byteDataSize 4
-SET Bus0 pipelineSize 1
-SET Bus0 arbitration 0
-SET Bus0 clockDivider 1
-
-NODE MEMORY Memory0
-SET Memory0 byteDataSize 4
-SET Memory0 clockDivider 1
-
-NODE LINK link_CPU0_to_Bus0
-SET link_CPU0_to_Bus0 node CPU0
-SET link_CPU0_to_Bus0 bus Bus0
-SET link_CPU0_to_Bus0 priority 0
-NODE LINK link_Memory0_to_Bus0
-SET link_Memory0_to_Bus0 node Memory0
-SET link_Memory0_to_Bus0 bus Bus0
-SET link_Memory0_to_Bus0 priority 0
diff --git a/ttool/src/test/resources/tmltranslator/simulator/delayRW.tmap b/ttool/src/test/resources/tmltranslator/simulator/delayRW.tmap
deleted file mode 100644
index 27669b92d5..0000000000
--- a/ttool/src/test/resources/tmltranslator/simulator/delayRW.tmap
+++ /dev/null
@@ -1,14 +0,0 @@
-TMLSPEC
- #include "delayRW.tml"
-ENDTMLSPEC
-
-TMLARCHI
- #include "delayRW.tarchi"
-ENDTMLARCHI
-
-TMLMAPPING
- MAP CPU0 TestCycleEvt_wait__C0
- SET TestCycleEvt_wait__C0 priority 1
- MAP CPU0 TestCycleEvt_wait__C1
- SET TestCycleEvt_wait__C1 priority 9
-ENDTMLMAPPING
diff --git a/ttool/src/test/resources/tmltranslator/simulator/delayRW.tml b/ttool/src/test/resources/tmltranslator/simulator/delayRW.tml
deleted file mode 100644
index 950690add3..0000000000
--- a/ttool/src/test/resources/tmltranslator/simulator/delayRW.tml
+++ /dev/null
@@ -1,36 +0,0 @@
-// TML Application - FORMAT 0.1
-// Application: /home/levan/Desktop/TTool/ttool/src/test/resources/tmltranslator/simulator/delay-readwrite.xml
-// Generated: Fri Nov 15 17:28:44 CET 2019
-
-// Channels
-
-// Events
-EVENT TestCycleEvt_wait__evt__TestCycleEvt_wait__evt(int) INF TestCycleEvt_wait__C0 TestCycleEvt_wait__C1
-
-// Requests
-
-TASK TestCycleEvt_wait__C0
- TASKOP
- //Local variables
- int x = 0
- int loop__0 = 0
-
- //Behavior
- FOR(loop__0 = 0; loop__0<10; loop__0 = loop__0 + 1)
- NOTIFY TestCycleEvt_wait__evt__TestCycleEvt_wait__evt x
- x=x+1
- DELAY 1 us isActiveDelay true
- ENDFOR
-ENDTASK
-
-TASK TestCycleEvt_wait__C1
- TASKOP
- //Local variables
- int x
-
- //Behavior
- FOR( ; ; )
- WAIT TestCycleEvt_wait__evt__TestCycleEvt_wait__evt x
- ENDFOR
-ENDTASK
-
diff --git a/ttool/src/test/resources/tmltranslator/simulator/fpgaTest-penalty.xml b/ttool/src/test/resources/tmltranslator/simulator/fpgaTest-penalty.xml
index b8073b9425..eea3dd1bab 100644
--- a/ttool/src/test/resources/tmltranslator/simulator/fpgaTest-penalty.xml
+++ b/ttool/src/test/resources/tmltranslator/simulator/fpgaTest-penalty.xml
@@ -1,6 +1,6 @@
<?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="0" LAST_SELECTED_SUB_TAB="2">
+<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="TestCycleEvt_wait" tabs="TML Component Task Diagram$C1$C0" >
<TMLComponentTaskDiagramPanel name="TML Component Task Diagram" minX="10" maxX="2500" minY="10" maxY="1500" channels="true" events="true" requests="true" zoom="1.0" >
@@ -8,8 +8,8 @@
<cdparam x="442" y="295" />
<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="443" y="245" id="13" />
-<P2 x="626" y="264" id="2" />
+<P1 x="456" y="258" id="13" />
+<P2 x="613" y="277" id="2" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<COMPONENT type="1202" id="12" >
@@ -172,12 +172,12 @@
</COMPONENT>
<COMPONENT type="1020" id="42" >
-<cdparam x="378" y="98" />
-<sizeparam width="98" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="374" y="98" />
+<sizeparam width="106" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="for loop" value="10" />
+<infoparam name="for loop" value="100" />
<TGConnectingPoint num="0" id="39" />
<TGConnectingPoint num="1" id="40" />
<TGConnectingPoint num="2" id="41" />
@@ -201,7 +201,7 @@
<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
<infoparam name="value of the delay" value="1 us" />
<extraparam>
-<TimeDelay minDelay="1" maxDelay="nope" hasMaxDelay="false" isActiveDelay="true" unit="us" />
+<TimeDelay minDelay="1" maxDelay="nope" hasMaxDelay="false" unit="us" />
</extraparam>
</SUBCOMPONENT>
@@ -285,7 +285,7 @@
<cdparam x="476" y="99" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="476" y="112" id="40" />
+<P1 x="480" y="112" id="40" />
<P2 x="510" y="117" id="52" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -307,146 +307,158 @@
<Modeling type="TML Architecture" nameTab="Architecture" >
<TMLArchiDiagramPanel name="DIPLODOCUS architecture and mapping Diagram" minX="10" maxX="2500" minY="10" maxY="1500" attributes="0" masterClockFrequency="200" >
-<COMPONENT type="1116" id="105" >
+<CONNECTOR type="125" id="184" >
+<cdparam x="417" y="431" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="{info}" />
+<P1 x="417" y="431" id="171" />
+<P2 x="558" y="391" id="77" />
+<AutomaticDrawing data="true" />
+<extraparam>
+<info priority="0" />
+<spy value="false" />
+</extraparam>
+</CONNECTOR>
+<COMPONENT type="1116" id="159" >
<cdparam x="167" y="381" />
<sizeparam width="250" height="200" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="FPGA0" value="name" />
-<TGConnectingPoint num="0" id="81" />
-<TGConnectingPoint num="1" id="82" />
-<TGConnectingPoint num="2" id="83" />
-<TGConnectingPoint num="3" id="84" />
-<TGConnectingPoint num="4" id="85" />
-<TGConnectingPoint num="5" id="86" />
-<TGConnectingPoint num="6" id="87" />
-<TGConnectingPoint num="7" id="88" />
-<TGConnectingPoint num="8" id="89" />
-<TGConnectingPoint num="9" id="90" />
-<TGConnectingPoint num="10" id="91" />
-<TGConnectingPoint num="11" id="92" />
-<TGConnectingPoint num="12" id="93" />
-<TGConnectingPoint num="13" id="94" />
-<TGConnectingPoint num="14" id="95" />
-<TGConnectingPoint num="15" id="96" />
-<TGConnectingPoint num="16" id="97" />
-<TGConnectingPoint num="17" id="98" />
-<TGConnectingPoint num="18" id="99" />
-<TGConnectingPoint num="19" id="100" />
-<TGConnectingPoint num="20" id="101" />
-<TGConnectingPoint num="21" id="102" />
-<TGConnectingPoint num="22" id="103" />
-<TGConnectingPoint num="23" id="104" />
+<TGConnectingPoint num="0" id="160" />
+<TGConnectingPoint num="1" id="161" />
+<TGConnectingPoint num="2" id="162" />
+<TGConnectingPoint num="3" id="163" />
+<TGConnectingPoint num="4" id="164" />
+<TGConnectingPoint num="5" id="165" />
+<TGConnectingPoint num="6" id="166" />
+<TGConnectingPoint num="7" id="167" />
+<TGConnectingPoint num="8" id="168" />
+<TGConnectingPoint num="9" id="169" />
+<TGConnectingPoint num="10" id="170" />
+<TGConnectingPoint num="11" id="171" />
+<TGConnectingPoint num="12" id="172" />
+<TGConnectingPoint num="13" id="173" />
+<TGConnectingPoint num="14" id="174" />
+<TGConnectingPoint num="15" id="175" />
+<TGConnectingPoint num="16" id="176" />
+<TGConnectingPoint num="17" id="177" />
+<TGConnectingPoint num="18" id="178" />
+<TGConnectingPoint num="19" id="179" />
+<TGConnectingPoint num="20" id="180" />
+<TGConnectingPoint num="21" id="181" />
+<TGConnectingPoint num="22" id="182" />
+<TGConnectingPoint num="23" id="183" />
<extraparam>
<info stereotype="FPGA" nodeName="FPGA0" />
<attributes capacity="100" byteDataSize="4" mappingPenalty="0" reconfigurationTime="50" goIdleTime="10" maxConsecutiveIdleCycles="10" execiTime="1" execcTime="1" clockRatio="1" operation ="" scheduling ="" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1101" id="71" >
-<father id="105" num="0" />
+<SUBCOMPONENT type="1101" id="130" >
+<father id="159" num="0" />
<cdparam x="206" y="489" />
<sizeparam width="168" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="82" minY="0" maxY="160" />
<infoparam name="TGComponent" value="TestCycleEvt_wait::C1" />
-<TGConnectingPoint num="0" id="63" />
-<TGConnectingPoint num="1" id="64" />
-<TGConnectingPoint num="2" id="65" />
-<TGConnectingPoint num="3" id="66" />
-<TGConnectingPoint num="4" id="67" />
-<TGConnectingPoint num="5" id="68" />
-<TGConnectingPoint num="6" id="69" />
-<TGConnectingPoint num="7" id="70" />
+<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="TestCycleEvt_wait::C1" taskName="C1" referenceTaskName="TestCycleEvt_wait" priority="0" operationMEC="C1" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1101" id="80" >
-<father id="105" num="1" />
+<SUBCOMPONENT type="1101" id="121" >
+<father id="159" num="1" />
<cdparam x="203" y="424" />
<sizeparam width="168" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="82" minY="0" maxY="160" />
<infoparam name="TGComponent" value="TestCycleEvt_wait::C0" />
-<TGConnectingPoint num="0" id="72" />
-<TGConnectingPoint num="1" id="73" />
-<TGConnectingPoint num="2" id="74" />
-<TGConnectingPoint num="3" id="75" />
-<TGConnectingPoint num="4" id="76" />
-<TGConnectingPoint num="5" id="77" />
-<TGConnectingPoint num="6" id="78" />
-<TGConnectingPoint num="7" id="79" />
+<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="TestCycleEvt_wait::C0" taskName="C0" referenceTaskName="TestCycleEvt_wait" priority="0" operationMEC="C0" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1102" id="130" >
+<COMPONENT type="1102" id="87" >
<cdparam x="496" y="341" />
<sizeparam width="250" height="50" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="Bus0" value="name" />
-<TGConnectingPoint num="0" id="106" />
-<TGConnectingPoint num="1" id="107" />
-<TGConnectingPoint num="2" id="108" />
-<TGConnectingPoint num="3" id="109" />
-<TGConnectingPoint num="4" id="110" />
-<TGConnectingPoint num="5" id="111" />
-<TGConnectingPoint num="6" id="112" />
-<TGConnectingPoint num="7" id="113" />
-<TGConnectingPoint num="8" id="114" />
-<TGConnectingPoint num="9" id="115" />
-<TGConnectingPoint num="10" id="116" />
-<TGConnectingPoint num="11" id="117" />
-<TGConnectingPoint num="12" id="118" />
-<TGConnectingPoint num="13" id="119" />
-<TGConnectingPoint num="14" id="120" />
-<TGConnectingPoint num="15" id="121" />
-<TGConnectingPoint num="16" id="122" />
-<TGConnectingPoint num="17" id="123" />
-<TGConnectingPoint num="18" id="124" />
-<TGConnectingPoint num="19" id="125" />
-<TGConnectingPoint num="20" id="126" />
-<TGConnectingPoint num="21" id="127" />
-<TGConnectingPoint num="22" id="128" />
-<TGConnectingPoint num="23" id="129" />
+<TGConnectingPoint num="0" id="63" />
+<TGConnectingPoint num="1" id="64" />
+<TGConnectingPoint num="2" id="65" />
+<TGConnectingPoint num="3" id="66" />
+<TGConnectingPoint num="4" id="67" />
+<TGConnectingPoint num="5" id="68" />
+<TGConnectingPoint num="6" id="69" />
+<TGConnectingPoint num="7" id="70" />
+<TGConnectingPoint num="8" id="71" />
+<TGConnectingPoint num="9" id="72" />
+<TGConnectingPoint num="10" id="73" />
+<TGConnectingPoint num="11" id="74" />
+<TGConnectingPoint num="12" id="75" />
+<TGConnectingPoint num="13" id="76" />
+<TGConnectingPoint num="14" id="77" />
+<TGConnectingPoint num="15" id="78" />
+<TGConnectingPoint num="16" id="79" />
+<TGConnectingPoint num="17" id="80" />
+<TGConnectingPoint num="18" id="81" />
+<TGConnectingPoint num="19" id="82" />
+<TGConnectingPoint num="20" id="83" />
+<TGConnectingPoint num="21" id="84" />
+<TGConnectingPoint num="22" id="85" />
+<TGConnectingPoint num="23" id="86" />
<extraparam>
<info stereotype="Bus" nodeName="Bus0" />
<attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" clockRatio="1" privacy="0" referenceAttack="null" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1105" id="155" >
+<COMPONENT type="1105" id="112" >
<cdparam x="749" y="86" />
<sizeparam width="200" height="200" minWidth="100" minHeight="35" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="Memory0" value="name" />
-<TGConnectingPoint num="0" id="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" />
+<TGConnectingPoint num="0" id="88" />
+<TGConnectingPoint num="1" id="89" />
+<TGConnectingPoint num="2" id="90" />
+<TGConnectingPoint num="3" id="91" />
+<TGConnectingPoint num="4" id="92" />
+<TGConnectingPoint num="5" id="93" />
+<TGConnectingPoint num="6" id="94" />
+<TGConnectingPoint num="7" id="95" />
+<TGConnectingPoint num="8" id="96" />
+<TGConnectingPoint num="9" id="97" />
+<TGConnectingPoint num="10" id="98" />
+<TGConnectingPoint num="11" id="99" />
+<TGConnectingPoint num="12" id="100" />
+<TGConnectingPoint num="13" id="101" />
+<TGConnectingPoint num="14" id="102" />
+<TGConnectingPoint num="15" id="103" />
+<TGConnectingPoint num="16" id="104" />
+<TGConnectingPoint num="17" id="105" />
+<TGConnectingPoint num="18" id="106" />
+<TGConnectingPoint num="19" id="107" />
+<TGConnectingPoint num="20" id="108" />
+<TGConnectingPoint num="21" id="109" />
+<TGConnectingPoint num="22" id="110" />
+<TGConnectingPoint num="23" id="111" />
<extraparam>
<info stereotype="MEMORY" nodeName="Memory0" />
<attributes byteDataSize="4" memorySize="1024" clockRatio="1" bufferType="0" />
@@ -454,23 +466,11 @@
</COMPONENT>
<CONNECTOR type="125" id="156" >
-<cdparam x="417" y="431" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="{info}" />
-<P1 x="417" y="431" id="92" />
-<P2 x="558" y="391" id="120" />
-<AutomaticDrawing data="true" />
-<extraparam>
-<info priority="0" />
-<spy value="false" />
-</extraparam>
-</CONNECTOR>
-<CONNECTOR type="125" id="157" >
<cdparam x="799" y="286" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="{info}" />
-<P1 x="799" y="286" id="145" />
-<P2 x="683" y="341" id="115" />
+<P1 x="799" y="286" id="102" />
+<P2 x="683" y="341" id="72" />
<AutomaticDrawing data="true" />
<extraparam>
<info priority="0" />
diff --git a/ttool/src/test/resources/tmltranslator/simulator/fpgaTest.xml b/ttool/src/test/resources/tmltranslator/simulator/fpgaTest.xml
index b8073b9425..eea3dd1bab 100644
--- a/ttool/src/test/resources/tmltranslator/simulator/fpgaTest.xml
+++ b/ttool/src/test/resources/tmltranslator/simulator/fpgaTest.xml
@@ -1,6 +1,6 @@
<?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="0" LAST_SELECTED_SUB_TAB="2">
+<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="TestCycleEvt_wait" tabs="TML Component Task Diagram$C1$C0" >
<TMLComponentTaskDiagramPanel name="TML Component Task Diagram" minX="10" maxX="2500" minY="10" maxY="1500" channels="true" events="true" requests="true" zoom="1.0" >
@@ -8,8 +8,8 @@
<cdparam x="442" y="295" />
<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="443" y="245" id="13" />
-<P2 x="626" y="264" id="2" />
+<P1 x="456" y="258" id="13" />
+<P2 x="613" y="277" id="2" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<COMPONENT type="1202" id="12" >
@@ -172,12 +172,12 @@
</COMPONENT>
<COMPONENT type="1020" id="42" >
-<cdparam x="378" y="98" />
-<sizeparam width="98" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="374" y="98" />
+<sizeparam width="106" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="for loop" value="10" />
+<infoparam name="for loop" value="100" />
<TGConnectingPoint num="0" id="39" />
<TGConnectingPoint num="1" id="40" />
<TGConnectingPoint num="2" id="41" />
@@ -201,7 +201,7 @@
<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
<infoparam name="value of the delay" value="1 us" />
<extraparam>
-<TimeDelay minDelay="1" maxDelay="nope" hasMaxDelay="false" isActiveDelay="true" unit="us" />
+<TimeDelay minDelay="1" maxDelay="nope" hasMaxDelay="false" unit="us" />
</extraparam>
</SUBCOMPONENT>
@@ -285,7 +285,7 @@
<cdparam x="476" y="99" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="476" y="112" id="40" />
+<P1 x="480" y="112" id="40" />
<P2 x="510" y="117" id="52" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -307,146 +307,158 @@
<Modeling type="TML Architecture" nameTab="Architecture" >
<TMLArchiDiagramPanel name="DIPLODOCUS architecture and mapping Diagram" minX="10" maxX="2500" minY="10" maxY="1500" attributes="0" masterClockFrequency="200" >
-<COMPONENT type="1116" id="105" >
+<CONNECTOR type="125" id="184" >
+<cdparam x="417" y="431" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="{info}" />
+<P1 x="417" y="431" id="171" />
+<P2 x="558" y="391" id="77" />
+<AutomaticDrawing data="true" />
+<extraparam>
+<info priority="0" />
+<spy value="false" />
+</extraparam>
+</CONNECTOR>
+<COMPONENT type="1116" id="159" >
<cdparam x="167" y="381" />
<sizeparam width="250" height="200" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="FPGA0" value="name" />
-<TGConnectingPoint num="0" id="81" />
-<TGConnectingPoint num="1" id="82" />
-<TGConnectingPoint num="2" id="83" />
-<TGConnectingPoint num="3" id="84" />
-<TGConnectingPoint num="4" id="85" />
-<TGConnectingPoint num="5" id="86" />
-<TGConnectingPoint num="6" id="87" />
-<TGConnectingPoint num="7" id="88" />
-<TGConnectingPoint num="8" id="89" />
-<TGConnectingPoint num="9" id="90" />
-<TGConnectingPoint num="10" id="91" />
-<TGConnectingPoint num="11" id="92" />
-<TGConnectingPoint num="12" id="93" />
-<TGConnectingPoint num="13" id="94" />
-<TGConnectingPoint num="14" id="95" />
-<TGConnectingPoint num="15" id="96" />
-<TGConnectingPoint num="16" id="97" />
-<TGConnectingPoint num="17" id="98" />
-<TGConnectingPoint num="18" id="99" />
-<TGConnectingPoint num="19" id="100" />
-<TGConnectingPoint num="20" id="101" />
-<TGConnectingPoint num="21" id="102" />
-<TGConnectingPoint num="22" id="103" />
-<TGConnectingPoint num="23" id="104" />
+<TGConnectingPoint num="0" id="160" />
+<TGConnectingPoint num="1" id="161" />
+<TGConnectingPoint num="2" id="162" />
+<TGConnectingPoint num="3" id="163" />
+<TGConnectingPoint num="4" id="164" />
+<TGConnectingPoint num="5" id="165" />
+<TGConnectingPoint num="6" id="166" />
+<TGConnectingPoint num="7" id="167" />
+<TGConnectingPoint num="8" id="168" />
+<TGConnectingPoint num="9" id="169" />
+<TGConnectingPoint num="10" id="170" />
+<TGConnectingPoint num="11" id="171" />
+<TGConnectingPoint num="12" id="172" />
+<TGConnectingPoint num="13" id="173" />
+<TGConnectingPoint num="14" id="174" />
+<TGConnectingPoint num="15" id="175" />
+<TGConnectingPoint num="16" id="176" />
+<TGConnectingPoint num="17" id="177" />
+<TGConnectingPoint num="18" id="178" />
+<TGConnectingPoint num="19" id="179" />
+<TGConnectingPoint num="20" id="180" />
+<TGConnectingPoint num="21" id="181" />
+<TGConnectingPoint num="22" id="182" />
+<TGConnectingPoint num="23" id="183" />
<extraparam>
<info stereotype="FPGA" nodeName="FPGA0" />
<attributes capacity="100" byteDataSize="4" mappingPenalty="0" reconfigurationTime="50" goIdleTime="10" maxConsecutiveIdleCycles="10" execiTime="1" execcTime="1" clockRatio="1" operation ="" scheduling ="" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="1101" id="71" >
-<father id="105" num="0" />
+<SUBCOMPONENT type="1101" id="130" >
+<father id="159" num="0" />
<cdparam x="206" y="489" />
<sizeparam width="168" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="82" minY="0" maxY="160" />
<infoparam name="TGComponent" value="TestCycleEvt_wait::C1" />
-<TGConnectingPoint num="0" id="63" />
-<TGConnectingPoint num="1" id="64" />
-<TGConnectingPoint num="2" id="65" />
-<TGConnectingPoint num="3" id="66" />
-<TGConnectingPoint num="4" id="67" />
-<TGConnectingPoint num="5" id="68" />
-<TGConnectingPoint num="6" id="69" />
-<TGConnectingPoint num="7" id="70" />
+<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="TestCycleEvt_wait::C1" taskName="C1" referenceTaskName="TestCycleEvt_wait" priority="0" operationMEC="C1" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1101" id="80" >
-<father id="105" num="1" />
+<SUBCOMPONENT type="1101" id="121" >
+<father id="159" num="1" />
<cdparam x="203" y="424" />
<sizeparam width="168" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="82" minY="0" maxY="160" />
<infoparam name="TGComponent" value="TestCycleEvt_wait::C0" />
-<TGConnectingPoint num="0" id="72" />
-<TGConnectingPoint num="1" id="73" />
-<TGConnectingPoint num="2" id="74" />
-<TGConnectingPoint num="3" id="75" />
-<TGConnectingPoint num="4" id="76" />
-<TGConnectingPoint num="5" id="77" />
-<TGConnectingPoint num="6" id="78" />
-<TGConnectingPoint num="7" id="79" />
+<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="TestCycleEvt_wait::C0" taskName="C0" referenceTaskName="TestCycleEvt_wait" priority="0" operationMEC="C0" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1102" id="130" >
+<COMPONENT type="1102" id="87" >
<cdparam x="496" y="341" />
<sizeparam width="250" height="50" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="Bus0" value="name" />
-<TGConnectingPoint num="0" id="106" />
-<TGConnectingPoint num="1" id="107" />
-<TGConnectingPoint num="2" id="108" />
-<TGConnectingPoint num="3" id="109" />
-<TGConnectingPoint num="4" id="110" />
-<TGConnectingPoint num="5" id="111" />
-<TGConnectingPoint num="6" id="112" />
-<TGConnectingPoint num="7" id="113" />
-<TGConnectingPoint num="8" id="114" />
-<TGConnectingPoint num="9" id="115" />
-<TGConnectingPoint num="10" id="116" />
-<TGConnectingPoint num="11" id="117" />
-<TGConnectingPoint num="12" id="118" />
-<TGConnectingPoint num="13" id="119" />
-<TGConnectingPoint num="14" id="120" />
-<TGConnectingPoint num="15" id="121" />
-<TGConnectingPoint num="16" id="122" />
-<TGConnectingPoint num="17" id="123" />
-<TGConnectingPoint num="18" id="124" />
-<TGConnectingPoint num="19" id="125" />
-<TGConnectingPoint num="20" id="126" />
-<TGConnectingPoint num="21" id="127" />
-<TGConnectingPoint num="22" id="128" />
-<TGConnectingPoint num="23" id="129" />
+<TGConnectingPoint num="0" id="63" />
+<TGConnectingPoint num="1" id="64" />
+<TGConnectingPoint num="2" id="65" />
+<TGConnectingPoint num="3" id="66" />
+<TGConnectingPoint num="4" id="67" />
+<TGConnectingPoint num="5" id="68" />
+<TGConnectingPoint num="6" id="69" />
+<TGConnectingPoint num="7" id="70" />
+<TGConnectingPoint num="8" id="71" />
+<TGConnectingPoint num="9" id="72" />
+<TGConnectingPoint num="10" id="73" />
+<TGConnectingPoint num="11" id="74" />
+<TGConnectingPoint num="12" id="75" />
+<TGConnectingPoint num="13" id="76" />
+<TGConnectingPoint num="14" id="77" />
+<TGConnectingPoint num="15" id="78" />
+<TGConnectingPoint num="16" id="79" />
+<TGConnectingPoint num="17" id="80" />
+<TGConnectingPoint num="18" id="81" />
+<TGConnectingPoint num="19" id="82" />
+<TGConnectingPoint num="20" id="83" />
+<TGConnectingPoint num="21" id="84" />
+<TGConnectingPoint num="22" id="85" />
+<TGConnectingPoint num="23" id="86" />
<extraparam>
<info stereotype="Bus" nodeName="Bus0" />
<attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" clockRatio="1" privacy="0" referenceAttack="null" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1105" id="155" >
+<COMPONENT type="1105" id="112" >
<cdparam x="749" y="86" />
<sizeparam width="200" height="200" minWidth="100" minHeight="35" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="Memory0" value="name" />
-<TGConnectingPoint num="0" id="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" />
+<TGConnectingPoint num="0" id="88" />
+<TGConnectingPoint num="1" id="89" />
+<TGConnectingPoint num="2" id="90" />
+<TGConnectingPoint num="3" id="91" />
+<TGConnectingPoint num="4" id="92" />
+<TGConnectingPoint num="5" id="93" />
+<TGConnectingPoint num="6" id="94" />
+<TGConnectingPoint num="7" id="95" />
+<TGConnectingPoint num="8" id="96" />
+<TGConnectingPoint num="9" id="97" />
+<TGConnectingPoint num="10" id="98" />
+<TGConnectingPoint num="11" id="99" />
+<TGConnectingPoint num="12" id="100" />
+<TGConnectingPoint num="13" id="101" />
+<TGConnectingPoint num="14" id="102" />
+<TGConnectingPoint num="15" id="103" />
+<TGConnectingPoint num="16" id="104" />
+<TGConnectingPoint num="17" id="105" />
+<TGConnectingPoint num="18" id="106" />
+<TGConnectingPoint num="19" id="107" />
+<TGConnectingPoint num="20" id="108" />
+<TGConnectingPoint num="21" id="109" />
+<TGConnectingPoint num="22" id="110" />
+<TGConnectingPoint num="23" id="111" />
<extraparam>
<info stereotype="MEMORY" nodeName="Memory0" />
<attributes byteDataSize="4" memorySize="1024" clockRatio="1" bufferType="0" />
@@ -454,23 +466,11 @@
</COMPONENT>
<CONNECTOR type="125" id="156" >
-<cdparam x="417" y="431" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="{info}" />
-<P1 x="417" y="431" id="92" />
-<P2 x="558" y="391" id="120" />
-<AutomaticDrawing data="true" />
-<extraparam>
-<info priority="0" />
-<spy value="false" />
-</extraparam>
-</CONNECTOR>
-<CONNECTOR type="125" id="157" >
<cdparam x="799" y="286" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="{info}" />
-<P1 x="799" y="286" id="145" />
-<P2 x="683" y="341" id="115" />
+<P1 x="799" y="286" id="102" />
+<P2 x="683" y="341" id="72" />
<AutomaticDrawing data="true" />
<extraparam>
<info priority="0" />
diff --git a/ttool/src/test/resources/tmltranslator/simulator/mono-RR-penalty.xml b/ttool/src/test/resources/tmltranslator/simulator/mono-RR-penalty.xml
index fb8cc201c7..1d18a5bc39 100644
--- a/ttool/src/test/resources/tmltranslator/simulator/mono-RR-penalty.xml
+++ b/ttool/src/test/resources/tmltranslator/simulator/mono-RR-penalty.xml
@@ -8,8 +8,8 @@
<cdparam x="442" y="295" />
<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="443" y="245" id="13" />
-<P2 x="626" y="264" id="2" />
+<P1 x="456" y="258" id="13" />
+<P2 x="613" y="277" id="2" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<COMPONENT type="1202" id="12" >
@@ -172,12 +172,12 @@
</COMPONENT>
<COMPONENT type="1020" id="42" >
-<cdparam x="378" y="98" />
-<sizeparam width="98" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="374" y="98" />
+<sizeparam width="106" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="for loop" value="10" />
+<infoparam name="for loop" value="100" />
<TGConnectingPoint num="0" id="39" />
<TGConnectingPoint num="1" id="40" />
<TGConnectingPoint num="2" id="41" />
@@ -201,7 +201,7 @@
<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
<infoparam name="value of the delay" value="1 us" />
<extraparam>
-<TimeDelay minDelay="1" maxDelay="nope" hasMaxDelay="false" isActiveDelay="true" unit="us" />
+<TimeDelay minDelay="1" maxDelay="nope" hasMaxDelay="false" unit="us" />
</extraparam>
</SUBCOMPONENT>
@@ -285,7 +285,7 @@
<cdparam x="476" y="99" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="476" y="112" id="40" />
+<P1 x="480" y="112" id="40" />
<P2 x="510" y="117" id="52" />
<AutomaticDrawing data="true" />
</CONNECTOR>
diff --git a/ttool/src/test/resources/tmltranslator/simulator/mono-RR.xml b/ttool/src/test/resources/tmltranslator/simulator/mono-RR.xml
index fb8cc201c7..1d18a5bc39 100644
--- a/ttool/src/test/resources/tmltranslator/simulator/mono-RR.xml
+++ b/ttool/src/test/resources/tmltranslator/simulator/mono-RR.xml
@@ -8,8 +8,8 @@
<cdparam x="442" y="295" />
<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="443" y="245" id="13" />
-<P2 x="626" y="264" id="2" />
+<P1 x="456" y="258" id="13" />
+<P2 x="613" y="277" id="2" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<COMPONENT type="1202" id="12" >
@@ -172,12 +172,12 @@
</COMPONENT>
<COMPONENT type="1020" id="42" >
-<cdparam x="378" y="98" />
-<sizeparam width="98" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="374" y="98" />
+<sizeparam width="106" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="for loop" value="10" />
+<infoparam name="for loop" value="100" />
<TGConnectingPoint num="0" id="39" />
<TGConnectingPoint num="1" id="40" />
<TGConnectingPoint num="2" id="41" />
@@ -201,7 +201,7 @@
<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
<infoparam name="value of the delay" value="1 us" />
<extraparam>
-<TimeDelay minDelay="1" maxDelay="nope" hasMaxDelay="false" isActiveDelay="true" unit="us" />
+<TimeDelay minDelay="1" maxDelay="nope" hasMaxDelay="false" unit="us" />
</extraparam>
</SUBCOMPONENT>
@@ -285,7 +285,7 @@
<cdparam x="476" y="99" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="476" y="112" id="40" />
+<P1 x="480" y="112" id="40" />
<P2 x="510" y="117" id="52" />
<AutomaticDrawing data="true" />
</CONNECTOR>
diff --git a/ttool/src/test/resources/tmltranslator/simulator/mono-RRPB-penalty.xml b/ttool/src/test/resources/tmltranslator/simulator/mono-RRPB-penalty.xml
index 855fa12bf2..2d93550577 100644
--- a/ttool/src/test/resources/tmltranslator/simulator/mono-RRPB-penalty.xml
+++ b/ttool/src/test/resources/tmltranslator/simulator/mono-RRPB-penalty.xml
@@ -1,6 +1,6 @@
<?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="0" LAST_SELECTED_SUB_TAB="2">
+<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="TestCycleEvt_wait" tabs="TML Component Task Diagram$C1$C0" >
<TMLComponentTaskDiagramPanel name="TML Component Task Diagram" minX="10" maxX="2500" minY="10" maxY="1500" channels="true" events="true" requests="true" zoom="1.0" >
@@ -8,8 +8,8 @@
<cdparam x="442" y="295" />
<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="443" y="245" id="13" />
-<P2 x="626" y="264" id="2" />
+<P1 x="456" y="258" id="13" />
+<P2 x="613" y="277" id="2" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<COMPONENT type="1202" id="12" >
@@ -172,12 +172,12 @@
</COMPONENT>
<COMPONENT type="1020" id="42" >
-<cdparam x="378" y="98" />
-<sizeparam width="98" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="374" y="98" />
+<sizeparam width="106" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="for loop" value="10" />
+<infoparam name="for loop" value="100" />
<TGConnectingPoint num="0" id="39" />
<TGConnectingPoint num="1" id="40" />
<TGConnectingPoint num="2" id="41" />
@@ -201,7 +201,7 @@
<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
<infoparam name="value of the delay" value="1 us" />
<extraparam>
-<TimeDelay minDelay="1" maxDelay="nope" hasMaxDelay="false" isActiveDelay="true" unit="us" />
+<TimeDelay minDelay="1" maxDelay="nope" hasMaxDelay="false" unit="us" />
</extraparam>
</SUBCOMPONENT>
@@ -285,7 +285,7 @@
<cdparam x="476" y="99" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="476" y="112" id="40" />
+<P1 x="480" y="112" id="40" />
<P2 x="510" y="117" id="52" />
<AutomaticDrawing data="true" />
</CONNECTOR>
diff --git a/ttool/src/test/resources/tmltranslator/simulator/mono-RRPB.xml b/ttool/src/test/resources/tmltranslator/simulator/mono-RRPB.xml
index 855fa12bf2..2d93550577 100644
--- a/ttool/src/test/resources/tmltranslator/simulator/mono-RRPB.xml
+++ b/ttool/src/test/resources/tmltranslator/simulator/mono-RRPB.xml
@@ -1,6 +1,6 @@
<?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="0" LAST_SELECTED_SUB_TAB="2">
+<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="TestCycleEvt_wait" tabs="TML Component Task Diagram$C1$C0" >
<TMLComponentTaskDiagramPanel name="TML Component Task Diagram" minX="10" maxX="2500" minY="10" maxY="1500" channels="true" events="true" requests="true" zoom="1.0" >
@@ -8,8 +8,8 @@
<cdparam x="442" y="295" />
<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="443" y="245" id="13" />
-<P2 x="626" y="264" id="2" />
+<P1 x="456" y="258" id="13" />
+<P2 x="613" y="277" id="2" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<COMPONENT type="1202" id="12" >
@@ -172,12 +172,12 @@
</COMPONENT>
<COMPONENT type="1020" id="42" >
-<cdparam x="378" y="98" />
-<sizeparam width="98" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="374" y="98" />
+<sizeparam width="106" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="for loop" value="10" />
+<infoparam name="for loop" value="100" />
<TGConnectingPoint num="0" id="39" />
<TGConnectingPoint num="1" id="40" />
<TGConnectingPoint num="2" id="41" />
@@ -201,7 +201,7 @@
<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
<infoparam name="value of the delay" value="1 us" />
<extraparam>
-<TimeDelay minDelay="1" maxDelay="nope" hasMaxDelay="false" isActiveDelay="true" unit="us" />
+<TimeDelay minDelay="1" maxDelay="nope" hasMaxDelay="false" unit="us" />
</extraparam>
</SUBCOMPONENT>
@@ -285,7 +285,7 @@
<cdparam x="476" y="99" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="476" y="112" id="40" />
+<P1 x="480" y="112" id="40" />
<P2 x="510" y="117" id="52" />
<AutomaticDrawing data="true" />
</CONNECTOR>
diff --git a/ttool/src/test/resources/tmltranslator/simulator/multi-RR-penalty.xml b/ttool/src/test/resources/tmltranslator/simulator/multi-RR-penalty.xml
index 46bec07e25..827033d74c 100644
--- a/ttool/src/test/resources/tmltranslator/simulator/multi-RR-penalty.xml
+++ b/ttool/src/test/resources/tmltranslator/simulator/multi-RR-penalty.xml
@@ -1,6 +1,6 @@
<?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="0" LAST_SELECTED_SUB_TAB="2">
+<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="TestCycleEvt_wait" tabs="TML Component Task Diagram$C1$C0" >
<TMLComponentTaskDiagramPanel name="TML Component Task Diagram" minX="10" maxX="2500" minY="10" maxY="1500" channels="true" events="true" requests="true" zoom="1.0" >
@@ -8,8 +8,8 @@
<cdparam x="442" y="295" />
<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="443" y="245" id="13" />
-<P2 x="626" y="264" id="2" />
+<P1 x="456" y="258" id="13" />
+<P2 x="613" y="277" id="2" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<COMPONENT type="1202" id="12" >
@@ -172,12 +172,12 @@
</COMPONENT>
<COMPONENT type="1020" id="42" >
-<cdparam x="378" y="98" />
-<sizeparam width="98" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="374" y="98" />
+<sizeparam width="106" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="for loop" value="10" />
+<infoparam name="for loop" value="100" />
<TGConnectingPoint num="0" id="39" />
<TGConnectingPoint num="1" id="40" />
<TGConnectingPoint num="2" id="41" />
@@ -201,7 +201,7 @@
<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
<infoparam name="value of the delay" value="1 us" />
<extraparam>
-<TimeDelay minDelay="1" maxDelay="nope" hasMaxDelay="false" isActiveDelay="true" unit="us" />
+<TimeDelay minDelay="1" maxDelay="nope" hasMaxDelay="false" unit="us" />
</extraparam>
</SUBCOMPONENT>
@@ -285,7 +285,7 @@
<cdparam x="476" y="99" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="476" y="112" id="40" />
+<P1 x="480" y="112" id="40" />
<P2 x="510" y="117" id="52" />
<AutomaticDrawing data="true" />
</CONNECTOR>
diff --git a/ttool/src/test/resources/tmltranslator/simulator/multi-RR.xml b/ttool/src/test/resources/tmltranslator/simulator/multi-RR.xml
index 46bec07e25..827033d74c 100644
--- a/ttool/src/test/resources/tmltranslator/simulator/multi-RR.xml
+++ b/ttool/src/test/resources/tmltranslator/simulator/multi-RR.xml
@@ -1,6 +1,6 @@
<?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="0" LAST_SELECTED_SUB_TAB="2">
+<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="TestCycleEvt_wait" tabs="TML Component Task Diagram$C1$C0" >
<TMLComponentTaskDiagramPanel name="TML Component Task Diagram" minX="10" maxX="2500" minY="10" maxY="1500" channels="true" events="true" requests="true" zoom="1.0" >
@@ -8,8 +8,8 @@
<cdparam x="442" y="295" />
<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="443" y="245" id="13" />
-<P2 x="626" y="264" id="2" />
+<P1 x="456" y="258" id="13" />
+<P2 x="613" y="277" id="2" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<COMPONENT type="1202" id="12" >
@@ -172,12 +172,12 @@
</COMPONENT>
<COMPONENT type="1020" id="42" >
-<cdparam x="378" y="98" />
-<sizeparam width="98" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="374" y="98" />
+<sizeparam width="106" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="for loop" value="10" />
+<infoparam name="for loop" value="100" />
<TGConnectingPoint num="0" id="39" />
<TGConnectingPoint num="1" id="40" />
<TGConnectingPoint num="2" id="41" />
@@ -201,7 +201,7 @@
<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
<infoparam name="value of the delay" value="1 us" />
<extraparam>
-<TimeDelay minDelay="1" maxDelay="nope" hasMaxDelay="false" isActiveDelay="true" unit="us" />
+<TimeDelay minDelay="1" maxDelay="nope" hasMaxDelay="false" unit="us" />
</extraparam>
</SUBCOMPONENT>
@@ -285,7 +285,7 @@
<cdparam x="476" y="99" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="476" y="112" id="40" />
+<P1 x="480" y="112" id="40" />
<P2 x="510" y="117" id="52" />
<AutomaticDrawing data="true" />
</CONNECTOR>
diff --git a/ttool/src/test/resources/tmltranslator/simulator/multi-RRPB-penalty.xml b/ttool/src/test/resources/tmltranslator/simulator/multi-RRPB-penalty.xml
index 48ca59ac3f..191a8e8331 100644
--- a/ttool/src/test/resources/tmltranslator/simulator/multi-RRPB-penalty.xml
+++ b/ttool/src/test/resources/tmltranslator/simulator/multi-RRPB-penalty.xml
@@ -1,6 +1,6 @@
<?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="0" LAST_SELECTED_SUB_TAB="2">
+<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="TestCycleEvt_wait" tabs="TML Component Task Diagram$C1$C0" >
<TMLComponentTaskDiagramPanel name="TML Component Task Diagram" minX="10" maxX="2500" minY="10" maxY="1500" channels="true" events="true" requests="true" zoom="1.0" >
@@ -8,8 +8,8 @@
<cdparam x="442" y="295" />
<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="443" y="245" id="13" />
-<P2 x="626" y="264" id="2" />
+<P1 x="456" y="258" id="13" />
+<P2 x="613" y="277" id="2" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<COMPONENT type="1202" id="12" >
@@ -172,12 +172,12 @@
</COMPONENT>
<COMPONENT type="1020" id="42" >
-<cdparam x="378" y="98" />
-<sizeparam width="98" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="374" y="98" />
+<sizeparam width="106" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="for loop" value="10" />
+<infoparam name="for loop" value="100" />
<TGConnectingPoint num="0" id="39" />
<TGConnectingPoint num="1" id="40" />
<TGConnectingPoint num="2" id="41" />
@@ -201,7 +201,7 @@
<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
<infoparam name="value of the delay" value="1 us" />
<extraparam>
-<TimeDelay minDelay="1" maxDelay="nope" hasMaxDelay="false" isActiveDelay="true" unit="us" />
+<TimeDelay minDelay="1" maxDelay="nope" hasMaxDelay="false" unit="us" />
</extraparam>
</SUBCOMPONENT>
@@ -285,7 +285,7 @@
<cdparam x="476" y="99" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="476" y="112" id="40" />
+<P1 x="480" y="112" id="40" />
<P2 x="510" y="117" id="52" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -307,75 +307,87 @@
<Modeling type="TML Architecture" nameTab="Architecture" >
<TMLArchiDiagramPanel name="DIPLODOCUS architecture and mapping Diagram" minX="10" maxX="2500" minY="10" maxY="1500" attributes="0" masterClockFrequency="200" >
-<COMPONENT type="1100" id="105" >
+<CONNECTOR type="125" id="184" >
+<cdparam x="493" y="261" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="{info}" />
+<P1 x="493" y="261" id="173" />
+<P2 x="558" y="341" id="114" />
+<AutomaticDrawing data="true" />
+<extraparam>
+<info priority="0" />
+<spy value="false" />
+</extraparam>
+</CONNECTOR>
+<COMPONENT type="1100" id="159" >
<cdparam x="243" y="111" />
<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="CPU0" value="name" />
-<TGConnectingPoint num="0" id="81" />
-<TGConnectingPoint num="1" id="82" />
-<TGConnectingPoint num="2" id="83" />
-<TGConnectingPoint num="3" id="84" />
-<TGConnectingPoint num="4" id="85" />
-<TGConnectingPoint num="5" id="86" />
-<TGConnectingPoint num="6" id="87" />
-<TGConnectingPoint num="7" id="88" />
-<TGConnectingPoint num="8" id="89" />
-<TGConnectingPoint num="9" id="90" />
-<TGConnectingPoint num="10" id="91" />
-<TGConnectingPoint num="11" id="92" />
-<TGConnectingPoint num="12" id="93" />
-<TGConnectingPoint num="13" id="94" />
-<TGConnectingPoint num="14" id="95" />
-<TGConnectingPoint num="15" id="96" />
-<TGConnectingPoint num="16" id="97" />
-<TGConnectingPoint num="17" id="98" />
-<TGConnectingPoint num="18" id="99" />
-<TGConnectingPoint num="19" id="100" />
-<TGConnectingPoint num="20" id="101" />
-<TGConnectingPoint num="21" id="102" />
-<TGConnectingPoint num="22" id="103" />
-<TGConnectingPoint num="23" id="104" />
+<TGConnectingPoint num="0" id="160" />
+<TGConnectingPoint num="1" id="161" />
+<TGConnectingPoint num="2" id="162" />
+<TGConnectingPoint num="3" id="163" />
+<TGConnectingPoint num="4" id="164" />
+<TGConnectingPoint num="5" id="165" />
+<TGConnectingPoint num="6" id="166" />
+<TGConnectingPoint num="7" id="167" />
+<TGConnectingPoint num="8" id="168" />
+<TGConnectingPoint num="9" id="169" />
+<TGConnectingPoint num="10" id="170" />
+<TGConnectingPoint num="11" id="171" />
+<TGConnectingPoint num="12" id="172" />
+<TGConnectingPoint num="13" id="173" />
+<TGConnectingPoint num="14" id="174" />
+<TGConnectingPoint num="15" id="175" />
+<TGConnectingPoint num="16" id="176" />
+<TGConnectingPoint num="17" id="177" />
+<TGConnectingPoint num="18" id="178" />
+<TGConnectingPoint num="19" id="179" />
+<TGConnectingPoint num="20" id="180" />
+<TGConnectingPoint num="21" id="181" />
+<TGConnectingPoint num="22" id="182" />
+<TGConnectingPoint num="23" id="183" />
<extraparam>
<info stereotype="CPURRPB" nodeName="CPU0" />
<attributes nbOfCores="2" byteDataSize="4" schedulingPolicy="1" sliceTime="1" 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="71" >
-<father id="105" num="0" />
+<SUBCOMPONENT type="1101" id="80" >
+<father id="159" num="0" />
<cdparam x="284" y="238" />
<sizeparam width="168" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="82" minY="0" maxY="160" />
<infoparam name="TGComponent" value="TestCycleEvt_wait::C1" />
-<TGConnectingPoint num="0" id="63" />
-<TGConnectingPoint num="1" id="64" />
-<TGConnectingPoint num="2" id="65" />
-<TGConnectingPoint num="3" id="66" />
-<TGConnectingPoint num="4" id="67" />
-<TGConnectingPoint num="5" id="68" />
-<TGConnectingPoint num="6" id="69" />
-<TGConnectingPoint num="7" id="70" />
+<TGConnectingPoint num="0" id="72" />
+<TGConnectingPoint num="1" id="73" />
+<TGConnectingPoint num="2" id="74" />
+<TGConnectingPoint num="3" id="75" />
+<TGConnectingPoint num="4" id="76" />
+<TGConnectingPoint num="5" id="77" />
+<TGConnectingPoint num="6" id="78" />
+<TGConnectingPoint num="7" id="79" />
<extraparam>
<info value="TestCycleEvt_wait::C1" taskName="C1" referenceTaskName="TestCycleEvt_wait" priority="0" operationMEC="C1" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1101" id="80" >
-<father id="105" num="1" />
+<SUBCOMPONENT type="1101" id="71" >
+<father id="159" num="1" />
<cdparam x="276" y="165" />
<sizeparam width="168" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="82" minY="0" maxY="160" />
<infoparam name="TGComponent" value="TestCycleEvt_wait::C0" />
-<TGConnectingPoint num="0" id="72" />
-<TGConnectingPoint num="1" id="73" />
-<TGConnectingPoint num="2" id="74" />
-<TGConnectingPoint num="3" id="75" />
-<TGConnectingPoint num="4" id="76" />
-<TGConnectingPoint num="5" id="77" />
-<TGConnectingPoint num="6" id="78" />
-<TGConnectingPoint num="7" id="79" />
+<TGConnectingPoint num="0" id="63" />
+<TGConnectingPoint num="1" id="64" />
+<TGConnectingPoint num="2" id="65" />
+<TGConnectingPoint num="3" id="66" />
+<TGConnectingPoint num="4" id="67" />
+<TGConnectingPoint num="5" id="68" />
+<TGConnectingPoint num="6" id="69" />
+<TGConnectingPoint num="7" id="70" />
<extraparam>
<info value="TestCycleEvt_wait::C0" taskName="C0" referenceTaskName="TestCycleEvt_wait" priority="0" operationMEC="C0" fatherComponentMECType="0" />
</extraparam>
@@ -453,18 +465,6 @@
</extraparam>
</COMPONENT>
-<CONNECTOR type="125" id="156" >
-<cdparam x="493" y="261" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="{info}" />
-<P1 x="493" y="261" id="94" />
-<P2 x="558" y="341" id="114" />
-<AutomaticDrawing data="true" />
-<extraparam>
-<info priority="0" />
-<spy value="false" />
-</extraparam>
-</CONNECTOR>
<CONNECTOR type="125" id="157" >
<cdparam x="799" y="286" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
diff --git a/ttool/src/test/resources/tmltranslator/simulator/multi-RRPB.xml b/ttool/src/test/resources/tmltranslator/simulator/multi-RRPB.xml
index 48ca59ac3f..191a8e8331 100644
--- a/ttool/src/test/resources/tmltranslator/simulator/multi-RRPB.xml
+++ b/ttool/src/test/resources/tmltranslator/simulator/multi-RRPB.xml
@@ -1,6 +1,6 @@
<?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="0" LAST_SELECTED_SUB_TAB="2">
+<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="TestCycleEvt_wait" tabs="TML Component Task Diagram$C1$C0" >
<TMLComponentTaskDiagramPanel name="TML Component Task Diagram" minX="10" maxX="2500" minY="10" maxY="1500" channels="true" events="true" requests="true" zoom="1.0" >
@@ -8,8 +8,8 @@
<cdparam x="442" y="295" />
<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="443" y="245" id="13" />
-<P2 x="626" y="264" id="2" />
+<P1 x="456" y="258" id="13" />
+<P2 x="613" y="277" id="2" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<COMPONENT type="1202" id="12" >
@@ -172,12 +172,12 @@
</COMPONENT>
<COMPONENT type="1020" id="42" >
-<cdparam x="378" y="98" />
-<sizeparam width="98" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="374" y="98" />
+<sizeparam width="106" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="for loop" value="10" />
+<infoparam name="for loop" value="100" />
<TGConnectingPoint num="0" id="39" />
<TGConnectingPoint num="1" id="40" />
<TGConnectingPoint num="2" id="41" />
@@ -201,7 +201,7 @@
<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
<infoparam name="value of the delay" value="1 us" />
<extraparam>
-<TimeDelay minDelay="1" maxDelay="nope" hasMaxDelay="false" isActiveDelay="true" unit="us" />
+<TimeDelay minDelay="1" maxDelay="nope" hasMaxDelay="false" unit="us" />
</extraparam>
</SUBCOMPONENT>
@@ -285,7 +285,7 @@
<cdparam x="476" y="99" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="null" />
-<P1 x="476" y="112" id="40" />
+<P1 x="480" y="112" id="40" />
<P2 x="510" y="117" id="52" />
<AutomaticDrawing data="true" />
</CONNECTOR>
@@ -307,75 +307,87 @@
<Modeling type="TML Architecture" nameTab="Architecture" >
<TMLArchiDiagramPanel name="DIPLODOCUS architecture and mapping Diagram" minX="10" maxX="2500" minY="10" maxY="1500" attributes="0" masterClockFrequency="200" >
-<COMPONENT type="1100" id="105" >
+<CONNECTOR type="125" id="184" >
+<cdparam x="493" y="261" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="{info}" />
+<P1 x="493" y="261" id="173" />
+<P2 x="558" y="341" id="114" />
+<AutomaticDrawing data="true" />
+<extraparam>
+<info priority="0" />
+<spy value="false" />
+</extraparam>
+</CONNECTOR>
+<COMPONENT type="1100" id="159" >
<cdparam x="243" y="111" />
<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="CPU0" value="name" />
-<TGConnectingPoint num="0" id="81" />
-<TGConnectingPoint num="1" id="82" />
-<TGConnectingPoint num="2" id="83" />
-<TGConnectingPoint num="3" id="84" />
-<TGConnectingPoint num="4" id="85" />
-<TGConnectingPoint num="5" id="86" />
-<TGConnectingPoint num="6" id="87" />
-<TGConnectingPoint num="7" id="88" />
-<TGConnectingPoint num="8" id="89" />
-<TGConnectingPoint num="9" id="90" />
-<TGConnectingPoint num="10" id="91" />
-<TGConnectingPoint num="11" id="92" />
-<TGConnectingPoint num="12" id="93" />
-<TGConnectingPoint num="13" id="94" />
-<TGConnectingPoint num="14" id="95" />
-<TGConnectingPoint num="15" id="96" />
-<TGConnectingPoint num="16" id="97" />
-<TGConnectingPoint num="17" id="98" />
-<TGConnectingPoint num="18" id="99" />
-<TGConnectingPoint num="19" id="100" />
-<TGConnectingPoint num="20" id="101" />
-<TGConnectingPoint num="21" id="102" />
-<TGConnectingPoint num="22" id="103" />
-<TGConnectingPoint num="23" id="104" />
+<TGConnectingPoint num="0" id="160" />
+<TGConnectingPoint num="1" id="161" />
+<TGConnectingPoint num="2" id="162" />
+<TGConnectingPoint num="3" id="163" />
+<TGConnectingPoint num="4" id="164" />
+<TGConnectingPoint num="5" id="165" />
+<TGConnectingPoint num="6" id="166" />
+<TGConnectingPoint num="7" id="167" />
+<TGConnectingPoint num="8" id="168" />
+<TGConnectingPoint num="9" id="169" />
+<TGConnectingPoint num="10" id="170" />
+<TGConnectingPoint num="11" id="171" />
+<TGConnectingPoint num="12" id="172" />
+<TGConnectingPoint num="13" id="173" />
+<TGConnectingPoint num="14" id="174" />
+<TGConnectingPoint num="15" id="175" />
+<TGConnectingPoint num="16" id="176" />
+<TGConnectingPoint num="17" id="177" />
+<TGConnectingPoint num="18" id="178" />
+<TGConnectingPoint num="19" id="179" />
+<TGConnectingPoint num="20" id="180" />
+<TGConnectingPoint num="21" id="181" />
+<TGConnectingPoint num="22" id="182" />
+<TGConnectingPoint num="23" id="183" />
<extraparam>
<info stereotype="CPURRPB" nodeName="CPU0" />
<attributes nbOfCores="2" byteDataSize="4" schedulingPolicy="1" sliceTime="1" 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="71" >
-<father id="105" num="0" />
+<SUBCOMPONENT type="1101" id="80" >
+<father id="159" num="0" />
<cdparam x="284" y="238" />
<sizeparam width="168" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="82" minY="0" maxY="160" />
<infoparam name="TGComponent" value="TestCycleEvt_wait::C1" />
-<TGConnectingPoint num="0" id="63" />
-<TGConnectingPoint num="1" id="64" />
-<TGConnectingPoint num="2" id="65" />
-<TGConnectingPoint num="3" id="66" />
-<TGConnectingPoint num="4" id="67" />
-<TGConnectingPoint num="5" id="68" />
-<TGConnectingPoint num="6" id="69" />
-<TGConnectingPoint num="7" id="70" />
+<TGConnectingPoint num="0" id="72" />
+<TGConnectingPoint num="1" id="73" />
+<TGConnectingPoint num="2" id="74" />
+<TGConnectingPoint num="3" id="75" />
+<TGConnectingPoint num="4" id="76" />
+<TGConnectingPoint num="5" id="77" />
+<TGConnectingPoint num="6" id="78" />
+<TGConnectingPoint num="7" id="79" />
<extraparam>
<info value="TestCycleEvt_wait::C1" taskName="C1" referenceTaskName="TestCycleEvt_wait" priority="0" operationMEC="C1" fatherComponentMECType="0" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="1101" id="80" >
-<father id="105" num="1" />
+<SUBCOMPONENT type="1101" id="71" >
+<father id="159" num="1" />
<cdparam x="276" y="165" />
<sizeparam width="168" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="82" minY="0" maxY="160" />
<infoparam name="TGComponent" value="TestCycleEvt_wait::C0" />
-<TGConnectingPoint num="0" id="72" />
-<TGConnectingPoint num="1" id="73" />
-<TGConnectingPoint num="2" id="74" />
-<TGConnectingPoint num="3" id="75" />
-<TGConnectingPoint num="4" id="76" />
-<TGConnectingPoint num="5" id="77" />
-<TGConnectingPoint num="6" id="78" />
-<TGConnectingPoint num="7" id="79" />
+<TGConnectingPoint num="0" id="63" />
+<TGConnectingPoint num="1" id="64" />
+<TGConnectingPoint num="2" id="65" />
+<TGConnectingPoint num="3" id="66" />
+<TGConnectingPoint num="4" id="67" />
+<TGConnectingPoint num="5" id="68" />
+<TGConnectingPoint num="6" id="69" />
+<TGConnectingPoint num="7" id="70" />
<extraparam>
<info value="TestCycleEvt_wait::C0" taskName="C0" referenceTaskName="TestCycleEvt_wait" priority="0" operationMEC="C0" fatherComponentMECType="0" />
</extraparam>
@@ -453,18 +465,6 @@
</extraparam>
</COMPONENT>
-<CONNECTOR type="125" id="156" >
-<cdparam x="493" y="261" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="{info}" />
-<P1 x="493" y="261" id="94" />
-<P2 x="558" y="341" id="114" />
-<AutomaticDrawing data="true" />
-<extraparam>
-<info priority="0" />
-<spy value="false" />
-</extraparam>
-</CONNECTOR>
<CONNECTOR type="125" id="157" >
<cdparam x="799" y="286" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
--
GitLab