INCLUDE "debug.ml"
INCLUDE "utils.ml"
-
+type jump_kind = [ `TAG of Tag.t | `CONTAINS of string | `NOTHING ]
let cpt_trans = ref 0
let miss_trans = ref 0
let cpt_eval = ref 0
let b,b1,b2 = eval_form_bool f s1 s2 in
let r = if b then (Ptset.add q s, b, b1'||b1,b2'||b2,mark||amark)
else s,b',b1',b2',amark
- in
-(* Format.fprintf Format.err_formatter "\nEvaluating formula (%i) %i %s" h q (if mark then "=>" else "->");
+ in(*
+ Format.fprintf Format.err_formatter "\nEvaluating formula (%i) %i %s" h q (if mark then "=>" else "->");
pr_frm (Format.err_formatter) f;
Format.fprintf Format.err_formatter " in context ";
pr_st Format.err_formatter (Ptset.elements s1);
module Run (RS : ResultSet) =
struct
+ let fmt = Format.err_formatter
+ let pr x = Format.fprintf fmt x
module Formlist =
struct
type t = formlist
function Nil -> Nil
| Cons(s,h,ll) -> cons (f s) (loop ll)
in loop l
+ let iter_pl f l =
+ let rec loop =
+ function Nil -> ()
+ | Cons(s,h,ll) -> (f s);(loop ll)
+ in loop l
let rev_pl l =
let rec loop acc l = match l with
if (TagSet.mem tag ts)
then
let (child,desc,below),(sibl,foll,after) = f.st in
+ let h_acc = HASHINT3(h_acc,f.fid,HASHINT2(q,vb m)) in
((Formlist.cons q f h_acc m fl_acc,
Ptset.union ll_acc below,
Ptset.union rl_acc after,
Ptset.union desc d_acc,
Ptset.union sibl s_acc,
Ptset.union foll f_acc),
- HASHINT3(h_acc,f.fid,HASHINT2(q,vb m)))
+ h_acc)
else acc ) (acc,0) (
try Hashtbl.find a.phi q
with
let rec fold l1 l2 fll i aq = match l1,l2,fll with
| Cons(s1,_,ll1), Cons(s2, _ ,ll2),fl::fll ->
let r',rb,rb1,rb2,mark = eval_formlist s1 s2 fl in
+(* let _ = pr "Evaluation context : "; pr_st fmt (Ptset.elements s1);
+ pr_st fmt (Ptset.elements s2);
+ pr "Formlist (%i) : " (Formlist.hash fl);
+ Formlist.pr fmt fl;
+ pr "Results : "; pr_st fmt (Ptset.elements r');
+ pr ", %b %b %b %b\n%!" rb rb1 rb2 mark
+ in *)
let _ = res.(i) <- merge rb rb1 rb2 mark t res1.(i) res2.(i)
in
fold ll1 ll2 fll (i+1) (cons r' aq)
in
let null_result() = (pempty,Array.make slot_size RS.empty) in
let rec loop t slist ctx =
+ let (a,b) =
if Tree.is_nil t then null_result()
else
let tag = Tree.tag t in
let fl_list,llist,rlist,first,next = get_trans slist tag a t in
+(* let _ = pr "For tag %s,node %s, returning formulae list: \n%!"
+ (Tag.to_string tag) (Tree.dump_node t);
+ List.iter (fun f -> Formlist.pr fmt f;pr "\n%!") fl_list
+ in*)
let sl1,res1 = loop (first t) llist t in
- let sl2,res2 = if noright then null_result()
- else loop (next t ctx) rlist ctx in
+ let sl2,res2 = loop (next t ctx) rlist ctx in
eval_fold2_slist fl_list sl1 sl2 res1 res2 t
+ in
+(* let _ = pr "Inside topdown call: tree was %s, tag = %s" (Tree.dump_node t) (if Tree.is_nil t then "###"
+ else Tag.to_string (Tree.tag t));
+ iter_pl (fun s -> (pr_st fmt (Ptset.elements s))) a;
+ Array.iter (fun i -> pr "%i" (RS.length i)) b;
+ pr "\n%!"; in*) (a,b)
+
in
let loop_no_right t slist ctx =
if Tree.is_nil t then null_result()
results = imap }
end
- let fmt = Format.err_formatter
- let pr x = Format.fprintf fmt x
+
let h_fold = Hashtbl.create 511
let fold_f_conf t slist fl_list conf dir=
Hashtbl.fold (fun q l acc ->
List.fold_left (fun (fl_acc,h_acc) (ts,(m,f,_)) ->
if TagSet.mem ptag ts
- then (Formlist.cons q f h_acc m fl_acc,
- HASHINT3(h_acc,f.fid,q))
+ then
+ let h_acc = HASHINT3(h_acc,f.fid,HASHINT2(q,vb m)) in
+ (Formlist.cons q f h_acc m fl_acc,
+ h_acc)
else (fl_acc,h_acc))
acc l)
a.phi (Formlist.nil,0)
in
(Hashtbl.add h_trans key res;res)
-
+
+ let h_tdconf = Hashtbl.create 511
let rec bottom_up a tree conf next jump_fun root dotd init accu =
if (not dotd) && (Configuration.is_empty conf ) then
- (* let _ = pr "Returning early from %s, with accu %i, next is %s\n%!"
- (Tree.dump_node tree) (Obj.magic accu) (Tree.dump_node next)
- in *)
- accu,conf,next
+(* let _ = pr "Returning early from %s, with accu %i, next is %s\n%!"
+ (Tree.dump_node tree) (Obj.magic accu) (Tree.dump_node next)
+ in *)
+ accu,conf,next
else
-(* let _ =
+(* let _ =
pr "Going bottom up for tree with tag %s configuration is"
- (if Tree.is_nil tree then "###" else Tag.to_string (Tree.tag tree));
+ (if Tree.is_nil tree then "###" else Tag.to_string (Tree.tag tree));
Configuration.pr fmt conf
- in *)
- let below_right = Tree.is_below_right tree next in
-(* let _ = Format.fprintf Format.err_formatter "below_right %s %s = %b\n%!"
- (Tree.dump_node tree) (Tree.dump_node next) below_right
- in *)
- let accu,rightconf,next_of_next =
+ in *)
+ let below_right = Tree.is_below_right tree next in
+ (* let _ = Format.fprintf Format.err_formatter "below_right %s %s = %b\n%!"
+ (Tree.dump_node tree) (Tree.dump_node next) below_right
+ in *)
+ let accu,rightconf,next_of_next =
if below_right then (* jump to the next *)
-(* let _ = pr "Jumping to %s\n%!" (Tree.dump_node next) in *)
+(* let _ = pr "Jumping to %s tag %s\n%!" (Tree.dump_node next) (Tag.to_string (Tree.tag next)) in *)
bottom_up a next conf (jump_fun next) jump_fun (Tree.next_sibling tree) true init accu
else accu,Configuration.empty,next
in
-(* let _ = if below_right then pr "Returning from jump to next\n" in *)
+(* let _ = if below_right then pr "Returning from jump to next = %s\n" (Tree.dump_node next)in *)
let sub =
if dotd then
if below_right then (* only recurse on the left subtree *)
- (* let _ = pr "Topdown on subtree\n%!" in *)
+(* let _ = pr "Topdown on left subtree\n%!" in *)
prepare_topdown a tree true
else
-(* let _ = pr "Topdown on whole tree\n%!" in *)
+(* let _ = pr "Topdown on whole tree\n%!" in *)
prepare_topdown a tree false
else conf
in
(Configuration.merge rightconf sub, next_of_next)
in
if Tree.equal tree root then
-(* let _ = pr "Stopping at root, configuration after topdown is:" ;
+(* let _ = pr "Stopping at root, configuration after topdown is:" ;
Configuration.pr fmt conf;
pr "\n%!"
- in *) accu,conf,next
+ in *) accu,conf,next
else
let parent = Tree.binary_parent tree in
let ptag = Tree.tag parent in
let slist = Configuration.Ptss.fold (fun e a -> cons e a) conf.Configuration.sets Nil in
let fl_list = get_up_trans slist ptag a parent in
let slist = rev_pl (slist) in
-(* let _ = pr "Current conf is : %i " (Tree.id tree);
+(* let _ = pr "Current conf is : %s " (Tree.dump_node tree);
Configuration.pr fmt conf;
pr "\n"
in *)
bottom_up a parent newconf next jump_fun root false init accu
and prepare_topdown a t noright =
-(* pr "Going top down on tree with tag %s\n%!"
- (if Tree.is_nil t then "###" else (Tag.to_string(Tree.tag t))); *)
- let r = cons a.states Nil in
+ let tag = Tree.tag t in
+(* pr "Going top down on tree with tag %s = %s "
+ (if Tree.is_nil t then "###" else (Tag.to_string(Tree.tag t))) (Tree.dump_node t); *)
+ let r =
+ try
+ Hashtbl.find h_tdconf tag
+ with
+ | Not_found ->
+ let res = Hashtbl.fold (fun q l acc ->
+ if List.exists (fun (ts,_) -> TagSet.mem tag ts) l
+ then Ptset.add q acc
+ else acc) a.phi Ptset.empty
+ in Hashtbl.add h_tdconf tag res;res
+ in
+(* let _ = pr ", among ";
+ pr_st fmt (Ptset.elements r);
+ pr "\n%!";
+ in *)
+ let r = cons r Nil in
let set,res = top_down (~noright:noright) a t r t 1 in
let set = match set with
| Cons(x,_,Nil) ->x
- let run_bottom_up_contains a t =
+ let run_bottom_up a t k =
let trlist = Hashtbl.find a.phi (Ptset.choose a.init)
in
let init = List.fold_left
Ptset.union acc (let (_,_,l) = fst (f.st) in l))
Ptset.empty trlist
in
- let tree1 = Tree.text_below t in
- let jump_fun = fun tree -> Tree.text_next tree t in
+ let tree1,jump_fun =
+ match k with
+ | `TAG (tag) ->
+ (*Tree.tagged_lowest t tag, fun tree -> Tree.tagged_next tree tag*)
+ (Tree.tagged_desc tag t, fun tree -> Tree.tagged_foll_below tag tree t)
+ | `CONTAINS(_) -> (Tree.text_below t,fun tree -> Tree.text_next tree t)
+ | _ -> assert false
+ in
let tree2 = jump_fun tree1 in
let rec loop tree next acc =
-(* let _ = pr "\n_________________________\nNew iteration\n" in *)
-(* let _ = pr "Jumping to %s\n%!" (Tree.dump_node tree) in *)
+(* let _ = pr "\n_________________________\nNew iteration\n" in
+ let _ = pr "Jumping to %s\n%!" (Tree.dump_node tree) in *)
let acc,conf,next_of_next = bottom_up a tree
Configuration.empty next jump_fun (Tree.root tree) true init acc
in
loop tree1 tree2 RS.empty
-
-
-
-
-
-
-
-
-
-
-
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 bottom_up_count_contains a t = let module RI = Run(Integer) in Integer.length (RI.run_bottom_up_contains a t)
- let bottom_up_count a t = failwith "not implemented"
+ let bottom_up_count a t k = let module RI = Run(Integer) in Integer.length (RI.run_bottom_up a t k)
+
let auto,ltags,contains = time XPath.Compile.compile query in
let _ = Ata.dump Format.err_formatter auto in
let _ = Printf.eprintf "%!" in
-
- let do_contains = match contains with
- None -> false
- | Some s ->
- let r = Tree.count v s
- in
- Printf.eprintf "%i documents in the TextCollection\n" (Tree.text_size v);
- Printf.eprintf "Global count is %i, using " r;
- if r < !Options.tc_threshold then begin
- Printf.eprintf "TextCollection contains\nTiming call to raw global contains (1st time): ";
- time (Tree.unsorted_contains v) s;
- Printf.eprintf "Calling global contains : ";
- time (Tree.init_contains v) s;
- Printf.eprintf "Timing call to global count contains : ";
- let r = time (Tree.count_contains v) s
- in
- Printf.eprintf " number of matching nodes %i \n%!" r;
- Printf.eprintf "Timing call to raw global contains (2nd time): ";
- time (Tree.unsorted_contains v) s;
- end
- else begin
- Printf.eprintf "Naive contains\nCalling global contains : ";
- time (Tree.init_naive_contains v) s
- end;true
+ let jump_to =
+ match contains with
+ None -> (max_int,`NOTHING)
+ | Some s ->
+ let r = Tree.count v s
+ in
+ Printf.eprintf "%i documents in the TextCollection\n" (Tree.text_size v);
+ Printf.eprintf "Global count is %i, using " r;
+ if r < !Options.tc_threshold then begin
+ Printf.eprintf "TextCollection contains\nCalling global contains : ";
+ time (Tree.init_contains v) s;
+ end
+ else begin
+ Printf.eprintf "Naive contains\nCalling global contains : ";
+ time (Tree.init_naive_contains v) s
+ end;(r,`CONTAINS(s))
+ in
+ let test_list =
+ if (!Options.backward) then begin
+ Printf.eprintf "Finding min occurences : ";
+ time
+ ( List.fold_left (fun ((min_occ,kind)as acc) (tag,_) ->
+ let numtags = Tree.subtree_tags v tag in
+ if ((numtags < min_occ) && numtags >= 2)
+ then (numtags,`TAG(tag))
+ else acc) jump_to) ltags
+ end
+ else (max_int,`NOTHING)
+ in
+ let _ = if (snd test_list) != `NOTHING then
+ let occ,s1,s2 = match test_list with
+ | (x,`TAG (tag)) -> (x, "tag", (Tag.to_string tag))
+ | (x,`CONTAINS(s)) -> (x, "contains()", s)
+ | _ -> assert false
+ in
+ Printf.eprintf "Will jump to %s %s occuring %i time\n%!" s1 s2 occ
in
Printf.eprintf "Execution time %s : "
(if !Options.count_only then "(counting only)" else if !Options.backward then "(bottomup)" else "");
begin
let _ = Gc.full_major();Gc.compact() in
- let _ = Gc.set (disabled_gc) in
- if !Options.backward then
- let tag,set = List.hd ltags in
- let r = if do_contains
- then time (bottom_up_count_contains auto) v
- else time (bottom_up_count auto v) tag in
+ (* let _ = Gc.set (disabled_gc) in *)
+ if !Options.backward && ((snd test_list) != `NOTHING )then
+
+ let r = time (bottom_up_count auto v )(snd test_list) in
let _ = Printf.eprintf "Number of nodes in the result set : %i\n%!" r
in ()
else
+ let _ =
+ if !Options.backward then Printf.eprintf "WARNING: couldn't find a jumping point, running top-down\n"
+ in
if !Options.count_only then
- let r = time ( top_down_count auto ) v in (* not clean *)
- let _ = Printf.eprintf "Number of nodes in the result set : %i\n%!" r
- in ()
- else
- let result = time (top_down auto) v in
- let rcount = IdSet.length result in
- Printf.eprintf "Number of nodes in the result set : %i\n" rcount;
- Printf.eprintf "\n%!";
- begin
- match output with
- | None -> ()
- | Some f ->
- Printf.eprintf "Serializing results : ";
- time( fun () ->
- let oc = open_out f in
- output_string oc "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
- IdSet.iter (fun t ->
- Tree.print_xml_fast oc t;
- output_char oc '\n';
- output_string oc "----------\n";
- ) result) ();
- end;
+ let r = time ( top_down_count auto ) v in
+ let _ = Printf.eprintf "Number of nodes in the result set : %i\n%!" r
+ in ()
+ else
+ let result = time (top_down auto) v in
+ let rcount = IdSet.length result in
+ Printf.eprintf "Number of nodes in the result set : %i\n" rcount;
+ Printf.eprintf "\n%!";
+ begin
+ match output with
+ | None -> ()
+ | Some f ->
+ Printf.eprintf "Serializing results : ";
+ time( fun () ->
+ let oc = open_out f in
+ output_string oc "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
+ IdSet.iter (fun t ->
+ Tree.print_xml_fast oc t;
+ output_char oc '\n';
+ output_string oc "----------\n";
+ ) result) ();
+ end;
end;
let _ = Gc.set enabled_gc in
-(* let _ = Ata.dump Format.err_formatter auto in *)
- Printf.eprintf "Total running time : %fms\n%!" (total_time())
+ Printf.eprintf "Total running time : %fms\n%!" (total_time())
;;
-
+
Options.parse_cmdline();;
let v =
(* Copyright NICTA 2008 *)
(* Distributed under the terms of the LGPL (see LICENCE) *)
(******************************************************************************)
-(*INCLUDE "debug.ml" *)
+INCLUDE "utils.ml"
type tree
type 'a node = int
node : descr;
ttable : (Tag.t,(Ptset.t*Ptset.t)) Hashtbl.t;
}
-
-let update h t sb sa =
- let sbelow,safter =
- try
- Hashtbl.find h t
- with
- | Not_found -> Ptset.empty,Ptset.empty
- in
- Hashtbl.replace h t (Ptset.union sbelow sb, Ptset.union safter sa)
+
+
+
let text_size t = text_size t.doc
let collect_tags tree =
+ let h_union = Hashtbl.create 511 in
+ let pt_cup s1 s2 =
+ (* special case, since this is a union we want hash(s1,s2) = hash(s2,s1) *)
+ let x = Ptset.hash s1
+ and y = Ptset.hash s2 in
+ let h = if x < y then HASHINT2(x,y) else HASHINT2(y,x) in
+ try
+ Hashtbl.find h_union h
+ with
+ | Not_found -> let s = Ptset.union s1 s2
+ in
+ Hashtbl.add h_union h s;s
+ in
+ let h_add = Hashtbl.create 511 in
+ let pt_add t s =
+ let k = HASHINT2(Tag.hash t,Ptset.hash s) in
+ try
+ Hashtbl.find h_add k
+ with
+ | Not_found -> let r = Ptset.add t s in
+ Hashtbl.add h_add k r;r
+ in
let h = Hashtbl.create 511 in
+ let sing = Ptset.singleton Tag.pcdata in
+ let update t sb sa =
+ let sbelow,safter =
+ try
+ Hashtbl.find h t
+ with
+ | Not_found ->
+ (sing,sing)
+ in
+ Hashtbl.replace h t (pt_cup sbelow sb, pt_cup safter sa)
+ in
let rec loop id acc =
if equal_node id nil
- then (Ptset.singleton Tag.pcdata, Ptset.add Tag.pcdata acc)
+ then (Ptset.empty,acc)
else
let below2,after2 = loop (tree_next_sibling tree id) acc in
let below1,after1 = loop (tree_first_child tree id) after2 in
let tag = tree_tag_id tree id in
- update h tag below1 after2;
- Ptset.add tag (Ptset.union below1 below2), (Ptset.add tag after1)
+ update tag below1 after2;
+ pt_add tag (pt_cup below1 below2), (pt_add tag after1)
in
let b,a = loop (tree_root tree) Ptset.empty in
- update h Tag.pcdata b a;
+ update Tag.pcdata b a;
h
| Text (i,_) -> (i,i)
| Nil -> (nil,nil)
))
+
+let subtree_tags t tag = match t.node with
+ | Nil -> 0
+ | Node(i) -> tree_subtree_tags t.doc i tag
+ | Text(_,i) -> tree_subtree_tags t.doc i tag
projects / SXSI / xpathcomp.git / commitdiff