From 4ce31bbf274a8f8ac9cba15c5339459865f2a741 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Kim=20Nguy=E1=BB=85n?= Date: Fri, 16 Aug 2013 19:42:17 +0200 Subject: [PATCH] Do not update the run if the todo set is empty for the current node. --- src/run.ml | 39 ++++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/src/run.ml b/src/run.ml index d7f4ba7..fb13084 100644 --- a/src/run.ml +++ b/src/run.ml @@ -334,31 +334,36 @@ DEFINE AND_(t1,t2) = let fcs = unsafe_get_status status fc_id in let nss = unsafe_get_status status ns_id in (* evaluate the transitions with all this statuses *) - let status1 = eval_trans auto cache2 cache5 tag fcs nss ps status0 in - 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; + 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"); + (* update the cache if the status of the node changed *) + if status1 != status0 then status.(node_id) <- status1; + status1 + end + in (* recursively traverse the first child *) let unstable_left = loop fc in (* here we re-enter the node from its first child, get the new status of the first child *) let fcs1 = unsafe_get_status status fc_id in (* update the status *) - 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 status2 != status1 then status.(node_id) <- status2; + 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 status2 != status1 then status.(node_id) <- status2; + status2 + end + in let unstable_right = loop ns in let nss1 = unsafe_get_status status ns_id in - 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 status3 != status2 then status.(node_id) <- status3; - + 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 status3 != status2 then status.(node_id) <- status3; + status3 + end + in let unstable_self = (* if either our left or right child is unstable or if we still have transitions pending, the current node is unstable *) -- 2.17.1