fixed a bug (status not reset properly between calls), tried some other

[helm.git] / helm / ocaml / paramodulation / inference.mli

diff --git a/helm/ocaml/paramodulation/inference.mli b/helm/ocaml/paramodulation/inference.mli
index 74194e84a0f7aa678d36708d555299a86ef99ef8..1d76aba7a8495d0ca91838e53b5ad55b4e93b94d 100644 (file)
--- a/helm/ocaml/paramodulation/inference.mli
+++ b/helm/ocaml/paramodulation/inference.mli
@@ -1,5 +1,6 @@
 type equality =
-    Cic.term *           (* proof *)
+    int *                (* weight *)
+    proof * 
     (Cic.term *          (* type *)
      Cic.term *          (* left side *)
      Cic.term *          (* right side *)
@@ -7,13 +8,19 @@ type equality =
     Cic.metasenv *       (* environment for metas *)
     Cic.term list        (* arguments *)
 
-type proof =
+and proof =
+  | NoProof
   | BasicProof of Cic.term
   | ProofBlock of
-      Cic.substitution * UriManager.uri * Cic.term * (Utils.pos * equality) *
-        equality
-  | NoProof
-
+      Cic.substitution * UriManager.uri *
+        (Cic.name * Cic.term) * Cic.term * 
+        (* name, ty, eq_ty, left, right *)
+(*         (Cic.name * Cic.term * Cic.term * Cic.term * Cic.term) *  *)
+        (Utils.pos * equality) * proof
+  | ProofGoalBlock of proof * proof (* equality *)
+(*   | ProofSymBlock of Cic.term Cic.explicit_named_substitution * proof *)
+  | ProofSymBlock of Cic.term list * proof
+  | SubProof of Cic.term * int * proof
 
 type environment = Cic.metasenv * Cic.context * CicUniv.universe_graph
 
@@ -48,8 +55,7 @@ val beta_expand:
    fresh metas...
 *)
 val find_equalities:
-  ?eq_uri:UriManager.uri -> Cic.context -> ProofEngineTypes.proof ->
-  equality list * int
+  Cic.context -> ProofEngineTypes.proof -> int list * equality list * int
 
 
 exception TermIsNotAnEquality;;
@@ -58,15 +64,16 @@ exception TermIsNotAnEquality;;
    raises TermIsNotAnEquality if term is not an equation.
    The first Cic.term is a proof of the equation
 *)
-val equality_of_term: ?eq_uri:UriManager.uri -> Cic.term -> Cic.term ->
-  equality
+val equality_of_term: Cic.term -> Cic.term -> equality
+
+val term_is_equality: Cic.term -> bool
 
 (**
    superposition_left env target source
    returns a list of new clauses inferred with a left superposition step
    the negative equation "target" and the positive equation "source"
 *)
-val superposition_left: environment -> equality -> equality -> equality list
+(* val superposition_left: environment -> equality -> equality -> equality list *)
 
 (**
    superposition_right newmeta env target source
@@ -75,18 +82,20 @@ val superposition_left: environment -> equality -> equality -> equality list
    "newmeta" is the first free meta index, i.e. the first number above the
    highest meta index: its updated value is also returned
 *)
-val superposition_right:
-  int -> environment -> equality -> equality -> int * equality list
+(* val superposition_right: *)
+(*   int -> environment -> equality -> equality -> int * equality list *)
 
-val demodulation: int -> environment -> equality -> equality -> int * equality
+(* val demodulation: int -> environment -> equality -> equality -> int * equality *)
 
+val meta_convertibility: Cic.term -> Cic.term -> bool
+  
 val meta_convertibility_eq: equality -> equality -> bool
 
 val is_identity: environment -> equality -> bool
 
 val string_of_equality: ?env:environment -> equality -> string
 
-val subsumption: environment -> equality -> equality -> bool
+(* val subsumption: environment -> equality -> equality -> bool *)
 
 val metas_of_term: Cic.term -> int list
 
@@ -95,9 +104,17 @@ val fix_metas: int -> equality -> int * equality
 val extract_differing_subterms:
   Cic.term -> Cic.term -> (Cic.term * Cic.term) option
 
+val build_proof_term: proof (* equality *) -> Cic.term
+
+val find_library_equalities:
+  HMysql.dbd -> Cic.context -> ProofEngineTypes.status -> int ->
+  UriManager.UriSet.t * equality list * int
 
-val store_proof: equality -> proof -> unit
+val find_library_theorems:
+  HMysql.dbd -> environment -> ProofEngineTypes.status -> UriManager.UriSet.t ->
+  (UriManager.uri * Cic.term * Cic.term * Cic.metasenv) list
 
-val delete_proof: equality -> unit
+val find_context_hypotheses:
+  environment -> int list -> (Cic.term * Cic.term * Cic.metasenv) list
 
-val build_term_proof: equality -> Cic.term
+val string_of_proof: proof -> string