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 d53b19c8245f8b6513889be718bef52f2c9f9e83..5dd1268b09250dff33f3122d5571d5ee99eabe9b 100644 (file)
--- a/helm/software/components/ng_paramodulation/foUtils.ml
+++ b/helm/software/components/ng_paramodulation/foUtils.ml
@@ -11,10 +11,18 @@
 
 (* $Id: terms.ml 9836 2009-06-05 15:33:35Z denes $ *)
 
-
+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 : Terms.Blob) = struct
-  module Subst = FoSubst.Subst(B) ;;
-  module Order = Orderings.Orderings(B) ;;
+  module Subst = FoSubst;; 
 
   let rec eq_foterm x y =
     x == y ||
@@ -25,15 +33,6 @@ module Utils (B : Terms.Blob) = struct
     | _ -> 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
@@ -69,73 +68,11 @@ 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 =
+  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)
-  ;;
-
-  let fresh_unit_clause maxvar (id, lit, varlist, proof) =
-    let maxvar, varlist, subst = relocate maxvar varlist 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
+      varlist (maxvar+1, [], subst)
   ;;
 
-  (* 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
-        | 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 (mk_id (), 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 ;;
-
 end