diff --git a/test/Makefile b/test/Makefile index 51004cabf7d84279f22b8fd9d4138a2a6743136c..5923f2b1b627432be218e91ebdabe2158b8c5e98 100644 --- a/test/Makefile +++ b/test/Makefile @@ -10,3 +10,5 @@ clean: cd unison/ && make clean cd coloring/ && make clean cd bfs-spanning-tree/ && make clean + + diff --git a/test/Makefile.inc b/test/Makefile.inc index 4bbae8998c8b7381cd23ba17ed3965d13c4e6de0..4bc73d8b33e8898efcb1aed36624a8c3d565dec3 100644 --- a/test/Makefile.inc +++ b/test/Makefile.inc @@ -1,17 +1,20 @@ -# Time-stamp: <modified the 09/03/2019 (at 14:32) by Erwan Jahier> +# Time-stamp: <modified the 10/03/2019 (at 12:09) by Erwan Jahier> DIR=~/sasa/_build/install/default sasa=$(DIR)/bin/sasa -# LIB=-I $(DIR)/lib/algo $(DIR)/lib/algo/algo.cmxa - -MLI=-I $(DIR)/lib/algo +LIB=-I $(DIR)/lib/algo +# LIB=-I +algo +%.cmxs: %.ml + ocamlopt -shared $(LIB) $^ -o $@ +%.rif: cmxs %.dot + $(sasa) $(sasaopt) $*.dot -rif > $*.rif -%.cmxs: %.ml - ocamlopt -shared $(MLI) $^ -o $@ +g:gnuplot +s:sim2chrogtk clean: - rm -f *.cmxs sasa *.cmi *.o *.cmx *.pdf + rm -f *.cmxs sasa *.cmi *.o *.cmx *.pdf *.rif *.gp *.log diff --git a/test/bfs-spanning-tree/Makefile b/test/bfs-spanning-tree/Makefile index 74c2b83568794618b55671b516fabca0fe71040e..862a6a801f7a1264883cad9b36a68ea20c9a207a 100644 --- a/test/bfs-spanning-tree/Makefile +++ b/test/bfs-spanning-tree/Makefile @@ -1,11 +1,18 @@ -# Time-stamp: <modified the 09/03/2019 (at 12:03) by Erwan Jahier> +# Time-stamp: <modified the 10/03/2019 (at 12:00) by Erwan Jahier> -test: root.cmxs p.cmxs +cmxs:root.cmxs p.cmxs +test: cmxs $(sasa) -l 200 fig5.1-noinit.dot -sd -test2: root.cmxs p.cmxs +test2: cmxs $(sasa) -l 200 fig5.1.dot -sd +sim2chrogtk: fig5.1-noinit.rif + sim2chrogtk -ecran -in $< > /dev/null + +gnuplot: fig5.1-noinit.rif + gnuplot-rif $< + -include ../Makefile.inc diff --git a/test/coloring/Makefile b/test/coloring/Makefile index a0509e5dd8af886e8ce79109be4ba55030d933ce..cf211566e2bb03f2d17b1ae700e40b8354e80dd2 100644 --- a/test/coloring/Makefile +++ b/test/coloring/Makefile @@ -1,8 +1,16 @@ -# Time-stamp: <modified the 07/03/2019 (at 15:44) by Erwan> +# Time-stamp: <modified the 10/03/2019 (at 12:02) by Erwan Jahier> test: p.cmxs $(sasa) -l 200 ring.dot + +cmxs: p.cmxs +sim2chrogtk: ring.rif + sim2chrogtk -ecran -in $< > /dev/null + +gnuplot: ring.rif + gnuplot-rif $< + -include ../Makefile.inc diff --git a/test/dijkstra-ring/Makefile b/test/dijkstra-ring/Makefile index 1135211d1a98de8ecd5b6e1001d22d1bc9839d21..911dabee4bf9b79bd9099b81791d17f4609357d3 100644 --- a/test/dijkstra-ring/Makefile +++ b/test/dijkstra-ring/Makefile @@ -1,6 +1,14 @@ -# Time-stamp: <modified the 07/03/2019 (at 14:29) by Erwan> +# Time-stamp: <modified the 10/03/2019 (at 12:13) by Erwan Jahier> -test: ring.cmxs ringroot.cmxs +test: cmxs $(sasa) ring.dot +cmxs: ring.cmxs ringroot.cmxs + +sim2chrogtk: ring.rif + sim2chrogtk -ecran -in $< > /dev/null + +gnuplot: ring.rif + gnuplot-rif $< + -include ../Makefile.inc diff --git a/test/unison/Makefile b/test/unison/Makefile index 7ff7119c13c7fe8bf7df40278ed75b716c6ba270..97aaf5519294381d4361d826df94ca40be2a1964 100644 --- a/test/unison/Makefile +++ b/test/unison/Makefile @@ -1,11 +1,19 @@ -# Time-stamp: <modified the 07/03/2019 (at 16:47) by Erwan> +# Time-stamp: <modified the 10/03/2019 (at 12:10) by Erwan Jahier> test: unison.cmxs $(sasa) -l 5 fig4.1.dot -sd -test2: unison.cmxs +test2: unison.cmxs $(sasa) -l 200 ring.dot +sasaopt=-sd + +cmxs: unison.cmxs +sim2chrogtk: ring.rif + sim2chrogtk -ecran -in $< > /dev/null + +gnuplot: ring.rif + gnuplot-rif $< -include ../Makefile.inc