Commit c88a7a6f authored by Erwan Jahier's avatar Erwan Jahier
Browse files

lurette 0.62 Fri, 03 May 2002 15:21:42 +0200 by jahier

Parent-Version:      0.61
Version-Log:

Reorganise things a little bit so that show_ima does not depend on
cudd, etc.

Project-Description: Lurette
parent 6b362e07
......@@ -12,8 +12,8 @@
(source/solver.ml 24560 1017837703 39_solver.ml 1.21)
(test/test_gen_stubs.h 1818 1020068208 b/45_test_gen_s 1.1)
(source/command_line.ml 4388 1019207707 b/20_command_li 1.7)
(source/lurette.ml 11711 1020420514 12_lurette.ml 1.36)
(source/solver.mli 1135 1016803757 38_solver.mli 1.10)
(source/lurette.ml 11847 1020432102 12_lurette.ml 1.37)
(source/solver.mli 1138 1020432102 38_solver.mli 1.11)
(source/env.mli 2077 1020420514 15_env.mli 1.13)
(test/heater_float.rif.exp 1461 1015514807 b/30_heater_flo 1.2)
(lurette.depfull.dot 49 1007651448 b/5_lurette.de 1.2)
......@@ -27,7 +27,7 @@
(ID_EN_VRAC 2184 1002196285 0_ID_EN_VRAC 1.1)
(source/parse_env.mli 908 1020420514 40_parse_env. 1.7)
(source/sim2chro.mli 1429 1017929190 b/23_sim2chro.m 1.4)
(source/ima_exe.ml 7748 1020420514 b/32_ima_exe.ml 1.6)
(source/ima_exe.ml 7871 1020432102 b/32_ima_exe.ml 1.7)
(doc/automata_format 0 1007379917 b/3_automata_f 1.1)
(source/eval.ml 7749 1016803757 49_eval.ml 1.12)
(source/gen_stubs.ml 36501 1020420514 24_generate_l 1.24)
......@@ -51,22 +51,22 @@
(test/ControleurPorte.rif.exp 4746 1016803757 b/29_Controleur 1.4)
(test/tram.env 1149 1019479246 b/15_tram.env 1.6)
(Makefile.lurette 1866 1020420514 b/38_Makefile.l 1.3)
(source/show_env.ml 3271 1020420514 43_show_env.m 1.6)
(source/show_env.ml 2989 1020432102 43_show_env.m 1.7)
(source/gne.mli 1107 1016803757 b/36_gne.mli 1.1)
(bin/Makefile.gen_stubs 467 1020068208 b/42_Makefile.g 1.1)
(doc/synthese 2556 1007379917 b/2_synthese 1.1)
(test/ControleurPorte.h 2306 1012914629 b/18_Controleur 1.1)
(source/show_env.mli 765 1015250295 42_show_env.m 1.5)
(source/show_env.mli 775 1020432102 42_show_env.m 1.6)
(source/gne.ml 8204 1016803757 b/37_gne.ml 1.1)
(test/tram_simple.h 1746 1013519411 b/25_tram_simpl 1.1)
(test/heater_float.lus 175 1020068208 b/44_heater_flo 1.1)
(test/vrai_tram.c 3060 1012914629 b/8_vrai_tram. 1.2)
(source/print.mli 789 1016803757 46_print.mli 1.8)
(test/heater_int.lus 170 1020068208 b/43_heater_int 1.1)
(source/graph.mli 1493 1015250295 13_graph.mli 1.6)
(source/graph.mli 1499 1020432102 13_graph.mli 1.7)
(test/heater_int.rif.exp 858 1017837703 b/28_heater_int 1.2)
(source/formula.ml 7330 1020420514 45_formula.ml 1.13)
(source/lurette.mli 448 1016027474 11_lurette.ml 1.12)
(source/print.ml 6587 1020420514 47_print.ml 1.15)
(test/vrai_tram.h 2468 1012914629 b/7_vrai_tram. 1.2)
(bin/Makefile.show_ima 1243 1020420514 b/40_Makefile.s 1.2)
(bin/Makefile.show_ima 958 1020432102 b/40_Makefile.s 1.3)
......@@ -15,20 +15,17 @@ OCAMLMAKEFILE = $(LURETTE_PATH)/OcamlMakefile
OCAMLNCFLAGS = -inline 10
# XXX Not all of these are used actually. I should slice it more accurately!
LIBS = str
CLIBS = cudd_caml cuddaux cudd camlidl mtr st epd util
CLIBS =
USE_CAMLP4 = yes
# XXX Not all of these are used actually. I should slice it more accurately!
SOURCES_OCAML = \
$(LURETTE_PATH)/source/util.ml \
$(LURETTE_PATH)/source/graph.mli $(LURETTE_PATH)/source/graph.ml \
$(LURETTE_PATH)/source/formula.mli $(LURETTE_PATH)/source/formula.ml \
$(LURETTE_PATH)/source/parse_env.mli $(LURETTE_PATH)/source/parse_env.ml \
$(LURETTE_PATH)/source/env_state.mli $(LURETTE_PATH)/source/env_state.ml \
$(LURETTE_PATH)/source/show_env.mli $(LURETTE_PATH)/source/show_env.ml \
$(LURETTE_PATH)/source/show_ima.ml
......
;; -*- Prcs -*-
(Created-By-Prcs-Version 1 3 3)
(Project-Description "Lurette")
(Project-Version lurette 0 61)
(Parent-Version lurette 0 60)
(Project-Version lurette 0 62)
(Parent-Version lurette 0 61)
(Version-Log "
Add support for handling loops. This is based on the use of dynamic
weigths. The idea is to compute the dynamic weigths before the trees
are constructed.
Reorganise things a little bit so that show_ima does not depend on
cudd, etc.
Add a --show-aut option for ima_exe.
Also, Add the command lise args hashed to the end of the name of the dot file
that is used to visualize the ima file.
")
(New-Version-Log "")
(Checkin-Time "Fri, 03 May 2002 12:08:34 +0200")
(Checkin-Time "Fri, 03 May 2002 15:21:42 +0200")
(Checkin-Login jahier)
(Populate-Ignore ())
(Project-Keywords)
......@@ -27,20 +24,20 @@ that is used to visualize the ima file.
;; Sources files for ima_exe
(source/ima_exe.mli (lurette/b/31_ima_exe.ml 1.1 644))
(source/ima_exe.ml (lurette/b/32_ima_exe.ml 1.6 644))
(source/ima_exe.ml (lurette/b/32_ima_exe.ml 1.7 644))
(source/command_line_ima_exe.ml (lurette/b/33_command_li 1.3 644))
(source/command_line_ima_exe.mli (lurette/b/34_command_li 1.2 644))
;; Sources files for lurette only
(source/lurette.mli (lurette/11_lurette.ml 1.12 644))
(source/lurette.ml (lurette/12_lurette.ml 1.36 644))
(source/lurette.ml (lurette/12_lurette.ml 1.37 644))
(source/command_line.ml (lurette/b/20_command_li 1.7 644))
(source/command_line.mli (lurette/b/21_command_li 1.6 644))
;; Sources files common to lurette and ima_exe
(source/graph.mli (lurette/13_graph.mli 1.6 644))
(source/graph.mli (lurette/13_graph.mli 1.7 644))
(source/graph.ml (lurette/14_graph.ml 1.5 644))
(source/env.mli (lurette/15_env.mli 1.13 644))
......@@ -48,7 +45,7 @@ that is used to visualize the ima file.
(source/util.ml (lurette/35_util.ml 1.18 644))
(source/solver.mli (lurette/38_solver.mli 1.10 644))
(source/solver.mli (lurette/38_solver.mli 1.11 644))
(source/solver.ml (lurette/39_solver.ml 1.21 644))
(source/rnumsolver.mli (lurette/b/26_rnumsolver 1.3 644))
......@@ -57,8 +54,8 @@ that is used to visualize the ima file.
(source/parse_env.mli (lurette/40_parse_env. 1.7 644))
(source/parse_env.ml (lurette/41_parse_env. 1.18 644))
(source/show_env.mli (lurette/42_show_env.m 1.5 644))
(source/show_env.ml (lurette/43_show_env.m 1.6 644))
(source/show_env.mli (lurette/42_show_env.m 1.6 644))
(source/show_env.ml (lurette/43_show_env.m 1.7 644))
(source/formula.mli (lurette/44_formula.ml 1.12 644))
(source/formula.ml (lurette/45_formula.ml 1.13 644))
......@@ -90,7 +87,7 @@ that is used to visualize the ima file.
(OcamlMakefile (lurette/17_OcamlMakef 1.27 644))
(Makefile.lurette (lurette/b/38_Makefile.l 1.3 644))
(bin/Makefile.show_ima (lurette/b/40_Makefile.s 1.2 644))
(bin/Makefile.show_ima (lurette/b/40_Makefile.s 1.3 644))
(bin/Makefile.ima_exe (lurette/b/41_Makefile.i 1.2 644))
(bin/Makefile.gen_stubs (lurette/b/42_Makefile.g 1.1 644))
......
......@@ -25,10 +25,10 @@ val create: unit -> ('a, 'b) t
val add_trans: ('a -> 'a -> int) -> ('a, 'b) t -> 'a -> 'b -> 'a -> unit
(**
[add_trans g node_from arc_info node_to] adds a transition from [node_from]
to [node_to] with arc label [arc_info] to the graph [g]. [sort] is a comparison
function used to sort nodes.
*)
[add_trans sort g node_from arc_info node_to] adds a transition
from [node_from] to [node_to] with arc label [arc_info] to the
graph [g]. [sort] is a comparison function used to sort nodes.
*)
val get_list_of_target_nodes: ('a, 'b) t -> 'a -> ('a * 'b) list
......
......@@ -185,7 +185,9 @@ and
if options.show_automata then (
Show_env.generate_env_graph [[]] ("automata" ^ (string_of_int (Hashtbl.hash Sys.argv))) ;
Show_env.generate_env_graph (flatten (Env_state.current_nodes ())) []
("automata" ^ (string_of_int (Hashtbl.hash Sys.argv)))
(Env_state.graph ()) ;
Util.gv ("automata" ^ (string_of_int (Hashtbl.hash Sys.argv)) ^ ".ps")
) ;
......@@ -239,8 +241,9 @@ and
in
if options.show_automata then (
Show_env.generate_env_graph
[[]] ("automata" ^ (string_of_int (Hashtbl.hash Sys.argv)))
Show_env.generate_env_graph (flatten (Env_state.current_nodes ()))
[] ("automata" ^ (string_of_int (Hashtbl.hash Sys.argv)))
(Env_state.graph ())
);
Env.env_step nll call out loc ;
......
......@@ -212,7 +212,9 @@ and
(* Sim2chro *)
if options.step_by_step then (
Show_env.generate_env_graph [[]] ("environment" ^ (string_of_int (Hashtbl.hash Sys.argv))) ;
Show_env.generate_env_graph (flatten (Env_state.current_nodes ())) []
("environment" ^ (string_of_int (Hashtbl.hash Sys.argv)))
(Env_state.graph ()) ;
Util.gv ("environment" ^ (string_of_int (Hashtbl.hash Sys.argv)) ^ ".ps");
Sim2chro.put_var_decl
("lurette chronogram (" ^
......@@ -332,9 +334,10 @@ and
let str =
if (options.step_by_step) then (
Show_env.generate_env_graph
previous_nodes ("environment"
^ (string_of_int (Hashtbl.hash Sys.argv)));
Show_env.generate_env_graph (flatten (Env_state.current_nodes ()))
(flatten previous_nodes) ("environment"
^ (string_of_int (Hashtbl.hash Sys.argv)))
(Env_state.graph ());
Sim2chro.put_current_step_values
stdout t input sut_output (Env_state.local ()) options.display_local_var;
output_string stderr
......
......@@ -10,7 +10,6 @@
*)
open Formula
open Env_state
let (dump_nodes_list: out_channel -> node list -> node list -> node list -> unit) =
......@@ -67,7 +66,8 @@ let (dump_graph: out_channel -> node list -> node list ->
output_string oc "} \n"
let (generate_graph: node list -> node list -> string ->
(* Exported *)
let (generate_env_graph: node list -> node list -> string ->
(node, arc_info) Graph.t -> unit) =
fun pnodes cnodes str graph ->
let dot_file = str ^ ".dot" in
......@@ -84,11 +84,5 @@ let (generate_graph: node list -> node list -> string ->
else ()
(* Exported *)
let (generate_env_graph: node list list -> string -> unit) =
fun previous_nodes file_name ->
let pnodes = List.flatten previous_nodes in
let cnodes = List.flatten (Env_state.current_nodes ()) in
generate_graph pnodes cnodes file_name (Env_state.graph ())
......@@ -12,12 +12,13 @@
open Formula
val generate_env_graph: node list list -> string -> unit
(** [generate_graph pnodes file_name] generates in [file_name.dot] a
dot version of the automata describing the current environment. It
also outputs in [file_name.ps] a post-script version of
it. [pnodes] is the list of previous nodes used to display in green
the previously visited nodes. *)
val generate_env_graph: node list -> node list -> string
-> (node, arc_info) Graph.t -> unit
(** [generate_graph cnodes pnodes file_name g] generates in
[file_name.dot] a dot version of [g]. It also generates in
[file_name.ps] a post-script version of it. [cnodes] is the list
of nodes to be display in red, and [pnodes] a list to be
displayed in green. *)
......@@ -30,3 +30,6 @@ val solve_formula : env_in -> int -> formula list -> vn list -> vnt list ->
(** Raised during the draw. *)
exception No_numeric_solution
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment