Skip to content

Commit d91e467

Browse files
committed
Bump mathlib
1 parent e7278b1 commit d91e467

7 files changed

Lines changed: 32 additions & 33 deletions

File tree

PFR/ApproxHomPFR.lean

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Mathlib.Data.FunLike.Fintype
22
import Mathlib.Data.Int.Lemmas
33

4-
import LeanAPAP.Extras.BSG
4+
import APAP.Extras.BSG
55

66
import PFR.HomPFR
77

PFR/ForMathlib/Uniform.lean

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ lemma IsUniform.map_eq_uniformOn [Countable S] [IsProbabilityMeasure μ]
260260
{H : Set S} (h : IsUniform H X μ) (hX : Measurable X) (hH : H.Finite) (h'H : H.Nonempty) :
261261
μ.map X = uniformOn H := by
262262
have : Finite H := hH
263-
have : IsProbabilityMeasure (uniformOn H) := uniformOn_isProbabilityMeasure hH h'H
263+
have : IsProbabilityMeasure (uniformOn H) := isProbabilityMeasure_uniformOn hH h'H
264264
have : IdentDistrib X id μ (uniformOn (H : Set S)) :=
265265
.of_isUniform (H := H) hX measurable_id h isUniform_uniformOn
266266
simpa using this.map_eq

PFR/Mathlib/Probability/UniformOn.lean

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ lemma uniformOn_real_singleton (hs : s.Finite) (ω : Ω) [Decidable (ω ∈ s)]
4747
simp [uniformOn_real hs, Set.ncard_inter_singleton]; split <;> simp
4848

4949
instance uniformOn.instIsProbabilityMeasure [Nonempty s] [Finite s] :
50-
IsProbabilityMeasure (uniformOn s) := uniformOn_isProbabilityMeasure ‹_› .of_subtype
50+
IsProbabilityMeasure (uniformOn s) := isProbabilityMeasure_uniformOn ‹_› .of_subtype
5151

5252
lemma map_uniformOn_apply {f : Ω → Ω'} (hmes : Measurable f) (hf : Injective f) {t : Set Ω'}
5353
(ht : MeasurableSet t) :

PFR/RhoFunctional.lean

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ lemma map_prod_uniformOn_ne_zero {y : G} (hA : A.Nonempty)
3939
obtain ⟨a, ha⟩ : ∃ x, x ∈ A := by exact hA
4040
let ν := uniformOn (A : Set G)
4141
have : IsProbabilityMeasure ν :=
42-
uniformOn_isProbabilityMeasure A.finite_toSet hA
42+
isProbabilityMeasure_uniformOn A.finite_toSet hA
4343
have h_indep : IndepFun Prod.fst Prod.snd (μ.prod ν) := ProbabilityTheory.indepFun_fst_snd
4444
rw [h_indep.map_add_singleton_eq_sum measurable_fst measurable_snd,
4545
Finset.sum_eq_zero_iff_of_nonneg (fun i _ ↦ by simp)] at h
@@ -53,10 +53,10 @@ lemma map_prod_uniformOn_ne_zero {y : G} (hA : A.Nonempty)
5353
lemma nonempty_rhoMinusSet [IsZeroOrProbabilityMeasure μ] (hA : A.Nonempty) :
5454
Set.Nonempty (rhoMinusSet X A μ) := by
5555
rcases eq_zero_or_isProbabilityMeasure μ with hμ | hμ
56-
· refine ⟨0, ⟨uniformOn (A : Set G), uniformOn_isProbabilityMeasure A.finite_toSet hA,
56+
· refine ⟨0, ⟨uniformOn (A : Set G), isProbabilityMeasure_uniformOn A.finite_toSet hA,
5757
by simp [hμ], by simp [hμ, KLDiv]⟩⟩
5858
set μ' := uniformOn (univ : Set G) with hμ'
59-
have : IsProbabilityMeasure μ' := uniformOn_isProbabilityMeasure finite_univ univ_nonempty
59+
have : IsProbabilityMeasure μ' := isProbabilityMeasure_uniformOn finite_univ univ_nonempty
6060
refine ⟨_, ⟨μ', this, fun y hy ↦ (map_prod_uniformOn_ne_zero hA ?_ hy).elim, rfl⟩⟩
6161
intro x
6262
simp [hμ', uniformOn_apply_singleton_of_mem (mem_univ _) finite_univ]
@@ -110,7 +110,7 @@ lemma rhoMinus_le [IsZeroOrProbabilityMeasure μ]
110110
cases nonempty_fintype G
111111
have : IsProbabilityMeasure (μ'.map T) := isProbabilityMeasure_map hT.aemeasurable
112112
have : IsProbabilityMeasure (uniformOn (A : Set G)) :=
113-
uniformOn_isProbabilityMeasure A.finite_toSet hA
113+
isProbabilityMeasure_uniformOn A.finite_toSet hA
114114
have E : μ'.map U = uniformOn (A : Set G) := hunif.map_eq_uniformOn hU A.finite_toSet hA
115115
have M : (Measure.map (Prod.fst + Prod.snd) ((μ'.map T).prod (uniformOn ↑A))) =
116116
(Measure.map (T + U) μ') := by
@@ -133,7 +133,7 @@ lemma rhoMinus_nonneg [IsZeroOrProbabilityMeasure μ]
133133
lemma rhoMinus_zero_measure (hP : μ = 0)
134134
{X : Ω → G} {A : Finset G} : ρ⁻[X ; μ # A] = 0 := by
135135
have : ∃ (μ' : Measure G), IsProbabilityMeasure μ' :=
136-
⟨uniformOn Set.univ, uniformOn_isProbabilityMeasure finite_univ univ_nonempty⟩
136+
⟨uniformOn Set.univ, isProbabilityMeasure_uniformOn finite_univ univ_nonempty⟩
137137
simp [rhoMinus, rhoMinusSet, hP, this, KLDiv]
138138

139139
private lemma rhoMinus_continuous_aux1 (hX : Measurable X) (hA : A.Nonempty)
@@ -147,7 +147,7 @@ private lemma rhoMinus_continuous_aux1 (hX : Measurable X) (hA : A.Nonempty)
147147
obtain ⟨u, -, u_mem, hu⟩ := exists_seq_strictAnti_tendsto' (x := (0 : ℝ≥0∞)) zero_lt_one
148148
let ν : ℕ → Measure G := fun n ↦ (1 - u n) • μ₀ + u n • uniformOn univ
149149
have : IsProbabilityMeasure (uniformOn (univ : Set G)) :=
150-
uniformOn_isProbabilityMeasure finite_univ univ_nonempty
150+
isProbabilityMeasure_uniformOn finite_univ univ_nonempty
151151
have P n : IsProbabilityMeasure (ν n) := by
152152
simp only [isProbabilityMeasure_iff, coe_add, coe_smul, Pi.add_apply, Pi.smul_apply,
153153
measure_univ, smul_eq_mul, mul_one, ν]
@@ -167,7 +167,7 @@ private lemma rhoMinus_continuous_aux1 (hX : Measurable X) (hA : A.Nonempty)
167167
· apply ENNReal.Tendsto.mul_const _ (by simp)
168168
exact ENNReal.Tendsto.sub tendsto_const_nhds hu (by simp)
169169
· exact ENNReal.Tendsto.mul_const hu (by simp)
170-
let PA : ProbabilityMeasure G := ⟨uniformOn A, uniformOn_isProbabilityMeasure (A.finite_toSet) hA⟩
170+
let PA : ProbabilityMeasure G := ⟨uniformOn A, isProbabilityMeasure_uniformOn (A.finite_toSet) hA⟩
171171
have : Tendsto (fun n ↦ (νP n).prod PA) atTop (𝓝 (μ₀P.prod PA)) :=
172172
(ProbabilityMeasure.continuous_prod.tendsto (μ₀P, PA)).comp (f := fun n ↦ (νP n, PA)) <|
173173
L.prodMk_nhds tendsto_const_nhds
@@ -461,7 +461,7 @@ private lemma le_rhoMinus_of_subgroup [IsProbabilityMeasure μ] {H : AddSubgroup
461461
let _ : MeasureSpace (G × G) := ⟨μ'.prod (uniformOn (A : Set G))⟩
462462
have hprod : (ℙ : Measure (G × G)) = μ'.prod (uniformOn (A : Set G)) := rfl
463463
have : IsProbabilityMeasure (uniformOn (A : Set G)) :=
464-
uniformOn_isProbabilityMeasure A.finite_toSet hA
464+
isProbabilityMeasure_uniformOn A.finite_toSet hA
465465
have : IsProbabilityMeasure (Measure.map T ℙ) := by rw [hprod, Measure.map_fst_prod]; simp [hμ']
466466
have h_indep : IndepFun T UA := ProbabilityTheory.indepFun_fst_snd
467467
have hUA_unif : IsUniform A UA := by
@@ -560,7 +560,7 @@ private lemma rhoMinus_le_of_subgroup [IsProbabilityMeasure μ] {H : AddSubgroup
560560
rw [measureReal_def, μ'_sing]
561561
rfl
562562
have : IsProbabilityMeasure (uniformOn (A : Set G)) :=
563-
uniformOn_isProbabilityMeasure A.finite_toSet hA
563+
isProbabilityMeasure_uniformOn A.finite_toSet hA
564564
have : IsProbabilityMeasure μ' :=
565565
isProbabilityMeasure_map (Measurable.aemeasurable (by fun_prop))
566566
have h_indep : IndepFun Prod.fst Prod.snd (μ'.prod (uniformOn (A : Set G))) := indepFun_fst_snd
@@ -763,7 +763,7 @@ lemma rhoMinus_of_sum [IsZeroOrProbabilityMeasure μ]
763763
· simp [rhoMinus_zero_measure hμ]
764764
apply le_csInf (nonempty_rhoMinusSet hA)
765765
have : IsProbabilityMeasure (uniformOn (A : Set G)) :=
766-
uniformOn_isProbabilityMeasure A.finite_toSet hA
766+
isProbabilityMeasure_uniformOn A.finite_toSet hA
767767
rintro - ⟨μ', μ'_prob, habs, rfl⟩
768768
obtain ⟨Ω', hΩ', m, X', Y', T, U, hm, h_indep', hX', hY', hT, hU, hXX', hYY', hTμ, hU_unif⟩ :=
769769
independent_copies4_nondep (X₁ := X) (X₂ := Y) (X₃ := id) (X₄ := id) hX hY measurable_id
@@ -931,7 +931,7 @@ lemma condRhoMinus_le [IsZeroOrProbabilityMeasure μ] {S : Type*} [MeasurableSpa
931931
ρ⁻[X | Z ; μ # A] ≤ ρ⁻[X ; μ # A] + H[X ; μ] - H[X | Z ; μ] := by
932932
cases nonempty_fintype S
933933
have : IsProbabilityMeasure (uniformOn (A : Set G)) := by
934-
apply uniformOn_isProbabilityMeasure A.finite_toSet hA
934+
apply isProbabilityMeasure_uniformOn A.finite_toSet hA
935935
suffices ρ⁻[X | Z ; μ # A] - H[X ; μ] + H[X | Z ; μ] ≤ ρ⁻[X ; μ # A] by linarith
936936
apply le_csInf (nonempty_rhoMinusSet hA)
937937
rintro - ⟨μ', hμ', habs, rfl⟩

lake-manifest.json

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,31 +11,31 @@
1111
"inputRev": null,
1212
"inherited": false,
1313
"configFile": "lakefile.lean"},
14-
{"url": "https://github.com/YaelDillies/LeanAPAP.git",
14+
{"url": "https://github.com/YaelDillies/apap.git",
1515
"type": "git",
1616
"subDir": null,
1717
"scope": "",
18-
"rev": "96167d24d9724269561f5f1ed7d29d779157e4da",
19-
"name": "LeanAPAP",
18+
"rev": "13fd6dd3a47445b6dd10826f0ffc1116f4e13144",
19+
"name": "APAP",
2020
"manifestFile": "lake-manifest.json",
21-
"inputRev": "v4.27.0",
21+
"inputRev": null,
2222
"inherited": false,
2323
"configFile": "lakefile.toml"},
2424
{"url": "https://github.com/leanprover-community/mathlib4.git",
2525
"type": "git",
2626
"subDir": null,
2727
"scope": "",
28-
"rev": "a3a10db0e9d66acbebf76c5e6a135066525ac900",
28+
"rev": "507f18fc9044549fc730d8d0270521e3b090360a",
2929
"name": "mathlib",
3030
"manifestFile": "lake-manifest.json",
31-
"inputRev": "v4.27.0",
31+
"inputRev": null,
3232
"inherited": true,
3333
"configFile": "lakefile.lean"},
3434
{"url": "https://github.com/leanprover-community/plausible",
3535
"type": "git",
3636
"subDir": null,
3737
"scope": "leanprover-community",
38-
"rev": "009dc1e6f2feb2c96c081537d80a0905b2c6498f",
38+
"rev": "7311586e1a56af887b1081d05e80c11b6c41d212",
3939
"name": "plausible",
4040
"manifestFile": "lake-manifest.json",
4141
"inputRev": "main",
@@ -55,7 +55,7 @@
5555
"type": "git",
5656
"subDir": null,
5757
"scope": "leanprover-community",
58-
"rev": "8f497d55985a189cea8020d9dc51260af1e41ad2",
58+
"rev": "b5908dbac486279f1133cb937648c63c30b455af",
5959
"name": "importGraph",
6060
"manifestFile": "lake-manifest.json",
6161
"inputRev": "main",
@@ -65,17 +65,17 @@
6565
"type": "git",
6666
"subDir": null,
6767
"scope": "leanprover-community",
68-
"rev": "c04225ee7c0585effbd933662b3151f01b600e40",
68+
"rev": "6d65c6e0a25b8a52c13c3adeb63ecde3bfbb6294",
6969
"name": "proofwidgets",
7070
"manifestFile": "lake-manifest.json",
71-
"inputRev": "v0.0.85",
71+
"inputRev": "v0.0.86",
7272
"inherited": true,
7373
"configFile": "lakefile.lean"},
7474
{"url": "https://github.com/leanprover-community/aesop",
7575
"type": "git",
7676
"subDir": null,
7777
"scope": "leanprover-community",
78-
"rev": "cb837cc26236ada03c81837bebe0acd9c70ced7d",
78+
"rev": "f08e838d4f9aea519f3cde06260cfb686fd4bab0",
7979
"name": "aesop",
8080
"manifestFile": "lake-manifest.json",
8181
"inputRev": "master",
@@ -85,7 +85,7 @@
8585
"type": "git",
8686
"subDir": null,
8787
"scope": "leanprover-community",
88-
"rev": "bd58c9efe2086d56ca361807014141a860ddbf8c",
88+
"rev": "23324752757bf28124a518ec284044c8db79fee5",
8989
"name": "Qq",
9090
"manifestFile": "lake-manifest.json",
9191
"inputRev": "master",
@@ -95,7 +95,7 @@
9595
"type": "git",
9696
"subDir": null,
9797
"scope": "leanprover-community",
98-
"rev": "b25b36a7caf8e237e7d1e6121543078a06777c8a",
98+
"rev": "0100f1a3222df01286db33fcb6a1f98564f5439d",
9999
"name": "batteries",
100100
"manifestFile": "lake-manifest.json",
101101
"inputRev": "main",
@@ -105,10 +105,10 @@
105105
"type": "git",
106106
"subDir": null,
107107
"scope": "leanprover",
108-
"rev": "55c37290ff6186e2e965d68cf853a57c0702db82",
108+
"rev": "28e0856d4424863a85b18f38868c5420c55f9bae",
109109
"name": "Cli",
110110
"manifestFile": "lake-manifest.json",
111-
"inputRev": "v4.27.0",
111+
"inputRev": "v4.28.0-rc1",
112112
"inherited": true,
113113
"configFile": "lakefile.toml"}],
114114
"name": "PFR",

lakefile.toml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,8 @@ weak.linter.mathlibStandardSet = true
1414
warn.sorry = false
1515

1616
[[require]]
17-
name = "LeanAPAP"
18-
git = "https://github.com/YaelDillies/LeanAPAP.git"
19-
rev = "v4.27.0"
17+
name = "APAP"
18+
git = "https://github.com/YaelDillies/apap.git"
2019

2120
[[require]]
2221
name = "checkdecls"

lean-toolchain

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
leanprover/lean4:v4.27.0
1+
leanprover/lean4:v4.28.0-rc1

0 commit comments

Comments
 (0)