X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matita%2Fcontribs%2FCoRN-Decl%2Fmetrics%2FCPseudoMSpaces.ma;h=93a5a663f1814ab8f363c8c51754a1b910680d50;hb=41af0583fbc8183183d389303951dca94f2965b0;hp=aacad54113e1a669e93c371668e73b49f845a8c9;hpb=0e0d5c57eb154bf20d101f09e560401434156c1d;p=helm.git

diff --git a/matita/contribs/CoRN-Decl/metrics/CPseudoMSpaces.ma b/matita/contribs/CoRN-Decl/metrics/CPseudoMSpaces.ma
index aacad5411..93a5a663f 100644
--- a/matita/contribs/CoRN-Decl/metrics/CPseudoMSpaces.ma
+++ b/matita/contribs/CoRN-Decl/metrics/CPseudoMSpaces.ma
@@ -16,17 +16,17 @@
 
 set "baseuri" "cic:/matita/CoRN-Decl/metrics/CPseudoMSpaces".
 
+include "CoRN.ma".
+
 (* $Id: CPseudoMSpaces.v,v 1.3 2004/04/23 10:01:02 lcf Exp $ *)
 
-(* INCLUDE
-Intervals
-*)
+include "reals/Intervals.ma".
 
 (*#* *Metric Spaces
 *)
 
 (* UNEXPORTED
-Section Relations.
+Section Relations
 *)
 
 (*#* **Relations necessary for Pseudo Metric Spaces and Metric Spaces
@@ -35,9 +35,9 @@ Let [A : CSetoid], [d : (CSetoid_bin_fun A A IR)].
 %\end{convention}%
 *)
 
-inline cic:/CoRN/metrics/CPseudoMSpaces/A.var.
+inline "cic:/CoRN/metrics/CPseudoMSpaces/Relations/A.var" "Relations__".
 
-inline cic:/CoRN/metrics/CPseudoMSpaces/d.var.
+inline "cic:/CoRN/metrics/CPseudoMSpaces/Relations/d.var" "Relations__".
 
 (* UNEXPORTED
 Set Implicit Arguments.
@@ -47,13 +47,13 @@ Set Implicit Arguments.
 Unset Strict Implicit.
 *)
 
-inline cic:/CoRN/metrics/CPseudoMSpaces/com.con.
+inline "cic:/CoRN/metrics/CPseudoMSpaces/com.con".
 
-inline cic:/CoRN/metrics/CPseudoMSpaces/nneg.con.
+inline "cic:/CoRN/metrics/CPseudoMSpaces/nneg.con".
 
-inline cic:/CoRN/metrics/CPseudoMSpaces/pos_imp_ap.con.
+inline "cic:/CoRN/metrics/CPseudoMSpaces/pos_imp_ap.con".
 
-inline cic:/CoRN/metrics/CPseudoMSpaces/tri_ineq.con.
+inline "cic:/CoRN/metrics/CPseudoMSpaces/tri_ineq.con".
 
 (* UNEXPORTED
 Set Strict Implicit.
@@ -63,16 +63,16 @@ Set Strict Implicit.
 Unset Implicit Arguments.
 *)
 
-inline cic:/CoRN/metrics/CPseudoMSpaces/diag_zero.con.
+inline "cic:/CoRN/metrics/CPseudoMSpaces/diag_zero.con".
 
-inline cic:/CoRN/metrics/CPseudoMSpaces/apdiag_imp_grzero.con.
+inline "cic:/CoRN/metrics/CPseudoMSpaces/apdiag_imp_grzero.con".
 
 (* UNEXPORTED
-End Relations.
+End Relations
 *)
 
 (* UNEXPORTED
-Section Definition_PsMS0.
+Section Definition_PsMS0
 *)
 
 (*#* **Definition of Pseudo Metric Space
@@ -83,20 +83,26 @@ A pseudo metric space consists of a setoid and a %''pseudo metric''% #"pseudo me
 %''distance''% #"distance"#, a binairy function that fulfils certain properties.
 *)
 
-inline cic:/CoRN/metrics/CPseudoMSpaces/is_CPsMetricSpace.ind.
+inline "cic:/CoRN/metrics/CPseudoMSpaces/is_CPsMetricSpace.ind".
+
+inline "cic:/CoRN/metrics/CPseudoMSpaces/CPsMetricSpace.ind".
 
-inline cic:/CoRN/metrics/CPseudoMSpaces/CPsMetricSpace.ind.
+coercion cic:/matita/CoRN-Decl/metrics/CPseudoMSpaces/cms_crr.con 0 (* compounds *).
 
 (* UNEXPORTED
-End Definition_PsMS0.
+End Definition_PsMS0
 *)
 
 (* UNEXPORTED
 Implicit Arguments cms_d [c].
 *)
 
+(* NOTATION
+Infix "[-d]" := cms_d (at level 68, left associativity).
+*)
+
 (* UNEXPORTED
-Section PsMS_axioms.
+Section PsMS_axioms
 *)
 
 (*#* **Pseudo Metric Space axioms
@@ -105,24 +111,24 @@ Let [A] be a pseudo metric space.
 %\end{convention}%
 *)
 
-inline cic:/CoRN/metrics/CPseudoMSpaces/A.var.
+inline "cic:/CoRN/metrics/CPseudoMSpaces/PsMS_axioms/A.var" "PsMS_axioms__".
 
-inline cic:/CoRN/metrics/CPseudoMSpaces/CPsMetricSpace_is_CPsMetricSpace.con.
+inline "cic:/CoRN/metrics/CPseudoMSpaces/CPsMetricSpace_is_CPsMetricSpace.con".
 
-inline cic:/CoRN/metrics/CPseudoMSpaces/d_com.con.
+inline "cic:/CoRN/metrics/CPseudoMSpaces/d_com.con".
 
-inline cic:/CoRN/metrics/CPseudoMSpaces/d_nneg.con.
+inline "cic:/CoRN/metrics/CPseudoMSpaces/d_nneg.con".
 
-inline cic:/CoRN/metrics/CPseudoMSpaces/d_pos_imp_ap.con.
+inline "cic:/CoRN/metrics/CPseudoMSpaces/d_pos_imp_ap.con".
 
-inline cic:/CoRN/metrics/CPseudoMSpaces/d_tri_ineq.con.
+inline "cic:/CoRN/metrics/CPseudoMSpaces/d_tri_ineq.con".
 
 (* UNEXPORTED
-End PsMS_axioms.
+End PsMS_axioms
 *)
 
 (* UNEXPORTED
-Section PsMS_basics.
+Section PsMS_basics
 *)
 
 (*#* **Pseudo Metric Space basics
@@ -131,27 +137,27 @@ Let [Y] be a pseudo metric space.
 %\end{convention}%
 *)
 
-inline cic:/CoRN/metrics/CPseudoMSpaces/Y.var.
+inline "cic:/CoRN/metrics/CPseudoMSpaces/PsMS_basics/Y.var" "PsMS_basics__".
 
-inline cic:/CoRN/metrics/CPseudoMSpaces/rev_tri_ineq.con.
+inline "cic:/CoRN/metrics/CPseudoMSpaces/rev_tri_ineq.con".
 
 (*#*
 Instead of taking [pos_imp_ap] as axiom, 
 we could as well have taken [diag_zero]. 
 *)
 
-inline cic:/CoRN/metrics/CPseudoMSpaces/diag_zero_imp_pos_imp_ap.con.
+inline "cic:/CoRN/metrics/CPseudoMSpaces/diag_zero_imp_pos_imp_ap.con".
 
-inline cic:/CoRN/metrics/CPseudoMSpaces/pos_imp_ap_imp_diag_zero.con.
+inline "cic:/CoRN/metrics/CPseudoMSpaces/pos_imp_ap_imp_diag_zero.con".
 
-inline cic:/CoRN/metrics/CPseudoMSpaces/is_CPsMetricSpace_diag_zero.con.
+inline "cic:/CoRN/metrics/CPseudoMSpaces/is_CPsMetricSpace_diag_zero.con".
 
 (* UNEXPORTED
-End PsMS_basics.
+End PsMS_basics
 *)
 
 (* UNEXPORTED
-Section Zerof.
+Section Zerof
 *)
 
 (*#* **Zero function
@@ -162,25 +168,25 @@ Every setoid forms with the binary function that always returns zero,
 a pseudo metric space. 
 *)
 
-inline cic:/CoRN/metrics/CPseudoMSpaces/zero_fun.con.
+inline "cic:/CoRN/metrics/CPseudoMSpaces/zero_fun.con".
 
-inline cic:/CoRN/metrics/CPseudoMSpaces/zero_fun_strext.con.
+inline "cic:/CoRN/metrics/CPseudoMSpaces/zero_fun_strext.con".
 
-inline cic:/CoRN/metrics/CPseudoMSpaces/Zero_fun.con.
+inline "cic:/CoRN/metrics/CPseudoMSpaces/Zero_fun.con".
 
-inline cic:/CoRN/metrics/CPseudoMSpaces/zero_fun_com.con.
+inline "cic:/CoRN/metrics/CPseudoMSpaces/zero_fun_com.con".
 
-inline cic:/CoRN/metrics/CPseudoMSpaces/zero_fun_nneg.con.
+inline "cic:/CoRN/metrics/CPseudoMSpaces/zero_fun_nneg.con".
 
-inline cic:/CoRN/metrics/CPseudoMSpaces/zero_fun_pos_imp_ap.con.
+inline "cic:/CoRN/metrics/CPseudoMSpaces/zero_fun_pos_imp_ap.con".
 
-inline cic:/CoRN/metrics/CPseudoMSpaces/zero_fun_tri_ineq.con.
+inline "cic:/CoRN/metrics/CPseudoMSpaces/zero_fun_tri_ineq.con".
 
-inline cic:/CoRN/metrics/CPseudoMSpaces/zf_is_CPsMetricSpace.con.
+inline "cic:/CoRN/metrics/CPseudoMSpaces/zf_is_CPsMetricSpace.con".
 
-inline cic:/CoRN/metrics/CPseudoMSpaces/zf_as_CPsMetricSpace.con.
+inline "cic:/CoRN/metrics/CPseudoMSpaces/zf_as_CPsMetricSpace.con".
 
 (* UNEXPORTED
-End Zerof.
+End Zerof
 *)