Skip to content

Commit f7cb251

Browse files
committed
set (set _) -> set_system
1 parent 52e4bdb commit f7cb251

24 files changed

Lines changed: 110 additions & 113 deletions

classical/classical_sets.v

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1699,7 +1699,7 @@ Qed.
16991699
End rectangle.
17001700

17011701
Definition preimage_set_system {aT rT : Type} (D : set aT) (f : aT -> rT)
1702-
(G : set_system rT) : set (set aT) :=
1702+
(G : set_system rT) : set_system aT :=
17031703
[set D `&` f @^-1` B | B in G].
17041704

17051705
Lemma preimage_set_system0 {aT rT : Type} (D : set aT) (f : aT -> rT) :
@@ -1720,7 +1720,7 @@ apply/seteqP; split=> [_ [B FB] <-|_ [_ [C FC <-] <-]].
17201720
by exists C => //; rewrite setTI comp_preimage.
17211721
Qed.
17221722

1723-
Lemma preimage_set_system_id {aT : Type} (D : set aT) (F : set (set aT)) :
1723+
Lemma preimage_set_system_id {aT : Type} (D : set aT) (F : set_system aT) :
17241724
preimage_set_system D idfun F = setI D @` F.
17251725
Proof. by []. Qed.
17261726

@@ -1730,7 +1730,7 @@ Lemma preimage_set_systemS {T1 T2} (A B : set_system T2) (f : T1 -> T2) :
17301730
Proof. by move=> AB _ [C ? <-]; exists C => //; exact: AB. Qed.
17311731

17321732
Definition image_set_system (aT rT : Type) (D : set aT) (f : aT -> rT)
1733-
(G : set (set aT)) : set (set rT) :=
1733+
(G : set_system aT) : set_system rT :=
17341734
[set B : set rT | G (D `&` f @^-1` B)].
17351735

17361736
Section cross.
@@ -1746,15 +1746,15 @@ End cross.
17461746
Definition cross12 {T1 T2 : Type} := @cross (T1 * T2)%type T1 T2 fst snd.
17471747
Notation "A `x` B" := (cross12 A B) : classical_set_scope.
17481748

1749-
Lemma subKimage {T T'} {P : set (set T')} (f : T -> T') (g : T' -> T) :
1749+
Lemma subKimage {T T'} {P : set_system T'} (f : T -> T') (g : T' -> T) :
17501750
cancel f g -> [set A | P (f @` A)] `<=` [set g @` A | A in P].
17511751
Proof. by move=> ? A; exists (f @` A); rewrite ?image_comp ?eq_image_id/=. Qed.
17521752

1753-
Lemma subimageK T T' (P : set (set T')) (f : T -> T') (g : T' -> T) :
1753+
Lemma subimageK T T' (P : set_system T') (f : T -> T') (g : T' -> T) :
17541754
cancel g f -> [set g @` A | A in P] `<=` [set A | P (f @` A)].
17551755
Proof. by move=> gK _ [B /= ? <-]; rewrite image_comp eq_image_id/=. Qed.
17561756

1757-
Lemma eq_imageK {T T'} {P : set (set T')} (f : T -> T') (g : T' -> T) :
1757+
Lemma eq_imageK {T T'} {P : set_system T'} (f : T -> T') (g : T' -> T) :
17581758
cancel f g -> cancel g f ->
17591759
[set g @` A | A in P] = [set A | P (f @` A)].
17601760
Proof.
@@ -3009,10 +3009,10 @@ Qed.
30093009
End Zorn.
30103010

30113011
Section Zorn_subset.
3012-
Variables (T : Type) (P : set (set T)).
3012+
Variables (T : Type) (P : set_system T).
30133013

30143014
Lemma Zorn_bigcup :
3015-
(forall F : set (set T), F `<=` P -> total_on F subset ->
3015+
(forall F : set_system T, F `<=` P -> total_on F subset ->
30163016
P (\bigcup_(X in F) X)) ->
30173017
exists A, P A /\ forall B, A `<` B -> ~ P B.
30183018
Proof.
@@ -3049,7 +3049,7 @@ Variables (B : I -> set T) (D : set I).
30493049

30503050
Let P := fun X => X `<=` D /\ trivIset X B.
30513051

3052-
Let maxP (A : set (set I)) :
3052+
Let maxP (A : set_system I) :
30533053
A `<=` P -> total_on A (fun x y => x `<=` y) -> P (\bigcup_(x in A) x).
30543054
Proof.
30553055
move=> AP h; split; first by apply: bigcup_sub => E /AP [].
@@ -3223,30 +3223,28 @@ rewrite -Order.TotalTheory.ltNge => kn.
32233223
by rewrite (Order.POrderTheory.le_trans _ (Am _ Ak)).
32243224
Qed.
32253225

3226-
Definition meets T (F G : set (set T)) :=
3226+
Definition meets T (F G : set_system T) :=
32273227
forall A B, F A -> G B -> A `&` B !=set0.
32283228

32293229
Notation "F `#` G" := (meets F G) : classical_set_scope.
32303230

32313231
Section meets.
32323232

3233-
Lemma meetsC T (F G : set (set T)) : F `#` G = G `#` F.
3233+
Lemma meetsC T (F G : set_system T) : F `#` G = G `#` F.
32343234
Proof.
32353235
gen have sFG : F G / F `#` G -> G `#` F.
32363236
by move=> FG B A => /FG; rewrite setIC; apply.
32373237
by rewrite propeqE; split; apply: sFG.
32383238
Qed.
32393239

3240-
Lemma sub_meets T (F F' G G' : set (set T)) :
3240+
Lemma sub_meets T (F F' G G' : set_system T) :
32413241
F `<=` F' -> G `<=` G' -> F' `#` G' -> F `#` G.
32423242
Proof. by move=> sF sG FG A B /sF FA /sG GB; apply: (FG A B). Qed.
32433243

3244-
Lemma meetsSr T (F G G' : set (set T)) :
3245-
G `<=` G' -> F `#` G' -> F `#` G.
3244+
Lemma meetsSr T (F G G' : set_system T) : G `<=` G' -> F `#` G' -> F `#` G.
32463245
Proof. exact: sub_meets. Qed.
32473246

3248-
Lemma meetsSl T (G F F' : set (set T)) :
3249-
F `<=` F' -> F' `#` G -> F `#` G.
3247+
Lemma meetsSl T (G F F' : set_system T) : F `<=` F' -> F' `#` G -> F `#` G.
32503248
Proof. by move=> /sub_meets; apply. Qed.
32513249

32523250
End meets.

classical/filter.v

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1211,7 +1211,7 @@ Canonical within_filter_on T D (F : filter_on T) :=
12111211
FilterType (within D F) (within_filter _ _).
12121212

12131213
Lemma filter_bigI_within T (I : choiceType) (D : {fset I}) (f : I -> set T)
1214-
(F : set (set T)) (P : set T) :
1214+
(F : set_system T) (P : set T) :
12151215
Filter F -> (forall i, i \in D -> F [set j | P j -> f i j]) ->
12161216
F ([set j | P j -> (\bigcap_(i in [set` D]) f i) j]).
12171217
Proof. move=> FF FfD; exact: (@filter_bigI T I D f _ (within_filter P FF)). Qed.
@@ -1479,7 +1479,7 @@ End UltraFilters.
14791479

14801480
Section filter_supremums.
14811481

1482-
Global Instance smallest_filter_filter {T : Type} (F : set (set T)) :
1482+
Global Instance smallest_filter_filter {T : Type} (F : set_system T) :
14831483
Filter (smallest Filter F).
14841484
Proof.
14851485
split.
@@ -1488,21 +1488,21 @@ split.
14881488
- by move=> ? ? /filterS + sFP ? [? ?]; apply; exact: sFP.
14891489
Qed.
14901490

1491-
Fixpoint filterI_iter {T : Type} (F : set (set T)) (n : nat) :=
1491+
Fixpoint filterI_iter {T : Type} (F : set_system T) (n : nat) :=
14921492
if n is m.+1
14931493
then [set P `&` Q |
14941494
P in filterI_iter F m & Q in filterI_iter F m]
14951495
else setT |` F.
14961496

1497-
Lemma filterI_iter_sub {T : Type} (F : set (set T)) :
1497+
Lemma filterI_iter_sub {T : Type} (F : set_system T) :
14981498
{homo filterI_iter F : i j / (i <= j)%N >-> i `<=` j}.
14991499
Proof.
15001500
move=> + j; elim: j; first by move=> i; rewrite leqn0 => /eqP ->.
15011501
move=> j IH i; rewrite leq_eqVlt => /predU1P[->//|].
15021502
by move=> /IH/subset_trans; apply=> A ?; do 2 exists A => //; rewrite setIid.
15031503
Qed.
15041504

1505-
Lemma filterI_iterE {T : Type} (F : set (set T)) :
1505+
Lemma filterI_iterE {T : Type} (F : set_system T) :
15061506
smallest Filter F = filter_from (\bigcup_n (filterI_iter F n)) id.
15071507
Proof.
15081508
rewrite eqEsubset; split.

theories/cantor.v

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@ Context (t0 t1 : T).
397397
Hypothesis T2e : t0 != t1.
398398

399399
Let ent_balls' (E : set (T * T)) :
400-
exists M : set (set T), entourage E -> [/\
400+
exists M : set_system T, entourage E -> [/\
401401
finite_set M,
402402
forall A, M A -> exists a, A a /\
403403
A `<=` closure (xsection (split_ent E) a),

theories/derive.v

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,22 +69,22 @@ Reserved Notation "f ^` ( n )" (format "f ^` ( n )").
6969
Section Differential.
7070
Context {K : numDomainType} {V W : normedModType K}.
7171

72-
Definition diff (F : filter_on V) (_ : phantom (set (set V)) F) (f : V -> W) :=
72+
Definition diff (F : filter_on V) (_ : phantom (set_system V) F) (f : V -> W) :=
7373
(get (fun (df : {linear V -> W}) => continuous df /\ forall x,
7474
f x = f (lim F) + df (x - lim F) +o_(x \near F) (x - lim F))).
7575

7676
Local Notation "''d' f x" := (@diff _ (Phantom _ (nbhs x)) f).
7777

7878
Fact diff_key : forall T, T -> unit. Proof. by constructor. Qed.
7979
Variant differentiable_def (f : V -> W) (x : filter_on V)
80-
(phF : phantom (set (set V)) x) : Prop := DifferentiableDef of
80+
(phF : phantom (set_system V) x) : Prop := DifferentiableDef of
8181
(continuous ('d f x) /\
8282
f = cst (f (lim x)) + 'd f x \o center (lim x) +o_x (center (lim x))).
8383

8484
Local Notation differentiable f F :=
8585
(@differentiable_def f _ (Phantom _ (nbhs F))).
8686

87-
Class is_diff_def (x : filter_on V) (Fph : phantom (set (set V)) x) (f : V -> W)
87+
Class is_diff_def (x : filter_on V) (Fph : phantom (set_system V) x) (f : V -> W)
8888
(df : V -> W) := DiffDef {
8989
ex_diff : differentiable f x ;
9090
diff_val : 'd f x = df :> (V -> W)

theories/esum.v

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ Section set_of_fset_in_a_set.
4141
Variable (T : choiceType).
4242
Implicit Type S : set T.
4343

44-
Definition fsets S : set (set T) := [set F | finite_set F /\ F `<=` S].
44+
Definition fsets S : set_system T := [set F | finite_set F /\ F `<=` S].
4545

4646
Lemma fsets_set0 S : fsets S set0. Proof. by split. Qed.
4747

theories/kernel.v

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -930,7 +930,7 @@ Lemma measurable_fun_mnormalize d d' (X : measurableType d)
930930
(Y : pmeasurableType d') (R : realType) (k : R.-ker X ~> Y) :
931931
measurable_fun [set: X] (fun x => mnormalize (k x) point : pprobability Y R).
932932
Proof.
933-
apply: (measurability (@pset _ _ _ : set (set (pprobability Y R)))) => //.
933+
apply: (measurability (@pset _ _ _ : set_system (pprobability Y R))) => //.
934934
move=> _ -[_ [r r01] [Ys mYs <-]] <-.
935935
rewrite /mnormalize /mset /preimage/=.
936936
apply: emeasurable_fun_infty_o => //.

theories/landau.v

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ Lemma littleoE (tag : unit) (F : filter_on T)
392392
Proof. by move=> /asboolP?; rewrite /the_littleo /insubd insubT. Qed.
393393

394394
Lemma littleoE0 (tag : unit) (F : filter_on T)
395-
(phF : phantom (set (set T)) F) f h :
395+
(phF : phantom (set_system T) F) f h :
396396
~ littleo_def F f h -> the_littleo tag F phF f h = 0.
397397
Proof. by move=> ?; rewrite /the_littleo /insubd insubN//; apply/asboolP. Qed.
398398

theories/lebesgue_integral_theory/lebesgue_integral_fubini.v

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ have UFGT : \bigcup_k (F k `*` G k) = setT.
391391
move=> [/= [n _ Fnx] [k _ Gky]]; exists (maxn n k) => //; split.
392392
- by move: x Fnx; exact/subsetPset/ndF/leq_maxl.
393393
- by move: y Gky; exact/subsetPset/ndG/leq_maxr.
394-
pose C : set (set (T1 * T2)) :=
394+
pose C : set_system (T1 * T2) :=
395395
[set C | exists A, measurable A /\ exists B, measurable B /\ C = A `*` B].
396396
have CI : setI_closed C.
397397
move=> /= _ _ [X1 [mX1 [X2 [mX2 ->]]]] [Y1 [mY1 [Y2 [mY2 ->]]]].

theories/lebesgue_stieltjes_measure.v

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ HB.instance Definition _ :=
177177
End itv_semiRingOfSets.
178178

179179
Notation "R .-ocitv" := (ocitv_display R) : measure_display_scope.
180-
Notation "R .-ocitv.-measurable" := (measurable : set (set (ocitv_type R))) :
180+
Notation "R .-ocitv.-measurable" := (measurable : set_system (ocitv_type R)) :
181181
classical_set_scope.
182182

183183
Local Open Scope measure_display_scope.
@@ -519,9 +519,8 @@ Definition measurableTypeR (R : realType) :=
519519
Section lebesgue_stieltjes_measure.
520520
Context {R : realType}.
521521

522-
Definition lebesgue_display : measure_display :=
523-
(R.-ocitv.-measurable).-sigma.
524-
Definition measurableR : set (set R) :=
522+
Definition lebesgue_display : measure_display := (R.-ocitv.-measurable).-sigma.
523+
Definition measurableR : set_system R :=
525524
(R.-ocitv.-measurable).-sigma.-measurable.
526525

527526
HB.instance Definition _ : Measurable lebesgue_display (measurableTypeR R) :=

theories/measurable_realfun.v

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,10 @@ Qed.
9393
End ps_infty.
9494

9595
Section salgebra_ereal.
96-
Variables (R : realType) (G : set (set R)).
97-
Let measurableR : set (set R) := G.-sigma.-measurable.
96+
Variables (R : realType) (G : set_system R).
97+
Let measurableR : set_system R := G.-sigma.-measurable.
9898

99-
Definition emeasurable : set (set \bar R) :=
99+
Definition emeasurable : set_system (\bar R) :=
100100
[set EFin @` A `|` B | A in measurableR & B in ps_infty].
101101

102102
Lemma emeasurable0 : emeasurable set0.
@@ -418,7 +418,7 @@ Section rgencinfty.
418418
Variable R : realType.
419419
Implicit Types x y z : R.
420420

421-
Definition G : set (set R) := [set A | exists x, A = `[x, +oo[%classic].
421+
Definition G : set_system R := [set A | exists x, A = `[x, +oo[%classic].
422422

423423
Lemma measurable_itv_bnd_infty b x :
424424
G.-sigma.-measurable [set` Interval (BSide b x) +oo%O].
@@ -1184,7 +1184,7 @@ Module NGenCInfty.
11841184
Section ngencinfty.
11851185
Implicit Types x y z : nat.
11861186

1187-
Definition G : set (set nat) := [set A | exists x, A = `[x, +oo[%classic].
1187+
Definition G : set_system nat := [set A | exists x, A = `[x, +oo[%classic].
11881188

11891189
Lemma measurable_itv_bnd_infty b x :
11901190
G.-sigma.-measurable [set` Interval (BSide b x) +oo%O].

0 commit comments

Comments
 (0)