Refactor the tracing code, store the whole tree structure in a javascript array and...

[tatoo.git] / src / html_trace.ml

diff --git a/src/html_trace.ml b/src/html_trace.ml
index 0d4890e..7ce3f39 100644 (file)
--- a/src/html_trace.ml
+++ b/src/html_trace.ml
@@ -83,10 +83,18 @@ let get_conf sel l i =
     accb || StateSet.intersect a.(i) sel,
     a.(i) :: accl) (false,[]) l
 
+let dup_rev_list l =
+  List.fold_left (fun acc e -> e::e::acc) [] l
+
 let gen_trace (type s) = fun auto sat_arrays t tree ->
+  let sat_arrays = dup_rev_list sat_arrays in
   let module T = (val (t) : Tree.S with type t = s) in
   let root = T.root tree in
   let sel = Ata.get_selecting_states auto in
+  let todos = Ata.get_states_by_rank auto in
+  let pr_sets = Pretty.print_list ~sep:", "
+    (fun fmt s -> fprintf fmt "'%a'" StateSet.print s)
+  in
   let rec loop output node parent prevsib x y =
     if node != T.nil then begin
       let node_id = T.preorder tree node in
@@ -97,9 +105,31 @@ let gen_trace (type s) = fun auto sat_arrays t tree ->
       let s_node = "node" ^ (string_of_int node_id) in
       let first = T.first_child tree node in
       let next = T.next_sibling tree node in
+      fprintf output "<script type='text/javascript'><![CDATA[ ";
+      let pass, max_active_pass, diff_list, full_list =
+        List.fold_left
+          (fun (pass, max_active_pass, diff_list, full_list) a ->
+            let todo = if pass >= Array.length todos then StateSet.empty
+              else todos.(pass)
+            in
+            let diff = StateSet.inter a.(node_id) todo in
+            let new_active_pass =
+              if diff == StateSet.empty then max_active_pass else pass
+            in
+            pass+1, new_active_pass, diff::diff_list, a.(node_id) :: full_list)
+          (0, -1, [], []) sat_arrays
+      in
+      fprintf output "tree['%s'] = { marked: %b, fc: 'node%i', ns: 'node%i', par: 'node%i', ps: 'node%i', max: %i, dlist: [%a], flist: [%a] };]]></script>\n"
+        s_node
+        marked
+        (T.preorder tree first) (T.preorder tree next)
+        (T.preorder tree parent) (T.preorder tree prevsib)
+        max_active_pass
+        pr_sets (List.rev diff_list)
+        pr_sets (List.rev full_list);
       fprintf output
         "<rect id=\"%s\" onclick=\"activate(\'%s\');\" x=\"%i\" y=\"%i\"\
- width=\"%i\" height=\"22\" style=\"fill:%s;stroke:rgb(0,0,0)%s\">%!"
+ width=\"%i\" height=\"22\" style=\"fill:%s;stroke:rgb(0,0,0)%s\"/>%!"
         s_node
         s_node
         x y
@@ -108,10 +138,6 @@ let gen_trace (type s) = fun auto sat_arrays t tree ->
         (if marked
          then ";stroke-width:4"
          else ";stroke-width:2;stroke-dasharray:2,2");
-      fprintf output "<metadata id='%s_fs'>node%i</metadata><metadata id='%s_ns'>node%i</metadata><metadata id='%s_par'>node%i</metadata><metadata id='%s_ps'>node%i</metadata></rect>\n%!"
-s_node (T.preorder tree first) s_node (T.preorder tree next)
-s_node (T.preorder tree parent) s_node (T.preorder tree prevsib)
-;
       fprintf output "<text x=\"%i\" y=\"%i\" style=\"fill:%s;font-size:17;\
 font-family:typewriter;\" onclick=\"activate(\'%s\');\" >%s</text>\n"
         (x+10)
@@ -148,29 +174,35 @@ style=\"stroke:rgb(0,0,0);stroke-width:2\"/>\n"
 <div id='automata' >%a</div>\n\
 <div id='data' > </div>\n\
 <script type='text/javascript'>\n\
-var data = new Array();\n\
+var tree = new Array();\n\
+var current_node = null;
+var nil_id = 'node%i';
+var last_id = %i;
 var rounds = %i;\n"
     Trace_css.content
     Ata.print auto
-    (List.length sat_arrays);
-    List.iteri (fun i _ ->
-      fprintf ohtml "data[%i] = new Array();\n" i) sat_arrays;
-    for node_id = 0 to (Array.length (List.hd sat_arrays)) - 1 do
-      let _,_ = List.fold_left (fun (pass, diff_set) a ->
-        let cur_set = a.(node_id) in
-        fprintf ohtml "data[%i]['node%i'] = \"new states %a<br/>full states = %a\";\n"
-        pass node_id StateSet.print (StateSet.diff cur_set diff_set) StateSet.print cur_set;
-        (pass+1, StateSet.union diff_set cur_set))
-        (0, StateSet.empty) (List.rev sat_arrays)
-      in ()
-    done;
+    (T.preorder tree T.nil)
+    (T.size tree)
+    (List.length sat_arrays - 1);
   fprintf ohtml "%s\n" Trace_js.content;
-  fprintf ohtml "%s"
+  fprintf ohtml
     "</script>\n\
+<div id='tree'>
+<div id='controls'><button onclick='activate_parent();'>↑</button>\n\
+<button onclick='activate_previous();'>←</button>\n\
+<button onclick='activate_first();'>↓</button>\n\
+<button onclick='activate_next();'>→</button>\n\
+<select id='relnodes' onchange='hide_nodes();'>\n\
+<option value='-1'>All nodes</option>\n\
+%a</select>\n\
+</div>
 <div id='svg'>\n
-   <svg id='svgimg' width='' height='' preserveAspectRatio='XMidYMid slice' xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\">\n";
+   <svg id='svgimg' width='' height='' xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\">\n"
+    (Pretty.print_range (fun fmt i ->
+      fprintf fmt "<option value='%i'>Relevant nodes on pass %i</option>\n" i i))
+    (0,(List.length sat_arrays - 1));
   let maxw, maxh = loop ohtml (T.root tree) T.nil T.nil 50 50 in
-  fprintf ohtml "</svg>\n</div><script type='text/javascript'>\n\
+  fprintf ohtml "</svg>\n</div></div><script type='text/javascript'>\n\
 window.onload = function () {\n\
     var svg = document.getElementById('svgimg');\n\
     svg.setAttribute('width', %i);\n\