projects
/
tatoo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactor HTML tracing utility. Color the nodes that are in the same
[tatoo.git]
/
src
/
run.ml
diff --git
a/src/run.ml
b/src/run.ml
index
fb13084
..
ca162a1
100644
(file)
--- a/
src/run.ml
+++ b/
src/run.ml
@@
-145,19
+145,18
@@
module Make (T : Tree.S) =
IFDEF HTMLTRACE
THEN
IFDEF HTMLTRACE
THEN
-DEFINE TRACE(e) = (e)
+DEFINE
IF
TRACE(e) = (e)
ELSE
ELSE
-DEFINE TRACE(e) = ()
+DEFINE
IF
TRACE(e) = ()
END
let html tree node i config msg =
let config = config.NodeStatus.node in
END
let html tree node i config msg =
let config = config.NodeStatus.node in
- Html.trace (T.preorder tree node) i
- "node: %i<br/>%s<br/>sat: %a<br/>todo: %a<br/>_______________________<br/>"
- (T.preorder tree node)
- msg
- StateSet.print config.sat
- StateSet.print config.todo
+ Html.trace ~msg:msg
+ (T.preorder tree node) i
+ config.todo
+ config.sat
+
let debug msg tree node i config =
let debug msg tree node i config =
@@
-327,7
+326,7
@@
DEFINE AND_(t1,t2) =
}
else c
in
}
else c
in
- TRACE(html tree node _i status0 "Entering node");
+
IF
TRACE(html tree node _i status0 "Entering node");
(* get the node_statuses for the first child, next sibling and parent *)
let ps = unsafe_get_status status (T.preorder tree parent) in
(* get the node_statuses for the first child, next sibling and parent *)
let ps = unsafe_get_status status (T.preorder tree parent) in
@@
-336,7
+335,7
@@
DEFINE AND_(t1,t2) =
(* evaluate the transitions with all this statuses *)
let status1 = if status0.NodeStatus.node.todo == StateSet.empty then status0 else begin
let status1 = eval_trans auto cache2 cache5 tag fcs nss ps status0 in
(* evaluate the transitions with all this statuses *)
let status1 = if status0.NodeStatus.node.todo == StateSet.empty then status0 else begin
let status1 = eval_trans auto cache2 cache5 tag fcs nss ps status0 in
- TRACE(html tree node _i status1 "Updating transitions");
+
IF
TRACE(html tree node _i status1 "Updating transitions");
(* update the cache if the status of the node changed *)
if status1 != status0 then status.(node_id) <- status1;
status1
(* update the cache if the status of the node changed *)
if status1 != status0 then status.(node_id) <- status1;
status1
@@
-350,7
+349,7
@@
DEFINE AND_(t1,t2) =
(* update the status *)
let status2 = if status1.NodeStatus.node.todo == StateSet.empty then status1 else begin
let status2 = eval_trans auto cache2 cache5 tag fcs1 nss ps status1 in
(* update the status *)
let status2 = if status1.NodeStatus.node.todo == StateSet.empty then status1 else begin
let status2 = eval_trans auto cache2 cache5 tag fcs1 nss ps status1 in
- TRACE(html tree node _i status2 "Updating transitions (after first-child)");
+
IF
TRACE(html tree node _i status2 "Updating transitions (after first-child)");
if status2 != status1 then status.(node_id) <- status2;
status2
end
if status2 != status1 then status.(node_id) <- status2;
status2
end
@@
-359,7
+358,7
@@
DEFINE AND_(t1,t2) =
let nss1 = unsafe_get_status status ns_id in
let status3 = if status2.NodeStatus.node.todo == StateSet.empty then status2 else begin
let status3 = eval_trans auto cache2 cache5 tag fcs1 nss1 ps status2 in
let nss1 = unsafe_get_status status ns_id in
let status3 = if status2.NodeStatus.node.todo == StateSet.empty then status2 else begin
let status3 = eval_trans auto cache2 cache5 tag fcs1 nss1 ps status2 in
- TRACE(html tree node _i status3 "Updating transitions (after next-sibling)");
+
IF
TRACE(html tree node _i status3 "Updating transitions (after next-sibling)");
if status3 != status2 then status.(node_id) <- status3;
status3
end
if status3 != status2 then status.(node_id) <- status3;
status3
end
@@
-372,7
+371,7
@@
DEFINE AND_(t1,t2) =
|| StateSet.empty != status3.NodeStatus.node.todo
in
Bitvector.unsafe_set unstable node_id unstable_self;
|| StateSet.empty != status3.NodeStatus.node.todo
in
Bitvector.unsafe_set unstable node_id unstable_self;
- TRACE((if not unstable_self then
+
IF
TRACE((if not unstable_self then
Html.finalize_node
node_id
_i
Html.finalize_node
node_id
_i
@@
-469,7
+468,9
@@
DEFINE AND_(t1,t2) =
while run.redo do
top_down run
done;
while run.redo do
top_down run
done;
- TRACE(Html.gen_trace auto (module T : Tree.S with type t = T.t) tree);
+
+ IFTRACE(Html.gen_trace auto (module T : Tree.S with type t = T.t) tree);
+
run
let full_eval auto tree nodes =
run
let full_eval auto tree nodes =