profile most operations, do not return a filtered varlist in unif (useless and expensive)

[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 26b7f6fa4b2e1abec80070352d5dbb502d1f99b8..10c96f543578f2133898f2077323f85cc1483855 100644 (file)
--- a/helm/software/components/ng_paramodulation/foUtils.ml
+++ b/helm/software/components/ng_paramodulation/foUtils.ml
@@ -21,11 +21,6 @@ let rec lexicograph f l1 l2 =
   | _,[] -> 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) ;;
@@ -77,15 +72,15 @@ module Utils (B : Terms.Blob) = struct
   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) ->
@@ -124,22 +119,17 @@ module Utils (B : Terms.Blob) = struct
       | 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