Branched paramodulation for CNF (Horn clauses)

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

diff --git a/helm/software/components/ng_paramodulation/terms.ml b/helm/software/components/ng_paramodulation/terms.ml
index aefbc01a864ea3a870746f11d7273f27d5eef8ff..db4c8cad6bce2680f9b98f538373cb8a9c274d5d 100644 (file)
--- a/helm/software/components/ng_paramodulation/terms.ml
+++ b/helm/software/components/ng_paramodulation/terms.ml
@@ -44,8 +44,23 @@ type 'a unit_clause =
  * varlist       (* variable list *)
  * 'a proof      (* proof *)
 
-type 'a passive_clause = int * 'a unit_clause (* weight * equation *)
+type 'a clause =
+    int
+    * 'a literal list (* left hand side of the arrow *)
+    * 'a literal list (* right hand side of the arrow *)
+    * varlist
+    * 'a proof
 
+type 'a passive_clause = int * 'a clause (* weight * equation *)
+
+
+let vars_of_term ?(start_acc=[]) t =
+  let rec aux acc = function
+    | Leaf _ -> acc
+    | Var i -> if (List.mem i acc) then acc else i::acc
+    | Node l -> List.fold_left aux acc l
+  in aux start_acc t
+;;
 
 module OT =
  struct
@@ -57,16 +72,16 @@ module M : Map.S with type key = int
   = Map.Make(OT) 
 
 type 'a bag = int
-              * (('a unit_clause * bool) M.t)
+              * (('a unit_clause * bool * int) M.t)
 
   let add_to_bag (_,lit,vl,proof) (id,bag) =
     let id = id+1 in
     let clause = (id, lit, vl, proof) in
-    let bag = M.add id (clause,false) bag in
+    let bag = M.add id (clause,false,0) bag in
     (id,bag), clause 
    ;;
 
-  let replace_in_bag ((id,_,_,_),_ as cl) (max_id,bag) =
+  let replace_in_bag ((id,_,_,_),_,_ as cl) (max_id,bag) =
     let bag = M.add id cl bag in
       (max_id,bag)
   ;;