X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fng_paramodulation%2Fsuperposition.ml;h=c1d5f8bdcffcd9ab3d7a2f226a278e0afe4c6440;hb=772def9075b7b62870ebf4cecec6bcd37a549b1d;hp=96b16bb07b6a66dd674495d750e76075185faae2;hpb=c87f56790dcb2825dcc2178eaea34f05a4649557;p=helm.git diff --git a/helm/software/components/ng_paramodulation/superposition.ml b/helm/software/components/ng_paramodulation/superposition.ml index 96b16bb07..c1d5f8bdc 100644 --- a/helm/software/components/ng_paramodulation/superposition.ml +++ b/helm/software/components/ng_paramodulation/superposition.ml @@ -31,12 +31,16 @@ module Superposition (B : Terms.Blob) = ;; let first_position pos ctx t f = + let inject_pos pos ctx = function + | None -> None + | Some (a,b,c,d,e) -> Some(ctx a,b,c,d,e,pos) + in let rec aux pos ctx = function - | Terms.Leaf _ as t -> f t pos ctx + | Terms.Leaf _ as t -> inject_pos pos ctx (f t) | Terms.Var _ -> None | Terms.Node l as t-> - match f t pos ctx with - | Some _ as x -> x + match f t with + | Some _ as x -> inject_pos pos ctx x | None -> let rec first pre post = function | [] -> None @@ -72,6 +76,29 @@ module Superposition (B : Terms.Blob) = aux pos ctx t ;; + let parallel_positions bag pos ctx id t f = + let rec aux bag pos ctx id = function + | Terms.Leaf _ as t -> f bag t pos ctx id + | Terms.Var _ as t -> bag,t,id + | Terms.Node l as t-> + let bag,t,id1 = f bag t pos ctx id in + if id = id1 then + let bag, l, _, id = + List.fold_left + (fun (bag,pre,post,id) t -> + let newctx = fun x -> ctx (Terms.Node (pre@[x]@post)) in + let newpos = (List.length pre)::pos in + let bag,newt,id = aux bag newpos newctx id t in + if post = [] then bag, pre@[newt], [], id + else bag, pre @ [newt], List.tl post, id) + (bag, [], List.tl l, id) l + in + bag, Terms.Node l, id + else bag,t,id1 + in + aux bag pos ctx id t + ;; + let vars_of_term t = let rec aux acc = function | Terms.Leaf _ -> acc @@ -102,7 +129,7 @@ module Superposition (B : Terms.Blob) = (* ============ simplification ================= *) - let demod table varlist subterm pos context = + let demod table varlist subterm = let cands = IDX.DT.retrieve_generalizations table subterm in list_first (fun (dir, (id,lit,vl,_)) -> @@ -114,25 +141,25 @@ module Superposition (B : Terms.Blob) = let subst, varlist = Unif.unification (varlist@vl) varlist subterm side in + let side = Subst.apply_subst subst side in + let newside = Subst.apply_subst subst newside in if o = Terms.Incomparable then - let side = Subst.apply_subst subst side in - let newside = Subst.apply_subst subst newside in let o = Order.compare_terms newside side in (* Riazanov, pp. 45 (ii) *) if o = Terms.Lt then - Some (context newside, subst, varlist, id, pos, dir) + Some (newside, subst, varlist, id, dir) else ((*prerr_endline ("Filtering: " ^ Pp.pp_foterm side ^ " =(< || =)" ^ Pp.pp_foterm newside ^ " coming from " ^ Pp.pp_unit_clause uc );*)None) else - Some (context newside, subst, varlist, id, pos, dir) + Some (newside, subst, varlist, id, dir) with FoUnif.UnificationFailure _ -> None) (IDX.ClauseSet.elements cands) ;; - let demodulate_once ~jump_to_right bag (id, literal, vl, pr) table = + let demodulate_once_old ~jump_to_right bag (id, literal, vl, pr) table = match literal with | Terms.Predicate t -> assert false | Terms.Equation (l,r,ty,_) -> @@ -142,7 +169,7 @@ module Superposition (B : Terms.Blob) = (demod table vl) in match left_position with - | Some (newt, subst, varlist, id2, pos, dir) -> + | Some (newt, subst, varlist, id2, dir, pos) -> begin match build_clause bag (fun _ -> true) Terms.Demodulation newt subst varlist id id2 pos dir @@ -156,7 +183,7 @@ module Superposition (B : Terms.Blob) = (demod table vl) with | None -> None - | Some (newt, subst, varlist, id2, pos, dir) -> + | Some (newt, subst, varlist, id2, dir, pos) -> match build_clause bag (fun _ -> true) Terms.Demodulation newt subst varlist id id2 pos dir with @@ -164,6 +191,39 @@ module Superposition (B : Terms.Blob) = | Some x -> Some (x,true) ;; + let parallel_demod table vl bag t pos ctx id = + match demod table vl t with + | None -> (bag,t,id) + | Some (newside, subst, vl, id2, dir) -> + match build_clause bag (fun _ -> true) + Terms.Demodulation (ctx newside) subst vl id id2 pos dir + with + | None -> assert false + | Some (bag,(id,_,_,_)) -> + (bag,newside,id) + ;; + + let demodulate_once ~jump_to_right bag (id, literal, vl, pr) table = + match literal with + | Terms.Predicate t -> assert false + | Terms.Equation (l,r,ty,_) -> + let bag,l,id1 = if jump_to_right then (bag,l,id) else + parallel_positions bag [2] + (fun x -> Terms.Node [ Terms.Leaf B.eqP; ty; x; r ]) id l + (parallel_demod table vl) + in + let jump_to_right = id1 = id in + let bag,r,id2 = + parallel_positions bag [3] + (fun x -> Terms.Node [ Terms.Leaf B.eqP; ty; l; x ]) id1 r + (parallel_demod table vl) + in + if id = id2 then None + else + let cl,_,_ = Terms.get_from_bag id2 bag in + Some ((bag,cl),jump_to_right) + ;; + let rec demodulate ~jump_to_right bag clause table = match demodulate_once ~jump_to_right bag clause table with | None -> bag, clause @@ -171,8 +231,37 @@ module Superposition (B : Terms.Blob) = bag clause table ;; - let demodulate bag clause table = demodulate ~jump_to_right:false - bag clause table + let rec demodulate_old ~jump_to_right bag clause table = + match demodulate_once_old ~jump_to_right bag clause table with + | None -> bag, clause + | Some ((bag, clause),r) -> demodulate_old ~jump_to_right:r + bag clause table + ;; + + let are_alpha_eq cl1 cl2 = + let get_term (_,lit,_,_) = + match lit with + | Terms.Predicate _ -> assert false + | Terms.Equation (l,r,ty,_) -> + Terms.Node [Terms.Leaf B.eqP; ty; l ; r] + in + try ignore(Unif.alpha_eq (get_term cl1) (get_term cl2)) ; true + with FoUnif.UnificationFailure _ -> false + ;; + + let demodulate bag clause table = +(* let (bag1,c1), (_,c2) =*) + demodulate ~jump_to_right:false bag clause table +(* demodulate_old ~jump_to_right:false bag clause table*) +(* in + if are_alpha_eq c1 c2 then bag1,c1 + else begin + prerr_endline (Pp.pp_unit_clause c1); + prerr_endline (Pp.pp_unit_clause c2); + prerr_endline "Bag :"; + prerr_endline (Pp.pp_bag bag1); + assert false + end*) ;; (* move away *) @@ -303,9 +392,9 @@ module Superposition (B : Terms.Blob) = let rec orphan_murder bag acc i = match Terms.get_from_bag i bag with - | (_,_,_,Terms.Exact _),discarded -> (discarded,acc) - | (_,_,_,Terms.Step (_,i1,i2,_,_,_)),true -> (true,acc) - | (_,_,_,Terms.Step (_,i1,i2,_,_,_)),false -> + | (_,_,_,Terms.Exact _),discarded,_ -> (discarded,acc) + | (_,_,_,Terms.Step (_,i1,i2,_,_,_)),true,_ -> (true,acc) + | (_,_,_,Terms.Step (_,i1,i2,_,_,_)),false,_ -> if (List.mem i acc) then (false,acc) else match orphan_murder bag acc i1 with | (true,acc) -> (true,acc) @@ -336,7 +425,9 @@ module Superposition (B : Terms.Blob) = let simplify table maxvar bag clause = match simplify table maxvar bag clause with | bag, None -> - Terms.replace_in_bag (clause,true) bag, None + let (id,_,_,_) = clause in + let (_,_,iter) = Terms.get_from_bag id bag in + Terms.replace_in_bag (clause,true,iter) bag, None | bag, Some clause -> bag, Some clause (*let (id,_,_,_) = clause in if orphan_murder bag clause then @@ -432,17 +523,6 @@ module Superposition (B : Terms.Blob) = keep_simplified_aux ~new_cl:true cl (alist,atable) bag [] ;; - let are_alpha_eq cl1 cl2 = - let get_term (_,lit,_,_) = - match lit with - | Terms.Predicate _ -> assert false - | Terms.Equation (l,r,ty,_) -> - Terms.Node [Terms.Leaf B.eqP; ty; l ; r] - in - try ignore(Unif.alpha_eq (get_term cl1) (get_term cl2)) ; true - with FoUnif.UnificationFailure _ -> false -;; - (* this is like simplify but raises Success *) let simplify_goal ~no_demod maxvar table bag g_actives clause = let bag, clause = @@ -500,8 +580,7 @@ module Superposition (B : Terms.Blob) = else ((*prerr_endline ("Filtering: " ^ Pp.pp_foterm side ^ " =(< || =)" ^ - Pp.pp_foterm newside ^ " coming from " ^ - Pp.pp_unit_clause uc );*)None) + Pp.pp_foterm newside);*)None) else Some (context newside, subst, varlist, id, pos, dir) with FoUnif.UnificationFailure _ -> None)