X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fparamodulation%2Findexing.ml;h=6425e3c82dde87399f88d7277d741be973fcaac6;hb=e67aacd065c5f2bb90dc6b07850b4f4c2bc865fc;hp=0193b781b2e87de32665093a4960d82527ef0b91;hpb=97b887beb8b28738303ae32bcd5bd5c9c87eb606;p=helm.git

diff --git a/helm/ocaml/paramodulation/indexing.ml b/helm/ocaml/paramodulation/indexing.ml
index 0193b781b..6425e3c82 100644
--- a/helm/ocaml/paramodulation/indexing.ml
+++ b/helm/ocaml/paramodulation/indexing.ml
@@ -24,6 +24,52 @@ let print_candidates mode term res =
 let indexing_retrieval_time = ref 0.;;
 
 
+(* let my_apply_subst subst term = *)
+(*   let module C = Cic in *)
+(*   let lookup lift_amount meta = *)
+(*     match meta with *)
+(*     | C.Meta (i, _) -> ( *)
+(*         try *)
+(*           let _, (_, t, _) = List.find (fun (m, _) -> m = i) subst in *)
+(*           (\* CicSubstitution.lift lift_amount  *\)t *)
+(*         with Not_found -> meta *)
+(*       ) *)
+(*     | _ -> assert false *)
+(*   in *)
+(*   let rec apply_aux lift_amount =  function *)
+(*     | C.Meta (i, l) as t -> lookup lift_amount t *)
+(*     | C.Appl l -> C.Appl (List.map (apply_aux lift_amount) l) *)
+(*     | C.Prod (nn, s, t) -> *)
+(*         C.Prod (nn, apply_aux lift_amount s, apply_aux (lift_amount+1) t) *)
+(*     | C.Lambda (nn, s, t) -> *)
+(*         C.Lambda (nn, apply_aux lift_amount s, apply_aux (lift_amount+1) t) *)
+(*     | t -> t *)
+(*   in *)
+(*   apply_aux 0 term *)
+(* ;; *)
+
+
+(* let apply_subst subst term = *)
+(*   Printf.printf "| apply_subst:\n| subst: %s\n| term: %s\n" *)
+(*     (Utils.print_subst ~prefix:" ; " subst) (CicPp.ppterm term); *)
+(*   let res = my_apply_subst subst term in *)
+(* (\*   let res = CicMetaSubst.apply_subst subst term in *\) *)
+(*   Printf.printf "| res: %s\n" (CicPp.ppterm res); *)
+(*   print_endline "|"; *)
+(*   res *)
+(* ;; *)
+
+(* let apply_subst = my_apply_subst *)
+let apply_subst = CicMetaSubst.apply_subst
+
+
+let apply_subst =
+  let profile = CicUtil.profile "apply_subst" in
+  (fun s a -> profile (apply_subst s) a)
+;;
+
+
+(*
 let empty_table () =
   Path_indexing.PSTrie.empty
 ;;
@@ -48,9 +94,9 @@ let get_candidates mode trie term =
   indexing_retrieval_time := !indexing_retrieval_time +. (t2 -. t1);
   res
 ;;
+*)
 
 
-(*
 let empty_table () =
   Discrimination_tree.DiscriminationTree.empty
 ;;
@@ -60,6 +106,7 @@ and remove_index = Discrimination_tree.remove_index
 and in_index = Discrimination_tree.in_index;;
 
 let get_candidates mode tree term =
+  let t1 = Unix.gettimeofday () in
   let res =
     let s = 
       match mode with
@@ -69,9 +116,17 @@ let get_candidates mode tree term =
     Discrimination_tree.PosEqSet.elements s
   in
 (*   print_candidates mode term res; *)
+  let t2 = Unix.gettimeofday () in
+  indexing_retrieval_time := !indexing_retrieval_time +. (t2 -. t1);
   res
 ;;
-*)
+
+
+(* let get_candidates = *)
+(*   let profile = CicUtil.profile "Indexing.get_candidates" in *)
+(*   (fun mode tree term -> profile (get_candidates mode tree) term) *)
+(* ;; *)
+
 
 let match_unif_time_ok = ref 0.;;
 let match_unif_time_no = ref 0.;;
@@ -120,8 +175,8 @@ let rec find_matches metasenv context ugraph lift_amount term =
           let res = try do_match c other eq_URI with e -> None in
           match res with
           | Some (_, s, _, _, _) ->
-              let c' = M.apply_subst s c
-              and other' = M.apply_subst s other in
+              let c' = (* M. *)apply_subst s c
+              and other' = (* M. *)apply_subst s other in
               let order = cmp c' other' in
               let names = U.names_of_context context in
               if order = U.Gt then
@@ -133,7 +188,7 @@ let rec find_matches metasenv context ugraph lift_amount term =
 ;;
 
 
-let rec find_all_matches ?(unif_fun=CicUnification.fo_unif)
+let rec find_all_matches ?(unif_fun=Inference.unification)
     metasenv context ugraph lift_amount term =
   let module C = Cic in
   let module U = Utils in
@@ -181,8 +236,8 @@ let rec find_all_matches ?(unif_fun=CicUnification.fo_unif)
             let res = do_match c other eq_URI in
             match res with
             | _, s, _, _, _ ->
-                let c' = M.apply_subst s c
-                and other' = M.apply_subst s other in
+                let c' = (* M. *)apply_subst s c
+                and other' = (* M. *)apply_subst s other in
                 let order = cmp c' other' in
                 let names = U.names_of_context context in
                 if order <> U.Lt && order <> U.Le then
@@ -198,7 +253,7 @@ let rec find_all_matches ?(unif_fun=CicUnification.fo_unif)
 
 
 let subsumption env table target =
-  let _, (ty, tl, tr, _), tmetas, _ = target in
+  let _, (ty, left, right, _), tmetas, _ = target in
   let metasenv, context, ugraph = env in
   let metasenv = metasenv @ tmetas in
   let samesubst subst subst' =
@@ -214,50 +269,47 @@ let subsumption env table target =
            true)
       subst'
   in
-  let subsaux left right =
-    let leftc = get_candidates Matching table left in
-    let leftr =
-      find_all_matches ~unif_fun:Inference.matching
-        metasenv context ugraph 0 left leftc
-    in
-    let ok what (_, subst, menv, ug, ((pos, (_, (_, l, r, o), _, _)), _)) =
-      try
-        let other = if pos = Utils.Left then r else l in
-        let subst', menv', ug' =
-          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
-    in
-    let r = List.exists (ok right) leftr in
-    if r then
-      true
-    else
-      let rightc = get_candidates Matching table right in
-      let rightr =
+  let leftr =
+    match left with
+    | Cic.Meta _ -> []
+    | _ ->
+        let leftc = get_candidates Matching table left in
         find_all_matches ~unif_fun:Inference.matching
-          metasenv context ugraph 0 right rightc
+          metasenv context ugraph 0 left leftc
+  in
+  let ok what (_, subst, menv, ug, ((pos, (_, (_, l, r, o), _, _)), _)) =
+    try
+      let other = if pos = Utils.Left then r else l in
+      let subst', menv', ug' =
+        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
-      List.exists (ok left) rightr
+      samesubst subst subst'
+    with e ->
+      false
   in
-  let res =  subsaux tl tr in
-  if res then (
-    Printf.printf "subsumption!:\ntarget: %s\n"
-      (Inference.string_of_equality ~env target);
-    print_newline ();
-  );
-  res
+  let r = List.exists (ok right) leftr in
+  if r then
+    true
+  else
+    let rightr =
+      match right with
+      | Cic.Meta _ -> []
+      | _ ->
+          let rightc = get_candidates Matching table right in
+          find_all_matches ~unif_fun:Inference.matching
+            metasenv context ugraph 0 right rightc
+    in
+    List.exists (ok left) rightr
 ;;
 
 
@@ -323,6 +375,8 @@ let rec demodulate_term metasenv context ugraph table lift_amount term =
 ;;
 
 
+let build_newtarget_time = ref 0.;;
+
 let rec demodulation newmeta env table target =
   let module C = Cic in
   let module S = CicSubstitution in
@@ -332,10 +386,12 @@ let rec demodulation newmeta env table target =
   let proof, (eq_ty, left, right, order), metas, args = target in
   let metasenv' = metasenv @ metas in
   let build_newtarget is_left (t, subst, menv, ug, (eq_found, eq_URI)) =
+    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 newterm, newproof =
-      let bo = M.apply_subst subst (S.subst other t) in
+      let bo = (* M. *)apply_subst subst (S.subst other t) in
       let bo'' =
         C.Appl ([C.MutInd (HL.Logic.eq_URI, 0, []);
                  S.lift 1 eq_ty] @
@@ -343,8 +399,9 @@ let rec demodulation newmeta env table target =
       in
       let t' = C.Lambda (C.Anonymous, ty, bo'') in
       bo,
-      M.apply_subst subst (C.Appl [C.Const (eq_URI, []); ty; what; t';
-                                   proof; other; proof'])
+      Inference.ProofBlock (subst, eq_URI, t', eq_found, target)
+(*       (\* M. *\)apply_subst subst (C.Appl [C.Const (eq_URI, []); ty; what; t'; *)
+(*                                    proof; other; proof']) *)
     in
     let left, right = if is_left then newterm, right else left, newterm in
     let m =
@@ -357,8 +414,20 @@ let rec demodulation newmeta env table target =
         args
     in
     let ordering = !Utils.compare_terms left right in
-    newmeta, (newproof, (eq_ty, left, right, ordering), newmetasenv, newargs)
+
+    let time2 = Unix.gettimeofday () in
+    build_newtarget_time := !build_newtarget_time +. (time2 -. time1);
+
+    let res =
+      (C.Implicit None, (eq_ty, left, right, ordering), newmetasenv, newargs)
+    in
+    Inference.store_proof res newproof;
+    newmeta, res
   in
+(*   let build_newtarget = *)
+(*     let profile = CicUtil.profile "Indexing.demodulation.build_newtarget" in *)
+(*     (fun a b -> profile (build_newtarget a) b) *)
+(*   in *)
   let res = demodulate_term metasenv' context ugraph table 0 left in
   let build_identity (p, (t, l, r, o), m, a) =
     match o with
@@ -372,9 +441,9 @@ let rec demodulation newmeta env table target =
         (Inference.meta_convertibility_eq target newtarget) then
           newmeta, newtarget
       else
-        if subsumption env table newtarget then
-          newmeta, build_identity newtarget
-        else
+(*         if subsumption env table newtarget then *)
+(*           newmeta, build_identity newtarget *)
+(*         else *)
           demodulation newmeta env table newtarget
   | None ->
       let res = demodulate_term metasenv' context ugraph table 0 right in
@@ -385,9 +454,9 @@ let rec demodulation newmeta env table target =
             (Inference.meta_convertibility_eq target newtarget) then
               newmeta, newtarget
           else
-            if subsumption env table newtarget then
-              newmeta, build_identity newtarget
-            else
+(*             if subsumption env table newtarget then *)
+(*               newmeta, build_identity newtarget *)
+(*             else *)
               demodulation newmeta env table newtarget
       | None ->
           newmeta, target
@@ -506,10 +575,12 @@ let superposition_left (metasenv, context, ugraph) table target =
     betaexpand_term metasenv context ugraph table 0 term
   in
   let build_new (bo, s, m, ug, (eq_found, eq_URI)) =
+    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' = M.apply_subst s (S.subst other bo) in
+      let bo' = (* M. *)apply_subst s (S.subst other bo) in
       let bo'' =
         C.Appl (
           [C.MutInd (HL.Logic.eq_URI, 0, []);
@@ -519,15 +590,26 @@ let superposition_left (metasenv, context, ugraph) table target =
       in
       let t' = C.Lambda (C.Anonymous, ty, bo'') in
       bo',
-      M.apply_subst s
-        (C.Appl [C.Const (eq_URI, []); ty; what; t';
-                 proof; other; proof'])
+      Inference.ProofBlock (s, eq_URI, t', eq_found, target)
+(*       (\* M. *\)apply_subst s *)
+(*         (C.Appl [C.Const (eq_URI, []); ty; what; t'; *)
+(*                  proof; other; proof']) *)
     in
     let left, right =
       if ordering = U.Gt then newgoal, right else left, newgoal in
     let neworder = !Utils.compare_terms left right in
-    (newproof, (eq_ty, left, right, neworder), [], [])
+
+    let time2 = Unix.gettimeofday () in
+    build_newtarget_time := !build_newtarget_time +. (time2 -. time1);
+
+    let res = (C.Implicit None, (eq_ty, left, right, neworder), [], []) in
+    Inference.store_proof res newproof;
+    res
   in
+(*   let build_new = *)
+(*     let profile = CicUtil.profile "Inference.superposition_left.build_new" in *)
+(*     (fun e -> profile build_new e) *)
+(*   in *)
   List.map build_new expansions
 ;;
 
@@ -550,7 +632,7 @@ let superposition_right newmeta (metasenv, context, ugraph) table target =
         let res l r =
           List.filter
             (fun (_, subst, _, _, _) ->
-               let subst = M.apply_subst subst in
+               let subst = (* M. *)apply_subst subst in
                let o = !Utils.compare_terms (subst l) (subst r) in
                o <> U.Lt && o <> U.Le)
             (fst (betaexpand_term metasenv' context ugraph table 0 l))
@@ -558,10 +640,13 @@ let superposition_right newmeta (metasenv, context, ugraph) table target =
         (res left right), (res right left)
   in
   let build_new ordering (bo, s, m, ug, (eq_found, eq_URI)) =
+
+    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' = M.apply_subst s (S.subst other bo) in
+      let bo' = (* M. *)apply_subst s (S.subst other bo) in
       let bo'' =
         C.Appl (
           [C.MutInd (HL.Logic.eq_URI, 0, []); S.lift 1 eq_ty] @
@@ -570,25 +655,38 @@ let superposition_right newmeta (metasenv, context, ugraph) table target =
       in
       let t' = C.Lambda (C.Anonymous, ty, bo'') in
       bo',
-      M.apply_subst s
-        (C.Appl [C.Const (eq_URI, []); ty; what; t';
-                 eqproof; other; proof'])
+      Inference.ProofBlock (s, eq_URI, t', eq_found, target)
+(*       (\* M. *\)apply_subst s *)
+(*         (C.Appl [C.Const (eq_URI, []); ty; what; t'; *)
+(*                  eqproof; other; proof']) *)
     in
     let newmeta, newequality = 
       let left, right =
-        if ordering = U.Gt then newgoal, M.apply_subst s right
-        else M.apply_subst s left, newgoal in
+        if ordering = U.Gt then newgoal, (* M. *)apply_subst s right
+        else (* M. *)apply_subst s left, newgoal in
       let neworder = !Utils.compare_terms left right 
       and newmenv = newmetas @ menv'
       and newargs = args @ args' in
-      let eq' = (newproof, (eq_ty, left, right, neworder), newmenv, newargs)
+      let eq' =
+        (C.Implicit None, (eq_ty, left, right, neworder), newmenv, newargs)
       and env = (metasenv, context, ugraph) in
       let newm, eq' = Inference.fix_metas !maxmeta eq' in
       newm, eq'
     in
     maxmeta := newmeta;
+
+    let time2 = Unix.gettimeofday () in
+    build_newtarget_time := !build_newtarget_time +. (time2 -. time1);
+
+    Inference.store_proof newequality newproof;
     newequality
   in
+
+(*   let build_new = *)
+(*     let profile = CicUtil.profile "Indexing.superposition_right.build_new" in *)
+(*     (fun o e -> profile (build_new o) e) *)
+(*   in *)
+  
   let new1 = List.map (build_new U.Gt) res1
   and new2 = List.map (build_new U.Lt) res2 in
   let ok = function