X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fmatita%2Fcontribs%2Fformal_topology%2Foverlap%2Fo-algebra.ma;h=6be19d92c31ac4518d402650c362e85dc4b3fd9b;hb=befe31089d1d45360b5b7681556c8a762800b3a2;hp=55d692190fdae75667e0efdcb678d83e087b84c3;hpb=8dddbb8d9eac4bc85f071b192f8ae7e8b6ac7060;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 55d692190..6be19d92c 100644
--- a/helm/software/matita/contribs/formal_topology/overlap/o-algebra.ma
+++ b/helm/software/matita/contribs/formal_topology/overlap/o-algebra.ma
@@ -13,7 +13,6 @@
 (**************************************************************************)
 
 include "categories.ma".
-include "logic/cprop_connectives.ma". 
 
 inductive bool : Type0 := true : bool | false : bool.
 
@@ -76,7 +75,7 @@ record OAlgebra : Type2 := {
   (* ⇔ deve essere =, l'esiste debole *)
   oa_join_split:
       ∀I:SET.∀p.∀q:arrows2 SET1 I oa_P.
-       oa_overlap p (oa_join I q) ⇔ ∃i:I.oa_overlap p (q i);
+       oa_overlap p (oa_join I q) ⇔ ∃i:carr I.oa_overlap p (q i);
   (*oa_base : setoid;
   1) enum non e' il nome giusto perche' non e' suriettiva
   2) manca (vedere altro capitolo) la "suriettivita'" come immagine di insiemi di oa_base
@@ -186,14 +185,14 @@ constructor 1;
 | 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 (eq2 ? (or_f_minus_star_ ?? p) (or_f_minus_star_ ?? q)) 
+   [ apply (λp,q. And42 (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; 
+   | whd; simplify; intros; cases a; clear a; split; 
      intro a; apply sym1; generalize in match a;assumption;
-   | whd; simplify; intros; cases H; cases H1; clear H H1; split; intro a;
+   | whd; simplify; intros; cases a; cases a1; clear a a1; split; intro a;
      [ apply (.= (e a)); apply e4;
      | apply (.= (e1 a)); apply e5;
      | apply (.= (e2 a)); apply e6;