X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fparamodulation%2Findexing.ml;h=64a96f82aefdcdb4f11a665c3316538b37519f07;hb=d35d134356645a09eb72db6e484f3df583123af1;hp=5a8960101d21c2a513b4acc18223817c1aad27c7;hpb=bbe7741f3bbaacb93f2876c018dace82f5e929b8;p=helm.git diff --git a/helm/ocaml/paramodulation/indexing.ml b/helm/ocaml/paramodulation/indexing.ml index 5a8960101..64a96f82a 100644 --- a/helm/ocaml/paramodulation/indexing.ml +++ b/helm/ocaml/paramodulation/indexing.ml @@ -116,6 +116,8 @@ let get_candidates mode tree term = Discrimination_tree.PosEqSet.elements s in (* print_candidates mode term res; *) +(* print_endline (Discrimination_tree.string_of_discrimination_tree tree); *) +(* print_newline (); *) let t2 = Unix.gettimeofday () in indexing_retrieval_time := !indexing_retrieval_time +. (t2 -. t1); res @@ -143,12 +145,12 @@ let rec find_matches metasenv context ugraph lift_amount term = function | [] -> None | candidate::tl -> - let pos, (proof, (ty, left, right, o), metas, args) = candidate in + let pos, (_, proof, (ty, left, right, o), metas, args) = candidate in let do_match c other eq_URI = let subst', metasenv', ugraph' = let t1 = Unix.gettimeofday () in try - let r = + let r = Inference.matching (metasenv @ metas) context term (S.lift lift_amount c) ugraph in let t2 = Unix.gettimeofday () in @@ -200,7 +202,7 @@ let rec find_all_matches ?(unif_fun=Inference.unification) function | [] -> [] | candidate::tl -> - let pos, (proof, (ty, left, right, o), metas, args) = candidate in + let pos, (_, _, (ty, left, right, o), metas, args) = candidate in let do_match c other eq_URI = let subst', metasenv', ugraph' = let t1 = Unix.gettimeofday () in @@ -277,7 +279,7 @@ let subsumption env table target = find_all_matches ~unif_fun:Inference.matching metasenv context ugraph 0 left leftc in - let ok what (_, subst, menv, ug, ((pos, (_, (_, l, r, o), _, _)), _)) = + 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' = @@ -375,38 +377,101 @@ let rec demodulate_term metasenv context ugraph table lift_amount term = ;; +let build_ens_for_sym_eq ty x y = + [(UriManager.uri_of_string + "cic:/Coq/Init/Logic/Logic_lemmas/equality/A.var", ty); + (UriManager.uri_of_string + "cic:/Coq/Init/Logic/Logic_lemmas/equality/x.var", x); + (UriManager.uri_of_string + "cic:/Coq/Init/Logic/Logic_lemmas/equality/y.var", y)] +;; + + let build_newtarget_time = ref 0.;; -let rec demodulation newmeta env table target = + +let demod_counter = ref 1;; + +let rec demodulation newmeta env table sign target = let module C = Cic in let module S = CicSubstitution in let module M = CicMetaSubst in let module HL = HelmLibraryObjects in let metasenv, context, ugraph = env in - let proof, (eq_ty, left, right, order), metas, args = target in + let _, proof, (eq_ty, left, right, order), metas, args = target in let metasenv' = metasenv @ metas in + + let maxmeta = ref newmeta 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 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'' = - C.Appl ([C.MutInd (HL.Logic.eq_URI, 0, []); - S.lift 1 eq_ty] @ - if is_left then [bo; S.lift 1 right] else [S.lift 1 left; bo]) + let t' = + let name = C.Name ("x_Demod_" ^ (string_of_int !demod_counter)) in + incr demod_counter; + let l, r = + if is_left then t, S.lift 1 right else S.lift 1 left, t in + (name, ty, S.lift 1 eq_ty, l, r) in - let t' = C.Lambda (C.Anonymous, ty, bo'') in - bo, - C.Implicit None -(* (\* M. *\)apply_subst subst (C.Appl [C.Const (eq_URI, []); ty; what; t'; *) -(* proof; other; proof']) *) + if sign = Utils.Positive then + (bo, + Inference.ProofBlock (subst, eq_URI, t', eq_found, proof)) + else + let metaproof = + incr maxmeta; + let irl = + CicMkImplicit.identity_relocation_list_for_metavariable context in + Printf.printf "\nADDING META: %d\n" !maxmeta; + print_newline (); + C.Meta (!maxmeta, irl) + in + let target' = + let eq_found = + let proof' = + let ens = + if pos = Utils.Left then + build_ens_for_sym_eq ty what other + else + build_ens_for_sym_eq ty other what + in + Inference.ProofSymBlock (ens, proof') + in + let what, other = + if pos = Utils.Left then what, other else other, what + in + pos, (0, proof', (ty, other, what, Utils.Incomparable), + menv', args') + in + let target_proof = + let pb = + Inference.ProofBlock (subst, eq_URI, t', eq_found, + Inference.BasicProof metaproof) + in + match proof with + | Inference.BasicProof _ -> + print_endline "replacing a BasicProof"; + pb + | Inference.ProofGoalBlock (_, parent_eq) -> + print_endline "replacing another ProofGoalBlock"; + Inference.ProofGoalBlock (pb, parent_eq) + | _ -> assert false + in + (0, target_proof, (eq_ty, left, right, order), metas, args) + in + let refl = + C.Appl [C.MutConstruct (* reflexivity *) + (HelmLibraryObjects.Logic.eq_URI, 0, 1, []); + eq_ty; if is_left then right else left] + in + (bo, + Inference.ProofGoalBlock (Inference.BasicProof refl, target')) in let left, right = if is_left then newterm, right else left, newterm in - let m = - (Inference.metas_of_term left) @ (Inference.metas_of_term right) - in + let m = (Inference.metas_of_term left) @ (Inference.metas_of_term right) in let newmetasenv = List.filter (fun (i, _, _) -> List.mem i m) metas and newargs = List.filter @@ -417,19 +482,24 @@ let rec demodulation newmeta env table target = let time2 = Unix.gettimeofday () in build_newtarget_time := !build_newtarget_time +. (time2 -. time1); - - newmeta, (newproof, (eq_ty, left, right, ordering), newmetasenv, newargs) + + let res = + let w = Utils.compute_equality_weight eq_ty left right in + (w, newproof, (eq_ty, left, right, ordering), newmetasenv, newargs) + in +(* if sign = Utils.Positive then ( *) +(* let newm, res = Inference.fix_metas !maxmeta res in *) +(* maxmeta := newm; *) +(* !maxmeta, res *) +(* ) else *) + !maxmeta(* 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 - | Utils.Gt -> (p, (t, r, r, Utils.Eq), m, a) - | _ -> (p, (t, l, l, Utils.Eq), m, a) - in +(* let build_identity (w, p, (t, l, r, o), m, a) = *) +(* match o with *) +(* | Utils.Gt -> (w, p, (t, r, r, Utils.Eq), m, a) *) +(* | _ -> (w, p, (t, l, l, Utils.Eq), m, a) *) +(* in *) match res with | Some t -> let newmeta, newtarget = build_newtarget true t in @@ -440,7 +510,7 @@ let rec demodulation newmeta env table target = (* if subsumption env table newtarget then *) (* newmeta, build_identity newtarget *) (* else *) - demodulation newmeta env table newtarget + demodulation newmeta env table sign newtarget | None -> let res = demodulate_term metasenv' context ugraph table 0 right in match res with @@ -453,7 +523,7 @@ let rec demodulation newmeta env table target = (* if subsumption env table newtarget then *) (* newmeta, build_identity newtarget *) (* else *) - demodulation newmeta env table newtarget + demodulation newmeta env table sign newtarget | None -> newmeta, target ;; @@ -558,38 +628,95 @@ let rec betaexpand_term metasenv context ugraph table lift_amount term = ;; -let superposition_left (metasenv, context, ugraph) table target = +let sup_l_counter = ref 1;; + +let superposition_left newmeta (metasenv, context, ugraph) table target = let module C = Cic in let module S = CicSubstitution in let module M = CicMetaSubst in let module HL = HelmLibraryObjects in let module CR = CicReduction in let module U = Utils in - let proof, (eq_ty, left, right, ordering), _, _ = target in + let weight, proof, (eq_ty, left, right, ordering), _, _ = target in let expansions, _ = let term = if ordering = U.Gt then left else right in betaexpand_term metasenv context ugraph table 0 term in + let maxmeta = ref newmeta in let build_new (bo, s, m, ug, (eq_found, eq_URI)) = + + print_endline "\nSUPERPOSITION LEFT\n"; + let time1 = Unix.gettimeofday () in - let pos, (proof', (ty, what, other, _), menv', args') = eq_found 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'' = - C.Appl ( - [C.MutInd (HL.Logic.eq_URI, 0, []); - S.lift 1 eq_ty] @ - if ordering = U.Gt then [bo'; S.lift 1 right] - else [S.lift 1 left; bo']) + let t' = + let name = C.Name ("x_SupL_" ^ (string_of_int !sup_l_counter)) in + incr sup_l_counter; + let l, r = + if ordering = U.Gt then bo, S.lift 1 right else S.lift 1 left, bo in + (name, ty, S.lift 1 eq_ty, l, r) in - let t' = C.Lambda (C.Anonymous, ty, bo'') in - bo', - C.Implicit None -(* (\* M. *\)apply_subst s *) -(* (C.Appl [C.Const (eq_URI, []); ty; what; t'; *) -(* proof; other; proof']) *) +(* let bo'' = *) +(* C.Appl ( *) +(* [C.MutInd (HL.Logic.eq_URI, 0, []); *) +(* S.lift 1 eq_ty] @ *) +(* if ordering = U.Gt then [S.lift 1 bo'; S.lift 1 right] *) +(* else [S.lift 1 left; S.lift 1 bo']) *) +(* in *) +(* let t' = *) +(* let name = C.Name ("x_SupL_" ^ (string_of_int !sup_l_counter)) in *) +(* incr sup_l_counter; *) +(* C.Lambda (name, ty, bo'') *) +(* in *) + incr maxmeta; + let metaproof = + let irl = + CicMkImplicit.identity_relocation_list_for_metavariable context in + C.Meta (!maxmeta, irl) + in + let target' = + let eq_found = + let proof' = + let ens = + if pos = Utils.Left then + build_ens_for_sym_eq ty what other + else + build_ens_for_sym_eq ty other what + in + Inference.ProofSymBlock (ens, proof') + in + let what, other = + if pos = Utils.Left then what, other else other, what + in + pos, (0, proof', (ty, other, what, Utils.Incomparable), menv', args') + in + let target_proof = + let pb = + Inference.ProofBlock (s, eq_URI, t', eq_found, + Inference.BasicProof metaproof) + in + match proof with + | Inference.BasicProof _ -> + print_endline "replacing a BasicProof"; + pb + | Inference.ProofGoalBlock (_, parent_eq) -> + print_endline "replacing another ProofGoalBlock"; + Inference.ProofGoalBlock (pb, parent_eq) + | _ -> assert false + in + (weight, target_proof, (eq_ty, left, right, ordering), [], []) + in + let refl = + C.Appl [C.MutConstruct (* reflexivity *) + (HelmLibraryObjects.Logic.eq_URI, 0, 1, []); + eq_ty; if ordering = U.Gt then right else left] + in + (bo', + Inference.ProofGoalBlock (Inference.BasicProof refl, target')) in let left, right = if ordering = U.Gt then newgoal, right else left, newgoal in @@ -597,17 +724,19 @@ let superposition_left (metasenv, context, ugraph) table target = let time2 = Unix.gettimeofday () in build_newtarget_time := !build_newtarget_time +. (time2 -. time1); - - (newproof, (eq_ty, left, right, neworder), [], []) + + let res = + let w = Utils.compute_equality_weight eq_ty left right in + (w, newproof, (eq_ty, left, right, neworder), [], []) + in + 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 + !maxmeta, List.map build_new expansions ;; +let sup_r_counter = ref 1;; + let superposition_right newmeta (metasenv, context, ugraph) table target = let module C = Cic in let module S = CicSubstitution in @@ -615,7 +744,7 @@ let superposition_right newmeta (metasenv, context, ugraph) table target = let module HL = HelmLibraryObjects in let module CR = CicReduction in let module U = Utils in - let eqproof, (eq_ty, left, right, ordering), newmetas, args = target in + let _, eqproof, (eq_ty, left, right, ordering), newmetas, args = target in let metasenv' = metasenv @ newmetas in let maxmeta = ref newmeta in let res1, res2 = @@ -637,19 +766,30 @@ let superposition_right newmeta (metasenv, context, ugraph) table target = let time1 = Unix.gettimeofday () in - let pos, (proof', (ty, what, other, _), menv', args') = eq_found 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'' = - C.Appl ( - [C.MutInd (HL.Logic.eq_URI, 0, []); S.lift 1 eq_ty] @ - if ordering = U.Gt then [bo'; S.lift 1 right] - else [S.lift 1 left; bo']) + let t' = + let name = C.Name ("x_SupR_" ^ (string_of_int !sup_r_counter)) in + incr sup_r_counter; + let l, r = + if ordering = U.Gt then bo, S.lift 1 right else S.lift 1 left, bo in + (name, ty, S.lift 1 eq_ty, l, r) in - let t' = C.Lambda (C.Anonymous, ty, bo'') in +(* let bo'' = *) +(* C.Appl ( *) +(* [C.MutInd (HL.Logic.eq_URI, 0, []); S.lift 1 eq_ty] @ *) +(* if ordering = U.Gt then [S.lift 1 bo'; S.lift 1 right] *) +(* else [S.lift 1 left; S.lift 1 bo']) *) +(* in *) +(* let t' = *) +(* let name = C.Name ("x_SupR_" ^ (string_of_int !sup_r_counter)) in *) +(* incr sup_r_counter; *) +(* C.Lambda (name, ty, bo'') *) +(* in *) bo', - C.Implicit None + Inference.ProofBlock (s, eq_URI, t', eq_found, eqproof(* target *)) (* (\* M. *\)apply_subst s *) (* (C.Appl [C.Const (eq_URI, []); ty; what; t'; *) (* eqproof; other; proof']) *) @@ -661,7 +801,9 @@ let superposition_right newmeta (metasenv, context, ugraph) table target = 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' = + let w = Utils.compute_equality_weight eq_ty left right in + (w, newproof, (eq_ty, left, right, neworder), newmenv, newargs) and env = (metasenv, context, ugraph) in let newm, eq' = Inference.fix_metas !maxmeta eq' in newm, eq' @@ -670,7 +812,7 @@ let superposition_right newmeta (metasenv, context, ugraph) table target = let time2 = Unix.gettimeofday () in build_newtarget_time := !build_newtarget_time +. (time2 -. time1); - + newequality in @@ -682,7 +824,7 @@ let superposition_right newmeta (metasenv, context, ugraph) table target = let new1 = List.map (build_new U.Gt) res1 and new2 = List.map (build_new U.Lt) res2 in let ok = function - | _, (_, left, right, _), _, _ -> + | _, _, (_, left, right, _), _, _ -> not (fst (CR.are_convertible context left right ugraph)) in (!maxmeta,