From a47b6f7620389b2f019a1958da1be590f1109b0b Mon Sep 17 00:00:00 2001
From: Ludovic Apvrille <ludovic.apvrille@telecom-paristech.fr>
Date: Wed, 22 May 2019 17:45:35 +0200
Subject: [PATCH] First totally connected Noc
---
src/main/java/tmltranslator/TMLForLoop.java | 2 +-
src/main/java/tmltranslator/TMLNotifiedEvent.java | 2 +-
src/main/java/tmltranslator/TMLTextSpecification.java | 11 ++++++++---
.../tmltranslator/tonetwork/TaskNetworkInterface.java | 1 +
.../tmltranslator/tonetwork/TaskOUTForDispatch.java | 6 +++---
5 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/src/main/java/tmltranslator/TMLForLoop.java b/src/main/java/tmltranslator/TMLForLoop.java
index 71e1367cc0..523e0396ff 100755
--- a/src/main/java/tmltranslator/TMLForLoop.java
+++ b/src/main/java/tmltranslator/TMLForLoop.java
@@ -78,7 +78,7 @@ public class TMLForLoop extends TMLActivityElement {
}
public String customExtraToXML() {
- return " init=\"" + Conversion.transformToXMLString(init) + "\" condition=\"" + Conversion.transformToXMLString(condition) + "\" increment=\"" + Conversion.transformToXMLString(increment) + "\" isInfinite=\"" + isInfinite + "\" ";
+ return " init=\"" + Conversion.transformToXMLString(init) + "\" condition=\"" + Conversion.transformToXMLString(condition) + "\" increment=\"" + Conversion.transformToXMLString(increment) + "\" isInfinite=\"" + isInfinite + "\" ";
}
diff --git a/src/main/java/tmltranslator/TMLNotifiedEvent.java b/src/main/java/tmltranslator/TMLNotifiedEvent.java
index 7f8f3b8f91..db4e5bc393 100755
--- a/src/main/java/tmltranslator/TMLNotifiedEvent.java
+++ b/src/main/java/tmltranslator/TMLNotifiedEvent.java
@@ -59,6 +59,6 @@ public class TMLNotifiedEvent extends TMLActivityElementEvent {
}
public String customExtraToXML() {
- return " event=\"" + event.getName() + "\" params=\"" + getAllParams() + "\" variable=\"" + variable + "\" ";
+ return " event=\"" + event.getName() + "\" params=\"" + getAllParams() + "\" variable=\"" + variable + "\" ";
}
}
diff --git a/src/main/java/tmltranslator/TMLTextSpecification.java b/src/main/java/tmltranslator/TMLTextSpecification.java
index 2cdcffa53b..6e9763115e 100755
--- a/src/main/java/tmltranslator/TMLTextSpecification.java
+++ b/src/main/java/tmltranslator/TMLTextSpecification.java
@@ -431,10 +431,15 @@ public class TMLTextSpecification<E> {
} else if (elt instanceof TMLForLoop) {
tmlfl = (TMLForLoop) elt;
- code = "FOR(" + tmlfl.getInit() + SC + SP;
- code += tmlfl.getCondition() + SC + SP;
- code += tmlfl.getIncrement() + ")" + CR;
+ if (tmlfl.isInfinite()) {
+ code = "FOR( " + SC + " " + SC + " )" + CR;
+ } else {
+ code = "FOR(" + tmlfl.getInit() + SC + SP;
+ code += tmlfl.getCondition() + SC + SP;
+ code += tmlfl.getIncrement() + ")" + CR;
+ }
code += makeBehavior(task, elt.getNextElement(0));
+
return code + "ENDFOR" + CR + makeBehavior(task, elt.getNextElement(1));
} else if (elt instanceof TMLRandom) {
diff --git a/src/main/java/tmltranslator/tonetwork/TaskNetworkInterface.java b/src/main/java/tmltranslator/tonetwork/TaskNetworkInterface.java
index 516f5a9daa..c1dc504514 100644
--- a/src/main/java/tmltranslator/tonetwork/TaskNetworkInterface.java
+++ b/src/main/java/tmltranslator/tonetwork/TaskNetworkInterface.java
@@ -239,6 +239,7 @@ public class TaskNetworkInterface extends TMLTask {
// Feedback present
TMLWriteChannel sendingSample = new TMLWriteChannel("SendingSample", referenceObject);
sendingSample.addChannel(outputChannel);
+ sendingSample.setNbOfSamples("1");
addElement(testOnFeedback, sendingSample);
testOnFeedback.addGuard("feedback > 0");
diff --git a/src/main/java/tmltranslator/tonetwork/TaskOUTForDispatch.java b/src/main/java/tmltranslator/tonetwork/TaskOUTForDispatch.java
index b6930a0e8d..35ec4ee506 100644
--- a/src/main/java/tmltranslator/tonetwork/TaskOUTForDispatch.java
+++ b/src/main/java/tmltranslator/tonetwork/TaskOUTForDispatch.java
@@ -76,7 +76,7 @@ public class TaskOUTForDispatch extends TMLTask {
this.addAttribute(vc);
TMLAttribute eop = new TMLAttribute("eop", "eop", new TMLType(TMLType.NATURAL), "0");
this.addAttribute(eop);
- TMLAttribute nEvt = new TMLAttribute("nevt", "nevt", new TMLType(TMLType.NATURAL), "0");
+ TMLAttribute nEvt = new TMLAttribute("nEvt", "nEvt", new TMLType(TMLType.NATURAL), "0");
this.addAttribute(nEvt);
TMLAttribute loopExit = new TMLAttribute("loopExit", "loopExit", new TMLType(TMLType.NATURAL), "0");
this.addAttribute(loopExit);
@@ -111,7 +111,7 @@ public class TaskOUTForDispatch extends TMLTask {
if (mainChoice == null) {
TMLNotifiedEvent notified = new TMLNotifiedEvent("NotificationOfEvent"+i, referenceObject);
notified.setEvent(inPacketEvents.get(i));
- notified.addParam("nEvt");
+ notified.setVariable("nEvt");
if (mainChoice == null) {
activity.addLinkElement(loop, notified);
} else {
@@ -131,7 +131,7 @@ public class TaskOUTForDispatch extends TMLTask {
TMLNotifiedEvent notifiedFeedback = new TMLNotifiedEvent("FeedbackNotifiedEvt"+i, referenceObject);
notifiedFeedback.setEvent(outSelectEvents.get(i));
- notifiedFeedback.addParam("feedback");
+ notifiedFeedback.setVariable("feedback");
activity.addLinkElement(loopInside, notifiedFeedback);
TMLChoice internalChoice = new TMLChoice("InternalChoice"+i, referenceObject);
--
GitLab