| [],_ -> ~-1
| _,[] -> 1
;;
-
+
module Utils (B : Terms.Blob) = struct
- module Subst = FoSubst.Subst(B) ;;
+ module Subst = FoSubst;; (*.Subst(B) ;;*)
module Order = Orderings.Orderings(B) ;;
let rec eq_foterm x y =
;;
(* 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 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)
+ ;;
+
+ 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