module M = Map.Make(struct type t = int let compare = compare end)
let info = Hashtbl.create 2017
+let final = Hashtbl.create 2017
-let max_round = ref ~-1
+let max_round = ref 0
-let add_info (nodeid:int) (i:int) (oldi: int) s =
+let add_info (nodeid:int) (i:int) s =
if i > !max_round then max_round := i;
- if i <= oldi || oldi < 0 then begin
- 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'
- end
+ 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 oldi =
+let trace nodeid i =
let () = pp_print_flush fmt ();
Buffer.clear buff
in
kfprintf (fun fmt ->
pp_print_flush fmt ();
let s = Buffer.contents buff in
- add_info nodeid i oldi s) fmt
+ add_info nodeid i s) fmt
+
+let finalize_node n r b =
+ Hashtbl.replace final n (b,r)
let gen_trace (type s) = (); fun t tree ->
Hashtbl.find info (T.preorder tree node)
with Not_found -> M.empty
in
- let last_round = try fst (M.max_binding m) with Not_found -> 0 in
- let s_node = "node" ^ (string_of_int (T.preorder tree node)) in
- fprintf odot "%s[ id=\"%s\" label=\"%s\" style=filled fillcolor=\"%f,1.0,1.0\"];\n"
- s_node s_node (QName.to_string (T.tag tree node))
- (0.2 *. (1.0 -. (float last_round /. float !max_round))) ;
+ 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 s_node = "node" ^ (string_of_int node_id) in
+ fprintf odot "%s[ id=\"%s\" label=\"%s\" style=filled fillcolor=\"%f,1.0,1.0\"\
+shape=\"%s\" ];\n"
+ s_node
+ s_node
+ (QName.to_string (T.tag tree node))
+ (1.0 -. (float (last_round+1) /. float (!max_round+1)))
+ (if marked then "oval" else "box") ;
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)