X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fng_paramodulation%2Findex.ml;h=36c9dd75e693ec51cf5e168995563113c2b92f66;hb=c450fdfb1b02eb69e5e7ef25f0acdf80157710df;hp=5c085c5188db5a4473337995e167d17b290f5bfe;hpb=50ed5ab75a38693c7b7558ca9487998e81bb7f89;p=helm.git

diff --git a/helm/software/components/ng_paramodulation/index.ml b/helm/software/components/ng_paramodulation/index.ml
index 5c085c518..36c9dd75e 100644
--- a/helm/software/components/ng_paramodulation/index.ml
+++ b/helm/software/components/ng_paramodulation/index.ml
@@ -44,10 +44,10 @@ module Index(B : Orderings.Blob) = struct
       let path_string_of =
         let rec aux arity = function
           | Terms.Leaf a -> [Constant (a, arity)]
-          | Terms.Var i -> assert (arity = 0); [Variable]
+          | Terms.Var i -> (* assert (arity = 0); *) [Variable]
+	  (* FIXME : should this be allowed or not ? 
           | Terms.Node (Terms.Var _::_) ->
-	      (* FIXME : should this be allowed or not ? *)
-	      assert false
+	      assert false *)
           | Terms.Node ([] | [ _ ] ) -> assert false
           | Terms.Node (Terms.Node _::_) -> assert false	      
           | Terms.Node (hd::tl) ->
@@ -80,32 +80,34 @@ module Index(B : Orderings.Blob) = struct
       type data = ClauseSet.elt and 
       type dataset = ClauseSet.t
     = Make(FotermIndexable)(ClauseSet)
-
-  let are_invertible maxvar varlist l r =
-    let _,_,subst = U.relocate maxvar varlist FoSubst.id_subst in
-    let l = FoSubst.apply_subst subst l in
-      try (ignore(Unif.alpha_eq l r);true) with
-	  FoUnif.UnificationFailure _ -> false
   
-  let index_unit_clause maxvar t = function
+  let process op t = function
     | (_,Terms.Equation (l,_,_,Terms.Gt),_,_) as c -> 
-          DT.index t l (Terms.Left2Right, c)
+        op t l (Terms.Left2Right, c)
     | (_,Terms.Equation (_,r,_,Terms.Lt),_,_) as c -> 
-          DT.index t r (Terms.Right2Left, c)
+        op t r (Terms.Right2Left, c)
     | (_,Terms.Equation (l,r,_,Terms.Incomparable),vl,_) as c ->
-	if are_invertible maxvar vl l r then
-	  (prerr_endline ("Invertible " ^ (Pp.pp_foterm l) ^ "=" ^
-	     (Pp.pp_foterm r));
-           DT.index t l (Terms.Left2Right, c))
-	   else
-          DT.index  
-           (DT.index t l (Terms.Left2Right, c))
-           r (Terms.Right2Left, c)
+        op (op t l (Terms.Left2Right, c))
+          r (Terms.Right2Left, c)
+    | (_,Terms.Equation (l,r,_,Terms.Invertible),vl,_) as c ->
+	op t l (Terms.Left2Right, c)
     | (_,Terms.Equation (_,r,_,Terms.Eq),_,_)  -> assert false
     | (_,Terms.Predicate p,_,_) as c ->
-          DT.index t p (Terms.Nodir, c)
+        op t p (Terms.Nodir, c)
   ;;
 
+  let index_unit_clause = 
+    process DT.index 
+ 
+  let remove_unit_clause =
+    process DT.remove_index 
+
+  let fold = DT.fold 
+
+  let elems index =
+    DT.fold index (fun _ dataset acc -> ClauseSet.union dataset acc)
+      ClauseSet.empty
+    
   type active_set = B.t Terms.unit_clause list * DT.t
 
 end