X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fmatita%2Fnlibrary%2Fsets%2Fpartitions.ma;h=de29e796c47141fc80cd8659aa35a64c68e01a82;hb=661403facfb7ca53b58635a95904787ae393bde5;hp=61173c78e34215c0081b4d0a3a29f49bbd0db564;hpb=8b1a49bbee9eea86eb74c040defe701370ca5893;p=helm.git

diff --git a/helm/software/matita/nlibrary/sets/partitions.ma b/helm/software/matita/nlibrary/sets/partitions.ma
index 61173c78e..de29e796c 100644
--- a/helm/software/matita/nlibrary/sets/partitions.ma
+++ b/helm/software/matita/nlibrary/sets/partitions.ma
@@ -18,16 +18,11 @@ include "nat/compare.ma".
 include "nat/minus.ma".
 include "datatypes/pairs.ma".
 
-alias symbol "eq" = "setoid eq".
-
-alias symbol "eq" = "setoid1 eq".
-alias symbol "eq" = "setoid eq".
-alias symbol "eq" = "setoid eq".
-alias symbol "eq" = "setoid1 eq".
+alias symbol "eq" (instance 7) = "setoid1 eq".
 nrecord partition (A: setoid) : Type[1] ≝ 
  { support: setoid;
-   indexes: qpowerclass support;
-   class: unary_morphism1 (setoid1_of_setoid support) (qpowerclass_setoid A);
+   indexes: ext_powerclass support;
+   class: unary_morphism1 (setoid1_of_setoid support) (ext_powerclass_setoid A);
    inhabited: ∀i. i ∈ indexes → class i ≬ class i;
    disjoint: ∀i,j. i ∈ indexes → j ∈ indexes → class i ≬ class j → i = j;
    covers: big_union support ? indexes (λx.class x) = full_set A
@@ -83,7 +78,7 @@ ntheorem iso_nat_nat_union_char:
     ncases (ltb_cases m (s (S n'))); *; #H1; #H2; nrewrite > H2;
     nwhd in ⊢ (let p ≝ % in ?); nwhd
      [ napply conj [napply conj
-        [ nwhd in ⊢ (????(?(?%(λ_.λ_:(??%).?))%)); nrewrite > (minus_canc n'); napply refl
+        [ nwhd in ⊢ (???(?(?%(λ_.λ_:(??%).?))%)); nrewrite > (minus_canc n'); napply refl
         | nnormalize; napply le_n]
       ##| nnormalize; nassumption ]
    ##| nchange in H with (m < s (S n') + big_plus (S n') (λi.λ_.s i));
@@ -93,7 +88,7 @@ ntheorem iso_nat_nat_union_char:
         |@
          [nrewrite > (split_big_plus …); ##[##2:napply ad_hoc11;##|##3:##skip]
           nrewrite > (ad_hoc12 …); ##[##2: nassumption]
-          nwhd in ⊢ (????(?(??%)?));
+          nwhd in ⊢ (???(?(??%)?));
           nrewrite > (ad_hoc13 …);##[##2: nassumption]
           napply ad_hoc14 [ napply not_lt_to_le; nassumption ]
           nwhd in ⊢ (???(?(??%)?));
@@ -146,46 +141,48 @@ nlemma partition_splits_card:
      | #a; #a'; #H; nrewrite < H; napply refl ]
 ##| #x; #Hx; nwhd; napply I
 ##| #y; #_;
-    ngeneralize in match (covers ? P) in ⊢ ?; *; #_; #Hc;
-    ngeneralize in match (Hc y I) in ⊢ ?; *; #index; *; #Hi1; #Hi2;
-    ngeneralize in match (f_sur ???? f ? Hi1) in ⊢ ?; *; #nindex; *; #Hni1; #Hni2;
-    ngeneralize in match (f_sur ???? (fi nindex) y ?) in ⊢ ?
-     [##2: alias symbol "refl" = "refl".
+    nlapply (covers ? P); *; #_; #Hc;
+    nlapply (Hc y I); *; #index; *; #Hi1; #Hi2;
+    nlapply (f_sur ???? f ? Hi1); *; #nindex; *; #Hni1; #Hni2;
+    nlapply (f_sur ???? (fi nindex) y ?)
+     [ alias symbol "refl" = "refl".
 alias symbol "prop1" = "prop11".
+alias symbol "prop2" = "prop21 mem".
 napply (. #‡(†?));##[##2: napply Hni2 |##1: ##skip | nassumption]##]
     *; #nindex2; *; #Hni21; #Hni22;
     nletin xxx ≝ (plus (big_plus (minus n nindex) (λi.λ_.s (S (plus i nindex)))) nindex2);
-    napply (ex_intro … xxx); napply conj
+    @ xxx; @
      [ napply iso_nat_nat_union_pre [ napply le_S_S_to_le; nassumption | nassumption ]
    ##| nwhd in ⊢ (???%%); napply (.= ?) [##3: nassumption|##skip]
-       ngeneralize in match (iso_nat_nat_union_char n s xxx ?) in ⊢ ?
-        [##2: napply iso_nat_nat_union_pre [ napply le_S_S_to_le; nassumption | nassumption]##]
+       nlapply (iso_nat_nat_union_char n s xxx ?)
+        [napply iso_nat_nat_union_pre [ napply le_S_S_to_le; nassumption | nassumption]##]
        *; *; #K1; #K2; #K3;
-       ngeneralize in match
+       nlapply
         (iso_nat_nat_union_uniq n s nindex (fst … (iso_nat_nat_union s xxx n))
-          nindex2 (snd … (iso_nat_nat_union s xxx n)) ?????) in ⊢ ?
-        [ *; #E1; #E2; nrewrite > E1; nrewrite > E2; napply refl
-        | napply le_S_S_to_le; nassumption
+          nindex2 (snd … (iso_nat_nat_union s xxx n)) ?????)
+        [##6: *; #E1; #E2; nrewrite > E1; nrewrite > E2; napply refl
+        |##5: napply le_S_S_to_le; nassumption
         |##*: nassumption]##]
 ##| #x; #x'; nnormalize in ⊢ (? → ? → %); #Hx; #Hx'; #E;
-    ngeneralize in match (? : ∀i1,i2,i1',i2'. i1 ∈ Nat_ (S n) → i1' ∈ Nat_ (S n) → i2 ∈ pc ? (Nat_ (s i1)) → i2' ∈ pc ? (Nat_ (s i1')) → eq_rel (carr A) (eq A) (iso_f ???? (fi i1) i2) (iso_f ???? (fi i1') i2') → i1=i1' ∧ i2=i2') in ⊢ ?
-     [##2: #i1; #i2; #i1'; #i2'; #Hi1; #Hi1'; #Hi2; #Hi2'; #E;
-      ngeneralize in match (disjoint ? P (iso_f ???? f i1) (iso_f ???? f i1') ???) in ⊢ ?
+    ncut(∀i1,i2,i1',i2'. i1 ∈ Nat_ (S n) → i1' ∈ Nat_ (S n) → i2 ∈ Nat_ (s i1) → i2' ∈ Nat_ (s i1') → eq_rel (carr A) (eq A) (fi i1 i2) (fi i1' i2') → i1=i1' ∧ i2=i2');
+    ##[ #i1; #i2; #i1'; #i2'; #Hi1; #Hi1'; #Hi2; #Hi2'; #E;
+       nlapply(disjoint … P (f i1) (f i1') ???)
        [##2,3: napply f_closed; nassumption
-       |##4: napply ex_intro [ napply (iso_f ???? (fi i1) i2) ] napply conj
-         [ napply f_closed; nassumption ##| napply (. ?‡#) [ nassumption | ##2: ##skip]
-         nwhd; napply f_closed; nassumption]##]
-      #E'; ngeneralize in match (? : i1=i1') in ⊢ ?
-       [##2: napply (f_inj … E'); nassumption
-       | #E''; nrewrite < E''; napply conj
-          [ napply refl | nrewrite < E'' in E; #E'''; napply (f_inj … E''')
+       |##1: @ (fi i1 i2); @;
+         ##[ napply f_closed; nassumption ##| alias symbol "refl" = "refl1".
+napply (. E‡#);
+             nwhd; napply f_closed; nassumption]##]
+      #E'; ncut(i1 = i1'); ##[ napply (f_inj … E'); nassumption; ##]
+      #E''; nrewrite < E''; @; 
+      ##[ @;
+      ##| nrewrite < E'' in E; #E'''; napply (f_inj … E''')
              [ nassumption | nrewrite > E''; nassumption ]##]##]
    ##] #K;
     nelim (iso_nat_nat_union_char n s x Hx); *; #i1x; #i2x; #i3x;
     nelim (iso_nat_nat_union_char n s x' Hx'); *; #i1x'; #i2x'; #i3x';
-    ngeneralize in match (K … E) in ⊢ ?
-     [##2,3: napply le_to_le_S_S; nassumption
-     |##4,5: nassumption]
+    nlapply (K … E)  
+     [##1,2: nassumption;
+     ##|##3,4:napply le_to_le_S_S; nassumption; ##]
     *; #K1; #K2;
     napply (eq_rect_CProp0_r ?? (λX.λ_.? = X) ?? i1x');
     napply (eq_rect_CProp0_r ?? (λX.λ_.X = ?) ?? i1x);
@@ -200,7 +197,7 @@ ndefinition partition_of_compatible_equivalence_relation:
   [ napply (quotient ? R)
   | napply Full_set
   | napply mk_unary_morphism1
-     [ #a; napply mk_qpowerclass
+     [ #a; napply mk_ext_powerclass
         [ napply {x | R x a}
         | #x; #x'; #H; nnormalize; napply mk_iff; #K; nelim daemon]
    ##| #a; #a'; #H; napply conj; #x; nnormalize; #K [ nelim daemon | nelim daemon]##]