end =
struct
type t = int
- let make =
- let id = ref (-1) in
- fun () -> incr id;!id
+ let make = let id = ref ~-1 in
+ fun () -> incr id; !id
+
let compare = (-)
let equal = (==)
external hash : t -> int = "%identity"
else 0
let merge conf t res1 res2 =
match conf with
- NO -> 0
- | MARK -> 1
- | MARK1 -> res1+1
+ NO -> 0
| ONLY1 -> res1
| ONLY2 -> res2
| ONLY12 -> res1+res2
+ | MARK -> 1
+ | MARK1 -> res1+1
| MARK2 -> res2+1
| MARK12 -> res1+res2+1
module Run (RS : ResultSet) =
struct
- module SList = Hlist.Make (StateSet)
-
+ module SList = struct
+ include Hlist.Make (StateSet)
+ let print ppf l =
+ Format.fprintf ppf "[ ";
+ begin
+ match l.Node.node with
+ | Nil -> ()
+ | Cons(s,ll) ->
+ StateSet.print ppf s;
+ iter (fun s -> Format.fprintf ppf "; ";
+ StateSet.print ppf s) ll
+ end;
+ Format.fprintf ppf "]%!"
+
+
+ end
IFDEF DEBUG
let mk_fun f s = D_IGNORE_(register_funname f s,f)
let mk_app_fun f arg s = let g = f arg in
D_IGNORE_(register_funname g ((get_funname f) ^ " " ^ s), g)
+ let mk_app_fun f arg _ = f arg
let mk_app_fun2 f arg1 arg2 s = let g = f arg1 arg2 in
D_IGNORE_(register_funname g ((get_funname f) ^ " " ^ s), g)
+(* let mk_app_fun2 f arg1 arg2 s = Printf.eprintf "Building f2 %s\n%!" s; f arg1 arg2 *)
let string_of_ts tags = (Ptset.Int.fold (fun t a -> a ^ " " ^ (Tag.to_string t) ) tags "{")^ " }"
(mk_fun (Tree.next_sibling_below tree) "Tree.node_sibling_ctx")
- module SListTable = Hashtbl.Make(struct type t = SList.t
- let equal = (==)
- let hash t = Uid.to_int t.SList.Node.id
- end)
-
-
- module TransCache =
- struct
- type cell = { key : int;
- obj : Obj.t }
- type 'a t = cell array
- let dummy = { key = 0; obj = Obj.repr () }
- let create n = Array.create 25000 dummy
- let hash a b = HASHINT2(Obj.magic a, Uid.to_int b.SList.Node.id)
-
- let find_slot t key =
- let rec loop i =
- if (t.(i) != dummy) && (t.(i).key != key)
- then loop ((i+1 mod 25000))
- else i
- in loop (key mod 25000)
- ;;
-
- let find t k1 k2 =
- let i = find_slot t (hash k1 k2) in
- if t.(i) == dummy then raise Not_found
- else Obj.magic (t.(i).obj)
-
- let add t k1 k2 v =
- let key = hash k1 k2 in
- let i = find_slot t key in
- t.(i)<- { key = key; obj = (Obj.repr v) }
-
- end
-
- module TransCache2 =
- struct
- type 'a t = Obj.t array SListTable.t
- let create n = SListTable.create n
- let dummy = Obj.repr (fun _ -> assert false)
- let find (h :'a t) tag slist : 'a =
- let tab =
- try
- SListTable.find h slist
- with
- Not_found ->
- SListTable.add h slist (Array.create 10000 dummy);
- raise Not_found
- in
- let res = tab.(tag) in
- if res == dummy then raise Not_found else (Obj.magic res)
-
- let add (h : 'a t) tag slist (data : 'a) =
- let tab =
- try
- SListTable.find h slist
- with
- Not_found ->
- let arr = Array.create 10000 dummy in
- SListTable.add h slist arr;
- arr
- in
- tab.(tag) <- (Obj.repr data)
-
-
- end
-
+
module TransCache =
struct
external get : 'a array -> int ->'a = "%array_unsafe_get"
external set : 'a array -> int -> 'a -> unit = "%array_unsafe_set"
- type fun_tree = [`Tree] Tree.node -> [`Tree] Tree.node -> SList.t*RS.t array
+ type fun_tree = [`Tree] Tree.node -> [`Tree] Tree.node -> Tag.t -> SList.t -> bool -> SList.t*RS.t array
type t = fun_tree array array
let dummy_cell = [||]
let create n = Array.create n dummy_cell
- let dummy = fun _ _-> assert false
+ let dummy = fun _ _ _ _ _ -> assert false
+ let default = ref dummy
let find h tag slist =
let tab = get h (Uid.to_int slist.SList.Node.id) in
- if tab == dummy_cell then raise Not_found
+ if tab == dummy_cell then !default
else
- let res = get tab tag in
- if res == dummy then raise Not_found else res
+ get tab tag
let add (h : t) tag slist (data : fun_tree) =
let tab = get h (Uid.to_int slist.SList.Node.id) in
let tab = if tab == dummy_cell then
- let x = Array.create 100000 dummy in
+ let x = Array.create 10000 !default in
(set h (Uid.to_int slist.SList.Node.id) x;x)
else tab
in
set tab tag data
+ let dump t = Array.iteri (fun id t' ->
+ if t' != dummy_cell then
+ begin
+ let sl = SList.with_id (Uid.of_int id) in
+ SList.print Format.err_formatter sl;
+ Format.fprintf Format.err_formatter " -> [ ";
+ Array.iteri
+ (fun i x -> if x != !default then
+ Format.fprintf Format.err_formatter "(%s,0x%x) "
+ (Tag.to_string i) (Obj.magic x)) t';
+ Format.fprintf Format.err_formatter " ]\n%!"
+
+ end) t
end
- let td_trans = TransCache.create 100000 (* should be number of tags *number of states^2
+ let td_trans = TransCache.create 10000 (* should be number of tags *number of states^2
in the document *)
let empty_size n =
| n -> loop (SList.cons StateSet.empty acc) (n-1)
in loop SList.nil n
- module FllTable = Hashtbl.Make (struct type t = Formlistlist.t
- let equal = (==)
- let hash t = Uid.to_int t.Formlistlist.Node.id
- end)
-
+
module Fold2Res = struct
external get : 'a array -> int ->'a = "%array_unsafe_get"
external set : 'a array -> int -> 'a -> unit = "%array_unsafe_set"
let x = get h tag in
if x == dummy then
begin
- let y = Array.make 100000 dummy in
+ let y = Array.make 10000 dummy in
set h tag y;y
end
else x
let x = get af (Uid.to_int fl.Formlistlist.Node.id) in
if x == dummy then
begin
- let y = Array.make 100000 dummy in
+ let y = Array.make 10000 dummy in
set af (Uid.to_int fl.Formlistlist.Node.id) y;y
end
else x
let x = get as1 (Uid.to_int s1.SList.Node.id) in
if x == dummy then
begin
- let y = Array.make 100000 dummy_val in
+ let y = Array.make 10000 dummy_val in
set as1 (Uid.to_int s1.SList.Node.id) y;y
end
else x
set as2 (Uid.to_int s2.SList.Node.id) data
end
-
-
-
- module Fold2Res2 = struct
- include Hashtbl.Make(struct
- type t = Tag.t*Formlistlist.t*SList.t*SList.t
- let equal (a,b,c,d) (x,y,z,t) =
- a == x && b == y && c == z && d == t
- let hash (a,b,c,d) = HASHINT4 (a,
- Uid.to_int b.Formlistlist.Node.id,
- Uid.to_int c.SList.Node.id,
- Uid.to_int d.SList.Node.id)
- end)
- let add h t f s1 s2 d =
- add h (t,f,s1,s2) d
- let find h t f s1 s2 =
- find h (t,f,s1,s2)
- end
-
- module Fold2ResOld =
- struct
- type cell = { key : int;
- obj : Obj.t }
- type 'a t = cell array
- let dummy = { key = 0; obj = Obj.repr () }
- let create n = Array.create 25000 dummy
- let hash a b c d = HASHINT4(Obj.magic a,
- Uid.to_int b.Formlistlist.Node.id,
- Uid.to_int c.SList.Node.id,
- Uid.to_int d.SList.Node.id)
-
- let find_slot t key =
- let rec loop i =
- if (t.(i) != dummy) && (t.(i).key != key)
- then loop ((i+1 mod 25000))
- else i
- in loop (key mod 25000)
- ;;
-
- let find t k1 k2 k3 k4 =
- let i = find_slot t (hash k1 k2 k3 k4) in
- if t.(i) == dummy then raise Not_found
- else Obj.magic (t.(i).obj)
-
- let add t k1 k2 k3 k4 v =
- let key = hash k1 k2 k3 k4 in
- let i = find_slot t key in
- t.(i)<- { key = key; obj = (Obj.repr v) }
-
- end
-
+
let h_fold2 = Fold2Res.create 10000
let top_down ?(noright=false) a tree t slist ctx slot_size =
let res = Array.copy rempty in
try
let r,b,btab = Fold2Res.find h_fold2 tag fll sl1 sl2 in
- if b then for i=0 to slot_size - 1 do
- res.(i) <- RS.merge btab.(i) t res1.(i) res2.(i);
+ if b then for i=0 to slot_size - 1 do
+ res.(0) <- RS.merge btab.(0) t res1.(0) res2.(0);
done;
r,res
with
in
let null_result = (pempty,Array.copy rempty) in
- let rec loop t slist ctx =
- if t == Tree.nil then null_result else get_trans t slist (Tree.tag tree t) ctx
- and loop_tag tag t slist ctx =
- if t == Tree.nil then null_result else get_trans t slist tag ctx
- and loop_no_right t slist ctx =
- if t == Tree.nil then null_result else get_trans ~noright:true t slist (Tree.tag tree t) ctx
- and get_trans ?(noright=false) t slist tag ctx =
- let cont =
- try
- TransCache.find td_trans tag slist
- with
- | Not_found ->
- let fl_list,llist,rlist,ca,da,sa,fa =
- SList.fold
- (fun set (fll_acc,lllacc,rllacc,ca,da,sa,fa) -> (* For each set *)
- let fl,ll,rr,ca,da,sa,fa =
- StateSet.fold
- (fun q acc ->
- List.fold_left
- (fun ((fl_acc,ll_acc,rl_acc,c_acc,d_acc,s_acc,f_acc) as acc)
- (ts,t) ->
- if (TagSet.mem tag ts)
- then
- let _,_,_,f,_ = t.Transition.node in
- let (child,desc,below),(sibl,foll,after) = Formula.st f in
- (Formlist.cons t fl_acc,
- StateSet.union ll_acc below,
- StateSet.union rl_acc after,
- StateSet.union child c_acc,
- StateSet.union desc d_acc,
- StateSet.union sibl s_acc,
- StateSet.union foll f_acc)
- else acc ) acc (
- try Hashtbl.find a.trans q
- with
- Not_found -> Printf.eprintf "Looking for state %i, doesn't exist!!!\n%!"
- q;[]
- )
-
- ) set (Formlist.nil,StateSet.empty,StateSet.empty,ca,da,sa,fa)
- in (Formlistlist.cons fl fll_acc), (SList.cons ll lllacc), (SList.cons rr rllacc),ca,da,sa,fa)
- slist (Formlistlist.nil,SList.nil,SList.nil,StateSet.empty,StateSet.empty,StateSet.empty,StateSet.empty)
- in
- (* Logic to chose the first and next function *)
- let tags_child,tags_below,tags_siblings,tags_after = Tree.tags tree tag in
- let d_f = Algebra.decide a tags_child tags_below (StateSet.union ca da) true in
- let d_n = Algebra.decide a tags_siblings tags_after (StateSet.union sa fa) false in
- let f_kind,first = choose_jump_down tree d_f
- and n_kind,next = if noright then (`NIL, fun _ _ -> Tree.nil )
- else choose_jump_next tree d_n in
- (*let f_kind,first = `ANY, Tree.first_child tree
- and n_kind,next = `ANY, Tree.next_sibling_below tree
- in *)
- let empty_res = null_result in
- let cont =
- match f_kind,n_kind with
- | `NIL,`NIL ->
- (fun t _ -> eval_fold2_slist fl_list t (Tree.tag tree t) empty_res empty_res)
- | _,`NIL -> (
- match f_kind with
- (*|`TAG(tag') ->
- let default = fun t _ -> eval_fold2_slist fl_list t (Tree.tag tree t) empty_res
- (loop_tag tag' (first t) llist t )
- in
- let cf = SList.hd llist in
- if (slot_size == 1) && StateSet.is_singleton cf
- then
- let s = StateSet.choose cf in
- if (Algebra.is_rec a s fst) && (Algebra.is_rec a s snd)
- && (Algebra.is_final_marking a s)
- then
- RS.mk_quick_tag_loop default llist 1 tree tag'
- else default
- else default *)
- | _ ->
- (fun t _ -> eval_fold2_slist fl_list t (Tree.tag tree t) empty_res
- (loop (first t) llist t ))
- )
- | `NIL,_ -> (
- match n_kind with
- |`TAG(tag') ->
- if SList.equal rlist slist && tag == tag' then
- let rec loop t ctx =
- if t == Tree.nil then empty_res else
- let res2 = loop (next t ctx) ctx in
- eval_fold2_slist fl_list t tag res2 empty_res
- in loop
- else
- (fun t ctx -> eval_fold2_slist fl_list t (Tree.tag tree t)
- (loop_tag tag' (next t ctx) rlist ctx ) empty_res)
-
- | _ ->
- (fun t ctx -> eval_fold2_slist fl_list t (Tree.tag tree t)
- (loop (next t ctx) rlist ctx ) empty_res)
- )
+ let rec loop t ctx _ slist =
+ if t == Tree.nil then null_result else
+ let tag = Tree.tag tree t in (TransCache.find td_trans tag slist) t ctx tag slist false
+
+ and loop_tag t ctx tag slist =
+ if t == Tree.nil then null_result else (TransCache.find td_trans tag slist) t ctx tag slist false
+
+ and loop_no_right t ctx _ slist =
+ if t == Tree.nil then null_result else
+ let tag = Tree.tag tree t in (TransCache.find td_trans tag slist) t ctx tag slist true
+
+ and mk_trans t ctx tag slist noright =
+ let fl_list,llist,rlist,ca,da,sa,fa =
+ SList.fold
+ (fun set (fll_acc,lllacc,rllacc,ca,da,sa,fa) -> (* For each set *)
+ let fl,ll,rr,ca,da,sa,fa =
+ StateSet.fold
+ (fun q acc ->
+ List.fold_left
+ (fun ((fl_acc,ll_acc,rl_acc,c_acc,d_acc,s_acc,f_acc) as acc)
+ (ts,t) ->
+ if (TagSet.mem tag ts)
+ then
+ let _,_,_,f,_ = t.Transition.node in
+ let (child,desc,below),(sibl,foll,after) = Formula.st f in
+ (Formlist.cons t fl_acc,
+ StateSet.union ll_acc below,
+ StateSet.union rl_acc after,
+ StateSet.union child c_acc,
+ StateSet.union desc d_acc,
+ StateSet.union sibl s_acc,
+ StateSet.union foll f_acc)
+ else acc ) acc (
+ try Hashtbl.find a.trans q
+ with
+ Not_found -> Printf.eprintf "Looking for state %i, doesn't exist!!!\n%!"
+ q;[]
+ )
- | `TAG(tag1),`TAG(tag2) ->
- (fun t ctx ->
- eval_fold2_slist fl_list t (Tree.tag tree t)
- (loop_tag tag2 (next t ctx) rlist ctx )
- (loop_tag tag1 (first t) llist t ))
+ ) set (Formlist.nil,StateSet.empty,StateSet.empty,ca,da,sa,fa)
+ in (Formlistlist.cons fl fll_acc), (SList.cons ll lllacc), (SList.cons rr rllacc),ca,da,sa,fa)
+ slist (Formlistlist.nil,SList.nil,SList.nil,StateSet.empty,StateSet.empty,StateSet.empty,StateSet.empty)
+ in
+ (* Logic to chose the first and next function *)
+ let tags_child,tags_below,tags_siblings,tags_after = Tree.tags tree tag in
+ let d_f = Algebra.decide a tags_child tags_below (StateSet.union ca da) true in
+ let d_n = Algebra.decide a tags_siblings tags_after (StateSet.union sa fa) false in
+ let f_kind,first = choose_jump_down tree d_f
+ and n_kind,next = if noright then (`NIL, fun _ _ -> Tree.nil )
+ else choose_jump_next tree d_n in
+ let empty_res = null_result in
+ let cont =
+ match f_kind,n_kind with
+ | `NIL,`NIL ->
+ (fun t _ tag _ _ -> eval_fold2_slist fl_list t tag empty_res empty_res)
+ | _,`NIL -> (
+ match f_kind with
+ |`TAG(tag') ->
+ fun t _ tag _ _ -> eval_fold2_slist fl_list t tag empty_res
+ (loop_tag (first t) t tag' llist )
+ | _ ->
+ (fun t _ tag _ _ -> eval_fold2_slist fl_list t tag empty_res
+ (loop (first t) t Tag.dummy llist ))
+ )
+ | `NIL,_ -> (
+ match n_kind with
+ |`TAG(tag') ->
+ if SList.equal rlist slist && tag == tag' then
+ let rec loop t ctx _ _ _ =
+ if t == Tree.nil then empty_res else
+ let res2 = loop (next t ctx) ctx Tag.dummy slist false in
+ eval_fold2_slist fl_list t tag res2 empty_res
+ in loop
+ else
+ (fun t ctx tag _ _ -> eval_fold2_slist fl_list t tag
+ (loop_tag (next t ctx) ctx tag' rlist) empty_res)
+
+ | _ ->
+ (fun t ctx tag _ _ -> eval_fold2_slist fl_list t tag
+ (loop (next t ctx) ctx Tag.dummy rlist ) empty_res)
+ )
+
+ | `TAG(tag1),`TAG(tag2) ->
+ (fun t ctx tag _ _ ->
+ eval_fold2_slist fl_list t tag
+ (loop_tag (next t ctx) ctx tag2 rlist)
+ (loop_tag (first t) t tag1 llist))
- | `TAG(tag'),`ANY ->
- (fun t ctx ->
- eval_fold2_slist fl_list t (Tree.tag tree t)
- (loop (next t ctx) rlist ctx )
- (loop_tag tag' (first t) llist t ))
+ | `TAG(tag'),`ANY ->
+ (fun t ctx tag _ _ ->
+ eval_fold2_slist fl_list t tag
+ (loop (next t ctx) ctx Tag.dummy rlist)
+ (loop_tag (first t) t tag' llist))
- | `ANY,`TAG(tag') ->
- (fun t ctx ->
- eval_fold2_slist fl_list t (Tree.tag tree t)
- (loop_tag tag' (next t ctx) rlist ctx )
- (loop (first t) llist t ))
+ | `ANY,`TAG(tag') ->
+ (fun t ctx tag _ _ ->
+ eval_fold2_slist fl_list t tag
+ (loop_tag (next t ctx) ctx tag' rlist )
+ (loop (first t) t Tag.dummy llist))
| `ANY,`ANY ->
(*if SList.equal slist rlist && SList.equal slist llist
eval_fold2_slist fl_list t (Tree.tag tree t) r2 r1
in loop
else *)
- (fun t ctx ->
- eval_fold2_slist fl_list t (Tree.tag tree t)
- (loop (next t ctx) rlist ctx )
- (loop (first t) llist t ))
+ (fun t ctx tag _ _ ->
+ eval_fold2_slist fl_list t tag
+ (loop (next t ctx) ctx Tag.dummy rlist )
+ (loop (first t) t Tag.dummy llist))
| _,_ ->
- (fun t ctx ->
- eval_fold2_slist fl_list t (Tree.tag tree t)
- (loop (next t ctx) rlist ctx )
- (loop (first t) llist t ))
+ (fun t ctx tag _ _ ->
+ eval_fold2_slist fl_list t tag
+ (loop (next t ctx) ctx Tag.dummy rlist)
+ (loop (first t) t Tag.dummy llist ))
in
- let cont = D_IF_( (fun t ctx ->
- let a,b = cont t ctx in
+ (* let cont = D_IF_( (fun t ctx tag ->
+ let a,b = cont t ctx tag in
register_trace tree t (slist,a,fl_list,first,next,ctx);
(a,b)
) ,cont)
- in
- ( TransCache.add td_trans tag slist cont ; cont)
- in cont t ctx
-
+ in *)
+ (TransCache.add td_trans tag slist cont; cont t ctx tag slist noright)
in
- (if noright then loop_no_right else loop) t slist ctx
+ let _ = TransCache.default := mk_trans in
+ (if noright then loop_no_right else loop) t ctx Tag.document_node slist
let run_top_down a tree =
let init = SList.cons a.init SList.nil in
end
- let top_down_count a t = let module RI = Run(Integer) in Integer.length (RI.run_top_down a t)
- let top_down a t = let module RI = Run(IdSet) in (RI.run_top_down a t)
+ let top_down_count a t = let module RI = Run(Integer) in let r = Integer.length (RI.run_top_down a t)
+ in (*RI.TransCache.dump RI.td_trans; *)r
+ let top_down a t = let module RI = Run(IdSet) in (RI.run_top_down a t)
let bottom_up_count a t k = let module RI = Run(Integer) in Integer.length (RI.run_bottom_up a t k)
let bottom_up a t k = let module RI = Run(IdSet) in (RI.run_bottom_up a t k)
projects / SXSI / xpathcomp.git / commitdiff