X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fcic%2Fdiscrimination_tree.mli;h=a311293068247737d0c0232e7c5dae0722e6ce8b;hb=134014e54c374789b38b6c53945f63d21ddbacb0;hp=63464e2ccf77b01b10bf11b3ff00debd098fd308;hpb=beb4e1e9549d5b43e24907dc86c7ef899e487a3c;p=helm.git

diff --git a/helm/software/components/cic/discrimination_tree.mli b/helm/software/components/cic/discrimination_tree.mli
index 63464e2cc..a31129306 100644
--- a/helm/software/components/cic/discrimination_tree.mli
+++ b/helm/software/components/cic/discrimination_tree.mli
@@ -23,18 +23,52 @@
  * http://cs.unibo.it/helm/.
  *)
 
-module DiscriminationTreeIndexing :
-  functor (A : Set.S) ->
+
+type 'a path_string_elem = 
+  | Constant of 'a * int (* name, arity *)
+  | Bound of int * int (* rel, arity *)
+  | Variable (* arity is 0 *)
+  | Proposition (* arity is 0 *) 
+  | Datatype (* arity is 0 *) 
+  | Dead (* arity is 0 *) 
+;;  
+
+type 'a path = ('a path_string_elem) list;;
+
+module type Indexable = sig
+  type input
+  type constant_name
+  val compare: 
+    constant_name path_string_elem -> 
+    constant_name path_string_elem -> int
+  val string_of_path : constant_name path -> string
+  val path_string_of : input -> constant_name path
+end
+
+module CicIndexable : Indexable 
+with type input = Cic.term and type constant_name = UriManager.uri
+
+module type DiscriminationTree  =
     sig
 
-      type t 
+      type input 
+      type data
+      type dataset
+      type constant_name
+      type t
+
+      val iter : t -> (constant_name path -> dataset -> unit) -> unit
 
       val empty : t
-      val index : t -> Cic.term -> A.elt -> t
-      val remove_index : t -> Cic.term -> A.elt -> t
-      val in_index : t -> Cic.term -> (A.elt -> bool) -> bool
-      val retrieve_generalizations : t -> Cic.term -> A.t
-      val retrieve_unifiables : t -> Cic.term -> A.t
+      val index : t -> input -> data -> t
+      val remove_index : t -> input -> data -> t
+      val in_index : t -> input -> (data -> bool) -> bool
+      val retrieve_generalizations : t -> input -> dataset
+      val retrieve_unifiables : t -> input -> dataset
     end
 
 
+module Make (I : Indexable) (A : Set.S) : DiscriminationTree 
+with type constant_name = I.constant_name and type input = I.input
+and type data = A.elt and type dataset = A.t
+