Skip to content
Snippets Groups Projects
Commit c89f8d64 authored by erwan's avatar erwan
Browse files

fix: for silent algo, the round output of test/lustre/round.lus was wrong

parent 1624f606
No related branches found
No related tags found
No related merge requests found
......@@ -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
......@@ -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
......
......@@ -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
......
......@@ -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
-- -- 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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment