(* $Id: terms.ml 9836 2009-06-05 15:33:35Z denes $ *)
-
-module Utils (B : Terms.Blob) = struct
- module Subst = FoSubst.Subst(B) ;;
- module Order = Orderings.Orderings(B) ;;
+let rec lexicograph f l1 l2 =
+ match l1, l2 with
+ | [], [] -> 0
+ | x::xs, y::ys ->
+ let c = f x y in
+ if c <> 0 then c else lexicograph f xs ys
+ | [],_ -> ~-1
+ | _,[] -> 1
+;;
+
+module Utils (B : Orderings.Blob) = struct
+ module Subst = FoSubst;;
+ module Order = B;;
let rec eq_foterm x y =
x == y ||
| _ -> false
;;
- let rec lexicograph f l1 l2 =
- match l1, l2 with
- | [], [] -> 0
- | x::xs, y::ys ->
- let c = f x y in
- if c <> 0 then c else lexicograph f xs ys
- | [],_ -> ~-1
- | _,[] -> 1
- ;;
let rec compare_foterm x y =
match x, y with
let eq_unit_clause (id1,_,_,_) (id2,_,_,_) = id1 = id2
let compare_unit_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 maxvar, varlist, subst = relocate maxvar varlist Subst.id_subst in
let lit =
match lit with
| Terms.Equation (l,r,ty,o) ->
;;
(* may be moved inside the bag *)
- let mk_id =
- let id = ref 0 in
- fun () -> incr id; !id
- ;;
-
let mk_unit_clause maxvar ty proofterm =
let varlist =
let rec aux acc = function
| t -> Terms.Predicate t
in
let proof = Terms.Exact proofterm in
- fresh_unit_clause maxvar (mk_id (), lit, varlist, proof)
+ fresh_unit_clause maxvar (0, lit, varlist, proof)
;;
- let add_to_bag =
- let id = ref 0 in
- fun bag (_,lit,vl,proof) ->
- incr id;
- 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)
+ ;;
+
+ let mk_passive_goal g =
+ (Order.compute_unit_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