(***********************************************************************)
(*
- Time-stamp: <Last modified on 2013-03-10 23:31:33 CET by Kim Nguyen>
+ Time-stamp: <Last modified on 2013-03-15 18:32:22 CET by Kim Nguyen>
*)
INCLUDE "utils.ml"
open Format
open Utils
-module Make (T : Tree.Sig.S) = struct
+module Make (T : Tree.Sig.S) :
+ sig
+ val eval : Ata.t -> T.t -> T.node -> T.node list
+ end
+ = struct
- type cache = (int, StateSet.t) Hashtbl.t
- let get c t n =
- try Hashtbl.find c (T.preorder t n)
- with Not_found -> StateSet.empty
+IFDEF HTMLTRACE
+ THEN
+DEFINE TRACE(e) = (e)
+ ELSE
+DEFINE TRACE(e) = ()
+END
- let set c t n v = Hashtbl.replace c (T.preorder t n) v
- let eval_form phi tree node fcs nss ps ss =
- let rec loop phi =
- match Ata.SFormula.expr phi with
- Formula.True -> true
- | Formula.False -> false
- | Formula.Atom a ->
- let p, b, q = Ata.Atom.node a in
- let pos =
- let open Ata in
- match p with
- | First_child -> StateSet.mem q fcs
- | Next_sibling -> StateSet.mem q nss
- | Parent | Previous_sibling -> StateSet.mem q ps
- | Stay -> StateSet.mem q ss
- | Is_first_child ->
- node == (T.first_child tree (T.parent tree node))
- | Is_next_sibling ->
- node == (T.next_sibling tree (T.parent tree node))
- | Is k -> k == (T.kind tree node)
- | Has_first_child ->
- T.nil != T.first_child tree node
- | Has_next_sibling ->
- T.nil != T.next_sibling tree node
- in
- if Ata.is_move p && (not b) then
- eprintf "Warning: Invalid negative atom %a" Ata.Atom.print a;
- b == pos
- | Formula.And(phi1, phi2) -> loop phi1 && loop phi2
- | Formula.Or (phi1, phi2) -> loop phi1 || loop phi2
- in
- loop phi
- let eval_trans l tree node fcs nss ps ss acc =
- List.fold_left (fun (acct, accs) ((q, phi) as trs) ->
- if StateSet.mem q accs then (acct, accs) else
- if eval_form phi tree node fcs nss ps ss then
- (acct, StateSet.add q accs)
- else
- (trs::acct, accs)
- ) ([], acc) l
- let top_down_run auto tree node cache i =
+ type cache = StateSet.t Cache.N1.t
+ let get c t n = Cache.N1.find c (T.preorder t n)
+
+ let set c t n v = Cache.N1.add c (T.preorder t n) v
+
+
+ let top_down_run auto tree node cache _i =
let redo = ref false in
let rec loop node =
if node != T.nil then begin
let parent = T.parent tree node in
let fc = T.first_child tree node in
let ns = T.next_sibling tree node in
- let states0 = get cache tree node in
let tag = T.tag tree node in
- let trans0 = Ata.get_trans auto auto.Ata.states tag in
+ let states0 = get cache tree node in
+ let trans0 = Ata.get_trans auto tag auto.Ata.states in
+ let () =
+ TRACE(Html.trace (T.preorder tree node) _i "Pre States: %a<br/>Pre Trans: %a<br/>"
+ StateSet.print states0 (Ata.TransList.print ~sep:"<br/>") trans0)
+ in
let ps = get cache tree parent in
let fcs = get cache tree fc in
let nss = get cache tree ns in
- eprintf "-- [Iteration % 4d] --\n node: %a\n%!" i T.print_node node;
- List.iter (fun (q, phi) -> eprintf " %a -> %a\n"
- State.print q Ata.SFormula.print phi) trans0;
- eprintf "----------------------\n%!";
+ let is_left = node == T.first_child tree parent
+ and is_right = node == T.next_sibling tree parent
+ and has_left = fc != T.nil
+ and has_right = ns != T.nil
+ and kind = T.kind tree node
+ in
let trans1, states1 =
- eval_trans trans0 tree node fcs nss ps states0 states0
+ Ata.eval_trans auto trans0
+ fcs nss ps states0
+ is_left is_right has_left has_right kind
+ in
+ let () =
+ TRACE(Html.trace (T.preorder tree node) _i "TD States: %a<br/>TD Trans: %a<br/>" StateSet.print states1 (Ata.TransList.print ~sep:"<br/>") trans1)
in
if states1 != states0 then set cache tree node states1;
let () = loop fc in
let fcs1 = get cache tree fc in
let trans2, states2 =
- eval_trans trans1 tree node fcs1 nss ps states1 states1
+ Ata.eval_trans auto trans1
+ fcs1 nss ps states1
+ is_left is_right has_left has_right kind
+ in
+ let () =
+ TRACE(Html.trace (T.preorder tree node) _i "Left BU States: %a<br/>Left BU Trans: %a<br/>" StateSet.print states2 (Ata.TransList.print ~sep:"<br/>") trans2)
in
if states2 != states1 then set cache tree node states2;
let () = loop ns in
- let _, states3 =
- eval_trans trans2 tree node fcs1 (get cache tree ns) ps states2 states2
+ let _trans3, states3 =
+ Ata.eval_trans auto trans2
+ fcs1 (get cache tree ns) ps states2
+ is_left is_right has_left has_right kind
+ in
+ let () =
+ TRACE(Html.trace (T.preorder tree node) _i "Right BU States: %a<br/>Right BU Trans: %a<br/>" StateSet.print states3 (Ata.TransList.print ~sep:"<br/>") _trans3)
in
if states3 != states2 then set cache tree node states3;
if states0 != states3 && (not !redo) then redo := true
loop node []
let eval auto tree node =
- let cache = Hashtbl.create 511 in
+ let cache = Cache.N1.create StateSet.empty in
let redo = ref true in
let iter = ref 0 in
+ Ata.reset auto;
while !redo do
redo := top_down_run auto tree node cache !iter;
incr iter;
done;
- get_results auto tree node cache
+ let r = get_results auto tree node cache in
+ TRACE(Html.gen_trace (module T : Tree.Sig.S with type t = T.t) (tree));
+ r
end