X-Git-Url: http://git.nguyen.vg/gitweb/?p=tatoo.git;a=blobdiff_plain;f=src%2Fhtml.ml;h=f5aa8b21ff5d5e6cbded32a1cf92e06bd89940d3;hp=d59265813564e1f259b7aeb14c183ac8d82a4ab1;hb=fee64144491afab22d71f6e2de72a9f18f35cd55;hpb=20ef25a27a326b250ae7f32997fa6d249a6b1751
diff --git a/src/html.ml b/src/html.ml
index d592658..f5aa8b2 100644
--- a/src/html.ml
+++ b/src/html.ml
@@ -1,119 +1,201 @@
+INCLUDE "utils.ml"
+
open Format
module M = Map.Make(struct type t = int let compare = compare end)
+type info = { sat : StateSet.t;
+ todo : StateSet.t;
+ msg : string;
+ }
let info = Hashtbl.create 2017
let final = Hashtbl.create 2017
let max_round = ref 0
-let add_info (nodeid:int) (i:int) s =
- if i > !max_round then max_round := i;
- let m = try Hashtbl.find info nodeid with Not_found -> M.empty in
- let old_s = try M.find i m with Not_found -> "" in
- let s' = old_s ^ s in
- let m' = M.add i s' m in
- Hashtbl.replace info nodeid m'
-
let buff = Buffer.create 20
let fmt = formatter_of_buffer buff
-let trace nodeid i =
- let () = pp_print_flush fmt ();
- Buffer.clear buff
+
+let trace ?(msg="") nid r t d =
+ if r > !max_round then max_round := r;
+ let m = try Hashtbl.find info nid with Not_found -> M.empty in
+ let () = pp_print_flush fmt () in
+ let _ = fprintf fmt
+ "node: %i %s todo: %a sat: %a _______________________ "
+ nid msg StateSet.print t StateSet.print d
in
- kfprintf (fun fmt ->
- pp_print_flush fmt ();
- let s = Buffer.contents buff in
- add_info nodeid i s) fmt
+ let () = pp_print_flush fmt () in
+ let msg = Buffer.contents buff in
+ let () = Buffer.clear buff in
+ let old_inf = try M.find r m with Not_found -> [] in
+ let m' = M.add r ({ sat = d; todo = t; msg = msg }::old_inf) m in
+ Hashtbl.replace info nid m'
let finalize_node n r b =
Hashtbl.replace final n (b,r)
+module K =
+struct
+ type t = StateSet.t list
+ let hash l =
+ List.fold_left (fun acc set ->
+ HASHINT2(acc, (set.StateSet.id :> int))) 17 l
+
+ let equal l1 l2 =
+ try
+ List.for_all2 (==) l1 l2
+ with _ -> false
+end
+
+module CTable = Hashtbl.Make (K)
+let ctable = CTable.create 20
-let gen_trace (type s) = fun auto t tree ->
+let rgb x =
+ let h = K.hash x in
+ let r = h land 0xff
+ and g = (h lsr 8) land 0xff
+ and b = (h lsr 16) land 0xff
+ in
+ r, g, b
+
+let color x =
+ try
+ CTable.find ctable x
+ with
+ Not_found ->
+ let r,g,b = rgb x in
+ let s = "rgb(" ^ (string_of_int r) ^ ","
+ ^ (string_of_int g) ^ ","
+ ^ (string_of_int b) ^ ")"
+ in
+ CTable.add ctable x s;
+ s
+
+let text_color x =
+ let r,g,b = rgb x in
+ let av = (r + g + b) / 3 in
+ if av > 128 then "rgb(0,0,0)"
+ else "rgb(255,255,255)"
+
+let get_conf sel l i =
+ List.fold_left (fun (accb,accl) a ->
+ accb || StateSet.intersect a.(i) sel,
+ a.(i) :: accl) (false,[]) l
+
+let gen_trace (type s) = fun auto sat_arrays t tree ->
let module T = (val (t) : Tree.S with type t = s) in
let root = T.root tree in
- let rec loop osvg ohtml node parent x y =
+ let sel = Ata.get_selecting_states auto in
+ let rec loop output node parent x y =
if node != T.nil then begin
- let m =
- try
- Hashtbl.find info (T.preorder tree node)
- with Not_found -> M.empty
- in
let node_id = T.preorder tree node in
- let marked, last_round = try Hashtbl.find final node_id with Not_found ->
- Printf.eprintf ">>> %i\n%!" node_id; false, !max_round;
- in
- let pc = if !max_round == 0 then 1. else float_of_int last_round /. float_of_int !max_round in
- let color = int_of_float (255. *. (1. -. pc)) in
+ let marked, conf = get_conf sel sat_arrays node_id in
+ let scolor, tcolor = color conf, text_color conf in
let tag = QName.to_string (T.tag tree node) in
let lbox = (String.length tag + 2) * 10 in
let s_node = "node" ^ (string_of_int node_id) in
- fprintf osvg "\n%!"
- s_node s_node x y lbox color color (if marked then "" else ";stroke-dasharray:2,2");
- fprintf osvg "%s\n" (x+10) (y+15) s_node tag;
- fprintf ohtml "data['%s'] = new Array();\n" s_node;
- M.iter
- (fun i s -> fprintf ohtml "data['%s'][%i] = '%s';\n" s_node i s)
- m;
+ fprintf output
+ "\n%!"
+ s_node
+ s_node
+ x y
+ lbox
+ scolor
+ (if marked
+ then ";stroke-width:4"
+ else ";stroke-width:2;stroke-dasharray:2,2");
+ fprintf output "%s\n"
+ (x+10)
+ (y+15)
+ tcolor s_node tag;
let first = T.first_child tree node in
- let maxw1, maxy1 = loop osvg ohtml first node x (y + 40) in
+ let maxw1, maxy1 = loop output first node x (y + 40) in
let next = T.next_sibling tree node in
let x_next = max (x+lbox) (maxw1+10) in
if node != root then begin
if node == T.first_child tree parent then
- fprintf osvg "\n"
+ fprintf output "\n"
(x + lbox / 2) (y-20) (x + lbox / 2) (y);
if next != T.nil then
- fprintf osvg "\n"
+ fprintf output "\n"
(x + lbox) (y+10) x_next (y+10);
end;
- let maxw2, maxy2 = loop osvg ohtml next node x_next y in
+ let maxw2, maxy2 = loop output next node x_next y in
maxw2, max maxy1 maxy2
end
else x, y
in
ignore (Sys.command "mkdir -p tests/trace");
- let osvg_ = open_out "tests/trace/trace.svg" in
let ohtml_ = open_out "tests/trace/trace.html" in
- let osvg = formatter_of_out_channel osvg_ in
let ohtml = formatter_of_out_channel ohtml_ in
fprintf ohtml "\
-\
\
+\
\
\