From c89f8d64f3383b78fdb0af27d7536fcd0ffb01e4 Mon Sep 17 00:00:00 2001
From: Erwan Jahier <erwan.jahier@univ-grenoble-alpes.fr>
Date: Wed, 11 Oct 2023 16:56:33 +0200
Subject: [PATCH] fix: for silent algo, the round output of
test/lustre/round.lus was wrong
---
salut/test/bfs-spanning-tree/bfs_spanning_tree_oracle.lus | 2 +-
salut/test/coloring/coloring_oracle.lus | 2 +-
salut/test/kclustering/kclustering_oracle.lus | 4 ++--
salut/test/rsp_tree/rsp_tree_oracle.lus | 4 ++--
test/lustre/round.lus | 4 ++--
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/salut/test/bfs-spanning-tree/bfs_spanning_tree_oracle.lus b/salut/test/bfs-spanning-tree/bfs_spanning_tree_oracle.lus
index 3b350dd9..d2b58bc6 100644
--- a/salut/test/bfs-spanning-tree/bfs_spanning_tree_oracle.lus
+++ b/salut/test/bfs-spanning-tree/bfs_spanning_tree_oracle.lus
@@ -55,7 +55,7 @@ let
ok = lustre_enabled = ocaml_enabled
-- compare the sasa dot interpretation and the salut dot to lustre compilation
and lustre_config = ocaml_config
- -- and lustre_round = round
+ and lustre_round = round
and lustre_round_nb = round_nb
;
tel
diff --git a/salut/test/coloring/coloring_oracle.lus b/salut/test/coloring/coloring_oracle.lus
index 7dc9b103..8389121d 100644
--- a/salut/test/coloring/coloring_oracle.lus
+++ b/salut/test/coloring/coloring_oracle.lus
@@ -30,7 +30,7 @@ let
and lustre_config = ocaml_config
-- compare the lustre and the ocaml version of the processes
-- and Lustre::real2int(ocaml_cost) = lustre_cost
--- and lustre_round = round
+ and lustre_round = round
and lustre_round_nb = round_nb
;
-- compare the cost functions
diff --git a/salut/test/kclustering/kclustering_oracle.lus b/salut/test/kclustering/kclustering_oracle.lus
index 7ac783b2..00681387 100644
--- a/salut/test/kclustering/kclustering_oracle.lus
+++ b/salut/test/kclustering/kclustering_oracle.lus
@@ -33,8 +33,8 @@ let
lustre_cost = cost(lustre_enabled, lustre_config);
ok = lustre_enabled = ocaml_enabled
-- compare the sasa dot interpretation and the salut dot to lustre compilation
- and lustre_config = ocaml_config
--- and lustre_round = round
+ and lustre_config = ocaml_config
+ and lustre_round = round
and lustre_round_nb = round_nb
-- compare the lustre and the ocaml version of the processes
-- and Lustre::real2int(ocaml_cost) = lustre_cost
diff --git a/salut/test/rsp_tree/rsp_tree_oracle.lus b/salut/test/rsp_tree/rsp_tree_oracle.lus
index 0a3d066d..c69bae81 100644
--- a/salut/test/rsp_tree/rsp_tree_oracle.lus
+++ b/salut/test/rsp_tree/rsp_tree_oracle.lus
@@ -39,8 +39,8 @@ let
ok = lustre_enabled = ocaml_enabled
-- compare the sasa dot interpretation and the salut dot to lustre compilation
and lustre_config = ocaml_config
--- and lustre_round = round
--- and lustre_round_nb = round_nb
+ and lustre_round = round
+ and lustre_round_nb = round_nb
;
-- compare the lustre and the ocaml version of the processes
tel
diff --git a/test/lustre/round.lus b/test/lustre/round.lus
index 86bf3a25..8b8100b2 100644
--- a/test/lustre/round.lus
+++ b/test/lustre/round.lus
@@ -1,4 +1,4 @@
--- -- Time-stamp: <modified the 14/06/2023 (at 16:30) by Erwan Jahier>
+-- -- Time-stamp: <modified the 11/10/2023 (at 16:29) by Erwan Jahier>
--
-- Computing rounds in Lustre
-- The inputs are 2 arrays Enab and Acti, where:
@@ -32,7 +32,7 @@ let
-- (false -> mask0 when not init_mask);
mask_i = mask_init<<an, pn>>(Enab);
mask = if init_mask then mask_i else mask0;
- res = false -> not(silent) and (boolnone<<pn>>(mask0));
+ res = false -> not(pre silent) and (boolnone<<pn>>(mask0));
tel
-- At the first instant, the round has not begun
--
GitLab