fixed Makefile

[helm.git] / helm / ocaml / metadata / metadataConstraints.mli

diff --git a/helm/ocaml/metadata/metadataConstraints.mli b/helm/ocaml/metadata/metadataConstraints.mli
index ecdb3e6b2d370ac93f59cb61218afbf99f0e9477..0d66557414365452837ed1eabef188624880dfae 100644 (file)
--- a/helm/ocaml/metadata/metadataConstraints.mli
+++ b/helm/ocaml/metadata/metadataConstraints.mli
@@ -35,18 +35,20 @@ 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
 
 type where = [ `Conclusion | `Statement ] (** signature matching extent *)
 
   (** @param where defaults to `Conclusion *)
 val sigmatch:
-  dbh:Dbi.connection ->
-  ?where:where -> term_signature ->
+  dbd:Mysql.dbd ->
+  ?facts:bool ->
+  ?where:where -> 
+  term_signature ->
     (int * string) list
 
 (** {2 Constraint engine} *)
@@ -55,23 +57,54 @@ val sigmatch:
 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 *)
+  ]
+
+val add_constraint:
+  ?start:int ->
+  ?tables:string * string * string * string ->
+  int * string list * string list ->
+  MetadataTypes.constr ->
+  int * string list * string list
 
   (** @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 ->
+  ?diff:cardinality_condition ->
+  ?rating:rating_criterion ->
   MetadataTypes.constr list ->
     string list
 
   (** @param where defaults to `Conclusion *)
 val at_most:
-  dbh:Dbi.connection ->
+  dbd:Mysql.dbd ->
   ?where:where -> StringSet.t ->
     (string -> bool)
 
+val add_all_constr: 
+  ?tbl:string ->
+   int * string list * string list ->
+  cardinality_condition option ->
+  cardinality_condition option ->
+  cardinality_condition option ->
+  int * string list * string list
+
+val exec: 
+  dbd:Mysql.dbd ->
+  ?rating:[ `Hits ] -> 
+  int * string list * string list -> 
+  string list
+
 val signature_of: Cic.term -> term_signature
 val constants_of: Cic.term -> StringSet.t