Reorganized foUtils, added Clauses module to avoid duplicate code around are_invertib...

[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 10c96f543578f2133898f2077323f85cc1483855..5dd1268b09250dff33f3122d5571d5ee99eabe9b 100644 (file)
--- a/helm/software/components/ng_paramodulation/foUtils.ml
+++ b/helm/software/components/ng_paramodulation/foUtils.ml
@@ -22,8 +22,7 @@ let rec lexicograph f l1 l2 =
 ;;
   
 module Utils (B : Terms.Blob) = struct
-        module Subst = FoSubst;; (*.Subst(B) ;;*)
-  module Order = Orderings.Orderings(B) ;;
+  module Subst = FoSubst;; 
 
   let rec eq_foterm x y =
     x == y ||
@@ -69,9 +68,6 @@ module Utils (B : Terms.Blob) = struct
     | Terms.Equation _, Terms.Predicate _ -> 1
   ;;
 
-  let eq_unit_clause (id1,_,_,_) (id2,_,_,_) = id1 = id2
-  let compare_unit_clause (id1,_,_,_) (id2,_,_,_) = Pervasives.compare id1 id2
-    
   let relocate maxvar varlist subst =
     List.fold_right
       (fun i (maxvar, varlist, s) -> 
@@ -79,64 +75,4 @@ module Utils (B : Terms.Blob) = struct
       varlist (maxvar+1, [], subst)
   ;;
 
-  let fresh_unit_clause maxvar (id, lit, varlist, proof) =
-    let maxvar, varlist, subst = relocate maxvar varlist Subst.id_subst in
-    let lit = 
-      match lit with
-      | Terms.Equation (l,r,ty,o) ->
-          let l = Subst.apply_subst subst l in
-          let r = Subst.apply_subst subst r in
-          let ty = Subst.apply_subst subst ty in
-          Terms.Equation (l,r,ty,o)
-      | Terms.Predicate p ->
-          let p = Subst.apply_subst subst p in
-          Terms.Predicate p
-    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
-  ;;
-
-  (* 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 = 
-      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
-    in
-    let proof = Terms.Exact proofterm in
-    fresh_unit_clause maxvar (0, lit, varlist, proof)
-  ;;
-
-  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