module Utils = FoUtils.Utils(B)
module Pp = Pp.Pp(B)
- exception Success of
- B.t Terms.bag
- * int
- * B.t Terms.unit_clause
- * B.t Terms.substitution
+ exception Success of B.t Terms.bag * int * B.t Terms.unit_clause
- let print s = prerr_endline (Lazy.force s);;
+ (* let debug s = prerr_endline s;; *)
let debug _ = ();;
let enable = true;;
prof_demod.HExtlib.profile (demod table varlist) x
;;
- let mydemod table varlist subterm =
+ 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,_) as c)) ->
- debug (lazy("candidate: "
- ^ Pp.pp_unit_clause c));
+ (fun (dir, (id,lit,vl,_)) ->
match lit with
| Terms.Predicate _ -> assert false
| Terms.Equation (l,r,_,o) ->
((*prerr_endline ("Filtering: " ^
Pp.pp_foterm side ^ " =(< || =)" ^
Pp.pp_foterm newside ^ " coming from " ^
- Pp.pp_unit_clause uc );*)
- debug (lazy "not applied");None)
+ Pp.pp_unit_clause uc );*)None)
else
Some (newside, subst, id, dir)
- with FoUnif.UnificationFailure _ ->
- debug (lazy "not applied"); None)
+ with FoUnif.UnificationFailure _ -> None)
(IDX.ClauseSet.elements cands)
;;
;;
let rec demodulate bag (id, literal, vl, pr) table =
- debug (lazy ("demodulate " ^ (string_of_int id)));
match literal with
- | 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.Predicate t -> assert false
| Terms.Equation (l,r,ty,_) ->
let bag,l,id1 =
visit bag [2]
visit bag [3]
(fun x -> Terms.Node [ Terms.Leaf B.eqP; ty; l; x ]) id1 r
(ctx_demod table vl)
- in
+ in
let cl,_,_ = Terms.get_from_bag id2 bag in
bag,cl
;;
;;
(* move away *)
- let is_identity_clause = function
+ 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
+ with FoUnif.UnificationFailure _ -> false)
| _, Terms.Equation (_,_,_,_), _, _ -> false
| _, Terms.Predicate _, _, _ -> assert false
;;
- 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 build_new_clause 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), 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)
+ | Some (bag, c) -> Some ((bag, maxvar), c)
+ | None -> None
;;
-
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
in
bag, maxvar, res
;;
+
let rewrite_eq ~unify l r ty vl table =
let retrieve = if unify then IDX.DT.retrieve_unifiables
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
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_reloc bag maxvar (fun _ -> true)
+ build_new_clause bag maxvar (fun _ -> true)
Terms.Superposition id_t
subst1 id id2 (pos@[2]) dir
with
- | 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) ->
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
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
let (id,_,_,_) = cl in
let actives = List.map (fun (i,_,_,_) -> i) actives in
let (res,_) = orphan_murder bag actives id in
- if res then debug (lazy "Orphan murdered"); res
+ if res then debug "Orphan murdered"; res
;;
let prof_orphan_murder = HExtlib.profile ~enable "orphan_murder";;
let orphan_murder bag actives x =
;;
(* demodulate and check for subsumption *)
- let simplify table maxvar bag clause =
- debug (lazy "simplify...");
- if is_identity_clause clause then bag,None
+ let simplify table maxvar bag clause =
+ if is_identity_clause ~unify:false 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 clause then bag,None
+ if is_identity_clause ~unify:false clause then bag,None
else
match is_subsumed ~unify:false bag maxvar clause table with
| None -> bag, Some clause
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 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 match (is_identity_goal clause) with
- | Some subst -> raise (Success (bag,maxvar,clause,subst))
- | None ->
+ 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
let (id,lit,vl,_) = clause in
- (* 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)
+ if vl = [] then Some (bag,clause)
else
let l,r,ty =
match lit with
table (Some(bag,maxvar,clause,Subst.id_subst)) with
| None -> Some (bag,clause)
| Some (bag,maxvar,cl,subst) ->
- debug (lazy "Goal subsumed");
- raise (Success (bag,maxvar,cl,subst))
+ prerr_endline "Goal subsumed";
+ raise (Success (bag,maxvar,cl))
(*
- match is_subsumed ~unify:true bag maxvar clause table with
+ else 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";;
(* 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
in
bag, (alist, List.fold_left IDX.index_unit_clause IDX.DT.empty alist)
in*)
- debug (lazy "Simplified active clauses with fact");
+ debug "Simplified active clauses with fact";
(* We superpose active clauses with current *)
let bag, maxvar, new_clauses =
List.fold_left
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");
+ debug "First superpositions";
(* 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 (lazy "Indexed");
+ debug "Indexed";
let fresh_current, maxvar = Utils.fresh_unit_clause maxvar current in
(* We need to put fresh_current into the bag so that all *
* variables clauses refer to are known. *)
let bag, maxvar, additional_new_clauses =
superposition_with_table bag maxvar fresh_current atable
in
- debug (lazy "Another superposition");
+ debug "Another superposition";
let new_clauses = new_clauses @ additional_new_clauses in
- (* debug (lazy (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
- debug (lazy "Demodulated new clauses");
+ debug "Demodulated new clauses";
bag, maxvar, (alist, atable), new_clauses
;;
let bag, maxvar, new_goals =
superposition_with_table bag maxvar goal atable
in
- debug(lazy "Superposed goal with active clauses");
+ debug "Superposed goal with active clauses";
(* We simplify the new goals with active clauses *)
let bag, new_goals =
List.fold_left
| Some (bag,g) -> bag,g::acc)
(bag, []) new_goals
in
- debug (lazy "Simplified new goals with active clauses");
+ debug "Simplified new goals with active clauses";
bag, maxvar, List.rev new_goals
;;
projects / helm.git / blobdiff