New age selection

[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 9b374a8a5f4acbbbf6c57d5cae9c5b5d23b4b57f..169d19b80b68a52d0eb062162464e451a96a5757 100644 (file)
--- a/helm/software/components/ng_paramodulation/terms.ml
+++ b/helm/software/components/ng_paramodulation/terms.ml
@@ -20,7 +20,7 @@ type 'a substitution = (int * 'a foterm) list
 
 type comparison = Lt | Eq | Gt | Incomparable
 
-type rule = SuperpositionRight | SuperpositionLeft | Demodulation
+type rule = Superposition | Demodulation
 type direction = Left2Right | Right2Left | Nodir
 type position = int list
 
@@ -56,16 +56,36 @@ module OT =
 module M : Map.S with type key = int 
   = Map.Make(OT) 
 
-type 'a bag = 'a unit_clause M.t
+type 'a bag = int
+              * (('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,0) bag in
+    (id,bag), clause 
+   ;;
+
+  let replace_in_bag ((id,_,_,_),_,_ as cl) (max_id,bag) =
+    let bag = M.add id cl bag in
+      (max_id,bag)
+  ;;
+
+  let get_from_bag id (_,bag) =
+    M.find id bag
+  ;;
+    
+  let empty_bag = (0,M.empty);;
 
 module type Blob =
   sig
     type t
     val eq : t -> t -> bool
     val compare : t -> t -> int
-    val is_eq_predicate : t -> bool
+    val eqP : t
     val pp : t -> string
-    val embed : t -> t foterm
-    val saturate : t -> t -> t foterm * t foterm
+    type input
+    val embed : input -> t foterm
+    val saturate : input -> input -> t foterm * t foterm
   end