X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2Fsoftware%2Fmatita%2Fcontribs%2Fformal_topology%2Foverlap%2Fbasic_pairs.ma;h=6140e278ec5c30e0d8624d90c0b50624f67ccde9;hb=fc577dad1529b2d90c40dad8e6e3429281107c99;hp=d0e4ffd4a67607650efe5cbc7127fc1dbc333b2d;hpb=49045bfd9b3038ce30a1911e2345f949ed38ec8a;p=helm.git

diff --git a/helm/software/matita/contribs/formal_topology/overlap/basic_pairs.ma b/helm/software/matita/contribs/formal_topology/overlap/basic_pairs.ma
index d0e4ffd4a..6140e278e 100644
--- a/helm/software/matita/contribs/formal_topology/overlap/basic_pairs.ma
+++ b/helm/software/matita/contribs/formal_topology/overlap/basic_pairs.ma
@@ -20,11 +20,8 @@ record basic_pair: Type1 ≝
    rel: arrows1 ? concr form
  }.
 
-notation "x ⊩ y" with precedence 45 for @{'Vdash2 $x $y}.
-notation "⊩" with precedence 60 for @{'Vdash}.
-
-interpretation "basic pair relation" 'Vdash2 x y = (rel _ x y).
-interpretation "basic pair relation (non applied)" 'Vdash = (rel _).
+interpretation "basic pair relation" 'Vdash2 x y c = (fun21 ___ (rel c) x y).
+interpretation "basic pair relation (non applied)" 'Vdash c = (rel c).
 
 alias symbol "eq" = "setoid1 eq".
 alias symbol "compose" = "category1 composition".
@@ -65,7 +62,12 @@ definition relation_pair_setoid: basic_pair → basic_pair → setoid1.
   ]
 qed.
 
-lemma eq_to_eq': ∀o1,o2.∀r,r': relation_pair_setoid o1 o2. r=r' → r \sub\f ∘ ⊩ = r'\sub\f ∘ ⊩.
+definition relation_pair_of_relation_pair_setoid :
+  ∀P,Q. relation_pair_setoid P Q → relation_pair P Q ≝ λP,Q,x.x.
+coercion relation_pair_of_relation_pair_setoid.
+
+lemma eq_to_eq': 
+  ∀o1,o2.∀r,r':relation_pair_setoid o1 o2. r=r' → r \sub\f ∘ ⊩ = r'\sub\f ∘ ⊩.
  intros 7 (o1 o2 r r' H c1 f2);
  split; intro H1;
   [ lapply (fi ?? (commute ?? r c1 f2) H1) as H2;
@@ -139,6 +141,13 @@ definition BP: category1.
     apply ((id_neutral_left1 ????)‡#);]
 qed.
 
+definition basic_pair_of_BP : objs1 BP → basic_pair ≝ λx.x.
+coercion basic_pair_of_BP.
+
+definition relation_pair_setoid_of_arrows1_BP :
+  ∀P,Q. arrows1 BP P Q → relation_pair_setoid P Q ≝ λP,Q,x.x.
+coercion relation_pair_setoid_of_arrows1_BP.
+
 definition BPext: ∀o: BP. form o ⇒ Ω \sup (concr o).
  intros; constructor 1;
   [ apply (ext ? ? (rel o));
@@ -158,8 +167,8 @@ definition fintersects: ∀o: BP. binary_morphism1 (form o) (form o) (Ω \sup (f
   [ apply (λa,b: form o.{c | BPext o c ⊆ BPext o a ∩ BPext o b });
     intros; simplify; apply (.= (†e)‡#); apply refl1
   | intros; split; simplify; intros;
-     [ apply (. #‡((†e)‡(†e1))); assumption
-     | apply (. #‡((†e\sup -1)‡(†e1\sup -1))); assumption]]
+     [ apply (. #‡((†e^-1)‡(†e1^-1))); assumption
+     | apply (. #‡((†e)‡(†e1))); assumption]]
 qed.
 
 interpretation "fintersects" 'fintersects U V = (fun21 ___ (fintersects _) U V).
@@ -170,19 +179,19 @@ definition fintersectsS:
   [ apply (λo: basic_pair.λa,b: Ω \sup (form o).{c | BPext o c ⊆ BPextS o a ∩ BPextS o b });
     intros; simplify; apply (.= (†e)‡#); apply refl1
   | intros; split; simplify; intros;
-     [ apply (. #‡((†e)‡(†e1))); assumption
-     | apply (. #‡((†e\sup -1)‡(†e1\sup -1))); assumption]]
+     [ apply (. #‡((†e^-1)‡(†e1^-1))); assumption
+     | apply (. #‡((†e)‡(†e1))); assumption]]
 qed.
 
 interpretation "fintersectsS" 'fintersects U V = (fun21 ___ (fintersectsS _) U V).
 
 definition relS: ∀o: BP. binary_morphism1 (concr o) (Ω \sup (form o)) CPROP.
  intros (o); constructor 1;
-  [ apply (λx:concr o.λS: Ω \sup (form o).∃y:carr (form o).y ∈ S ∧ x ⊩ y);
+  [ apply (λx:concr o.λS: Ω \sup (form o).∃y:form o.y ∈ S ∧ x ⊩_o y);
   | intros; split; intros; cases e2; exists [1,3: apply w]
-     [ apply (. (#‡e1)‡(e‡#)); assumption
-     | apply (. (#‡e1 \sup -1)‡(e \sup -1‡#)); assumption]]
+     [ apply (. (#‡e1^-1)‡(e^-1‡#)); assumption
+     | apply (. (#‡e1)‡(e‡#)); assumption]]
 qed.
 
-interpretation "basic pair relation for subsets" 'Vdash2 x y = (fun21 (concr _) __ (relS _) x y).
-interpretation "basic pair relation for subsets (non applied)" 'Vdash = (fun21 ___ (relS _)).
+interpretation "basic pair relation for subsets" 'Vdash2 x y c = (fun21 (concr _) __ (relS c) x y).
+interpretation "basic pair relation for subsets (non applied)" 'Vdash c = (fun21 ___ (relS c)).