X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fmetadata%2FmetadataConstraints.mli;h=ddf672b7f1d939d84099c216bbd3116190b9afcb;hb=88a07a009adcd5c2320900ea342d7682ada587ce;hp=59cb0427eb26edbaff92dab9481a92be55bae6d7;hpb=7403c949ea3a84624f8c05deee00de53336937ba;p=helm.git

diff --git a/helm/ocaml/metadata/metadataConstraints.mli b/helm/ocaml/metadata/metadataConstraints.mli
index 59cb0427e..ddf672b7f 100644
--- a/helm/ocaml/metadata/metadataConstraints.mli
+++ b/helm/ocaml/metadata/metadataConstraints.mli
@@ -35,13 +35,21 @@ type term_signature = (string * string list) option * StringSet.t
 
   (** @return sorted list of theorem URIs, first URIs in the least have higher
   * relevance *)
-val cmatch: dbh:Dbi.connection -> Cic.term -> string list
+val cmatch: dbd:Mysql.dbd -> ?facts:bool -> Cic.term -> string list
 
   (** as cmatch, but returned list is not sorted but rather tagged with
   * relevance information: higher the tag, higher the relevance *)
-val cmatch': dbh:Dbi.connection -> Cic.term -> (int * string) list
+val cmatch': dbd:Mysql.dbd -> ?facts:bool -> Cic.term -> (int * string) list
 
-val sigmatch: dbh:Dbi.connection -> term_signature -> (int * string) list
+type where = [ `Conclusion | `Statement ] (** signature matching extent *)
+
+  (** @param where defaults to `Conclusion *)
+val sigmatch:
+  dbd:Mysql.dbd ->
+  ?facts:bool ->
+  ?where:where -> 
+  term_signature ->
+    (int * string) list
 
 (** {2 Constraint engine} *)
 
@@ -49,17 +57,32 @@ val sigmatch: dbh:Dbi.connection -> term_signature -> (int * string) list
 type cardinality_condition =
   | Eq of int
   | Gt of int
+  | Lt of int
+
+type rating_criterion =
+  [ `Hits   (** order by number of hits, most used objects first *)
+  ]
 
   (** @param concl_card cardinality condition on conclusion only
   * @param full_card cardinality condition on the whole statement
+  * @param diff required difference between the number of different constants in
+  * hypothesis and the number of different constants in body
   * @return list of URI satisfying given constraints *)
 val at_least:
-  dbh:Dbi.connection ->
+  dbd:Mysql.dbd ->
   ?concl_card:cardinality_condition ->
   ?full_card:cardinality_condition ->
-  MetadataTypes.metadata list ->
+  ?diff:cardinality_condition ->
+  ?rating:rating_criterion ->
+  MetadataTypes.constr list ->
     string list
 
+  (** @param where defaults to `Conclusion *)
+val at_most:
+  dbd:Mysql.dbd ->
+  ?where:where -> StringSet.t ->
+    (string -> bool)
+
 val signature_of: Cic.term -> term_signature
 val constants_of: Cic.term -> StringSet.t