Discrimination and trie removed.

[helm.git] / helm / ocaml / paramodulation / indexing.ml

diff --git a/helm/ocaml/paramodulation/indexing.ml b/helm/ocaml/paramodulation/indexing.ml
index c964e3a78c882f525df690c230ec60e18abd1eb4..8c41375565652266966189d1d068d7b3bba437c2 100644 (file)
--- a/helm/ocaml/paramodulation/indexing.ml
+++ b/helm/ocaml/paramodulation/indexing.ml
@@ -23,6 +23,15 @@
  * http://cs.unibo.it/helm/.
  *)
 
  * http://cs.unibo.it/helm/.
  *)
 

+module OrderedPosEquality = struct
+       type t = Utils.pos * Inference.equality
+       let compare = Pervasives.compare
+      end
+
+module PosEqSet = Set.Make(OrderedPosEquality);;
+
+module DT = Discrimination_tree.DiscriminationTreeIndexing(PosEqSet);;
+

 let debug_print = Utils.debug_print;;
 
 
 let debug_print = Utils.debug_print;;
 
 


@@ -53,8 +62,6 @@ let indexing_retrieval_time = ref 0.;;
 
 let apply_subst = CicMetaSubst.apply_subst
 
 
 let apply_subst = CicMetaSubst.apply_subst
 

-
-

 (*
 (* NO INDEXING *)
 let init_index () = ()
 (*
 (* NO INDEXING *)
 let init_index () = ()


@@ -90,8 +97,16 @@ let empty_table () =
 ;;
 
 let index = Path_indexing.index
 ;;
 
 let index = Path_indexing.index

-and remove_index = Path_indexing.remove_index
-and in_index = Path_indexing.in_index;;
+let remove_index tree equality = 
+  let _, _, (_, l, r, ordering), _, _ = equality in
+  match ordering with
+  | Utils.Gt -> DT.remove_index tree l equality
+  | Utils.Lt -> DT.remove_index tree r equality
+  | _ -> 
+    DT.remove_index (DT.remove_index tree r equality) l equality
+  
+
+let in_index = Path_indexing.in_index;;

   
 let get_candidates mode trie term =
   let t1 = Unix.gettimeofday () in
   
 let get_candidates mode trie term =
   let t1 = Unix.gettimeofday () in


@@ -111,31 +126,66 @@ let get_candidates mode trie term =
 ;;
 *)
 
 ;;
 *)
 

-

 (* DISCRIMINATION TREES *)
 let init_index () =
 (* DISCRIMINATION TREES *)
 let init_index () =

-  Hashtbl.clear Discrimination_tree.arities;
+  Hashtbl.clear DT.arities;

 ;;
 
 let empty_table () =
 ;;
 
 let empty_table () =

-  Discrimination_tree.DiscriminationTree.empty
+  DT.empty

 ;;
 
 ;;
 

-let index = Discrimination_tree.index
-and remove_index = Discrimination_tree.remove_index
-and in_index = Discrimination_tree.in_index;;
+let remove_index tree equality = 
+  let _, _, (_, l, r, ordering), _, _ = equality in
+  match ordering with
+  | Utils.Gt -> DT.remove_index tree l (Utils.Left, equality)
+  | Utils.Lt -> DT.remove_index tree r (Utils.Right, equality)
+  | _ -> 
+    let tree = DT.remove_index tree r (Utils.Right, equality) in
+    DT.remove_index tree l (Utils.Left, equality)

 
 

+let index tree equality = 
+  let _, _, (_, l, r, ordering), _, _ = equality in
+  match ordering with
+  | Utils.Gt -> DT.index tree l (Utils.Left, equality)
+  | Utils.Lt -> DT.index tree r (Utils.Right, equality)
+  | _ -> 
+    let tree = DT.index tree r (Utils.Right, equality) in
+    DT.index tree l (Utils.Left, equality)
+  
+
+let in_index tree equality = 
+  let _, _, (_, l, r, ordering), _, _ = equality in
+  let meta_convertibility (pos,equality') = 
+    Inference.meta_convertibility_eq equality equality' 
+  in
+  DT.in_index tree l meta_convertibility || DT.in_index tree r meta_convertibility
+
+
+(* returns a list of all the equalities in the tree that are in relation
+   "mode" with the given term, where mode can be either Matching or
+   Unification.
+
+   Format of the return value: list of tuples in the form:
+   (position - Left or Right - of the term that matched the given one in this
+     equality,
+    equality found)
+   
+   Note that if equality is "left = right", if the ordering is left > right,
+   the position will always be Left, and if the ordering is left < right,
+   position will be Right.
+*)

 let get_candidates mode tree term =
   let t1 = Unix.gettimeofday () in
   let res =
     let s = 
       match mode with
 let get_candidates mode tree term =
   let t1 = Unix.gettimeofday () in
   let res =
     let s = 
       match mode with

-      | Matching -> Discrimination_tree.retrieve_generalizations tree term
-      | Unification -> Discrimination_tree.retrieve_unifiables tree term
+      | Matching -> DT.retrieve_generalizations tree term
+      | Unification -> DT.retrieve_unifiables tree term

     in
     in

-    Discrimination_tree.PosEqSet.elements s
+    PosEqSet.elements s

   in
   in

-(*   print_candidates mode term res; *)
+  (*   print_candidates mode term res; *)

 (*   print_endline (Discrimination_tree.string_of_discrimination_tree tree); *)
 (*   print_newline (); *)
   let t2 = Unix.gettimeofday () in
 (*   print_endline (Discrimination_tree.string_of_discrimination_tree tree); *)
 (*   print_newline (); *)
   let t2 = Unix.gettimeofday () in


@@ -153,6 +203,22 @@ let match_unif_time_no = ref 0.;;
   termty can be Implicit if it is not needed. The result (one of the sides of
   the equality, actually) should be not greater (wrt the term ordering) than
   term
   termty can be Implicit if it is not needed. The result (one of the sides of
   the equality, actually) should be not greater (wrt the term ordering) than
   term

+
+  Format of the return value:
+
+  (term to substitute, [Cic.Rel 1 properly lifted - see the various
+                        build_newtarget functions inside the various
+                        demodulation_* functions]
+   substitution used for the matching,
+   metasenv,
+   ugraph, [substitution, metasenv and ugraph have the same meaning as those
+   returned by CicUnification.fo_unif]
+   (equality where the matching term was found, [i.e. the equality to use as
+                                                rewrite rule]
+    uri [either eq_ind_URI or eq_ind_r_URI, depending on the direction of
+         the equality: this is used to build the proof term, again see one of
+         the build_newtarget functions]
+   ))

 *)
 let rec find_matches metasenv context ugraph lift_amount term termty =
   let module C = Cic in
 *)
 let rec find_matches metasenv context ugraph lift_amount term termty =
   let module C = Cic in


@@ -204,8 +270,8 @@ let rec find_matches metasenv context ugraph lift_amount term termty =
             in
             match res with
             | Some (_, s, _, _, _) ->
             in
             match res with
             | Some (_, s, _, _, _) ->

-                let c' = apply_subst s c
-                and other' = apply_subst s other in
+                let c' = apply_subst s c in
+                let other' = U.guarded_simpl context (apply_subst s other) in

                 let order = cmp c' other' in
                 let names = U.names_of_context context in
                 if order = U.Gt then
                 let order = cmp c' other' in
                 let names = U.names_of_context context in
                 if order = U.Gt then


@@ -363,11 +429,11 @@ let subsumption env table target =
       in
        ok left rightr
   in
       in
        ok left rightr
   in

-    (if r then 
-       debug_print 
-        (lazy
-           (Printf.sprintf "SUBSUMPTION! %s\n%s\n"
-              (Inference.string_of_equality target) (Utils.print_subst s))));
+(*     (if r then  *)
+(*        debug_print  *)
+(*      (lazy *)
+(*         (Printf.sprintf "SUBSUMPTION! %s\n%s\n" *)
+(*            (Inference.string_of_equality target) (Utils.print_subst s)))); *)

     r, s
 ;;
 
     r, s
 ;;
 


@@ -472,6 +538,7 @@ let rec demodulation_equality newmeta env table sign target =
   let module S = CicSubstitution in
   let module M = CicMetaSubst in
   let module HL = HelmLibraryObjects in
   let module S = CicSubstitution in
   let module M = CicMetaSubst in
   let module HL = HelmLibraryObjects in

+  let module U = Utils in

   let metasenv, context, ugraph = env in
   let _, proof, (eq_ty, left, right, order), metas, args = target in
   let metasenv' = metasenv @ metas in
   let metasenv, context, ugraph = env in
   let _, proof, (eq_ty, left, right, order), metas, args = target in
   let metasenv' = metasenv @ metas in


@@ -488,7 +555,7 @@ let rec demodulation_equality newmeta env table sign target =
     in
     let what, other = if pos = Utils.Left then what, other else other, what in
     let newterm, newproof =
     in
     let what, other = if pos = Utils.Left then what, other else other, what in
     let newterm, newproof =

-      let bo = apply_subst subst (S.subst other t) in
+      let bo = U.guarded_simpl context (apply_subst subst (S.subst other t)) in

       let name = C.Name ("x_Demod_" ^ (string_of_int !demod_counter)) in
       incr demod_counter;
       let bo' =
       let name = C.Name ("x_Demod_" ^ (string_of_int !demod_counter)) in
       incr demod_counter;
       let bo' =


@@ -505,8 +572,8 @@ let rec demodulation_equality newmeta env table sign target =
           incr maxmeta;
           let irl =
             CicMkImplicit.identity_relocation_list_for_metavariable context in
           incr maxmeta;
           let irl =
             CicMkImplicit.identity_relocation_list_for_metavariable context in

-          debug_print (lazy (Printf.sprintf "\nADDING META: %d\n" !maxmeta));
-          print_newline ();
+(*           debug_print (lazy (Printf.sprintf "\nADDING META: %d\n" !maxmeta)); *)
+(*           print_newline (); *)

           C.Meta (!maxmeta, irl)
         in
           let eq_found =
           C.Meta (!maxmeta, irl)
         in
           let eq_found =


@@ -593,13 +660,13 @@ let rec demodulation_equality newmeta env table sign target =
     if !Utils.compare_terms left' left = Utils.Lt then left' else left in
   let newright = 
     if !Utils.compare_terms right' right = Utils.Lt then right' else right in
     if !Utils.compare_terms left' left = Utils.Lt then left' else left in
   let newright = 
     if !Utils.compare_terms right' right = Utils.Lt then right' else right in

-  if newleft != left || newright != right then (
-    debug_print
-      (lazy
-        (Printf.sprintf "left: %s, left': %s\nright: %s, right': %s\n"
-           (CicPp.ppterm left) (CicPp.ppterm left') (CicPp.ppterm right)
-           (CicPp.ppterm right')))
-  );
+(*   if newleft != left || newright != right then ( *)
+(*     debug_print *)
+(*       (lazy *)
+(*      (Printf.sprintf "left: %s, left': %s\nright: %s, right': %s\n" *)
+(*         (CicPp.ppterm left) (CicPp.ppterm left') (CicPp.ppterm right) *)
+(*         (CicPp.ppterm right'))) *)
+(*   ); *)

   let w' = Utils.compute_equality_weight ty newleft newright in
   let o' = !Utils.compare_terms newleft newright in
   newmeta, (w', p, (ty, newleft, newright, o'), m, a)
   let w' = Utils.compute_equality_weight ty newleft newright in
   let o' = !Utils.compare_terms newleft newright in
   newmeta, (w', p, (ty, newleft, newright, o'), m, a)


@@ -753,14 +820,14 @@ let superposition_left newmeta (metasenv, context, ugraph) table target =
   let maxmeta = ref newmeta in
   let build_new (bo, s, m, ug, (eq_found, eq_URI)) =
 
   let maxmeta = ref newmeta in
   let build_new (bo, s, m, ug, (eq_found, eq_URI)) =
 

-    debug_print (lazy "\nSUPERPOSITION LEFT\n");
+(*     debug_print (lazy "\nSUPERPOSITION LEFT\n"); *)

 
     let time1 = Unix.gettimeofday () in
     
     let pos, (_, proof', (ty, what, other, _), menv', args') = eq_found in
     let what, other = if pos = Utils.Left then what, other else other, what in
     let newgoal, newproof =
 
     let time1 = Unix.gettimeofday () in
     
     let pos, (_, proof', (ty, what, other, _), menv', args') = eq_found in
     let what, other = if pos = Utils.Left then what, other else other, what in
     let newgoal, newproof =

-      let bo' = apply_subst s (S.subst other bo) in
+      let bo' =  U.guarded_simpl context (apply_subst s (S.subst other bo)) in

       let name = C.Name ("x_SupL_" ^ (string_of_int !sup_l_counter)) in
       incr sup_l_counter;
       let bo'' = 
       let name = C.Name ("x_SupL_" ^ (string_of_int !sup_l_counter)) in
       incr sup_l_counter;
       let bo'' = 


@@ -795,10 +862,10 @@ let superposition_left newmeta (metasenv, context, ugraph) table target =
         in
         match proof with
         | Inference.BasicProof _ ->
         in
         match proof with
         | Inference.BasicProof _ ->

-            debug_print (lazy "replacing a BasicProof");
+(*             debug_print (lazy "replacing a BasicProof"); *)

             pb
         | Inference.ProofGoalBlock (_, parent_proof) ->
             pb
         | Inference.ProofGoalBlock (_, parent_proof) ->

-            debug_print (lazy "replacing another ProofGoalBlock");
+(*             debug_print (lazy "replacing another ProofGoalBlock"); *)

             Inference.ProofGoalBlock (pb, parent_proof)
         | _ -> assert false
       in
             Inference.ProofGoalBlock (pb, parent_proof)
         | _ -> assert false
       in


@@ -943,7 +1010,7 @@ let rec demodulation_goal newmeta env table goal =
         incr maxmeta;
         let irl =
           CicMkImplicit.identity_relocation_list_for_metavariable context in
         incr maxmeta;
         let irl =
           CicMkImplicit.identity_relocation_list_for_metavariable context in

-        debug_print (lazy (Printf.sprintf "\nADDING META: %d\n" !maxmeta));
+(*         debug_print (lazy (Printf.sprintf "\nADDING META: %d\n" !maxmeta)); *)

         C.Meta (!maxmeta, irl)
       in
       let eq_found =
         C.Meta (!maxmeta, irl)
       in
       let eq_found =


@@ -966,19 +1033,19 @@ let rec demodulation_goal newmeta env table goal =
         in
         let rec repl = function
           | Inference.NoProof ->
         in
         let rec repl = function
           | Inference.NoProof ->

-              debug_print (lazy "replacing a NoProof");
+(*               debug_print (lazy "replacing a NoProof"); *)

               pb
           | Inference.BasicProof _ ->
               pb
           | Inference.BasicProof _ ->

-              debug_print (lazy "replacing a BasicProof");
+(*               debug_print (lazy "replacing a BasicProof"); *)

               pb
           | Inference.ProofGoalBlock (_, parent_proof) ->
               pb
           | Inference.ProofGoalBlock (_, parent_proof) ->

-              debug_print (lazy "replacing another ProofGoalBlock");
+(*               debug_print (lazy "replacing another ProofGoalBlock"); *)

               Inference.ProofGoalBlock (pb, parent_proof)
           | (Inference.SubProof (term, meta_index, p) as subproof) ->
               Inference.ProofGoalBlock (pb, parent_proof)
           | (Inference.SubProof (term, meta_index, p) as subproof) ->

-              debug_print
-                (lazy
-                   (Printf.sprintf "replacing %s"
-                      (Inference.string_of_proof subproof)));
+(*               debug_print *)
+(*                 (lazy *)
+(*                    (Printf.sprintf "replacing %s" *)
+(*                       (Inference.string_of_proof subproof))); *)

               Inference.SubProof (term, meta_index, repl p)
           | _ -> assert false
         in repl proof
               Inference.SubProof (term, meta_index, repl p)
           | _ -> assert false
         in repl proof