(* $Id: index.mli 9822 2009-06-03 15:37:06Z tassi $ *)
-module Superposition (B : Terms.Blob) =
+module Superposition (B : Orderings.Blob) =
struct
module IDX = Index.Index(B)
module Unif = FoUnif.Founif(B)
module Subst = FoSubst
- module Order = Orderings.Orderings(B)
+ module Order = B
module Utils = FoUtils.Utils(B)
module Pp = Pp.Pp(B)
exception Success of B.t Terms.bag * int * B.t Terms.unit_clause
- let debug s = prerr_endline s;;
- let debug _ = ();;
+ (* let debug s = prerr_endline s;; *)
+ let debug _ = ();;
let enable = true;;
let rec list_first f = function
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->
+ | Terms.Node (hd::l) as t->
let bag,t,id1 = f bag t pos ctx id in
if id = id1 then
let bag, l, _, id =
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
+ (bag, [hd], List.tl l, id) l
in
bag, Terms.Node l, id
- else bag,t,id1
+ else bag,t,id1
+ (* else aux bag pos ctx id1 t *)
+ | _ -> assert false
in
aux bag pos ctx id t
;;
+
+ let visit bag pos ctx id t f =
+ let rec aux bag pos ctx id subst = function
+ | Terms.Leaf _ as t ->
+ let bag,subst,t,id = f bag t pos ctx id
+ in assert (subst=[]); bag,t,id
+ | Terms.Var i as t ->
+ let t= Subst.apply_subst subst t in
+ bag,t,id
+ | Terms.Node (hd::l) ->
+ 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 subst t in
+ if post = [] then bag, pre@[newt], [], id
+ else bag, pre @ [newt], List.tl post, id)
+ (bag, [hd], List.map (Subst.apply_subst subst) (List.tl l), id) l
+ in
+ let bag,subst,t,id1 = f bag (Terms.Node l) pos ctx id
+ in
+ if id1 = id then (assert (subst=[]); bag,t,id)
+ else aux bag pos ctx id1 subst t
+ | _ -> assert false
+ in
+ aux bag pos ctx id [] t
+ ;;
let build_clause bag filter rule t subst id id2 pos dir =
let proof = Terms.Step(rule,id,id2,dir,pos,subst) in
let prof_demod_u = HExtlib.profile ~enable "demod.unify";;
let prof_demod_r = HExtlib.profile ~enable "demod.retrieve_generalizations";;
let prof_demod_o = HExtlib.profile ~enable "demod.compare_terms";;
+ let prof_demod_s = HExtlib.profile ~enable "demod.apply_subst";;
let demod table varlist subterm =
let cands =
try
let subst =
prof_demod_u.HExtlib.profile
- (Unif.unification (varlist@vl) varlist subterm) side
+ (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 =
+ prof_demod_s.HExtlib.profile
+ (Subst.apply_subst subst) side
+ in
+ let newside =
+ prof_demod_s.HExtlib.profile
+ (Subst.apply_subst subst) newside
+ in
+ if o = Terms.Incomparable || o = Terms.Invertible then
let o =
prof_demod_o.HExtlib.profile
(Order.compare_terms newside) side in
prof_demod.HExtlib.profile (demod table varlist) x
;;
+ let mydemod table varlist subterm =
+ let cands =
+ prof_demod_r.HExtlib.profile
+ (IDX.DT.retrieve_generalizations table) subterm
+ in
+ list_first
+ (fun (dir, (id,lit,vl,_)) ->
+ match lit with
+ | Terms.Predicate _ -> assert false
+ | Terms.Equation (l,r,_,o) ->
+ let side, newside = if dir=Terms.Left2Right then l,r else r,l in
+ try
+ let subst =
+ prof_demod_u.HExtlib.profile
+ (Unif.unification (* (varlist@vl) *) varlist subterm) side
+ in
+ let iside =
+ prof_demod_s.HExtlib.profile
+ (Subst.apply_subst subst) side
+ in
+ let inewside =
+ prof_demod_s.HExtlib.profile
+ (Subst.apply_subst subst) newside
+ in
+ if o = Terms.Incomparable || o = Terms.Invertible then
+ let o =
+ prof_demod_o.HExtlib.profile
+ (Order.compare_terms inewside) iside in
+ (* Riazanov, pp. 45 (ii) *)
+ if o = Terms.Lt then
+ Some (newside, subst, id, dir)
+ else
+ ((*prerr_endline ("Filtering: " ^
+ Pp.pp_foterm side ^ " =(< || =)" ^
+ Pp.pp_foterm newside ^ " coming from " ^
+ Pp.pp_unit_clause uc );*)None)
+ else
+ Some (newside, subst, id, dir)
+ with FoUnif.UnificationFailure _ -> None)
+ (IDX.ClauseSet.elements cands)
+ ;;
+
+ let ctx_demod table vl bag t pos ctx id =
+ match mydemod table vl t with
+ | None -> (bag,[],t,id)
+ | Some (newside, subst, id2, dir) ->
+ let inewside = Subst.apply_subst subst newside in
+ match build_clause bag (fun _ -> true)
+ Terms.Demodulation (ctx inewside) subst id id2 pos dir
+ with
+ | None -> assert false
+ | Some (bag,(id,_,_,_)) ->
+ (bag,subst,newside,id)
+ ;;
+
+ let rec demodulate ~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 =
+ visit bag [2]
+ (fun x -> Terms.Node [ Terms.Leaf B.eqP; ty; x; r ]) id l
+ (ctx_demod table vl)
+ in
+ let bag,_,id2 =
+ visit bag [3]
+ (fun x -> Terms.Node [ Terms.Leaf B.eqP; ty; l; x ]) id1 r
+ (ctx_demod table vl)
+ in
+ let cl,_,_ = Terms.get_from_bag id2 bag in
+ bag,cl
+ ;;
+
+
let demodulate_once_old ~jump_to_right bag (id, literal, vl, pr) table =
match literal with
| Terms.Predicate t -> assert false
Some ((bag,cl),jump_to_right)
;;
- let rec demodulate ~jump_to_right bag clause table =
+ let rec demodulate_old ~jump_to_right bag clause table =
match demodulate_once ~jump_to_right bag clause table with
| None -> bag, clause
| Some ((bag, clause),r) -> demodulate ~jump_to_right:r
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,_,_) =
;;
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
+ demodulate ~jump_to_right:false bag clause table
+;;
+(*
+ let (bag1,c1), (bag2,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
+ else
+ begin
+ prerr_endline (Pp.pp_unit_clause clause);
prerr_endline (Pp.pp_unit_clause c1);
prerr_endline (Pp.pp_unit_clause c2);
- prerr_endline "Bag :";
+ prerr_endline "Bag1 :";
prerr_endline (Pp.pp_bag bag1);
+ prerr_endline "Bag2 :";
+ prerr_endline (Pp.pp_bag bag2);
assert false
- end*)
- ;;
+ end
+ ;; *)
+
let prof_demodulate = HExtlib.profile ~enable "demodulate";;
let demodulate bag clause x =
prof_demodulate.HExtlib.profile (demodulate bag clause) x
let is_identity_clause ~unify = function
| _, Terms.Equation (_,_,_,Terms.Eq), _, _ -> true
| _, Terms.Equation (l,r,_,_), vl, proof when unify ->
- (try ignore(Unif.unification vl [] l r); true
+ (try ignore(Unif.unification (* vl *) [] l r); true
with FoUnif.UnificationFailure _ -> false)
| _, Terms.Equation (_,_,_,_), _, _ -> false
| _, Terms.Predicate _, _, _ -> assert false
| [] -> None
| (id2,dir,c,vl1)::tl ->
try
- let subst = Unif.unification (vl@vl1) locked_vars c t in
+ let subst = Unif.unification (* (vl@vl1) *) locked_vars c t in
Some (id2, dir, subst)
with FoUnif.UnificationFailure _ -> aux tl
in
let l = Subst.apply_subst subst l in
let r = Subst.apply_subst subst r in
try
- let subst1 = Unif.unification vl [] l r in
+ let subst1 = Unif.unification (* vl *) [] l r in
let lit =
match lit with Terms.Predicate _ -> assert false
| Terms.Equation (l,r,ty,o) ->
match simplify atable maxvar bag new_clause with
| bag,None -> bag,None (* new_clause has been discarded *)
| bag,(Some clause) ->
- let ctable = IDX.index_unit_clause IDX.DT.empty clause in
+ let ctable = IDX.index_unit_clause maxvar IDX.DT.empty clause in
let bag, alist, atable =
List.fold_left
(fun (bag, alist, atable) c ->
|bag,None -> (bag,alist,atable)
(* an active clause as been discarded *)
|bag,Some c1 ->
- bag, c :: alist, IDX.index_unit_clause atable c)
+ bag, c :: alist, IDX.index_unit_clause maxvar atable c)
(bag,[],IDX.DT.empty) alist
in
bag, Some (clause, (alist,atable))
let simplification_step ~new_cl cl (alist,atable) bag maxvar new_clause =
let atable1 =
if new_cl then atable else
- IDX.index_unit_clause atable cl
+ IDX.index_unit_clause maxvar atable cl
in
(* Simplification of new_clause with : *
* - actives and cl if new_clause is not cl *
| bag,Some clause ->
(* Simplification of each active clause with clause *
* which is the simplified form of new_clause *)
- let ctable = IDX.index_unit_clause IDX.DT.empty clause in
+ let ctable = IDX.index_unit_clause maxvar IDX.DT.empty clause in
let bag, newa, alist, atable =
List.fold_left
(fun (bag, newa, alist, atable) c ->
|bag,Some c1 ->
if (c1 == c) then
bag, newa, c :: alist,
- IDX.index_unit_clause atable c
+ IDX.index_unit_clause maxvar atable c
else
bag, c1 :: newa, alist, atable)
(bag,[],[],IDX.DT.empty) alist
| bag,(None, Some _) -> bag,None
| bag,(Some cl1, Some (clause, (alist,atable), newa)) ->
let alist,atable =
- (clause::alist, IDX.index_unit_clause atable clause)
+ (clause::alist, IDX.index_unit_clause maxvar atable clause)
in
keep_simplified_aux ~new_cl:(cl!=cl1) cl1 (alist,atable)
bag (newa@tl)
let side, newside = if dir=Terms.Left2Right then l,r else r,l in
try
let subst =
- Unif.unification (varlist@vl) [] subterm side
+ Unif.unification (* (varlist@vl)*) [] subterm side
in
- if o = Terms.Incomparable then
+ if o = Terms.Incomparable || o = Terms.Invertible then
let side = Subst.apply_subst subst side in
let newside = Subst.apply_subst subst newside in
let o = Order.compare_terms side newside in
(all_positions [3]
(fun x -> Terms.Node [ Terms.Leaf B.eqP; ty; l; x ])
r (superposition table vl))
+ | Terms.Equation (l,r,ty,Terms.Invertible)
| Terms.Equation (l,r,ty,Terms.Gt) ->
fold_build_new_clause bag maxvar id Terms.Superposition
(fun _ -> true)
fold_build_new_clause bag maxvar id Terms.Superposition
(filtering Terms.Lt)
(all_positions [2]
- (fun x -> Terms.Node [ Terms.Leaf B.eqP; ty; l; x ])
- r (superposition table vl))
+ (fun x -> Terms.Node [ Terms.Leaf B.eqP; ty; x; r ])
+ l (superposition table vl))
in
bag, maxvar, r_terms @ l_terms
| _ -> assert false
(* We demodulate actives clause with current until all *
* active clauses are reduced w.r.t each other *)
(* let bag, (alist,atable) = keep_simplified (alist,atable) bag [current] in *)
- let ctable = IDX.index_unit_clause IDX.DT.empty current in
+ let ctable = IDX.index_unit_clause maxvar IDX.DT.empty current in
(* let bag, (alist, atable) =
let bag, alist =
HExtlib.filter_map_acc (simplify ctable) bag alist
(* We add current to active clauses so that it can be *
* superposed with itself *)
let alist, atable =
- current :: alist, IDX.index_unit_clause atable current
+ current :: alist, IDX.index_unit_clause maxvar atable current
in
debug "Indexed";
let fresh_current, maxvar = Utils.fresh_unit_clause maxvar current in
in
debug "Another superposition";
let new_clauses = new_clauses @ additional_new_clauses in
- debug (Printf.sprintf "Demodulating %d clauses"
- (List.length new_clauses));
+ debug (lazy (Printf.sprintf "Demodulating %d clauses"
+ (List.length new_clauses)));
let bag, new_clauses =
HExtlib.filter_map_monad (simplify atable maxvar) bag new_clauses
in