X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fmatita%2Fcontribs%2Fformal_topology%2Foverlap%2Frelations.ma;h=c4502f3d080b61874360cfb4e650bde1f3b99694;hb=6302e8ebc63beb73aa672c9c23199bdfaa3f8715;hp=f5141a2ed3bf34098ca92ea27126b90d515c2d95;hpb=3e4dee5271019834cfe061d43789380cb3871b7c;p=helm.git

diff --git a/helm/software/matita/contribs/formal_topology/overlap/relations.ma b/helm/software/matita/contribs/formal_topology/overlap/relations.ma
index f5141a2ed..c4502f3d0 100644
--- a/helm/software/matita/contribs/formal_topology/overlap/relations.ma
+++ b/helm/software/matita/contribs/formal_topology/overlap/relations.ma
@@ -29,10 +29,10 @@ definition binary_relation_setoid: SET → SET → SET1.
      [ apply (λA,B.λr,r': binary_relation A B. ∀x,y. r x y ↔ r' x y)
      | simplify; intros 3; split; intro; assumption
      | simplify; intros 5; split; intro;
-       [ apply (fi ?? (H ??)) | apply (if ?? (H ??))] assumption
+       [ apply (fi ?? (f ??)) | apply (if ?? (f ??))] assumption
      | simplify;  intros 7; split; intro;
-        [ apply (if ?? (H1 ??)) | apply (fi ?? (H ??)) ]
-        [ apply (if ?? (H ??)) | apply (fi ?? (H1 ??)) ]
+        [ apply (if ?? (f1 ??)) | apply (fi ?? (f ??)) ]
+        [ apply (if ?? (f ??)) | apply (fi ?? (f1 ??)) ]
        assumption]]
 qed.
 
@@ -48,7 +48,7 @@ definition composition:
        (* carr to avoid universe inconsistency *)  
        apply (λs1:carr A.λs3:carr C.∃s2:carr B. s1 ♮R12 s2 ∧ s2 ♮R23 s3);
      | intros;
-       split; intro; cases H (w H3); clear H; exists; [1,3: apply w ]
+       split; intro; cases e2 (w H3); clear e2; exists; [1,3: apply w ]
         [ apply (. (e‡#)‡(#‡e1)); assumption
         | apply (. ((e \sup -1)‡#)‡(#‡(e1 \sup -1))); assumption]]
   | intros 8; split; intro H2; simplify in H2 ⊢ %;
@@ -87,7 +87,7 @@ definition REL: category1.
     split; assumption
   |6,7: intros 5; unfold composition; simplify; split; intro;
         unfold setoid1_of_setoid in x y; simplify in x y;
-        [1,3: cases H (w H1); clear H; cases H1; clear H1; unfold;
+        [1,3: cases e (w H1); clear e; cases H1; clear H1; unfold;
           [ apply (. (e ^ -1 : eq1 ? w x)‡#); assumption
           | apply (. #‡(e : eq1 ? w y)); assumption]
         |2,4: exists; try assumption; split;
@@ -96,7 +96,6 @@ definition REL: category1.
           first [apply refl | assumption]]]
 qed.
 
-(*
 definition full_subset: ∀s:REL. Ω \sup s.
  apply (λs.{x | True});
  intros; simplify; split; intro; assumption.
@@ -105,25 +104,35 @@ qed.
 coercion full_subset.
 
 definition setoid1_of_REL: REL → setoid ≝ λS. S.
-
 coercion setoid1_of_REL.
 
-definition comprehension: ∀b:REL. (b ⇒ CPROP) → Ω \sup b.
- apply (λb:REL. λP: b ⇒ CPROP. {x | x ∈ b ∧ P x});
- intros; simplify; apply (.= (H‡#)‡(†H)); apply refl1.
+lemma Type_OF_setoid1_of_REL: ∀o1:Type_OF_category1 REL. Type_OF_objs1 o1 → Type_OF_setoid1 ?(*(setoid1_of_SET o1)*).
+ [ apply (setoid1_of_SET o1);
+ | intros; apply t;]
+qed.
+coercion Type_OF_setoid1_of_REL.
+
+definition comprehension: ∀b:REL. (unary_morphism1 b CPROP) → Ω \sup b.
+ apply (λb:REL. λP: b ⇒ CPROP. {x | P x});
+ intros; simplify;
+ alias symbol "trans" = "trans1".
+ alias symbol "prop1" = "prop11".
+ apply (.= †e); apply refl1.
 qed.
 
 interpretation "subset comprehension" 'comprehension s p =
- (comprehension s (mk_unary_morphism __ p _)).
+ (comprehension s (mk_unary_morphism1 __ p _)).
 
 definition ext: ∀X,S:REL. binary_morphism1 (arrows1 ? X S) S (Ω \sup X).
- apply (λX,S.mk_binary_morphism1 ??? (λr:arrows1 ? X S.λf:S.{x ∈ X | x ♮r f}) ?);
-  [ intros; simplify; apply (.= (H‡#)); apply refl1
-  | intros; simplify; split; intros; simplify; intros; cases f; split; try assumption;
-     [ apply (. (#‡H1)); whd in H; apply (if ?? (H ??)); assumption
-     | apply (. (#‡H1\sup -1)); whd in H; apply (fi ?? (H ??));assumption]]
+ apply (λX,S.mk_binary_morphism1 ??? (λr:arrows1 REL X S.λf:S.{x ∈ X | x ♮r f}) ?);
+  [ intros; simplify; apply (.= (e‡#)); apply refl1
+  | intros; simplify; split; intros; simplify;
+     [ change with (∀x. x ♮a b → x ♮a' b'); intros;
+       apply (. (#‡e1)); whd in e; apply (if ?? (e ??)); assumption
+     | change with (∀x. x ♮a' b' → x ♮a b); intros;
+       apply (. (#‡e1\sup -1)); whd in e; apply (fi ?? (e ??));assumption]]
 qed.
-
+(*
 definition extS: ∀X,S:REL. ∀r: arrows1 ? X S. Ω \sup S ⇒ Ω \sup X.
  (* ∃ is not yet a morphism apply (λX,S,r,F.{x ∈ X | ∃a. a ∈ F ∧ x ♮r a});*)
  intros (X S r); constructor 1;
@@ -174,21 +183,11 @@ lemma extS_com: ∀o1,o2,o3,c1,c2,S. extS o1 o3 (c2 ∘ c1) S = extS o1 o2 c1 (e
     assumption]
 qed.
 *)
-(* senza questo exT "fresco", universe inconsistency *)
-inductive exT (A:Type0) (P:A→CProp0) : CProp0 ≝
-  ex_introT: ∀w:A. P w → exT A P.
-
-lemma hint: ∀U. carr U → Type_OF_setoid1 ?(*(setoid1_of_SET U)*).
- [ apply setoid1_of_SET; apply U
- | intros; apply c;]
-qed.
-coercion hint.
 
 (* the same as ⋄ for a basic pair *)
 definition image: ∀U,V:REL. binary_morphism1 (arrows1 ? U V) (Ω \sup U) (Ω \sup V).
  intros; constructor 1;
-  [ apply (λr: arrows1 ? U V.λS: Ω \sup U. {y | (*∃x:U. x ♮r y ∧ x ∈ S*)
-      exT ? (λx:carr U.x ♮r y ∧ x ∈ S) });
+  [ apply (λr: arrows1 ? U V.λS: Ω \sup U. {y | ∃x:carr U. x ♮r y ∧ x ∈ S });
     intros; simplify; split; intro; cases e1; exists [1,3: apply w]
      [ apply (. (#‡e)‡#); assumption
      | apply (. (#‡e ^ -1)‡#); assumption]
@@ -210,7 +209,7 @@ definition minus_star_image: ∀U,V:REL. binary_morphism1 (arrows1 ? U V) (Ω \s
     apply f; [ apply (if ?? (e ^ -1 ??)); | apply (if ?? (e ??)) ] assumption]
 qed.
 
-(* the same as * for a basic pair *)
+(* the same as Rest for a basic pair *)
 definition star_image: ∀U,V:REL. binary_morphism1 (arrows1 ? U V) (Ω \sup V) (Ω \sup U).
  intros; constructor 1;
   [ apply (λr: arrows1 ? U V.λS: Ω \sup V. {x | ∀y:carr V. x ♮r y → y ∈ S});
@@ -221,7 +220,7 @@ definition star_image: ∀U,V:REL. binary_morphism1 (arrows1 ? U V) (Ω \sup V)
     apply f; [ apply (if ?? (e ^ -1 ??)); | apply (if ?? (e ??)) ] assumption]
 qed.
 
-(* the same as - for a basic pair *)
+(* the same as Ext for a basic pair *)
 definition minus_image: ∀U,V:REL. binary_morphism1 (arrows1 ? U V) (Ω \sup V) (Ω \sup U).
  intros; constructor 1;
   [ apply (λr: arrows1 ? U V.λS: Ω \sup V. {x | (*∃x:U. x ♮r y ∧ x ∈ S*)
@@ -292,43 +291,3 @@ theorem extS_singleton:
   | exists; try assumption; split; try assumption; change with (x = x); apply refl]
 qed.
 *)
-
-include "o-algebra.ma".
-
-definition orelation_of_relation: ∀o1,o2:REL. arrows1 ? o1 o2 → ORelation (SUBSETS o1) (SUBSETS o2).
- intros;
- constructor 1;
-  [ constructor 1;
-     [ apply (λU.image ?? t U);
-     | intros; apply (#‡e); ]
-  | constructor 1;
-     [ apply (λU.minus_star_image ?? t U);
-     | intros; apply (#‡e); ]
-  | constructor 1;
-     [ apply (λU.star_image ?? t U);
-     | intros; apply (#‡e); ]
-  | constructor 1;
-     [ apply (λU.minus_image ?? t U);
-     | intros; apply (#‡e); ]
-  | intros; split; intro;
-     [ change in f with (∀a. a ∈ image ?? t p → a ∈ q);
-       change with (∀a:o1. a ∈ p → a ∈ star_image ?? t q);
-       intros 4; apply f; exists; [apply a] split; assumption;
-     | change in f with (∀a:o1. a ∈ p → a ∈ star_image ?? t q);
-       change with (∀a. a ∈ image ?? t p → a ∈ q);
-       intros; cases f1; cases x; clear f1 x; apply (f ? f3); assumption; ]
-  | intros; split; intro;
-     [ change in f with (∀a. a ∈ minus_image ?? t p → a ∈ q);
-       change with (∀a:o2. a ∈ p → a ∈ minus_star_image ?? t q);
-       intros 4; apply f; exists; [apply a] split; assumption;
-     | change in f with (∀a:o2. a ∈ p → a ∈ minus_star_image ?? t q);
-       change with (∀a. a ∈ minus_image ?? t p → a ∈ q);
-       intros; cases f1; cases x; clear f1 x; apply (f ? f3); assumption; ]
-  | intros; split; intro; cases f; clear f;
-     [ cases x; cases x2; clear x x2; exists; [apply w1]
-        [ assumption;
-        | exists; [apply w] split; assumption]
-     | cases x1; cases x2; clear x1 x2; exists; [apply w1]
-        [ exists; [apply w] split; assumption;
-        | assumption; ]]]
-qed. sistemare anche l'hint da un'altra parte e capire l'exT (doppio!)
\ No newline at end of file