true
with
Exit -> false
+ let for_all2 p m1 m2 =
+ try
+ for i = 0 to 4 do
+ let v1 = m1.(i)
+ and v2 = m2.(i) in
+ if not (p (ridx i) v1 v2) then raise Exit
+ done;
+ true
+ with
+ Exit -> false
+
let exists p m =
try
iter (fun i v -> if p i v then raise Exit) m;
mutable starting_states : StateSet.t;
mutable selecting_states: StateSet.t;
transitions: (State.t, (QNameSet.t*Formula.t) list) Hashtbl.t;
+ mutable ranked_states : StateSet.t array
}
let uid t = t.id
let get_states a = a.states
let get_starting_states a = a.starting_states
let get_selecting_states a = a.selecting_states
-
+let get_states_by_rank a = a.ranked_states
+let get_max_rank a = Array.length a.ranked_states - 1
let _pr_buff = Buffer.create 50
let _str_fmt = formatter_of_buffer _pr_buff
Number of states: %i@\n\
Starting states: %a@\n\
Selection states: %a@\n\
+ Ranked states: %a@\n\
Alternating transitions:@\n"
(a.id :> int)
StateSet.print a.states
(StateSet.cardinal a.states)
StateSet.print a.starting_states
- StateSet.print a.selecting_states;
+ StateSet.print a.selecting_states
+ (let r = ref 0 in Pretty.print_array ~sep:", " (fun ppf s ->
+ fprintf ppf "%i:%a" !r StateSet.print s; incr r)) a.ranked_states;
let trs =
Hashtbl.fold
(fun q t acc -> List.fold_left (fun acc (s , f) -> (q,s,f)::acc) acc t)
while not (Queue.is_empty todo) do
let (q, b) as key = Queue.pop todo in
- let q' =
- try
- Hashtbl.find memo_state key
- with
- Not_found ->
- let nq = if b then q else
- let nq = State.make () in
- auto.states <- StateSet.add nq auto.states;
- nq
- in
- Hashtbl.add memo_state key nq; nq
- in
- let trans = try Hashtbl.find auto.transitions q with Not_found -> [] in
- let trans' = List.map (fun (lab, f) -> lab, flip b f) trans in
- Hashtbl.replace auto.transitions q' trans';
+ if not (StateSet.mem q auto.starting_states) then
+ let q' =
+ try
+ Hashtbl.find memo_state key
+ with
+ Not_found ->
+ let nq = if b then q else
+ let nq = State.make () in
+ auto.states <- StateSet.add nq auto.states;
+ nq
+ in
+ Hashtbl.add memo_state key nq; nq
+ in
+ let trans = try Hashtbl.find auto.transitions q with Not_found -> [] in
+ let trans' = List.map (fun (lab, f) -> lab, flip b f) trans in
+ Hashtbl.replace auto.transitions q' trans';
done;
cleanup_states auto
-
-
+(* [compute_dependencies auto] returns a hash table storing for each
+ states [q] a Move.table containing the set of states on which [q]
+ depends (loosely). [q] depends on [q'] if there is a transition
+ [q, {...} -> phi], where [q'] occurs in [phi].
+*)
+let compute_dependencies auto =
+ let edges = Hashtbl.create 17 in
+ StateSet.iter
+ (fun q -> Hashtbl.add edges q (Move.create_table StateSet.empty))
+ auto.starting_states;
+ Hashtbl.iter (fun q trans ->
+ let moves = try Hashtbl.find edges q with Not_found ->
+ let m = Move.create_table StateSet.empty in
+ Hashtbl.add edges q m;
+ m
+ in
+ List.iter (fun (_, phi) ->
+ let m_phi = Formula.get_states_by_move phi in
+ Move.iter (fun m set ->
+ Move.set moves m (StateSet.union set (Move.get moves m)))
+ m_phi) trans) auto.transitions;
+
+ edges
+
+
+let compute_rank auto =
+ let dependencies = compute_dependencies auto in
+ let upward = [ `Stay ; `Parent ; `Previous_sibling ] in
+ let downward = [ `Stay; `First_child; `Next_sibling ] in
+ let swap dir = if dir == upward then downward else upward in
+ let is_satisfied q t =
+ Move.for_all (fun _ set -> StateSet.(is_empty (remove q set))) t
+ in
+ let update_dependencies dir initacc =
+ let rec loop acc =
+ let new_acc =
+ Hashtbl.fold (fun q deps acc ->
+ let to_remove = StateSet.union acc initacc in
+ List.iter
+ (fun m ->
+ Move.set deps m (StateSet.diff (Move.get deps m) to_remove)
+ )
+ dir;
+ if is_satisfied q deps then StateSet.add q acc else acc
+ ) dependencies acc
+ in
+ if acc == new_acc then new_acc else loop new_acc
+ in
+ let satisfied = loop StateSet.empty in
+ StateSet.iter (fun q ->
+ Hashtbl.remove dependencies q) satisfied;
+ satisfied
+ in
+ let current_states = ref StateSet.empty in
+ let rank_list = ref [] in
+ let rank = ref 0 in
+ let current_dir = ref upward in
+ let detect_cycle = ref 0 in
+ while Hashtbl.length dependencies != 0 do
+ let new_sat = update_dependencies !current_dir !current_states in
+ if StateSet.is_empty new_sat then incr detect_cycle;
+ if !detect_cycle > 2 then assert false;
+ rank_list := (!rank, new_sat) :: !rank_list;
+ rank := !rank + 1;
+ current_dir := swap !current_dir;
+ current_states := StateSet.union new_sat !current_states;
+ done;
+ let by_rank = Hashtbl.create 17 in
+ List.iter (fun (r,s) ->
+ let r = r/2 in
+ let set = try Hashtbl.find by_rank r with Not_found -> StateSet.empty in
+ Hashtbl.replace by_rank r (StateSet.union s set)) !rank_list;
+ auto.ranked_states <-
+ Array.init (Hashtbl.length by_rank) (fun i -> Hashtbl.find by_rank i)
module Builder =
starting_states = StateSet.empty;
selecting_states = StateSet.empty;
transitions = Hashtbl.create MED_H_SIZE;
+ ranked_states = [| |]
}
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 ?(starting=false) ?(selecting=false) q =
let finalize a =
complete_transitions a;
normalize_negations a;
+ compute_rank a;
a
end
(fun l ->
(List.map (fun (labels, form) -> (labels, map_form rename form)) l))
a.transitions;
+ ranked_states = Array.map (map_set rename) a.ranked_states
}
let copy a =
(fun q ->
Hashtbl.replace a1.transitions q [(QNameSet.any, link_phi)])
a2.starting_states;
- { a1 with
+ let a = { a1 with
states = StateSet.union a1.states a2.states;
selecting_states = a2.selecting_states;
transitions = a1.transitions;
}
+ in compute_rank a; a
let merge a1 a2 =
let a1 = copy a1 in
let a2 = copy a2 in
- { a1 with
+ let a = { a1 with
states = StateSet.union a1.states a2.states;
selecting_states = StateSet.union a1.selecting_states a2.selecting_states;
starting_states = StateSet.union a1.starting_states a2.starting_states;
Hashtbl.iter (fun k v -> Hashtbl.add a1.transitions k v) a2.transitions
in
a1.transitions
- }
+ } in
+ compute_rank a ; a
let link a1 a2 q link_phi =
- { a1 with
+ let a = { a1 with
states = StateSet.union a1.states a2.states;
selecting_states = StateSet.singleton q;
starting_states = StateSet.union a1.starting_states a2.starting_states;
Hashtbl.add a1.transitions q [(QNameSet.any, link_phi)];
a1.transitions
}
+ in
+ compute_rank a; a
let union a1 a2 =
let a1 = copy a1 in
let neg a =
let a = copy a in
let q = State.make () in
- let link_phi =
+ let link_phi =
StateSet.fold
(fun q phi -> Formula.(and_ (not_(stay q)) phi))
a.selecting_states
selecting_states = StateSet.singleton q;
}
in
- normalize_negations a; a
+ normalize_negations a; compute_rank a; a
let diff a1 a2 = inter a1 (neg a2)
-
projects / tatoo.git / blobdiff