huge commit regarding universes:

[helm.git] / helm / software / matita / nlibrary / sets / partitions.ma

diff --git a/helm/software/matita/nlibrary/sets/partitions.ma b/helm/software/matita/nlibrary/sets/partitions.ma
index 7affc517f79d26aaa5dfcf06463ecf7881816ed0..61173c78e34215c0081b4d0a3a29f49bbd0db564 100644 (file)
--- a/helm/software/matita/nlibrary/sets/partitions.ma
+++ b/helm/software/matita/nlibrary/sets/partitions.ma
@@ -18,24 +18,21 @@ include "nat/compare.ma".
 include "nat/minus.ma".
 include "datatypes/pairs.ma".
 
-alias symbol "eq" (instance 2) = "leibnitz's equality".
-alias symbol "eq" (instance 1) = "setoid eq".
 alias symbol "eq" = "setoid eq".
+
 alias symbol "eq" = "setoid1 eq".
 alias symbol "eq" = "setoid eq".
-alias symbol "eq" = "setoid1 eq".
 alias symbol "eq" = "setoid eq".
 alias symbol "eq" = "setoid1 eq".
-alias symbol "eq" = "setoid eq".
 nrecord partition (A: setoid) : Type[1] ≝ 
  { support: setoid;
    indexes: qpowerclass support;
    class: unary_morphism1 (setoid1_of_setoid support) (qpowerclass_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 ? ? (λx.class x) = full_set A
- }. napply indexes; nqed.
-
+   disjoint: ∀i,j. i ∈ indexes → j ∈ indexes → class i ≬ class j → i = j;
+   covers: big_union support ? indexes (λx.class x) = full_set A
+ }.
+ 
 naxiom daemon: False.
 
 nlet rec iso_nat_nat_union (s: nat → nat) m index on index : pair nat nat ≝
@@ -153,7 +150,9 @@ nlemma partition_splits_card:
     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: napply (. #‡(†?));##[##2: napply Hni2 |##1: ##skip | nassumption]##]
+     [##2: alias symbol "refl" = "refl".
+alias symbol "prop1" = "prop11".
+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