Commit b92b28c8 authored by Ludovic Apvrille's avatar Ludovic Apvrille

Merge branch 'master' of gitlab.enst.fr:mbe-tools/TTool

parents cfc0dfc4 2d0659dc
......@@ -55,7 +55,7 @@ make ultraclean Clean the repository from binaries and compilation artif
make ttooljavac Build TTool only with javac
make ttoolnotest Build TTool with gradle, but do not execute test. Performs the install
make allnotest Builld all apps, but do not execute tests. Performs the install
make ttoolhelp Generate the help of TTool in HTML format
make internalhelp Generate the help of TTool in HTML format
Other targets:
......@@ -201,7 +201,7 @@ $(WEBCRAWLER_SERVER_BINARY): FORCE
$(JTTOOL_BINARY): FORCE
@$(MAKE) -C $(JTTOOL_DIR) -e $@
ttoolhelp: html
internalhelp: html
html: $(MD2HTML)
......
13036
\ No newline at end of file
13037
\ No newline at end of file
......@@ -300,7 +300,7 @@ public class TranslatedRouter<E> {
if (fromPreviousRouters[portNb] != null) {
for (int vcNb = 0; vcNb < nbOfVCs; vcNb++) {
TaskINForVC taskINForVC = new TaskINForVC("IN_" + nameOfExecNode + "_" + vcNb, null,
TaskINForVC taskINForVC = new TaskINForVC("INVC_" + nameOfExecNode + "___" + portNb + "_" + vcNb, null,
null);
tmlm.addTask(taskINForVC);
dispatchInVCs[portNb][vcNb] = taskINForVC;
......@@ -441,8 +441,11 @@ public class TranslatedRouter<E> {
// Internal events and channels
// Between IN and INVC
pktInEvtsVCs = new TMLEvent[TMAP2Network.DOMAIN + 1][nbOfVCs];
pktInChsVCs = new TMLChannel[TMAP2Network.DOMAIN + 1][nbOfVCs];
pktInEvtsVCs = new TMLEvent[NB_OF_PORTS][nbOfVCs];
pktInChsVCs = new TMLChannel[NB_OF_PORTS][nbOfVCs];
for (int i = 0; i < TMAP2Network.DOMAIN + 1; i++) {
for (int j = 0; j < nbOfVCs; j++) {
......
......@@ -50,8 +50,8 @@ package ui.util;
*/
public class DefaultText {
public static String BUILD = "13035";
public static String DATE = "2019/05/15 03:02:17 CET";
public static String BUILD = "13036";
public static String DATE = "2019/05/16 03:02:16 CET";
public static StringBuffer sbAbout = makeAbout();
......
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