X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fmatita%2Fcontribs%2Fformal_topology%2Foverlap%2Fo-algebra.ma;h=ce9583da36098ffd0861c9b517aa3c84561be823;hb=b93b2e4f499c30b01b838f75a1e95df43920ffcc;hp=bcd1aae1bcf6fcba2541e417fb91b4b4ed0b3677;hpb=b8f8fdbf7c1714e3332b71952b9610b8cd8e8841;p=helm.git

diff --git a/helm/software/matita/contribs/formal_topology/overlap/o-algebra.ma b/helm/software/matita/contribs/formal_topology/overlap/o-algebra.ma
index bcd1aae1b..ce9583da3 100644
--- a/helm/software/matita/contribs/formal_topology/overlap/o-algebra.ma
+++ b/helm/software/matita/contribs/formal_topology/overlap/o-algebra.ma
@@ -99,7 +99,7 @@ interpretation "o-algebra leq" 'leq a b = (fun21 ___ (oa_leq _) a b).
 
 notation "hovbox(a mpadded width -150% (>)< b)" non associative with precedence 45
 for @{ 'overlap $a $b}.
-interpretation "o-algebra overlap" 'overlap a b = (fun22 ___ (oa_overlap _) a b).
+interpretation "o-algebra overlap" 'overlap a b = (fun21 ___ (oa_overlap _) a b).
 
 notation < "hovbox(mstyle scriptlevel 1 scriptsizemultiplier 1.7 (∧) \below (\emsp) \nbsp term 90 p)" 
 non associative with precedence 50 for @{ 'oa_meet $p }.
@@ -117,28 +117,39 @@ notation > "hovbox(a ∧ b)" left associative with precedence 50
 for @{ 'oa_meet (mk_unary_morphism BOOL ? (λx__:bool.match x__ with [ true ⇒ $a | false ⇒ $b ]) (IF_THEN_ELSE_p ? $a $b)) }.
 *)
 interpretation "o-algebra meet" 'oa_meet f = 
-  (fun11 __ (oa_meet __) f).
+  (fun12 __ (oa_meet __) f).
 interpretation "o-algebra meet with explicit function" 'oa_meet_mk f = 
-  (fun11 __ (oa_meet __) (mk_unary_morphism _ _ f _)).
+  (fun12 __ (oa_meet __) (mk_unary_morphism _ _ f _)).
 
-(*
+definition hint3: OAlgebra → setoid1.
+ intro; apply (oa_P o);
+qed.
+coercion hint3.
+
+definition hint4: ∀A. setoid2_OF_OAlgebra A → hint3 A.
+ intros; apply t;
+qed.
+coercion hint4.
 
 definition binary_meet : ∀O:OAlgebra. binary_morphism1 O O O.
 intros; split;
 [ intros (p q); 
   apply (∧ { x ∈ BOOL | match x with [ true ⇒ p | false ⇒ q ] | IF_THEN_ELSE_p ? p q });
-| intros; apply (prop_1 ?? (oa_meet O BOOL)); intro x; simplify;
-  cases x; simplify; assumption;]
+| intros; lapply (prop12 ? O (oa_meet O BOOL));
+   [2: apply ({ x ∈ BOOL | match x with [ true ⇒ a | false ⇒ b ] | IF_THEN_ELSE_p ? a b });
+   |3: apply ({ x ∈ BOOL | match x with [ true ⇒ a' | false ⇒ b' ] | IF_THEN_ELSE_p ? a' b' });
+   | apply Hletin;]
+  intro x; simplify; cases x; simplify; assumption;]
 qed.
 
 notation "hovbox(a ∧ b)" left associative with precedence 35
 for @{ 'oa_meet_bin $a $b }.
 interpretation "o-algebra binary meet" 'oa_meet_bin a b = 
-  (fun1 ___ (binary_meet _) a b).
+  (fun21 ___ (binary_meet _) a b).
 
 lemma oa_overlap_preservers_meet: ∀O:OAlgebra.∀p,q:O.p >< q → p >< (p ∧ q).
-intros;  lapply (oa_overlap_preservers_meet_ O p q f);
-lapply (prop1 O O CPROP (oa_overlap O) p p ? (p ∧ q) # ?);
+intros;  lapply (oa_overlap_preserves_meet_ O p q f);
+lapply (prop21 O O CPROP (oa_overlap O) p p ? (p ∧ q) # ?);
 [3: apply (if ?? (Hletin1)); apply Hletin;|skip] apply refl1;
 qed.
 
@@ -155,89 +166,94 @@ notation > "hovbox(a ∨ b)" left associative with precedence 49
 for @{ 'oa_join (mk_unary_morphism BOOL ? (λx__:bool.match x__ with [ true ⇒ $a | false ⇒ $b ]) (IF_THEN_ELSE_p ? $a $b)) }.
 
 interpretation "o-algebra join" 'oa_join f = 
-  (fun_1 __ (oa_join __) f).
+  (fun12 __ (oa_join __) f).
 interpretation "o-algebra join with explicit function" 'oa_join_mk f = 
-  (fun_1 __ (oa_join __) (mk_unary_morphism _ _ f _)).
+  (fun12 __ (oa_join __) (mk_unary_morphism _ _ f _)).
+
+definition hint5: OAlgebra → objs2 SET1.
+ intro; apply (oa_P o);
+qed.
+coercion hint5.
 
 record ORelation (P,Q : OAlgebra) : Type ≝ {
-  or_f_ : arrows1 SET P Q;
-  or_f_minus_star_ : arrows1 SET P Q;
-  or_f_star_ : arrows1 SET Q P;
-  or_f_minus_ : arrows1 SET Q P;
+  or_f_ : P ⇒ Q;
+  or_f_minus_star_ : P ⇒ Q;
+  or_f_star_ : Q ⇒ P;
+  or_f_minus_ : Q ⇒ P;
   or_prop1_ : ∀p,q. (or_f_ p ≤ q) = (p ≤ or_f_star_ q);
   or_prop2_ : ∀p,q. (or_f_minus_ p ≤ q) = (p ≤ or_f_minus_star_ q);
   or_prop3_ : ∀p,q. (or_f_ p >< q) = (p >< or_f_minus_ q)
 }.
 
-
-definition ORelation_setoid : OAlgebra → OAlgebra → setoid1.
+definition ORelation_setoid : OAlgebra → OAlgebra → setoid2.
 intros (P Q);
 constructor 1;
 [ apply (ORelation P Q);
 | constructor 1;
    (* tenere solo una uguaglianza e usare la proposizione 9.9 per
       le altre (unicita' degli aggiunti e del simmetrico) *)
-   [ apply (λp,q. And4 (eq1 ? (or_f_minus_star_ ?? p) (or_f_minus_star_ ?? q)) 
-             (eq1 ? (or_f_minus_ ?? p) (or_f_minus_ ?? q)) 
-             (eq1 ? (or_f_ ?? p) (or_f_ ?? q)) 
-             (eq1 ? (or_f_star_ ?? p) (or_f_star_ ?? q))); 
-   | whd; simplify; intros; repeat split; intros; apply refl1;
+   [ apply (λp,q. And4 (eq2 ? (or_f_minus_star_ ?? p) (or_f_minus_star_ ?? q)) 
+             (eq2 ? (or_f_minus_ ?? p) (or_f_minus_ ?? q)) 
+             (eq2 ? (or_f_ ?? p) (or_f_ ?? q)) 
+             (eq2 ? (or_f_star_ ?? p) (or_f_star_ ?? q))); 
+   | whd; simplify; intros; repeat split; intros; apply refl2;
    | whd; simplify; intros; cases H; clear H; split; 
-     intro a; apply sym; generalize in match a;assumption;
+     intro a; apply sym1; generalize in match a;assumption;
    | whd; simplify; intros; cases H; cases H1; clear H H1; split; intro a;
-     [ apply (.= (H2 a)); apply H6;
-     | apply (.= (H3 a)); apply H7;
-     | apply (.= (H4 a)); apply H8;
-     | apply (.= (H5 a)); apply H9;]]]
-qed.  
+     [ apply (.= (e a)); apply e4;
+     | apply (.= (e1 a)); apply e5;
+     | apply (.= (e2 a)); apply e6;
+     | apply (.= (e3 a)); apply e7;]]]
+qed.
 
-definition or_f_minus_star: ∀P,Q:OAlgebra.ORelation_setoid P Q ⇒ arrows1 SET P Q.
+definition or_f_minus_star:
+ ∀P,Q:OAlgebra.unary_morphism2 (ORelation_setoid P Q) (P ⇒ Q).
  intros; constructor 1;
   [ apply or_f_minus_star_;
-  | intros; cases H; assumption]
+  | intros; cases e; assumption]
 qed.
 
-definition or_f: ∀P,Q:OAlgebra.ORelation_setoid P Q ⇒ arrows1 SET P Q.
+definition or_f: ∀P,Q:OAlgebra.unary_morphism2 (ORelation_setoid P Q) (P ⇒ Q).
  intros; constructor 1;
   [ apply or_f_;
-  | intros; cases H; assumption]
+  | intros; cases e; assumption]
 qed.
 
 coercion or_f.
 
-definition or_f_minus: ∀P,Q:OAlgebra.ORelation_setoid P Q ⇒ arrows1 SET Q P.
+definition or_f_minus: ∀P,Q:OAlgebra.unary_morphism2 (ORelation_setoid P Q) (Q ⇒ P).
  intros; constructor 1;
   [ apply or_f_minus_;
-  | intros; cases H; assumption]
+  | intros; cases e; assumption]
 qed.
 
-definition or_f_star: ∀P,Q:OAlgebra.ORelation_setoid P Q ⇒ arrows1 SET Q P.
+definition or_f_star: ∀P,Q:OAlgebra.unary_morphism2 (ORelation_setoid P Q) (Q ⇒ P).
  intros; constructor 1;
   [ apply or_f_star_;
-  | intros; cases H; assumption]
+  | intros; cases e; assumption]
 qed.
 
-lemma arrows1_OF_ORelation_setoid : ∀P,Q. ORelation_setoid P Q → arrows1 SET P Q.
-intros; apply (or_f ?? c);
+lemma arrows1_OF_ORelation_setoid : ∀P,Q. ORelation_setoid P Q → (P ⇒ Q).
+intros; apply (or_f ?? t);
 qed.
 
-coercion arrows1_OF_ORelation_setoid nocomposites.
+coercion arrows1_OF_ORelation_setoid.
 
 lemma umorphism_OF_ORelation_setoid : ∀P,Q. ORelation_setoid P Q → P ⇒ Q.
-intros; apply (or_f ?? c);
+intros; apply (or_f ?? t);
 qed.
 
 coercion umorphism_OF_ORelation_setoid.
 
 
 lemma uncurry_arrows : ∀B,C. arrows1 SET B C → B → C. 
-intros; apply ((fun_1 ?? c) t);
+intros; apply ((fun1 ?? t) t1);
 qed.
 
 coercion uncurry_arrows 1.
 
-lemma hint3 : ∀P,Q. arrows1 SET P Q → P ⇒ Q. intros; apply c;qed.
-coercion hint3 nocomposites.
+lemma hint6 : ∀P,Q. arrows1 SET P Q → P ⇒ Q. intros; apply t;qed.
+coercion hint6.
 
 (*
 lemma hint2: OAlgebra → setoid. intros; apply (oa_P o). qed.
@@ -254,9 +270,9 @@ notation > "r⎻*" non associative with precedence 90 for @{'OR_f_minus_star $r}
 notation "r \sup ⎻" non associative with precedence 90 for @{'OR_f_minus $r}.
 notation > "r⎻" non associative with precedence 90 for @{'OR_f_minus $r}.
 
-interpretation "o-relation f⎻*" 'OR_f_minus_star r = (fun_1 __ (or_f_minus_star _ _) r).
-interpretation "o-relation f⎻" 'OR_f_minus r = (fun_1 __ (or_f_minus _ _) r).
-interpretation "o-relation f*" 'OR_f_star r = (fun_1 __ (or_f_star _ _) r).
+interpretation "o-relation f⎻*" 'OR_f_minus_star r = (fun12 __ (or_f_minus_star _ _) r).
+interpretation "o-relation f⎻" 'OR_f_minus r = (fun12 __ (or_f_minus _ _) r).
+interpretation "o-relation f*" 'OR_f_star r = (fun12 __ (or_f_star _ _) r).
 
 definition or_prop1 : ∀P,Q:OAlgebra.∀F:ORelation_setoid P Q.∀p,q.
    (F p ≤ q) = (p ≤ F* q).
@@ -316,5 +332,4 @@ split;
    | apply ((comp_assoc1 ????? H* G* F* ));]
 | intros; split; unfold ORelation_composition; simplify; apply id_neutral_left1;
 | intros; split; unfold ORelation_composition; simplify; apply id_neutral_right1;]
-qed.
-*)
\ No newline at end of file
+qed.
\ No newline at end of file