diff --git a/test/bfs-spanning-tree/Makefile b/test/bfs-spanning-tree/Makefile
index 12eaa3d9935e1c5d87a9e920231adf650ddaad4e..11c3005a9a25531215cd09956ad5bb3807ae566f 100644
--- a/test/bfs-spanning-tree/Makefile
+++ b/test/bfs-spanning-tree/Makefile
@@ -1,4 +1,4 @@
-# Time-stamp: <modified the 23/10/2019 (at 15:41) by Erwan Jahier>
+# Time-stamp: <modified the 22/11/2019 (at 15:41) by Erwan Jahier>
test: test0 test2 lurette0
@@ -38,9 +38,7 @@ lurette: lurette0
gnuplot-rif lurette.rif
rdbg: fig51_noinit.ml fig51_noinit.lut
- rdbg -o lurette.rif \
- -env "$(sasa) fig51_noinit.dot -custd -rif" \
- -sut-nd "lutin fig51_noinit.lut -n distributed"
+ ledit rdbg -sut "sasa fig51_noinit.dot -dd "
rdbg2: fig51.ml fig51.lut
rdbg -o lurette.rif \
diff --git a/test/bfs-spanning-tree/my-rdbg-tuning.ml b/test/bfs-spanning-tree/my-rdbg-tuning.ml
index 82813d6dd7166c61c1d740335f934f70f340988a..71f993aeb204087ed184873c95cf7386801b97dd 100644
--- a/test/bfs-spanning-tree/my-rdbg-tuning.ml
+++ b/test/bfs-spanning-tree/my-rdbg-tuning.ml
@@ -2,6 +2,7 @@
#use "../my-rdbg-tuning.ml";;
let _ =
+ ci();
dot_view:=ci;;
diff --git a/test/coloring/Makefile b/test/coloring/Makefile
index 082d40082371c9583cfafa8336a1181b12eff30c..ad3096e682f428da7fa0fee0ece140947c55459a 100644
--- a/test/coloring/Makefile
+++ b/test/coloring/Makefile
@@ -1,14 +1,17 @@
-# Time-stamp: <modified the 27/11/2019 (at 09:09) by Erwan Jahier>
+# Time-stamp: <modified the 01/12/2019 (at 16:17) by Erwan Jahier>
sasa=$(DIR)/bin/sasa -l 100
-test: ring.cmxs coloring.rif lurette
+test: ring.cmxs coloring.rif coloring2.rif lurette
coloring.rif: ring.cmxs
$(sasa) -l 200 ring.dot > $@
+coloring2.rif: grid4.cmxs
+ $(sasa) -l 200 grid4.dot > $@
+
sim2chrogtk: coloring.rif
- sim2chrogtk -ecran -in $< > /dev/null
+ sim2chrogtk -screenrealheight 2000 -ecran -in $< > /dev/null
gnuplot: coloring.rif
gnuplot-rif $<
diff --git a/test/dfs/Makefile b/test/dfs/Makefile
index bc34f0806898f1b52a4eb9e52aacb2ed8472529e..1d5a32117c6313011a113f680f580e36c7092ba3 100644
--- a/test/dfs/Makefile
+++ b/test/dfs/Makefile
@@ -1,4 +1,4 @@
-# Time-stamp: <modified the 23/10/2019 (at 12:21) by Erwan Jahier>
+# Time-stamp: <modified the 24/11/2019 (at 11:39) by Erwan Jahier>
test: test0 lurette0 rdbg_test
@@ -23,6 +23,10 @@ lurette: lurette0
rdbg: g.lut g.ml
rdbg -o lurette.rif \
+ -env "$(sasa) g.dot -rif"
+
+rdbg2: g.lut g.ml
+ rdbg -o lurette.rif \
-env "$(sasa) g.dot -rif" \
-sut-nd "lutin g.lut -n dummy"
diff --git a/test/dijkstra-ring/Makefile b/test/dijkstra-ring/Makefile
index 71b2b7608342fdc7fd40a1961ab1e9677cb0bb87..8a12881682256dc43f33743506b0849b1daa3031 100644
--- a/test/dijkstra-ring/Makefile
+++ b/test/dijkstra-ring/Makefile
@@ -1,7 +1,7 @@
-# Time-stamp: <modified the 23/10/2019 (at 15:41) by Erwan Jahier>
+# Time-stamp: <modified the 24/11/2019 (at 15:51) by Erwan Jahier>
-test: ring.cmxs lurette1
+test: ring.cmxs lurette1 rdbg_test
$(sasa) ring.dot
@@ -13,10 +13,15 @@ gnuplot: dijkstra-ring.rif
rdbg: ring.ml ring.lut
- rdbg -o ring.rif \
+ ledit rdbg -o ring.rif -sut "$(sasa) ring.dot -dd -rif"
+
+rdbg2: ring.ml ring.lut
+ ledit rdbg -o ring.rif \
-env "$(sasa) ring.dot -custd -rif" \
-sut-nd "lutin ring.lut -n distributed"\
+rdbg_test: ring.ml
+ echo "\nnr\nsd\n" | rdbg -o ring.rif -l 10000 -sut "$(sasa) -vl 1 ring.dot -dd"
lurette1: ring.lut ring_oracle.lus
lurette \
diff --git a/test/dijkstra-ring/p.ml b/test/dijkstra-ring/p.ml
index 5a7c0137b5ca7a2303f63755fb95a1f244848f50..5a5fb1865fe5aa294a21279e8892c9054579fdca 100644
--- a/test/dijkstra-ring/p.ml
+++ b/test/dijkstra-ring/p.ml
@@ -1,10 +1,9 @@
-(* Time-stamp: <modified the 25/09/2019 (at 13:50) by Erwan Jahier> *)
+(* Time-stamp: <modified the 27/11/2019 (at 06:40) by Erwan Jahier> *)
open Algo
let k = 42
-
let (init_state: int -> 's) =
fun _ ->
(* let k = (card() - 1) in *)
@@ -14,7 +13,7 @@ let (init_state: int -> 's) =
let (enable_f: 's -> 's neighbor list -> action list) =
fun e nl ->
let pred = List.hd nl in
- if e <> state pred then ["a"] else []
+ if e <> state pred then ["T"] else []
let (step_f : 's -> 's neighbor list -> action -> 's) =
fun e nl a ->
@@ -22,6 +21,6 @@ let (step_f : 's -> 's neighbor list -> action -> 's) =
match a with
| _ -> state pred
-let actions = Some ["a"]
+let actions = Some ["T"]
diff --git a/test/dijkstra-ring/ring.dot b/test/dijkstra-ring/ring.dot
index b34e38951ffb6106fd3c101f80284044a4633739..ee5e024a2f0b34de227a6aab411a8a2814669519 100644
--- a/test/dijkstra-ring/ring.dot
+++ b/test/dijkstra-ring/ring.dot
@@ -1,7 +1,7 @@
digraph ring7 {
graph [k=3]
- p1 [algo="root.ml" init="v=1" ]
+ root [algo="root.ml" init="v=1" ]
p2 [algo="p.ml" init="v=3" ]
p3 [algo="p.ml" init="v=3" ]
p4 [algo="p.ml" init="v=2" ]
@@ -11,6 +11,6 @@ digraph ring7 {
p8 [algo="p.ml" init="v=0" ]
- p1 -> p2 -> p3 -> p4 -> p5 -> p6 -> p7 -> p8 -> p1
+ root -> p2 -> p3 -> p4 -> p5 -> p6 -> p7 -> p8 -> root
}
diff --git a/test/dijkstra-ring/root.ml b/test/dijkstra-ring/root.ml
index 833731bcd7e90b60de4fbd4775e589d3c9d8af20..3e03c3d4eb5e432f21a214933e1415809dc68bb6 100644
--- a/test/dijkstra-ring/root.ml
+++ b/test/dijkstra-ring/root.ml
@@ -1,4 +1,4 @@
-(* Time-stamp: <modified the 25/09/2019 (at 13:50) by Erwan Jahier> *)
+(* Time-stamp: <modified the 27/11/2019 (at 06:40) by Erwan Jahier> *)
open Algo
@@ -13,7 +13,7 @@ let (init_state: int -> 's) =
let (enable_f: 's -> 's neighbor list -> action list) =
fun e nl ->
let pred = List.hd nl in
- if e = state pred then ["a"] else []
+ if e = state pred then ["T"] else []
let (step_f : 's -> 's neighbor list -> action -> 's) =
fun e nl a ->
@@ -21,6 +21,6 @@ let (step_f : 's -> 's neighbor list -> action -> 's) =
match a with
| _ -> (e + 1) mod k
-let actions = Some ["a"]
+let actions = Some ["T"]
diff --git a/test/dijkstra-ring/state.ml b/test/dijkstra-ring/state.ml
index df1f3e07e93f77c6ebf375dc9d881d06b889a746..5c49f922ec3e8f09d2aac2aa8d7192646c9b69aa 100644
--- a/test/dijkstra-ring/state.ml
+++ b/test/dijkstra-ring/state.ml
@@ -1,5 +1,5 @@
type t = int
-let to_string = string_of_int
+let to_string = Printf.sprintf "c=%i"
let of_string = None
let copy x = x
diff --git a/test/rdbg-utils/dot.ml b/test/rdbg-utils/dot.ml
index 432f42307c1c46f631fb40eeecf05309c127e37e..4c4fe3a894d750b724171cb39b75598dd8d25e07 100644
--- a/test/rdbg-utils/dot.ml
+++ b/test/rdbg-utils/dot.ml
@@ -24,6 +24,7 @@ let (is_parent: string -> string -> int -> Event.t -> bool) =
| Some (I j) -> j > -1 && i = j
| _ -> false
+
let (get_processes : Event.t -> process list) =
fun e ->
(* if e.kind <> Ltop then (