X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=components%2Ftactics%2Fparamodulation%2Fequality.mli;h=1a909dfc4b387c40465d5743bfc940964ba5e79c;hb=894b08ca7d14aa7e31c35f3acb3903a1c3472a27;hp=ea0cefd55113dca76d0f48b236246a2363fbdc2e;hpb=6421979dbececb04f6ab0d3534f2489d7f151c5f;p=helm.git

diff --git a/components/tactics/paramodulation/equality.mli b/components/tactics/paramodulation/equality.mli
index ea0cefd55..1a909dfc4 100644
--- a/components/tactics/paramodulation/equality.mli
+++ b/components/tactics/paramodulation/equality.mli
@@ -23,46 +23,24 @@
  * http://helm.cs.unibo.it/
  *)
 
-type substitution 
-
-type rule = SuperpositionRight | SuperpositionLeft |Demodulation
+type rule = SuperpositionRight | SuperpositionLeft | Demodulation
 
 type equality 
 
-and proof = new_proof * old_proof
-
-and new_proof =
+and proof =
     Exact of Cic.term
-  | Step of substitution * (rule * int * (Utils.pos * int) * Cic.term)
-
-and old_proof =
-    NoProof
-  | BasicProof of substitution * Cic.term
-  | ProofBlock of substitution * UriManager.uri * (Cic.name * Cic.term) *
-      Cic.term * (Utils.pos * equality) * old_proof
-  | ProofGoalBlock of old_proof * old_proof
-  | ProofSymBlock of Cic.term list * old_proof
-  | SubProof of Cic.term * int * old_proof
-
-and goal_proof = (Utils.pos * int * substitution * Cic.term) list
-
-val pp_proof: (Cic.name option) list -> goal_proof -> string
-
-val empty_subst : substitution
-val apply_subst : substitution -> Cic.term -> Cic.term
-val apply_subst_metasenv : substitution -> Cic.metasenv -> Cic.metasenv
-val ppsubst : substitution -> string
-val buildsubst : 
-  int -> Cic.context -> Cic.term -> Cic.term -> substitution -> 
-    substitution
-val flatten_subst : substitution -> substitution 
-val lookup_subst : Cic.term -> substitution -> Cic.term
-val filter : substitution -> Cic.metasenv -> Cic.metasenv
-val is_in_subst : int -> substitution -> bool
-val merge_subst_if_possible: 
-  substitution -> substitution -> 
-    substitution option
+  | Step of Subst.substitution * (rule * int * (Utils.pos * int) * Cic.term)
+
+and goal_proof = (rule * Utils.pos * int * Subst.substitution * Cic.term) list
+
+type goal = goal_proof * Cic.metasenv * Cic.term
 
+val pp_proof: 
+  (Cic.name option) list -> goal_proof -> proof -> Subst.substitution -> int ->
+    Cic.term -> string
+
+val pp_proofterm: Cic.term -> string
+    
 val reset : unit -> unit
 
 val mk_equality :
@@ -70,25 +48,42 @@ val mk_equality :
   (Cic.term * Cic.term * Cic.term * Utils.comparison) *
   Cic.metasenv -> 
     equality
+
+val mk_tmp_equality :
+  int * (Cic.term * Cic.term * Cic.term * Utils.comparison) * Cic.metasenv -> 
+    equality
     
 val open_equality :
   equality ->
     int * proof * 
     (Cic.term * Cic.term * Cic.term * Utils.comparison) *
     Cic.metasenv * int
+val depend : equality -> int -> bool
 val compare : equality -> equality -> int
+val max_weight_in_proof : int-> proof -> int
+val max_weight : goal_proof -> proof -> int
 val string_of_equality : ?env:Utils.environment -> equality -> string
-val string_of_proof_old : ?names:(Cic.name option)list -> old_proof -> string
-val string_of_proof_new : 
-  ?names:(Cic.name option)list -> new_proof -> goal_proof -> string
-val build_proof_term_new: new_proof -> Cic.term 
-val build_proof_term_old: ?noproof:Cic.term -> old_proof -> Cic.term
-val build_goal_proof: goal_proof -> Cic.term -> Cic.term
-val refl_proof: Cic.term -> Cic.term -> Cic.term 
+val string_of_proof : 
+  ?names:(Cic.name option)list -> proof -> goal_proof -> string
+(* given a proof and a list of meta indexes we are interested in the
+ * instantiation gives back the cic proof and the list of instantiations *)  
+(* build_goal_proof [eq_URI] [goal_proof] [initial_proof] [ty] 
+ *  [ty] is the type of the goal *)
+val build_goal_proof: 
+  UriManager.uri -> goal_proof -> proof -> Cic.term-> int list -> 
+    Cic.context -> Cic.metasenv -> 
+    Cic.term * Cic.term list
+val build_proof_term : 
+  UriManager.uri -> (int * Cic.term) list -> int -> proof -> Cic.term
+val refl_proof: UriManager.uri -> Cic.term -> Cic.term -> Cic.term 
 (** ensures that metavariables in equality are unique *)
+val fix_metas_goal: int -> goal -> int * goal
 val fix_metas: int -> equality -> int * equality
 val metas_of_proof: proof -> int list
 
+(* this should be used _only_ to apply (efficiently) this subst on the 
+ * initial proof passed to build_goal_proof *)
+val add_subst : Subst.substitution -> proof -> proof
 exception TermIsNotAnEquality;;
 
 (**
@@ -100,7 +95,7 @@ val equality_of_term: Cic.term -> Cic.term -> equality
 (**
    Re-builds the term corresponding to this equality
 *)
-val term_of_equality: equality -> Cic.term
+val term_of_equality: UriManager.uri -> equality -> Cic.term
 val term_is_equality: Cic.term -> bool
 
 (** tests a sort of alpha-convertibility between the two terms, but on the
@@ -113,3 +108,26 @@ val meta_convertibility_eq: equality -> equality -> bool
 val is_weak_identity: equality -> bool
 val is_identity: Utils.environment -> equality -> bool
 
+(* symmetric [eq_ty] [l] [id] [uri] [m] 
+ *
+ * given an equality (_,p,(_,[l],r,_),[m],[id]) of 'type' l=r
+ * returns the proof of the symmetric (r=l).
+ *
+ * [uri] is the uri of eq
+ * [eq_ty] the ty of the equality sides
+ *)
+val symmetric:
+  Cic.term -> Cic.term -> int -> UriManager.uri ->
+    Cic.metasenv -> proof
+
+(* takes 3 lists of alive ids (they are threated the same way, the type is
+ * funny just to not oblige you to concatenate them) and drops all the dead
+ * equalities *)
+val collect: int list -> int list -> int list -> unit
+
+(* given an equality, returns the numerical id *)
+val id_of: equality -> int
+
+(* profiling statistics *)
+val get_stats: unit -> string
+