diff --git a/src/main/java/tmltranslator/TMLForLoop.java b/src/main/java/tmltranslator/TMLForLoop.java index 71e1367cc0ecc8e376703bddbfe4baab4f4a1c52..523e0396ff8fc58c4768a7fcdc48a0d32fb2e722 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 7f8f3b8f91bc68fb70c0bbc688f759ba6b717b88..db4e5bc3931270c8d0ec644a3a3bb542d79241d2 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 2cdcffa53b2bd31d88dceb5a95339fc85a1db747..6e9763115e3d2928605ed791e045534618cb6ec8 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 516f5a9daabcba622327623c50634b9dbcddf395..c1dc504514f8251f66d23aaf8107938a98460ebe 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 b6930a0e8d3beeb984a50bd22be8b9b7b5a9a5bb..35ec4ee506710dbb7208acd29caddfb2de654d14 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);