Commit 106126a0 authored by apvrille's avatar apvrille

Update on OUT task in tmltonetwork

parent a7d7f81a
......@@ -133,7 +133,7 @@ public class Link {
feedbackPerVC = new TMLEvent[nbOfVCs];
for(int i=0; i<nbOfVCs; i++) {
feedbackPerVC[i] = new TMLEvent("Feedback__" + getNaming() + "_" + i,
feedbackPerVC[i] = new TMLEvent("Feedback__" + getNaming() + "_vc" + i,
null, 8, true);
tmlm.addEvent(feedbackPerVC[i]);
}
......@@ -146,8 +146,8 @@ public class Link {
}
public String getNaming() {
return "P_" + previousRouter.getXPos() + "_" + previousRouter.getYPos() +
"_N_" + nextRouter.getXPos() + "_" + nextRouter.getYPos() + add;
return "P_x" + previousRouter.getXPos() + "_y" + previousRouter.getYPos() +
"_N_x" + nextRouter.getXPos() + "_y" + nextRouter.getYPos() + add;
}
......
......@@ -315,7 +315,7 @@ public class TMAP2Network<E> {
if (s != null)
hwExecNode = (HwExecutionNode)(tmla.getHwNodeByName(s));
if (hwExecNode == null) {
HwCPU missingCPU = new HwCPU("EmptyCPUForDomain" + i + "_" + j);
HwCPU missingCPU = new HwCPU("EmptyCPUForDomain_x" + i + "_y" + j);
tmla.addHwNode(missingCPU);
hwExecNode = missingCPU;
fakeCPUs.add(missingCPU);
......
......@@ -137,6 +137,9 @@ public class TaskOUTForDispatch extends TMLTask {
mainChoice = new TMLChoice("ChoiceOf" + i, referenceObject);
activity.addLinkElement(notified, mainChoice);
activity.addLinkElement(notified, new TMLStopState("StopAfterMainChoice", referenceObject));
mainChoice.addGuard("nEvt == 0");
TMLForLoop loopInside = new TMLForLoop("LoopInside" + i, referenceObject);
loopInside.setInit("loopExit=0");
loopInside.setCondition("loopExit<1");
......@@ -197,7 +200,7 @@ public class TaskOUTForDispatch extends TMLTask {
// Right branch of internal choice
TMLActionState actionEnd = new TMLActionState("MustExitLoop" + i, referenceObject);
actionEnd.setAction("loopExit = 1");
actionEnd.setAction("loopExit = 2");
activity.addLinkElement(internalChoice, actionEnd);
internalChoice.addGuard("feedback == 0");
......@@ -307,7 +310,7 @@ public class TaskOUTForDispatch extends TMLTask {
// Right branch of internal choice
actionEnd = new TMLActionState("MustExitLoop" + i, referenceObject);
actionEnd.setAction("loopExit = 1");
actionEnd.setAction("loopExit = 2");
activity.addLinkElement(internalChoice, actionEnd);
internalChoice.addGuard("feedback == 0");
......
......@@ -338,7 +338,8 @@ public class TranslatedRouter<E> {
if (playingTheRoleOfNext[portNb] != null) {
for (int vcNb = 0; vcNb < nbOfVCs; vcNb++) {
TaskINForVC taskINForVC = new TaskINForVC("INVC_" + nameOfExecNode + "___" + portNb + "_" + vcNb, null,
TaskINForVC taskINForVC = new TaskINForVC("INVC_" + nameOfExecNode +
"___p" + portNb + "_vc" + vcNb, null,
null);
tmlm.addTask(taskINForVC);
allTasks.add(taskINForVC);
......
......@@ -784,7 +784,7 @@ public class JFrameInteractiveSimulation extends JFrame implements ActionListene
animateWithInfo.setSelected(true);
openDiagram = new JCheckBox("Automatically open active task diagram");
jp01.add(openDiagram, c01);
openDiagram.setSelected(true);
openDiagram.setSelected(false);
update = new JCheckBox("Automatically update information (task, CPU, etc.)");
jp01.add(update, c01);
update.addItemListener(this);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment