diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a6d51e831902f74839b50683559b804ed1face27..3268697aca0839d0ba8b1c5ea83c1bc97bf1eaae 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,6 +18,9 @@ build:
- make test
- cd tools/simca
- make && make cmxs && make log -j 15 && make pdf
+ artifacts:
+ paths:
+ - tools/simca
simca-docker:
image: jahierwan/verimag-sync-tools
diff --git a/lib/sasa/sasaRun.ml b/lib/sasa/sasaRun.ml
index b42debfb7d40817c8b815ff99d5843124e5ed974..422f4a75ce6bda46d7d1ba242e528789146bcba4 100644
--- a/lib/sasa/sasaRun.ml
+++ b/lib/sasa/sasaRun.ml
@@ -110,7 +110,8 @@ let (make_do: string array -> SasArg.t ->
let silent = List.for_all (fun b -> not b) (List.flatten enab_ll) in
let legit = compute_legitimate silent p_nl_l e in
pre_enable_processes_opt := Some(pnall, enab_ll);
- ("legitimate", Data.B legit)::pot_sl @ sasa_nenv @ (get_sl_out true pl enab_ll)
+ ("silent", Data.B silent)::("legitimate", Data.B legit)::pot_sl
+ @ sasa_nenv @ (get_sl_out true pl enab_ll)
)
| Some (pre_pnall, pre_enab_ll) ->
(* 2: read the actions from the outside process, i.e., from sl_in *)
@@ -129,7 +130,8 @@ let (make_do: string array -> SasArg.t ->
let legit = compute_legitimate silent p_nl_l e in
pre_enable_processes_opt := Some(pnall, enab_ll);
sasa_env := ne;
- ("legitimate", Data.B legit)::pot_sl @ sasa_nenv @ (get_sl_out true pl enab_ll)
+ ("silent", Data.B silent)::("legitimate", Data.B legit)::pot_sl @
+ sasa_nenv @ (get_sl_out true pl enab_ll)
in
let (step_internal_daemon: RdbgPlugin.sl -> RdbgPlugin.sl) =
fun sl_in ->
diff --git a/lib/sasacore/main.ml b/lib/sasacore/main.ml
index 0f79e98d27cc11fb0222bd48ff454a3c6d5c5a1a..1d57f10f21c363cfb06a59a324461e2e69683460 100644
--- a/lib/sasacore/main.ml
+++ b/lib/sasacore/main.ml
@@ -1,4 +1,4 @@
-(* Time-stamp: <modified the 15/10/2020 (at 15:53) by Erwan Jahier> *)
+(* Time-stamp: <modified the 02/12/2020 (at 11:04) by Erwan Jahier> *)
open Register
@@ -266,7 +266,8 @@ let (make : bool -> string array -> 'v t) =
if args.no_data_file then () else (
let oc = if args.rif then stderr else stdout in
if !Register.verbose_level > 0 then Printf.eprintf "==> open rif file...\n%!";
- Printf.fprintf oc "%s" (Mypervasives.entete "#" SasaVersion.str SasaVersion.sha);
+ if not args.rif then
+ Printf.fprintf oc "%s" (Mypervasives.entete "#" SasaVersion.str SasaVersion.sha);
Printf.fprintf oc "#seed %i\n" seed;
let inputs_decl = get_inputs_rif_decl args pl in
Printf.printf "#inputs ";
diff --git a/lib/sasacore/sasArg.ml b/lib/sasacore/sasArg.ml
index 5346581f5432ea072146169541bdcd379feea1ac..44260098c9b38bfd8baa4edd228d1d9ff53a7cd2 100644
--- a/lib/sasacore/sasArg.ml
+++ b/lib/sasacore/sasArg.ml
@@ -1,4 +1,4 @@
-(* Time-stamp: <modified the 30/09/2020 (at 13:53) by Erwan Jahier> *)
+(* Time-stamp: <modified the 02/12/2020 (at 11:14) by Erwan Jahier> *)
type t = {
@@ -225,8 +225,7 @@ let (mkoptab : string array -> t -> unit) =
mkopt args ~hide:true ["--ignore-first-inputs"; "-ifi"]
(Arg.Unit(fun () -> args.ifi <- true))
- ["Ignore first inputs (necessary to use luciole via ";
- "lurette/rdbg/luciole-rif)"];
+ ["[Deprecated] make sasa ignore its first input vector"];
mkopt args ["--length";"-l"] ~arg:" <int>"
(Arg.Int (fun i -> args.length <- i))
diff --git a/src/sasaMain.ml b/src/sasaMain.ml
index 74f66c29549164eeef07f13f70e9048b6a741c92..dfcb5c6efdb616af0f16ad92c4b204c4a1aa16dc 100644
--- a/src/sasaMain.ml
+++ b/src/sasaMain.ml
@@ -13,17 +13,21 @@ let (print_step : int -> int -> string -> SasArg.t -> 'v Env.t -> 'v Process.t l
if args.daemon = Daemon.Custom then (
(* in custom mode, to be able to talk with lurette, this should not be
printed on stdout
- *)
- Printf.eprintf "\n#step %s\n" (string_of_int (n-i)) ;
- Printf.eprintf "%s #outs " activate_val; flush stderr;
- Printf.printf "%s %s %s\n" (StringOf.env_rif e pl) enable_val pot;
+ *)
+ if not args.rif then (
+ Printf.eprintf "\n#step %s\n" (string_of_int (n-i)) ;
+ Printf.eprintf "%s #outs " activate_val; flush stderr
+ );
+ Printf.printf "%s %s %s\n%!" (StringOf.env_rif e pl) enable_val pot;
) else (
(* rif mode, internal daemons *)
if args.rif then
Printf.printf " %s %s %s %s\n%!" (StringOf.env_rif e pl) enable_val activate_val pot
else (
Printf.printf "\n#step %s\n" (string_of_int (n-i));
- Printf.printf "#outs %s %s %s %s\n%!" (StringOf.env_rif e pl) enable_val activate_val pot
+ Printf.printf "%s%s %s %s %s\n%!"
+ (if args.rif then "" else "#outs ")
+ (StringOf.env_rif e pl) enable_val activate_val pot
);
);
flush stderr;
diff --git a/test/coloring/Makefile b/test/coloring/Makefile
index dc21aef1702a5ab690ebf58a06900236ddb9d349..ece5ffcfd7f707c519f0dd1e8f1ccd217d361431 100644
--- a/test/coloring/Makefile
+++ b/test/coloring/Makefile
@@ -1,4 +1,4 @@
-# Time-stamp: <modified the 04/11/2020 (at 11:07) by Erwan Jahier>
+# Time-stamp: <modified the 02/12/2020 (at 11:15) by Erwan Jahier>
sasa=$(DIR)/bin/sasa -l 100
@@ -42,6 +42,19 @@ rdbgui: grid4.ml
echo "" > include.ml
rdbgui4sasa -sut "sasa grid4.dot --locally-central-daemon"
+rdbgui-demo: grid10.ml
+ echo "" > include.ml
+ rdbgui4sasa -sut "sasa grid10.dot --central-daemon"
+
+rdbg-luciole: grid4.ml
+ echo "" > include.ml
+ rdbg --luciole -sut "sasa -rif grid4.dot --custom-daemon" --missing-vars-last
+
+rdbgui-luciole: grid4.ml
+ echo "" > include.ml
+ rdbgui4sasa --luciole -sut "sasa -rif grid4.dot --custom-daemon" --missing-vars-last
+
+
rdbg3: ring.ml
echo "" > include.ml
ledit rdbg -sut "sasa ring.dot -wd"
diff --git a/test/dijkstra-ring/Makefile b/test/dijkstra-ring/Makefile
index fc0d35bfca075fbcb9e686b5f27590f95f586136..c1f82931af99d21caf8488200b95f107257d4c02 100644
--- a/test/dijkstra-ring/Makefile
+++ b/test/dijkstra-ring/Makefile
@@ -1,4 +1,4 @@
-# Time-stamp: <modified the 04/11/2020 (at 12:28) by Erwan Jahier>
+# Time-stamp: <modified the 19/11/2020 (at 15:04) by Erwan Jahier>
test: ring.cmxs lurette1 rdbg_test
@@ -21,6 +21,12 @@ rdbg: ring.ml ring.lut
rdbgui: ring.ml ring.lut
rdbgui4sasa -o ring.rif -sut "sasa ring.dot"
+rdbgui-cd: ring.ml ring.lut
+ rdbgui4sasa -o ring.rif -sut "sasa ring.dot -cd"
+
+rdbgui-sd: ring.ml ring.lut
+ rdbgui4sasa -o ring.rif -sut "sasa ring.dot -sd"
+
rdbg2: ring.ml ring.lut
ledit rdbg -o ring.rif \
-env "$(sasa) ring.dot -custd -rif" \