X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fng_paramodulation%2Fsuperposition.ml;h=42cf063b64f08b3e352693d7a30bebff78025e95;hb=dd29593d12cffd332c9d546167215f42a90fa9f7;hp=6a2950b0e3da34514327d96f988bb0599e50d3c9;hpb=946065280df015323ce624769fd0c4261f8b4209;p=helm.git diff --git a/helm/software/components/ng_paramodulation/superposition.ml b/helm/software/components/ng_paramodulation/superposition.ml index 6a2950b0e..42cf063b6 100644 --- a/helm/software/components/ng_paramodulation/superposition.ml +++ b/helm/software/components/ng_paramodulation/superposition.ml @@ -20,9 +20,13 @@ module Superposition (B : Orderings.Blob) = module Utils = FoUtils.Utils(B) module Pp = Pp.Pp(B) - exception Success of B.t Terms.bag * int * B.t Terms.unit_clause + exception Success of + B.t Terms.bag + * int + * B.t Terms.unit_clause + * B.t Terms.substitution - (* let debug s = prerr_endline (Lazy.force s);; *) + let print s = prerr_endline (Lazy.force s);; let debug _ = ();; let enable = true;; @@ -243,10 +247,12 @@ module Superposition (B : Orderings.Blob) = ((*prerr_endline ("Filtering: " ^ Pp.pp_foterm side ^ " =(< || =)" ^ Pp.pp_foterm newside ^ " coming from " ^ - Pp.pp_unit_clause uc );*)None) + Pp.pp_unit_clause uc );*) + debug (lazy "not applied");None) else Some (newside, subst, id, dir) - with FoUnif.UnificationFailure _ -> None) + with FoUnif.UnificationFailure _ -> + debug (lazy "not applied"); None) (IDX.ClauseSet.elements cands) ;; @@ -264,9 +270,14 @@ module Superposition (B : Orderings.Blob) = ;; let rec demodulate bag (id, literal, vl, pr) table = - debug (lazy "demodulate..."); + debug (lazy ("demodulate " ^ (string_of_int id))); match literal with - | Terms.Predicate t -> assert false + | Terms.Predicate t -> (* assert false *) + let bag,_,id1 = + visit bag [] (fun x -> x) id t (ctx_demod table vl) + in + let cl,_,_ = Terms.get_from_bag id1 bag in + bag,cl | Terms.Equation (l,r,ty,_) -> let bag,l,id1 = visit bag [2] @@ -311,22 +322,33 @@ module Superposition (B : Orderings.Blob) = ;; (* move away *) - let is_identity_clause ~unify = function + let is_identity_clause = function | _, Terms.Equation (_,_,_,Terms.Eq), _, _ -> true - | _, Terms.Equation (l,r,_,_), vl, proof when unify -> - (try ignore(Unif.unification (* vl *) [] l r); true - with FoUnif.UnificationFailure _ -> false) | _, Terms.Equation (_,_,_,_), _, _ -> false | _, Terms.Predicate _, _, _ -> assert false ;; - let build_new_clause bag maxvar filter rule t subst id id2 pos dir = + let is_identity_goal = function + | _, Terms.Equation (_,_,_,Terms.Eq), _, _ -> Some [] + | _, Terms.Equation (l,r,_,_), vl, proof -> + (try Some (Unif.unification (* vl *) [] l r) + with FoUnif.UnificationFailure _ -> None) + | _, Terms.Predicate _, _, _ -> assert false + ;; + + let build_new_clause_reloc bag maxvar filter rule t subst id id2 pos dir = let maxvar, _vl, subst = Utils.relocate maxvar (Terms.vars_of_term (Subst.apply_subst subst t)) subst in match build_clause bag filter rule t subst id id2 pos dir with - | Some (bag, c) -> Some ((bag, maxvar), c) - | None -> None + | Some (bag, c) -> Some ((bag, maxvar), c), subst + | None -> None,subst ;; + + let build_new_clause bag maxvar filter rule t subst id id2 pos dir = + fst (build_new_clause_reloc bag maxvar filter rule t + subst id id2 pos dir) + ;; + let prof_build_new_clause = HExtlib.profile ~enable "build_new_clause";; let build_new_clause bag maxvar filter rule t subst id id2 pos x = prof_build_new_clause.HExtlib.profile (build_new_clause bag maxvar filter @@ -342,7 +364,6 @@ module Superposition (B : Orderings.Blob) = in bag, maxvar, res ;; - let rewrite_eq ~unify l r ty vl table = let retrieve = if unify then IDX.DT.retrieve_unifiables @@ -396,6 +417,7 @@ module Superposition (B : Orderings.Blob) = match acc with | None -> None | Some(bag,maxvar,(id,lit,vl,p),subst) -> + (* prerr_endline ("input subst = "^Pp.pp_substitution subst); *) let l = Subst.apply_subst subst l in let r = Subst.apply_subst subst r in try @@ -410,19 +432,24 @@ module Superposition (B : Orderings.Blob) = with FoUnif.UnificationFailure _ -> match rewrite_eq ~unify l r ty vl table with | Some (id2, dir, subst1) -> + (* prerr_endline ("subst1 = "^Pp.pp_substitution subst1); + prerr_endline ("old subst = "^Pp.pp_substitution subst);*) let newsubst = Subst.concat subst1 subst in let id_t = FoSubst.apply_subst newsubst (Terms.Node[Terms.Leaf B.eqP;ty;contextl r;contextr r]) in (match - build_new_clause bag maxvar (fun _ -> true) + build_new_clause_reloc bag maxvar (fun _ -> true) Terms.Superposition id_t subst1 id id2 (pos@[2]) dir with - | Some ((bag, maxvar), c) -> + | Some ((bag, maxvar), c), r -> + (* prerr_endline ("r = "^Pp.pp_substitution r); *) + let newsubst = Subst.flat + (Subst.concat r subst) in Some(bag,maxvar,c,newsubst) - | None -> assert false) + | None, _ -> assert false) | None -> match l,r with | Terms.Node (a::la), Terms.Node (b::lb) when @@ -444,6 +471,7 @@ module Superposition (B : Orderings.Blob) = in acc | _,_ -> None ;; + let prof_deep_eq = HExtlib.profile ~enable "deep_eq";; let deep_eq ~unify l r ty pos contextl contextr table x = prof_deep_eq.HExtlib.profile (deep_eq ~unify l r ty pos contextl contextr table) x @@ -476,10 +504,10 @@ module Superposition (B : Orderings.Blob) = (* demodulate and check for subsumption *) let simplify table maxvar bag clause = debug (lazy "simplify..."); - if is_identity_clause ~unify:false clause then bag,None + if is_identity_clause clause then bag,None (* else if orphan_murder bag actives clause then bag,None *) else let bag, clause = demodulate bag clause table in - if is_identity_clause ~unify:false clause then bag,None + if is_identity_clause clause then bag,None else match is_subsumed ~unify:false bag maxvar clause table with | None -> bag, Some clause @@ -608,12 +636,18 @@ module Superposition (B : Orderings.Blob) = let bag, clause = if no_demod then bag, clause else demodulate bag clause table in + let _ = debug (lazy ("demodulated goal : " + ^ Pp.pp_unit_clause clause)) + in if List.exists (are_alpha_eq clause) g_actives then None - else if (is_identity_clause ~unify:true clause) - then raise (Success (bag, maxvar, clause)) - else + else match (is_identity_goal clause) with + | Some subst -> raise (Success (bag,maxvar,clause,subst)) + | None -> let (id,lit,vl,_) = clause in - if vl = [] then Some (bag,clause) + (* this optimization makes sense only if we demodulated, since in + that case the clause should have been turned into an identity *) + if (vl = [] && not(no_demod)) + then Some (bag,clause) else let l,r,ty = match lit with @@ -624,15 +658,15 @@ module Superposition (B : Orderings.Blob) = table (Some(bag,maxvar,clause,Subst.id_subst)) with | None -> Some (bag,clause) | Some (bag,maxvar,cl,subst) -> - prerr_endline "Goal subsumed"; - raise (Success (bag,maxvar,cl)) + debug (lazy "Goal subsumed"); + raise (Success (bag,maxvar,cl,subst)) (* - else match is_subsumed ~unify:true bag maxvar clause table with + match is_subsumed ~unify:true bag maxvar clause table with | None -> Some (bag, clause) | Some ((bag,maxvar),c) -> prerr_endline "Goal subsumed"; raise (Success (bag,maxvar,c)) -*) +*) ;; let prof_simplify_goal = HExtlib.profile ~enable "simplify_goal";; @@ -738,6 +772,10 @@ module Superposition (B : Orderings.Blob) = bag, maxvar, newc @ acc) (bag, maxvar, []) alist in + debug + (lazy + ("New clauses :" ^ (String.concat ";\n" + (List.map Pp.pp_unit_clause new_clauses)))); debug (lazy "First superpositions"); (* We add current to active clauses so that it can be * * superposed with itself *)