From e5e2b135cc4ab23be80c34c5a9eef2f043571c71 Mon Sep 17 00:00:00 2001
From: apvrille <ludovic.apvrille@eurecom.fr>
Date: Mon, 17 Jun 2019 13:52:29 +0200
Subject: [PATCH] Update on NI_OUT
---
.../tmltranslator/tonetwork/TaskNetworkInterfaceOUT.java | 6 +++---
src/main/java/tmltranslator/tonetwork/TranslatedRouter.java | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/tmltranslator/tonetwork/TaskNetworkInterfaceOUT.java b/src/main/java/tmltranslator/tonetwork/TaskNetworkInterfaceOUT.java
index 69be81ef1f..6fc67cee7f 100644
--- a/src/main/java/tmltranslator/tonetwork/TaskNetworkInterfaceOUT.java
+++ b/src/main/java/tmltranslator/tonetwork/TaskNetworkInterfaceOUT.java
@@ -155,13 +155,13 @@ public class TaskNetworkInterfaceOUT extends TMLTask {
TMLStopState stopInvalid = new TMLStopState("InvalidCHID", referenceObject);
addElement(packetChoice, stopInvalid);
- packetChoice.addGuard("chid == (0-1)");
-
+ packetChoice.addGuard("else");
+
// Right branch of choice
TMLStopState stopOfRightBranchOfChoice = new TMLStopState("stopOfRightBranchOfChoice", referenceObject);
addElement(testingEOP, stopOfRightBranchOfChoice);
- testingEOP.addGuard("not(eop == 1)");
+ testingEOP.addGuard("else");
// Right branch of internal seg
// Test on vc
diff --git a/src/main/java/tmltranslator/tonetwork/TranslatedRouter.java b/src/main/java/tmltranslator/tonetwork/TranslatedRouter.java
index b22a38d81c..212bc030e7 100644
--- a/src/main/java/tmltranslator/tonetwork/TranslatedRouter.java
+++ b/src/main/java/tmltranslator/tonetwork/TranslatedRouter.java
@@ -387,7 +387,7 @@ public class TranslatedRouter<E> {
//TraceManager.addDev("I have a router after me at port =" + portNb);
for (int vcNb = 0; vcNb < nbOfVCs; vcNb++) {
- TaskOUTForVC taskOUTForVC = new TaskOUTForVC("OUTVC_" + nameOfExecNode + "__" + portNb + "_" + vcNb, null,
+ TaskOUTForVC taskOUTForVC = new TaskOUTForVC("OUTVC_" + nameOfExecNode + "__p" + portNb + "_vc" + vcNb, null,
null);
tmlm.addTask(taskOUTForVC);
allTasks.add(taskOUTForVC);
--
GitLab