| _,[] -> 1
;;
-let mk_id =
- let id = ref 0 in
- fun () -> incr id; !id
-;;
-
-module Utils (B : Terms.Blob) = struct
- module Subst = FoSubst;; (*.Subst(B) ;;*)
- module Order = Orderings.Orderings(B) ;;
+module Utils (B : Orderings.Blob) = struct
+ module Subst = FoSubst;;
+ module Order = B;;
let rec eq_foterm x y =
x == y ||
| Terms.Equation _, Terms.Predicate _ -> 1
;;
- let eq_unit_clause (id1,_,_,_) (id2,_,_,_) = id1 = id2
- let compare_unit_clause (id1,_,_,_) (id2,_,_,_) = Pervasives.compare id1 id2
+ let eq_clause (id1,_,_,_,_) (id2,_,_,_,_) = id1 = id2
+ let compare_clause (id1,_,_,_,_) (id2,_,_,_,_) = Pervasives.compare id1 id2
- let relocate maxvar varlist =
+ let relocate maxvar varlist subst =
List.fold_right
(fun i (maxvar, varlist, s) ->
maxvar+1, maxvar::varlist, Subst.build_subst i (Terms.Var maxvar) s)
- varlist (maxvar+1, [], Subst.id_subst)
+ varlist (maxvar+1, [], subst)
;;
- let fresh_unit_clause maxvar (id, lit, varlist, proof) =
- let maxvar, varlist, subst = relocate maxvar varlist in
- let lit =
- match lit with
+ let fresh_clause maxvar (id, nlit, plit, varlist, proof) =
+ let maxvar, varlist, subst = relocate maxvar varlist Subst.id_subst in
+ let apply_subst_on_lit = function
| Terms.Equation (l,r,ty,o) ->
let l = Subst.apply_subst subst l in
let r = Subst.apply_subst subst r in
let p = Subst.apply_subst subst p in
Terms.Predicate p
in
+ let nlit = List.map (fun (l,s) -> (apply_subst_on_lit l,s)) nlit in
+ let plit = List.map (fun (l,s) -> (apply_subst_on_lit l,s)) plit in
let proof =
match proof with
| Terms.Exact t -> Terms.Exact (Subst.apply_subst subst t)
| Terms.Step (rule,c1,c2,dir,pos,s) ->
Terms.Step(rule,c1,c2,dir,pos,Subst.concat subst s)
in
- (id, lit, varlist, proof), maxvar
+ (id, nlit, plit, varlist, proof), maxvar
;;
(* may be moved inside the bag *)
- let mk_unit_clause maxvar ty proofterm =
- let varlist =
- let rec aux acc = function
- | Terms.Leaf _ -> acc
- | Terms.Var i -> if List.mem i acc then acc else i::acc
- | Terms.Node l -> List.fold_left aux acc l
- in
- aux (aux [] ty) proofterm
- in
- let lit =
+ let mk_clause maxvar nlit plit proofterm =
+ let foterm_to_lit (acc,literals) ty =
+ let vars = Terms.vars_of_term ~start_acc:acc ty in
match ty with
| Terms.Node [ Terms.Leaf eq ; ty; l; r ] when B.eq B.eqP eq ->
let o = Order.compare_terms l r in
- Terms.Equation (l, r, ty, o)
- | t -> Terms.Predicate t
+ (vars,(Terms.Equation (l, r, ty, o),false)::literals)
+ | _ -> (vars,(Terms.Predicate ty,false)::literals)
in
+ let varlist = Terms.vars_of_term proofterm in
+ let (varlist,nlit) = List.fold_left foterm_to_lit (varlist,[]) nlit in
+ let (varlist,plit) = List.fold_left foterm_to_lit (varlist,[]) plit in
let proof = Terms.Exact proofterm in
- fresh_unit_clause maxvar (mk_id (), lit, varlist, proof)
+ fresh_clause maxvar (0, nlit, plit, varlist, proof)
;;
- let add_to_bag bag (_,lit,vl,proof) =
- let id = mk_id () in
- let clause = (id, lit, vl, proof) in
- let bag = Terms.M.add id clause bag in
- bag, clause
- ;;
-
- let empty_bag = Terms.M.empty ;;
-
let mk_passive_clause cl =
- (Order.compute_unit_clause_weight cl, cl)
+ (Order.compute_clause_weight cl, cl)
;;
- let compare_passive_clauses (w1,(id1,_,_,_)) (w2,(id2,_,_,_)) =
+ let mk_passive_goal g =
+ (Order.compute_clause_weight g, g)
+ ;;
+
+ let compare_passive_clauses_weight (w1,(id1,_,_,_,_)) (w2,(id2,_,_,_,_)) =
if w1 = w2 then id1 - id2
else w1 - w2
;;
+ let compare_passive_clauses_age (_,(id1,_,_,_,_)) (_,(id2,_,_,_,_)) =
+ id1 - id2
+ ;;
+
end