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 3b350dd9f537acd857bcf00e9dc266f296aef398..d2b58bc63b8b5ac07de32956366727b4ba983b24 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 7dc9b10324f33034b67de377bcded519f80074b4..8389121dcc4ea0118c9aeb6ae20b660419dc67ba 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 7ac783b282eac2f5434e9b78f1c589ca8b1d6049..00681387941e2419b75c3b64c94ceae101d71d29 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 0a3d066d7324e8ba74febe97c9a86919a7d95f4d..c69bae817d3a278bc889a509cdbdd88db20a6421 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 86bf3a250278b069825e299210a94fccb55e1506..8b8100b2d0b30858daba8a66e40c48f4ff060207 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