From 1340a75b9441bac6cbd54c30bd214664ee11a8ed Mon Sep 17 00:00:00 2001 From: Huibo SHI Date: Tue, 11 Mar 2014 21:03:53 +0100 Subject: [PATCH] supprimer (List.rev p) dans la fonction compile_path_rev --- src/query_tree.ml | 4 ++-- src/table.ml | 16 ++++++++-------- src/table_driver.ml | 9 +++------ tests/gen_xmark.sh | 2 +- 4 files changed, 14 insertions(+), 17 deletions(-) diff --git a/src/query_tree.ml b/src/query_tree.ml index a1b47a6..c513bdb 100644 --- a/src/query_tree.ml +++ b/src/query_tree.ml @@ -46,7 +46,7 @@ and compile_step_list p = and compile_single_path_rev p = match p with - | Absolute p | Relative p -> compile_step_list_rev (List.rev p) + | Absolute p | Relative p -> compile_step_list_rev p (*(List.rev p)*) and compile_step_list_rev p = match p with | [] -> Dom (*assert false*) (*on fait rien , mais comment signifer ???*) @@ -111,7 +111,7 @@ let rec diff_list t l1 l2 = else diff_list t ll1 ll2 -let do_debug = ref true +let do_debug = ref false let debug tree q l = if !do_debug then begin diff --git a/src/table.ml b/src/table.ml index f6e7749..91bb85e 100644 --- a/src/table.ml +++ b/src/table.ml @@ -17,14 +17,14 @@ and op = Union | Inter | Diff parametres : tree l'arbre xml n un noeud m move - retour :un noeud qui correspond à la relation r + retour :un noeud qui correspond ॆ la relation r *) let print_node_list tree l = List.iter (fun node -> - Naive_tree.print_xml stdout tree node - ) l; - print_newline() + Naive_tree.print_xml stdout tree node; + print_newline() + ) l let rec print_query_tree fmt q = match q with @@ -57,7 +57,7 @@ let rec eval_relation tree m n = parametres : tree l'arbre xml ls l'ensemble de noeuds m move - retour : l'ensemble de noeuds qui correspondent à la relation r + retour : l'ensemble de noeuds qui correspondent ॆ la relation r *) @@ -75,7 +75,7 @@ let rec eval_move tree ls m = parametres : tree l'arbre xml ls l'ensemble de noeuds m move - retour : l'ensemble de noeuds qui correspondent à des relations lr + retour : l'ensemble de noeuds qui correspondent ॆ des relations lr *) and eval_star tree ls lr = @@ -100,7 +100,7 @@ and eval_star tree ls lr = parametres : tree l'arbre xml ls l'ensemble de noeuds a axis - retour : l'ensemble de noeuds qui correspondent à l'axe + retour : l'ensemble de noeuds qui correspondent ॆ l'axe *) let keep_elements t l = @@ -110,7 +110,7 @@ let keep_elements t l = let rec eval_axis tree ls a = let open Xpath.Ast in let res = - (* let ls = List.sort ( fun a b -> compare (Naive_tree.preorder tree a ) (Naive_tree.preorder tree b ) ) ls in écrir dans la log!!!!!*) + (* let ls = List.sort ( fun a b -> compare (Naive_tree.preorder tree a ) (Naive_tree.preorder tree b ) ) ls in ़crir dans la log!!!!!*) match a with Self -> ls diff --git a/src/table_driver.ml b/src/table_driver.ml index 9d5b240..1f04028 100644 --- a/src/table_driver.ml +++ b/src/table_driver.ml @@ -26,14 +26,11 @@ let main () = let query_tree_list = List.map (fun query -> compile_xpath query) queries in - let cpt = ref 0 in - - List.iter ( fun q -> - + List.iter ( fun q -> let res = eval_query_tree doc [ (Naive_tree.root doc) ] q in + print_string "\n"; print_node_list doc res; - Format.printf "---------------Fin %i\n!" !cpt; - incr cpt; + print_string "\n" ) query_tree_list ; (* let output = diff --git a/tests/gen_xmark.sh b/tests/gen_xmark.sh index 0f32512..b386d00 100755 --- a/tests/gen_xmark.sh +++ b/tests/gen_xmark.sh @@ -2,6 +2,6 @@ for i in 0.00 0.05 0.50 do - xmarkgen -f "$i" -o xmark_"$i".xml + ../tools/xmarkgen -f "$i" -o xmark_"$i".xml cp xmark_queries.template xmark_"$i".xml.queries done -- 2.17.1