X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fmatita%2Fnlibrary%2Fsets%2Fsets.ma;h=d4a13507c79bf6790b4d8dce4da16266dc8fb9cc;hb=1439ced76cb62f9c5f5e638c53a005c3843870ae;hp=c66b51e2dbb6a98efa6bf7249e8817aaf6b529b0;hpb=fd52068e75c3ea1e67b2066ac9f7e2a862148a18;p=helm.git

diff --git a/helm/software/matita/nlibrary/sets/sets.ma b/helm/software/matita/nlibrary/sets/sets.ma
index c66b51e2d..d4a13507c 100644
--- a/helm/software/matita/nlibrary/sets/sets.ma
+++ b/helm/software/matita/nlibrary/sets/sets.ma
@@ -52,8 +52,8 @@ ndefinition seteq: ∀A. equivalence_relation1 (Ω^A).
  #A; @
   [ napply (λS,S'. S ⊆ S' ∧ S' ⊆ S)
   | /2/
-  | #S; #S'; *; /2/
-  | #S; #T; #U; *; #H1; #H2; *; /3/]
+  | #S; #S'; *; /3/
+  | #S; #T; #U; *; #H1; #H2; *; /4/]
 nqed.
 
 include "sets/setoids1.ma".
@@ -140,7 +140,7 @@ unification hint 0 ≔  A:setoid, x, S;
 nlemma subseteq_is_morph: ∀A. unary_morphism1 (ext_powerclass_setoid A)
  (unary_morphism1_setoid1 (ext_powerclass_setoid A) CPROP).
  #A; napply (mk_binary_morphism1 … (λS,S':𝛀^A. S ⊆ S'));
- #a; #a'; #b; #b'; *; #H1; #H2; *; /4/.
+ #a; #a'; #b; #b'; *; #H1; #H2; *; /5/.
 nqed.
 
 unification hint 0 ≔ A,a,a'
@@ -171,36 +171,36 @@ nqed.
 alias symbol "hint_decl" = "hint_decl_Type1".
 unification hint 0 ≔ 
   A : Type[0], B,C : Ω^A;
-  R ≟ (mk_binary_morphism1 …
-       (λS,S'.S ∩ S') 
-       (prop21 … (intersect_is_morph A)))
+  R ≟ (mk_unary_morphism1 …
+       (λS. mk_unary_morphism1 … (λS'.S ∩ S') (prop11 … (intersect_is_morph A S))) 
+       (prop11 … (intersect_is_morph A)))
    ⊢ 
-    fun21 (powerclass_setoid A) (powerclass_setoid A) (powerclass_setoid A) R B C 
-  ≡ intersect ? B C.
+    R B C  ≡ intersect ? B C.
 
-interpretation "prop21 ext" 'prop2 l r = (prop21 (ext_powerclass_setoid ?) (ext_powerclass_setoid ?) ? ? ???? l r).
+interpretation "prop21 ext" 'prop2 l r =
+ (prop11 (ext_powerclass_setoid ?)
+  (unary_morphism1_setoid1 (ext_powerclass_setoid ?) ?) ? ?? l ?? r).
 
 nlemma intersect_is_ext_morph: 
- ∀A. binary_morphism1 (ext_powerclass_setoid A) (ext_powerclass_setoid A) (ext_powerclass_setoid A).
- #A; @ (intersect_is_ext …); nlapply (prop21 … (intersect_is_morph A));
-#H; #a; #a'; #b; #b'; #H1; #H2; napply H; nassumption; 
+ ∀A. unary_morphism1 (ext_powerclass_setoid A)
+  (unary_morphism1_setoid1 (ext_powerclass_setoid A) (ext_powerclass_setoid A)).
+ #A; napply (mk_binary_morphism1 … (intersect_is_ext …));
+ #a; #a'; #b; #b'; #Ha; #Hb; napply (prop11 … (intersect_is_morph A)); nassumption.
 nqed.
 
 unification hint 1 ≔ 
       A:setoid, B,C : 𝛀^A;
-      R ≟ (mk_binary_morphism1 (ext_powerclass_setoid A) (ext_powerclass_setoid A) (ext_powerclass_setoid A)
-              (λS,S':carr1 (ext_powerclass_setoid A).
-                mk_ext_powerclass A (S∩S') (ext_prop A (intersect_is_ext ? S S'))) 
-              (prop21 … (intersect_is_ext_morph A))) ,
+      R ≟ (mk_unary_morphism1 …
+              (λS:ext_powerclass_setoid A.
+               mk_unary_morphism1 ??
+                (λS':ext_powerclass_setoid A.
+                  mk_ext_powerclass A (S∩S') (ext_prop A (intersect_is_ext ? S S')))
+                (prop11 … (intersect_is_ext_morph A S))) 
+              (prop11 … (intersect_is_ext_morph A))) ,
        BB ≟ (ext_carr ? B),
        CC ≟ (ext_carr ? C)
    (* ------------------------------------------------------*) ⊢ 
-            ext_carr A
-             (fun21 
-              (ext_powerclass_setoid A) 
-              (ext_powerclass_setoid A) 
-              (ext_powerclass_setoid A) R B C) ≡ 
-            intersect (carr A) BB CC.
+            ext_carr A (R B C) ≡ intersect (carr A) BB CC.
 
 (*
 alias symbol "hint_decl" = "hint_decl_Type2".
@@ -362,4 +362,4 @@ ncheck (λA:?.
    
    ;
  }.
-*)
+*)
\ No newline at end of file