X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fmatita%2Fcontribs%2Fformal_topology%2Foverlap%2Fsubsets.ma;h=4152f48529a54ea91d8ef461b6dcfd8b45144169;hb=1654d0ad0d8ba9e03ab403b59fd0893ed8ebd4f6;hp=3aaf2d3d6b34b6da73f52a678e6cfb7d95c5f73b;hpb=2857d1c432f073379552e1572235a86509b665a4;p=helm.git diff --git a/helm/software/matita/contribs/formal_topology/overlap/subsets.ma b/helm/software/matita/contribs/formal_topology/overlap/subsets.ma index 3aaf2d3d6..4152f4852 100644 --- a/helm/software/matita/contribs/formal_topology/overlap/subsets.ma +++ b/helm/software/matita/contribs/formal_topology/overlap/subsets.ma @@ -90,10 +90,10 @@ definition overlaps: ∀A. binary_morphism1 (Ω \sup A) (Ω \sup A) CPROP. [ apply (λA:objs1 SET.λU,V:Ω \sup A.(exT2 ? (λx:A.?(*x*) ∈ U) (λx:A.?(*x*) ∈ V) : CProp0)) | intros; constructor 1; intro; cases e2; exists; [1,4: apply w] - [ apply (. #‡e); assumption - | apply (. #‡e1); assumption - | apply (. #‡(e \sup -1)); assumption; - | apply (. #‡(e1 \sup -1)); assumption]] + [ apply (. #‡e^-1); assumption + | apply (. #‡e1^-1); assumption + | apply (. #‡e); assumption; + | apply (. #‡e1); assumption]] qed. interpretation "overlaps" 'overlaps U V = (fun21 ___ (overlaps _) U V). @@ -106,8 +106,8 @@ definition intersects: intros; simplify; apply (.= (e‡#)‡(e‡#)); apply refl1; | intros; split; intros 2; simplify in f ⊢ %; - [ apply (. (#‡e)‡(#‡e1)); assumption - | apply (. (#‡(e \sup -1))‡(#‡(e1 \sup -1))); assumption]] + [ apply (. (#‡e^-1)‡(#‡e1^-1)); assumption + | apply (. (#‡e)‡(#‡e1)); assumption]] qed. interpretation "intersects" 'intersects U V = (fun21 ___ (intersects _) U V). @@ -120,8 +120,8 @@ definition union: intros; simplify; apply (.= (e‡#)‡(e‡#)); apply refl1 | intros; split; intros 2; simplify in f ⊢ %; - [ apply (. (#‡e)‡(#‡e1)); assumption - | apply (. (#‡(e \sup -1))‡(#‡(e1 \sup -1))); assumption]] + [ apply (. (#‡e^-1)‡(#‡e1^-1)); assumption + | apply (. (#‡e)‡(#‡e1)); assumption]] qed. interpretation "union" 'union U V = (fun21 ___ (union _) U V). @@ -129,7 +129,7 @@ interpretation "union" 'union U V = (fun21 ___ (union _) U V). (* qua non riesco a mettere set *) definition singleton: ∀A:setoid. unary_morphism1 A (Ω \sup A). intros; constructor 1; - [ apply (λa:A.{b | eq ? a b}); unfold setoid1_of_setoid; simplify; + [ apply (λa:A.{b | a =_0 b}); unfold setoid1_of_setoid; simplify; intros; simplify; split; intro; apply (.= e1); @@ -145,23 +145,23 @@ definition big_intersects: ∀A:SET.∀I:SET.unary_morphism2 (setoid1_of_setoid I ⇒ Ω \sup A) (setoid2_of_setoid1 (Ω \sup A)). intros; constructor 1; [ intro; whd; whd in I; - apply ({x | ∀i:I. x ∈ t i}); - simplify; intros; split; intros; [ apply (. (e‡#)); | apply (. (e \sup -1‡#)); ] + apply ({x | ∀i:I. x ∈ c i}); + simplify; intros; split; intros; [ apply (. (e^-1‡#)); | apply (. e‡#); ] apply f; | intros; split; intros 2; simplify in f ⊢ %; intro; - [ apply (. (#‡(e i))); apply f; - | apply (. (#‡(e i)\sup -1)); apply f]] + [ apply (. (#‡(e i)^-1)); apply f; + | apply (. (#‡e i)); apply f]] qed. definition big_union: ∀A:SET.∀I:SET.unary_morphism2 (setoid1_of_setoid I ⇒ Ω \sup A) (setoid2_of_setoid1 (Ω \sup A)). intros; constructor 1; [ intro; whd; whd in A; whd in I; - apply ({x | ∃i:carr I. x ∈ t i }); + apply ({x | ∃i:I. x ∈ c i }); simplify; intros; split; intros; cases e1; clear e1; exists; [1,3:apply w] - [ apply (. (e‡#)); | apply (. (e \sup -1‡#)); ] + [ apply (. (e^-1‡#)); | apply (. (e‡#)); ] apply x; | intros; split; intros 2; simplify in f ⊢ %; cases f; clear f; exists; [1,3:apply w] - [ apply (. (#‡(e w))); apply x; - | apply (. (#‡(e w)\sup -1)); apply x]] + [ apply (. (#‡(e w)^-1)); apply x; + | apply (. (#‡e w)); apply x]] qed.