X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fparamodulation%2Findexing.ml;h=0193b781b2e87de32665093a4960d82527ef0b91;hb=fc9cad6c109e279130501114000edcfb9621075b;hp=84559b22247fdde62f74f2485562eb34fef34cbb;hpb=a89f7271e79dc7dc81dc868a75125669c8decc16;p=helm.git

diff --git a/helm/ocaml/paramodulation/indexing.ml b/helm/ocaml/paramodulation/indexing.ml
index 84559b222..0193b781b 100644
--- a/helm/ocaml/paramodulation/indexing.ml
+++ b/helm/ocaml/paramodulation/indexing.ml
@@ -1,61 +1,81 @@
 
-let head_of_term = function
-  | Cic.Appl (hd::tl) -> hd
-  | t -> t
+type retrieval_mode = Matching | Unification;;
+
+
+let print_candidates mode term res =
+  let _ =
+    match mode with
+    | Matching ->
+        Printf.printf "| candidates Matching %s\n" (CicPp.ppterm term)
+    | Unification ->
+        Printf.printf "| candidates Unification %s\n" (CicPp.ppterm term)
+  in
+  print_endline
+    (String.concat "\n"
+       (List.map
+          (fun (p, e) ->
+             Printf.sprintf "| (%s, %s)" (Utils.string_of_pos p)
+               (Inference.string_of_equality e))
+          res));
+  print_endline "|";
 ;;
 
 
-(*
+let indexing_retrieval_time = ref 0.;;
+
+
 let empty_table () =
-  Hashtbl.create 10
+  Path_indexing.PSTrie.empty
 ;;
 
-
-let index table eq =
-  let _, (_, l, r, ordering), _, _ = eq in
-  let hl = head_of_term l in
-  let hr = head_of_term r in
-  let index x pos = 
-    let x_entry = try Hashtbl.find table x with Not_found -> [] in
-    Hashtbl.replace table x ((pos, eq)::x_entry)
-  in
-  let _ = 
-    match ordering with
-    | Utils.Gt ->
-        index hl Utils.Left
-    | Utils.Lt ->
-        index hr Utils.Right
-    | _ -> index hl Utils.Left; index hr Utils.Right
+let index = Path_indexing.index
+and remove_index = Path_indexing.remove_index
+and in_index = Path_indexing.in_index;;
+  
+let get_candidates mode trie term =
+  let t1 = Unix.gettimeofday () in
+  let res = 
+    let s = 
+      match mode with
+      | Matching -> Path_indexing.retrieve_generalizations trie term
+      | Unification -> Path_indexing.retrieve_unifiables trie term
+(*       Path_indexing.retrieve_all trie term *)
+    in
+    Path_indexing.PosEqSet.elements s
   in
-(*   index hl Utils.Left; *)
-(*   index hr Utils.Right; *)
-  table
+(*   print_candidates mode term res; *)
+  let t2 = Unix.gettimeofday () in
+  indexing_retrieval_time := !indexing_retrieval_time +. (t2 -. t1);
+  res
 ;;
 
 
-let remove_index table eq =
-  let _, (_, l, r, ordering), _, _ = eq in
-  let hl = head_of_term l
-  and hr = head_of_term r in
-  let remove_index x pos =
-    let x_entry = try Hashtbl.find table x with Not_found -> [] in
-    let newentry = List.filter (fun e -> e <> (pos, eq)) x_entry in
-    Hashtbl.replace table x newentry
-  in
-  remove_index hl Utils.Left;
-  remove_index hr Utils.Right;
-  table
+(*
+let empty_table () =
+  Discrimination_tree.DiscriminationTree.empty
 ;;
-*)
 
+let index = Discrimination_tree.index
+and remove_index = Discrimination_tree.remove_index
+and in_index = Discrimination_tree.in_index;;
 
-let empty_table () =
-  Path_indexing.PSTrie.empty
+let get_candidates mode tree term =
+  let res =
+    let s = 
+      match mode with
+      | Matching -> Discrimination_tree.retrieve_generalizations tree term
+      | Unification -> Discrimination_tree.retrieve_unifiables tree term
+    in
+    Discrimination_tree.PosEqSet.elements s
+  in
+(*   print_candidates mode term res; *)
+  res
 ;;
+*)
+
+let match_unif_time_ok = ref 0.;;
+let match_unif_time_no = ref 0.;;
 
-let index = Path_indexing.index
-and remove_index = Path_indexing.remove_index;;
-  
 
 let rec find_matches metasenv context ugraph lift_amount term =
   let module C = Cic in
@@ -71,11 +91,21 @@ let rec find_matches metasenv context ugraph lift_amount term =
         let pos, (proof, (ty, left, right, o), metas, args) = candidate in
         let do_match c other eq_URI =
           let subst', metasenv', ugraph' =
-            Inference.matching (metasenv @ metas) context
-              term (S.lift lift_amount c) ugraph
+            let t1 = Unix.gettimeofday () in
+            try
+              let r = 
+                Inference.matching (metasenv @ metas) context
+                  term (S.lift lift_amount c) ugraph in
+              let t2 = Unix.gettimeofday () in
+              match_unif_time_ok := !match_unif_time_ok +. (t2 -. t1);
+              r
+            with e ->
+              let t2 = Unix.gettimeofday () in
+              match_unif_time_no := !match_unif_time_no +. (t2 -. t1);
+              raise e
           in
-          Some (C.Rel (1 + lift_amount), subst', metasenv', ugraph',
-                (candidate, eq_URI))
+            Some (C.Rel (1 + lift_amount), subst', metasenv', ugraph',
+                  (candidate, eq_URI))
         in
         let c, other, eq_URI =
           if pos = Utils.Left then left, right, HL.Logic.eq_ind_URI
@@ -118,8 +148,18 @@ let rec find_all_matches ?(unif_fun=CicUnification.fo_unif)
         let pos, (proof, (ty, left, right, o), metas, args) = candidate in
         let do_match c other eq_URI =
           let subst', metasenv', ugraph' =
-            unif_fun (metasenv @ metas) context
-              term (S.lift lift_amount c) ugraph
+            let t1 = Unix.gettimeofday () in
+            try
+              let r = 
+                unif_fun (metasenv @ metas) context
+                  term (S.lift lift_amount c) ugraph in
+              let t2 = Unix.gettimeofday () in
+              match_unif_time_ok := !match_unif_time_ok +. (t2 -. t1);
+              r
+            with e ->
+              let t2 = Unix.gettimeofday () in
+              match_unif_time_no := !match_unif_time_no +. (t2 -. t1);
+              raise e
           in
           (C.Rel (1 + lift_amount), subst', metasenv', ugraph',
            (candidate, eq_URI))
@@ -157,27 +197,6 @@ let rec find_all_matches ?(unif_fun=CicUnification.fo_unif)
 ;;
 
 
-type retrieval_mode = Matching | Unification;;
-
-(*
-let get_candidates mode table term =
-  try Hashtbl.find table (head_of_term term) with Not_found -> []
-;;
-*)
-
-
-let get_candidates mode trie term =
-  let s = 
-    match mode with
-    | Matching ->
-        Path_indexing.retrieve_generalizations trie term
-    | Unification ->
-        Path_indexing.retrieve_unifiables trie term
-  in
-  Path_indexing.PosEqSet.elements s
-;;
-
-
 let subsumption env table target =
   let _, (ty, tl, tr, _), tmetas, _ = target in
   let metasenv, context, ugraph = env in
@@ -205,7 +224,18 @@ let subsumption env table target =
       try
         let other = if pos = Utils.Left then r else l in
         let subst', menv', ug' =
-          Inference.matching metasenv context what other ugraph in
+          let t1 = Unix.gettimeofday () in
+          try
+            let r = 
+              Inference.matching metasenv context what other ugraph in
+            let t2 = Unix.gettimeofday () in
+            match_unif_time_ok := !match_unif_time_ok +. (t2 -. t1);
+            r
+          with e ->
+            let t2 = Unix.gettimeofday () in
+            match_unif_time_no := !match_unif_time_no +. (t2 -. t1);
+            raise e
+        in
         samesubst subst subst'
       with e ->
         false