diff --git a/test/Makefile b/test/Makefile index bb1a052585448d6184edc2aaaf994dbf5f8857b4..599c4245b0500e862ba5a12e43f5794b20d51a6d 100644 --- a/test/Makefile +++ b/test/Makefile @@ -19,7 +19,7 @@ test: cd toy-example-a5sf/ && make test cd k-clustering/ && make test cd ghosh/ && make test - cd sierpinski/ && make test + cd wolfram-cellular-automaton/ && make test echo "Every test went fine!" clean: @@ -43,7 +43,7 @@ clean: cd toy-example-a5sf/ && make clean cd k-clustering/ && make clean cd ghosh/ && make clean - cd sierpinski/ && make clean + cd wolfram-cellular-automaton/ && make clean utest: cd skeleton/ && make test @@ -65,6 +65,6 @@ utest: cd toy-example-a5sf/ && make utest cd k-clustering/ && make utest cd ghosh/ && make utest - cd sierpinski/ && make utest + cd wolfram-cellular-automaton/ && make utest -include Makefile.untracked diff --git a/test/sierpinski/Makefile b/test/sierpinski/Makefile deleted file mode 100644 index 3f567b254a37db9207e25ecec32b10a47f17ef48..0000000000000000000000000000000000000000 --- a/test/sierpinski/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -# Time-stamp: <modified the 03/07/2023 (at 16:22) by Erwan Jahier> - -DECO_PATTERN="0-:p.ml" --include ./Makefile.dot --include ./Makefile.inc - -############################################################################## -# Non-regression tests - -test: chain10.gm_test chain10.rdbg-test demo50 clean - -# update golden-master tests (if necessary) -utest: - make chain10.ugm_test || echo "chain10 ok" - -# usage: make demo50 -demo%: - make chain$*.dot - sasa chain$*.dot --synchronous-daemon --length $(shell echo $$(( $* / 2 ))) \ - | grep outs | cut -d ' ' -f 2-$* \ - | sed -e "s/ //g" | sed -e "s/f/ /g" | sed -e "s/t/â–²/g" - - -clean: genclean - rm -f chain* diff --git a/test/sierpinski/Makefile.dot b/test/sierpinski/Makefile.dot deleted file mode 120000 index 618c8ab02bdfa1c158e4fda4241e5fc0187b611c..0000000000000000000000000000000000000000 --- a/test/sierpinski/Makefile.dot +++ /dev/null @@ -1 +0,0 @@ -../Makefile.dot \ No newline at end of file diff --git a/test/sierpinski/Makefile.inc b/test/sierpinski/Makefile.inc deleted file mode 120000 index b9a83c9dae3121bce33a41c0e052c2c405b90e26..0000000000000000000000000000000000000000 --- a/test/sierpinski/Makefile.inc +++ /dev/null @@ -1 +0,0 @@ -../Makefile.inc \ No newline at end of file diff --git a/test/sierpinski/config.ml b/test/sierpinski/config.ml deleted file mode 100644 index 1e0e05f19ad1274feaf2190998a37dcab48e172f..0000000000000000000000000000000000000000 --- a/test/sierpinski/config.ml +++ /dev/null @@ -1,5 +0,0 @@ - -let potential = None (* None => only -sd, -cd, -lcd, -dd, or -custd are possible *) -let legitimate = None (* None => only silent configuration are legitimate *) -let fault = None (* None => the simulation stop once a legitimate configuration is reached *) -let init_search_utils = None (* To provide to use --init-search *) diff --git a/test/sierpinski/dune b/test/sierpinski/dune deleted file mode 120000 index 5cb715b83e3d6df4f6d2b21b7c883e6e633c30ec..0000000000000000000000000000000000000000 --- a/test/sierpinski/dune +++ /dev/null @@ -1 +0,0 @@ -../dune2copy \ No newline at end of file diff --git a/test/sierpinski/dune-project b/test/sierpinski/dune-project deleted file mode 120000 index 1c5c1f5066170326034eb2eb4de944b70866a2d1..0000000000000000000000000000000000000000 --- a/test/sierpinski/dune-project +++ /dev/null @@ -1 +0,0 @@ -../dune-project2copy \ No newline at end of file diff --git a/test/sierpinski/dune-workspace b/test/sierpinski/dune-workspace deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/test/sierpinski/p.ml b/test/sierpinski/p.ml deleted file mode 100644 index 5fa45cefe91413b8421fbb9c0524ba5db9b73c11..0000000000000000000000000000000000000000 --- a/test/sierpinski/p.ml +++ /dev/null @@ -1,39 +0,0 @@ -(* Time-stamp: <modified the 10/07/2023 (at 11:36) by Erwan Jahier> *) - -(* Draw the Sierpinski triangle using Wolfram cellular automata - -https://mathworld.wolfram.com/ElementaryCellularAutomaton.html -*) - -let rule_nb = 126 (* Sierpinski rule *) -let _ = assert( 0 <= rule_nb && rule_nb <256 ) - -let rec to_bool_list n = if n = 0 then [] else (n mod 2 = 1)::(to_bool_list (n/2)) -let to_array l = - let a = Array.make 8 false in - let ll = List.length l in - List.iteri (fun i b -> a.(i+8-ll) <- b) l; a - -let rule_nb_array = rule_nb |> to_bool_list |> List.rev |> to_array - -(* For each rule, the next value (of x2) depends its value and the ones of its 2 neighbors *) -let b2i b = if b then 1 else 0 -let next x1 x2 x3 = - let index = 7 - ((b2i x1)*4 + (b2i x2)*2 + b2i x3) in - (* Printf.printf "index=%d\n%!" index; *) - rule_nb_array.(index) - -let cpt = ref 0 -let init_state _ _ = - cpt := (!cpt+1) mod Algo.card(); - let res = !cpt = Algo.card() / 2 in (* one cell is true, in the middle *) - (* Printf.printf "cell(%d)=%b\n%!" !cpt res; *) - res - - -let enable_f x2 nl = - match List.map Algo.state nl with - | [x1; x3] -> if next x1 x2 x3 = not x2 then ["flip"] else [] - | _ -> [] - -let step_f x _ _ = not x diff --git a/test/sierpinski/ring.dot b/test/sierpinski/ring.dot deleted file mode 100644 index bacf56c5919691c28fbb9f0178a43c4dbdfca30f..0000000000000000000000000000000000000000 --- a/test/sierpinski/ring.dot +++ /dev/null @@ -1,11 +0,0 @@ -graph ring { - p1 [algo="p.ml"] - p2 [algo="p.ml"] - p3 [algo="p.ml"] - p4 [algo="p.ml"] - p5 [algo="p.ml"] - p6 [algo="p.ml"] - p7 [algo="p.ml"] - - p1 -- p2 -- p3 -- p4 -- p5 -- p6 -- p7 -- p1 -} diff --git a/test/sierpinski/some_session b/test/sierpinski/some_session deleted file mode 100644 index 96b69b572b2550b34d05923df7442cd926d536d3..0000000000000000000000000000000000000000 --- a/test/sierpinski/some_session +++ /dev/null @@ -1,7 +0,0 @@ -n -n -n -n -wait 3 -print_event !e;; - diff --git a/test/sierpinski/state.ml b/test/sierpinski/state.ml deleted file mode 100644 index 3a8ddee92a6438934703027c93b4855a9b4ec86f..0000000000000000000000000000000000000000 --- a/test/sierpinski/state.ml +++ /dev/null @@ -1,6 +0,0 @@ - -type t = bool -let to_string = (fun s -> Printf.sprintf "%B" s) -let of_string = Some bool_of_string -let copy x = x -let actions = ["flip"]