Add automatic rules to call gnuplot-rif and sim2chro on the sasa output

test/Makefile

@@ -10,3 +10,5 @@ clean:
 	cd unison/ && make clean
 	cd coloring/ && make clean
 	cd bfs-spanning-tree/ && make clean
+
+

test/Makefile.inc

-# 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

test/bfs-spanning-tree/Makefile

-# 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
 

test/coloring/Makefile

-# 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
 

test/dijkstra-ring/Makefile

-# 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

test/unison/Makefile

-# 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