INCLUDE "utils.ml"
open Format
+open Misc
type move = [ `First_child
| `Next_sibling
| `Parent
| Has_first_child
| Has_next_sibling
-let is_move = function Move _ -> true | _ -> false
-
-module Atom : (Boolean.ATOM with type data = predicate) =
+module Atom =
struct
module Node =
end
+
module Formula =
struct
include Boolean.Make(Atom)
open Tree.NodeKind
let mk_atom a = atom_ (Atom.make a)
- let mk_kind k = mk_atom (Is k)
+ let is k = mk_atom (Is k)
let has_first_child = mk_atom Has_first_child
end
-
module Transition = Hcons.Make (struct
type t = State.t * QNameSet.t * Formula.t
let equal (a, b, c) (d, e, f) =
-type node_summary = int
-let dummy_summary = -1
-(*
-4444444444443210
-4 -> kind
-3 -> is_left
-2 -> is_right
-1 -> has_left
-0 -> has_right
-*)
-
-let has_right (s : node_summary) : bool =
- Obj.magic (s land 1)
-let has_left (s : node_summary) : bool =
- Obj.magic ((s lsr 1) land 1)
-
-let is_right (s : node_summary) : bool =
- Obj.magic ((s lsr 2) land 1)
-
-let is_left (s : node_summary) : bool =
- Obj.magic ((s lsr 3) land 1)
-
-let kind (s : node_summary ) : Tree.NodeKind.t =
- Obj.magic (s lsr 4)
-
-let node_summary is_left is_right has_left has_right kind =
- ((Obj.magic kind) lsl 4) lor
- ((Obj.magic is_left) lsl 3) lor
- ((Obj.magic is_right) lsl 2) lor
- ((Obj.magic has_left) lsl 1) lor
- (Obj.magic has_right)
-
-
-
-type config = {
- sat : StateSet.t;
- unsat : StateSet.t;
- todo : TransList.t;
- summary : node_summary;
-}
-
-module Config = Hcons.Make(struct
- type t = config
- let equal c d =
- c == d ||
- c.sat == d.sat &&
- c.unsat == d.unsat &&
- c.todo == d.todo &&
- c.summary == d.summary
-
- let hash c =
- HASHINT4((c.sat.StateSet.id :> int),
- (c.unsat.StateSet.id :> int),
- (c.todo.TransList.id :> int),
- c.summary)
-end
-)
-
type t = {
id : Uid.t;
mutable states : StateSet.t;
- mutable selection_states: StateSet.t;
+ mutable selecting_states: StateSet.t;
transitions: (State.t, (QNameSet.t*Formula.t) list) Hashtbl.t;
- mutable cache2 : TransList.t Cache.N2.t;
- mutable cache4 : Config.t Cache.N4.t;
}
-let next = Uid.make_maker ()
-
-let dummy2 = TransList.cons
- (Transition.make (State.dummy,QNameSet.empty, Formula.false_))
- TransList.nil
-
-
-let dummy_config =
- Config.make { sat = StateSet.empty;
- unsat = StateSet.empty;
- todo = TransList.nil;
- summary = dummy_summary
- }
+let get_states a = a.states
+let get_selecting_states a = a.selecting_states
-let create s ss =
- let auto = { id = next ();
- states = s;
- selection_states = ss;
- transitions = Hashtbl.create 17;
- cache2 = Cache.N2.create dummy2;
- cache4 = Cache.N4.create dummy_config;
- }
- in
- at_exit (fun () ->
- let n4 = ref 0 in
- let n2 = ref 0 in
- Cache.N2.iteri (fun _ _ _ b -> if b then incr n2) auto.cache2;
- Cache.N4.iteri (fun _ _ _ _ _ b -> if b then incr n4) auto.cache4;
- Logger.msg `STATS "automaton %i, cache2: %i entries, cache6: %i entries"
- (auto.id :> int) !n2 !n4;
- let c2l, c2u = Cache.N2.stats auto.cache2 in
- let c4l, c4u = Cache.N4.stats auto.cache4 in
- Logger.msg `STATS
- "cache2: length: %i, used: %i, occupation: %f"
- c2l c2u (float c2u /. float c2l);
- Logger.msg `STATS
- "cache4: length: %i, used: %i, occupation: %f"
- c4l c4u (float c4u /. float c4l)
-
- );
- auto
-
-let reset a =
- a.cache4 <- Cache.N4.create (Cache.N4.dummy a.cache4)
-
-let full_reset a =
- reset a;
- a.cache2 <- Cache.N2.create (Cache.N2.dummy a.cache2)
-
-
-let get_trans_aux a tag states =
+let get_trans a tag states =
StateSet.fold (fun q acc0 ->
try
let trs = Hashtbl.find a.transitions q in
List.fold_left (fun acc1 (labs, phi) ->
- if QNameSet.mem tag labs then TransList.cons (Transition.make (q, labs, phi)) acc1 else acc1) acc0 trs
+ if QNameSet.mem tag labs then
+ TransList.cons (Transition.make (q, labs, phi)) acc1
+ else acc1) acc0 trs
with Not_found -> acc0
) states TransList.nil
-let get_trans a tag states =
- let trs =
- Cache.N2.find a.cache2
- (tag.QName.id :> int) (states.StateSet.id :> int)
- in
- if trs == dummy2 then
- let trs = get_trans_aux a tag states in
- (Cache.N2.add
- a.cache2
- (tag.QName.id :> int)
- (states.StateSet.id :> int) trs; trs)
- else trs
-
-let simplify_atom atom pos q { Config.node=config; _ } =
- if (pos && StateSet.mem q config.sat)
- || ((not pos) && StateSet.mem q config.unsat) then Formula.true_
- else if (pos && StateSet.mem q config.unsat)
- || ((not pos) && StateSet.mem q config.sat) then Formula.false_
- else atom
-
-let eval_form phi fcs nss ps ss summary =
- let rec loop phi =
- begin match Formula.expr phi with
- Boolean.True | Boolean.False -> phi
- | Boolean.Atom (a, b) ->
- begin
- match a.Atom.node with
- | Move (m, q) ->
- let states = match m with
- `First_child -> fcs
- | `Next_sibling -> nss
- | `Parent | `Previous_sibling -> ps
- | `Stay -> ss
- in simplify_atom phi b q states
- | Is_first_child -> Formula.of_bool (b == (is_left summary))
- | Is_next_sibling -> Formula.of_bool (b == (is_right summary))
- | Is k -> Formula.of_bool (b == (k == (kind summary)))
- | Has_first_child -> Formula.of_bool (b == (has_left summary))
- | Has_next_sibling -> Formula.of_bool (b == (has_right summary))
- end
- | Boolean.And(phi1, phi2) -> Formula.and_ (loop phi1) (loop phi2)
- | Boolean.Or (phi1, phi2) -> Formula.or_ (loop phi1) (loop phi2)
- end
- in
- loop phi
-
-
-
-let eval_trans auto fcs nss ps ss =
- let fcsid = (fcs.Config.id :> int) in
- let nssid = (nss.Config.id :> int) in
- let psid = (ps.Config.id :> int) in
- let rec loop old_config =
- let oid = (old_config.Config.id :> int) in
- let res =
- let res = Cache.N4.find auto.cache4 oid fcsid nssid psid in
- if res != dummy_config then res
- else
- let { sat = old_sat;
- unsat = old_unsat;
- todo = old_todo;
- summary = old_summary } = old_config.Config.node
- in
- let sat, unsat, removed, kept, todo =
- TransList.fold
- (fun trs acc ->
- let q, lab, phi = Transition.node trs in
- let a_sat, a_unsat, a_rem, a_kept, a_todo = acc in
- if StateSet.mem q a_sat || StateSet.mem q a_unsat then acc else
- let new_phi =
- eval_form phi fcs nss ps old_config old_summary
- in
- if Formula.is_true new_phi then
- StateSet.add q a_sat, a_unsat, StateSet.add q a_rem, a_kept, a_todo
- else if Formula.is_false new_phi then
- a_sat, StateSet.add q a_unsat, StateSet.add q a_rem, a_kept, a_todo
- else
- let new_tr = Transition.make (q, lab, new_phi) in
- (a_sat, a_unsat, a_rem, StateSet.add q a_kept, (TransList.cons new_tr a_todo))
- ) old_todo (old_sat, old_unsat, StateSet.empty, StateSet.empty, TransList.nil)
- in
- (* States that have been removed from the todo list and not kept are now
- unsatisfiable *)
- let unsat = StateSet.union unsat (StateSet.diff removed kept) in
- (* States that were found once to be satisfiable remain so *)
- let unsat = StateSet.diff unsat sat in
- let new_config = Config.make { old_config.Config.node with sat; unsat; todo; } in
- Cache.N4.add auto.cache4 oid fcsid nssid psid new_config;
- new_config
- in
- if res == old_config then res else loop res
- in
- loop ss
-
-(*
- [add_trans a q labels f] adds a transition [(q,labels) -> f] to the
- automaton [a] but ensures that transitions remains pairwise disjoint
-*)
-
-let add_trans a q s f =
- let trs = try Hashtbl.find a.transitions q with Not_found -> [] in
- let cup, ntrs =
- List.fold_left (fun (acup, atrs) (labs, phi) ->
- let lab1 = QNameSet.inter labs s in
- let lab2 = QNameSet.diff labs s in
- let tr1 =
- if QNameSet.is_empty lab1 then []
- else [ (lab1, Formula.or_ phi f) ]
- in
- let tr2 =
- if QNameSet.is_empty lab2 then []
- else [ (lab2, Formula.or_ phi f) ]
- in
- (QNameSet.union acup labs, tr1@ tr2 @ atrs)
- ) (QNameSet.empty, []) trs
- in
- let rem = QNameSet.diff s cup in
- let ntrs = if QNameSet.is_empty rem then ntrs
- else (rem, f) :: ntrs
- in
- Hashtbl.replace a.transitions q ntrs
let _pr_buff = Buffer.create 50
let _str_fmt = formatter_of_buffer _pr_buff
Alternating transitions:@\n"
(a.id :> int)
StateSet.print a.states
- StateSet.print a.selection_states;
+ StateSet.print a.selecting_states;
let trs =
Hashtbl.fold
(fun q t acc -> List.fold_left (fun acc (s , f) -> (q,s,f)::acc) acc t)
StateSet.iter loop (Formula.get_states phi)) trs
end
in
- StateSet.iter loop a.selection_states;
+ StateSet.iter loop a.selecting_states;
let unused = StateSet.diff a.states !memo in
StateSet.iter (fun q -> Hashtbl.remove a.transitions q) unused;
a.states <- !memo
end
in
(* states that are not reachable from a selection stat are not interesting *)
- StateSet.iter (fun q -> Queue.add (q, true) todo) auto.selection_states;
+ StateSet.iter (fun q -> Queue.add (q, true) todo) auto.selecting_states;
while not (Queue.is_empty todo) do
let (q, b) as key = Queue.pop todo in
Hashtbl.replace auto.transitions q' trans';
done;
cleanup_states auto
+
+
+module Builder =
+ struct
+ type auto = t
+ type t = auto
+ let next = Uid.make_maker ()
+
+ let make () =
+ let auto =
+ {
+ id = next ();
+ states = StateSet.empty;
+ selecting_states = StateSet.empty;
+ transitions = Hashtbl.create MED_H_SIZE;
+ }
+ in
+ (*
+ at_exit (fun () ->
+ let n4 = ref 0 in
+ let n2 = ref 0 in
+ Cache.N2.iteri (fun _ _ _ b -> if b then incr n2) auto.cache2;
+ Cache.N4.iteri (fun _ _ _ _ _ b -> if b then incr n4) auto.cache4;
+ Logger.msg `STATS "automaton %i, cache2: %i entries, cache6: %i entries"
+ (auto.id :> int) !n2 !n4;
+ let c2l, c2u = Cache.N2.stats auto.cache2 in
+ let c4l, c4u = Cache.N4.stats auto.cache4 in
+ Logger.msg `STATS
+ "cache2: length: %i, used: %i, occupation: %f"
+ c2l c2u (float c2u /. float c2l);
+ Logger.msg `STATS
+ "cache4: length: %i, used: %i, occupation: %f"
+ c4l c4u (float c4u /. float c4l)
+
+ ); *)
+ auto
+
+ let add_state a ?(selecting=false) q =
+ a.states <- StateSet.add q a.states;
+ if selecting then a.selecting_states <- StateSet.add q a.selecting_states
+
+ let add_trans a q s f =
+ if not (StateSet.mem q a.states) then add_state a q;
+ let trs = try Hashtbl.find a.transitions q with Not_found -> [] in
+ let cup, ntrs =
+ List.fold_left (fun (acup, atrs) (labs, phi) ->
+ let lab1 = QNameSet.inter labs s in
+ let lab2 = QNameSet.diff labs s in
+ let tr1 =
+ if QNameSet.is_empty lab1 then []
+ else [ (lab1, Formula.or_ phi f) ]
+ in
+ let tr2 =
+ if QNameSet.is_empty lab2 then []
+ else [ (lab2, Formula.or_ phi f) ]
+ in
+ (QNameSet.union acup labs, tr1@ tr2 @ atrs)
+ ) (QNameSet.empty, []) trs
+ in
+ let rem = QNameSet.diff s cup in
+ let ntrs = if QNameSet.is_empty rem then ntrs
+ else (rem, f) :: ntrs
+ in
+ Hashtbl.replace a.transitions q ntrs
+
+ let finalize a =
+ complete_transitions a;
+ normalize_negations a;
+ a
+ end
projects / tatoo.git / blobdiff