First attempt for refined goal selection strategy

[helm.git] / helm / software / components / ng_paramodulation / foUtils.ml

diff --git a/helm/software/components/ng_paramodulation/foUtils.ml b/helm/software/components/ng_paramodulation/foUtils.ml
index 76e9735be4c546a08fb029531842fc99cf47289f..a970bb6f0c51ee67870e6577b9797daf45b1abca 100644 (file)
--- a/helm/software/components/ng_paramodulation/foUtils.ml
+++ b/helm/software/components/ng_paramodulation/foUtils.ml
@@ -27,7 +27,7 @@ let mk_id =
 ;;
 
 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 =
@@ -130,10 +130,27 @@ module Utils (B : Terms.Blob) = struct
   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
+    let bag = Terms.M.add id (clause,false) 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_goal_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