Skip to content

Commit d61a3f9

Browse files
committed
Merge branch 'master' into fae_MilmanPettis
2 parents 804bcc4 + 165834c commit d61a3f9

396 files changed

Lines changed: 4103 additions & 2757 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/PR_summary.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ jobs:
8686
git diff --name-only --diff-filter D origin/${{ github.base_ref }}... | tee removed_files.txt
8787
echo "Checking for renamed files..."
8888
89-
# Shows the `R`enamed files, in human readable format
89+
# Shows the `R`enamed files, in human-readable format
9090
# The `awk` pipe
9191
# * extracts into an array the old name as the key and the new name as the value
9292
# * eventually prints "`oldName` was renamed to `newName`" for each key-value pair.

Archive/Imo/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ These are part of mathlib for three purposes:
1111
and an opportunity to teach new contributors how to write Lean code.
1212

1313
That said, IMO problems also come at a cost:
14-
* reviewing pull requests by first time contributors can be very time-consuming
14+
* reviewing pull requests by first-time contributors can be very time-consuming
1515
* less significantly, there is a certain amount of maintenance work
1616
ensuring they keep up with mathlib.
1717

@@ -24,7 +24,7 @@ Thus we'd like authors of IMO pull requests to keep in mind the following points
2424
carefully, and try to follow it very closely.
2525
* Please document your solution thoroughly.
2626
Remember everything in `/Archive/` should be an exemplar of good mathlib style.
27-
There must be a clear human readable account of the solution at the top of the file
27+
There must be a clear human-readable account of the solution at the top of the file
2828
(ideally something that would score 7!) but don't stop there.
2929
Please write doc-strings on most of your lemmas, explaining what they are doing and why,
3030
and in any non-trivial proof include single line comments explaining the significant steps.
@@ -41,7 +41,7 @@ Thus we'd like authors of IMO pull requests to keep in mind the following points
4141
and include it in the appropriate part of mathlib (i.e. not under `/Archive/`).
4242
(We're much more interested if you find ways that mathlib could be improved to
4343
make solving your IMO problem easier, than we are in having another solution.)
44-
* Although this may be hard for first time contributors,
44+
* Although this may be hard for first-time contributors,
4545
if you can identify a new tactic that would make your proof work more naturally,
4646
either ask for help on Zulip getting it implemented,
4747
or start reading about [metaprogramming](https://leanprover-community.github.io/learn.html#metaprogramming-and-tactic-writing)

Archive/Wiedijk100Theorems/CubingACube.lean

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ theorem smallest_onBoundary {j} (bi : OnBoundary (mi_mem_bcubes : mi h v ∈ _)
355355
have hs : s.Nonempty := by
356356
rcases (nontrivial_bcubes h v).exists_ne i with ⟨i', hi', h2i'⟩
357357
exact ⟨i', hi', h2i'⟩
358-
rcases Set.exists_min_image s (w cs) (Set.toFinite _) hs with ⟨i', ⟨hi', h2i'⟩, h3i'⟩
358+
rcases Set.exists_min_image s (w <| cs ·) (Set.toFinite _) hs with ⟨i', ⟨hi', h2i'⟩, h3i'⟩
359359
rw [mem_singleton_iff] at h2i'
360360
let x := c.b j.succ + c.w - (cs i').w
361361
have hx : x < (cs i).b j.succ := by
@@ -368,8 +368,7 @@ theorem smallest_onBoundary {j} (bi : OnBoundary (mi_mem_bcubes : mi h v ∈ _)
368368
· simp only [side, not_and_or, not_lt, not_le, mem_Ico]; left; exact hx
369369
intro i'' hi'' h2i'' h3i''; constructor; swap; · apply lt_trans hx h3i''.2
370370
rw [le_sub_iff_add_le]
371-
refine le_trans ?_ (t_le_t hi'' j); gcongr; apply h3i' i'' ⟨hi'', _⟩
372-
simp [i, h2i'']
371+
grw [← t_le_t hi'', h3i' i'' ⟨hi'', h2i''⟩]
373372

374373
variable (h v)
375374

Mathlib.lean

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -448,6 +448,7 @@ import Mathlib.Algebra.Group.Units.Hom
448448
import Mathlib.Algebra.Group.Units.Opposite
449449
import Mathlib.Algebra.Group.WithOne.Basic
450450
import Mathlib.Algebra.Group.WithOne.Defs
451+
import Mathlib.Algebra.Group.WithOne.Map
451452
import Mathlib.Algebra.GroupWithZero.Action.Basic
452453
import Mathlib.Algebra.GroupWithZero.Action.Center
453454
import Mathlib.Algebra.GroupWithZero.Action.ConjAct
@@ -847,6 +848,7 @@ import Mathlib.Algebra.Order.Group.Multiset
847848
import Mathlib.Algebra.Order.Group.Nat
848849
import Mathlib.Algebra.Order.Group.Opposite
849850
import Mathlib.Algebra.Order.Group.OrderIso
851+
import Mathlib.Algebra.Order.Group.PartialSups
850852
import Mathlib.Algebra.Order.Group.PiLex
851853
import Mathlib.Algebra.Order.Group.Pointwise.Bounds
852854
import Mathlib.Algebra.Order.Group.Pointwise.CompleteLattice
@@ -1018,6 +1020,7 @@ import Mathlib.Algebra.Polynomial.Expand
10181020
import Mathlib.Algebra.Polynomial.FieldDivision
10191021
import Mathlib.Algebra.Polynomial.GroupRingAction
10201022
import Mathlib.Algebra.Polynomial.HasseDeriv
1023+
import Mathlib.Algebra.Polynomial.Homogenize
10211024
import Mathlib.Algebra.Polynomial.Identities
10221025
import Mathlib.Algebra.Polynomial.Inductions
10231026
import Mathlib.Algebra.Polynomial.Laurent
@@ -1521,10 +1524,13 @@ import Mathlib.Analysis.Complex.Angle
15211524
import Mathlib.Analysis.Complex.Arg
15221525
import Mathlib.Analysis.Complex.Asymptotics
15231526
import Mathlib.Analysis.Complex.Basic
1527+
import Mathlib.Analysis.Complex.Cardinality
15241528
import Mathlib.Analysis.Complex.CauchyIntegral
15251529
import Mathlib.Analysis.Complex.Circle
15261530
import Mathlib.Analysis.Complex.Conformal
15271531
import Mathlib.Analysis.Complex.Convex
1532+
import Mathlib.Analysis.Complex.Exponential
1533+
import Mathlib.Analysis.Complex.ExponentialBounds
15281534
import Mathlib.Analysis.Complex.Hadamard
15291535
import Mathlib.Analysis.Complex.HalfPlane
15301536
import Mathlib.Analysis.Complex.IntegerCompl
@@ -1533,8 +1539,10 @@ import Mathlib.Analysis.Complex.Isometry
15331539
import Mathlib.Analysis.Complex.Liouville
15341540
import Mathlib.Analysis.Complex.LocallyUniformLimit
15351541
import Mathlib.Analysis.Complex.MeanValue
1542+
import Mathlib.Analysis.Complex.Norm
15361543
import Mathlib.Analysis.Complex.OpenMapping
15371544
import Mathlib.Analysis.Complex.OperatorNorm
1545+
import Mathlib.Analysis.Complex.Order
15381546
import Mathlib.Analysis.Complex.Periodic
15391547
import Mathlib.Analysis.Complex.PhragmenLindelof
15401548
import Mathlib.Analysis.Complex.Polynomial.Basic
@@ -1546,6 +1554,7 @@ import Mathlib.Analysis.Complex.RemovableSingularity
15461554
import Mathlib.Analysis.Complex.Schwarz
15471555
import Mathlib.Analysis.Complex.TaylorSeries
15481556
import Mathlib.Analysis.Complex.Tietze
1557+
import Mathlib.Analysis.Complex.Trigonometric
15491558
import Mathlib.Analysis.Complex.UnitDisc.Basic
15501559
import Mathlib.Analysis.Complex.UpperHalfPlane.Basic
15511560
import Mathlib.Analysis.Complex.UpperHalfPlane.Exp
@@ -1575,6 +1584,7 @@ import Mathlib.Analysis.Convex.Cone.InnerDual
15751584
import Mathlib.Analysis.Convex.Continuous
15761585
import Mathlib.Analysis.Convex.Contractible
15771586
import Mathlib.Analysis.Convex.Deriv
1587+
import Mathlib.Analysis.Convex.DoublyStochasticMatrix
15781588
import Mathlib.Analysis.Convex.EGauge
15791589
import Mathlib.Analysis.Convex.Exposed
15801590
import Mathlib.Analysis.Convex.Extrema
@@ -1849,6 +1859,12 @@ import Mathlib.Analysis.RCLike.BoundedContinuous
18491859
import Mathlib.Analysis.RCLike.Inner
18501860
import Mathlib.Analysis.RCLike.Lemmas
18511861
import Mathlib.Analysis.RCLike.TangentCone
1862+
import Mathlib.Analysis.Real.Cardinality
1863+
import Mathlib.Analysis.Real.Hyperreal
1864+
import Mathlib.Analysis.Real.Pi.Bounds
1865+
import Mathlib.Analysis.Real.Pi.Irrational
1866+
import Mathlib.Analysis.Real.Pi.Leibniz
1867+
import Mathlib.Analysis.Real.Pi.Wallis
18521868
import Mathlib.Analysis.Seminorm
18531869
import Mathlib.Analysis.SpecialFunctions.Arsinh
18541870
import Mathlib.Analysis.SpecialFunctions.Bernstein
@@ -2976,16 +2992,9 @@ import Mathlib.Data.Bundle
29762992
import Mathlib.Data.Char
29772993
import Mathlib.Data.Complex.Basic
29782994
import Mathlib.Data.Complex.BigOperators
2979-
import Mathlib.Data.Complex.Cardinality
29802995
import Mathlib.Data.Complex.Determinant
2981-
import Mathlib.Data.Complex.Exponential
2982-
import Mathlib.Data.Complex.ExponentialBounds
2983-
import Mathlib.Data.Complex.FiniteDimensional
29842996
import Mathlib.Data.Complex.Module
2985-
import Mathlib.Data.Complex.Norm
2986-
import Mathlib.Data.Complex.Order
29872997
import Mathlib.Data.Complex.Orientation
2988-
import Mathlib.Data.Complex.Trigonometric
29892998
import Mathlib.Data.Countable.Basic
29902999
import Mathlib.Data.Countable.Defs
29913000
import Mathlib.Data.Countable.Small
@@ -3280,7 +3289,6 @@ import Mathlib.Data.Matrix.ConjTranspose
32803289
import Mathlib.Data.Matrix.DMatrix
32813290
import Mathlib.Data.Matrix.Defs
32823291
import Mathlib.Data.Matrix.Diagonal
3283-
import Mathlib.Data.Matrix.DoublyStochastic
32843292
import Mathlib.Data.Matrix.DualNumber
32853293
import Mathlib.Data.Matrix.Hadamard
32863294
import Mathlib.Data.Matrix.Invertible
@@ -3493,19 +3501,13 @@ import Mathlib.Data.Rat.Sqrt
34933501
import Mathlib.Data.Rat.Star
34943502
import Mathlib.Data.Real.Archimedean
34953503
import Mathlib.Data.Real.Basic
3496-
import Mathlib.Data.Real.Cardinality
34973504
import Mathlib.Data.Real.CompleteField
34983505
import Mathlib.Data.Real.ConjExponents
34993506
import Mathlib.Data.Real.ENatENNReal
35003507
import Mathlib.Data.Real.EReal
35013508
import Mathlib.Data.Real.Embedding
35023509
import Mathlib.Data.Real.GoldenRatio
3503-
import Mathlib.Data.Real.Hyperreal
35043510
import Mathlib.Data.Real.Irrational
3505-
import Mathlib.Data.Real.Pi.Bounds
3506-
import Mathlib.Data.Real.Pi.Irrational
3507-
import Mathlib.Data.Real.Pi.Leibniz
3508-
import Mathlib.Data.Real.Pi.Wallis
35093511
import Mathlib.Data.Real.Pointwise
35103512
import Mathlib.Data.Real.Sign
35113513
import Mathlib.Data.Real.Sqrt
@@ -3514,6 +3516,7 @@ import Mathlib.Data.Real.StarOrdered
35143516
import Mathlib.Data.Rel
35153517
import Mathlib.Data.SProd
35163518
import Mathlib.Data.Semiquot
3519+
import Mathlib.Data.Seq.Basic
35173520
import Mathlib.Data.Seq.Computation
35183521
import Mathlib.Data.Seq.Parallel
35193522
import Mathlib.Data.Seq.Seq
@@ -3704,6 +3707,7 @@ import Mathlib.FieldTheory.KummerPolynomial
37043707
import Mathlib.FieldTheory.Laurent
37053708
import Mathlib.FieldTheory.LinearDisjoint
37063709
import Mathlib.FieldTheory.Minpoly.Basic
3710+
import Mathlib.FieldTheory.Minpoly.ConjRootClass
37073711
import Mathlib.FieldTheory.Minpoly.Field
37083712
import Mathlib.FieldTheory.Minpoly.IsConjRoot
37093713
import Mathlib.FieldTheory.Minpoly.IsIntegrallyClosed
@@ -4071,6 +4075,7 @@ import Mathlib.LinearAlgebra.CliffordAlgebra.Prod
40714075
import Mathlib.LinearAlgebra.CliffordAlgebra.SpinGroup
40724076
import Mathlib.LinearAlgebra.CliffordAlgebra.Star
40734077
import Mathlib.LinearAlgebra.Coevaluation
4078+
import Mathlib.LinearAlgebra.Complex.FiniteDimensional
40744079
import Mathlib.LinearAlgebra.Contraction
40754080
import Mathlib.LinearAlgebra.Countable
40764081
import Mathlib.LinearAlgebra.CrossProduct
@@ -4743,6 +4748,7 @@ import Mathlib.NumberTheory.MaricaSchoenheim
47434748
import Mathlib.NumberTheory.Modular
47444749
import Mathlib.NumberTheory.ModularForms.Basic
47454750
import Mathlib.NumberTheory.ModularForms.CongruenceSubgroups
4751+
import Mathlib.NumberTheory.ModularForms.DedekindEta
47464752
import Mathlib.NumberTheory.ModularForms.EisensteinSeries.Basic
47474753
import Mathlib.NumberTheory.ModularForms.EisensteinSeries.Defs
47484754
import Mathlib.NumberTheory.ModularForms.EisensteinSeries.IsBoundedAtImInfty
@@ -5127,6 +5133,7 @@ import Mathlib.Probability.CDF
51275133
import Mathlib.Probability.CondVar
51285134
import Mathlib.Probability.ConditionalExpectation
51295135
import Mathlib.Probability.ConditionalProbability
5136+
import Mathlib.Probability.Decision.Risk.Defs
51305137
import Mathlib.Probability.Density
51315138
import Mathlib.Probability.Distributions.Exponential
51325139
import Mathlib.Probability.Distributions.Gamma

Mathlib/Algebra/ArithmeticGeometric.lean

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ lemma arithGeom_same_eq_mul_div (ha : a ≠ 1) (n : ℕ) :
9292
lemma arithGeom_zero_eq_mul_div' (ha : a ≠ 1) (n : ℕ) :
9393
arithGeom a b 0 n = b * (1 - a ^ n) / (1 - a) := by
9494
rw [arithGeom_eq ha n]
95-
have : 1 - a ≠ 0 := sub_ne_zero.mpr ha.symm
9695
field_simp
9796
ring
9897

Mathlib/Algebra/Category/FGModuleCat/Basic.lean

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ and then as a right-rigid monoidal category.
2626
2727
## Future work
2828
29-
* Show that `FGModuleCat R` is abelian when `R` is (left)-noetherian.
29+
* Show that `FGModuleCat R` is abelian when `R` is (left)-Noetherian.
3030
3131
-/
3232

Mathlib/Algebra/Category/Grp/Adjunctions.lean

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,8 @@ def adj : free ⊣ forget AddCommGrp.{u} :=
7070
homEquiv_naturality_left_symm := by
7171
intros
7272
ext
73-
simp
73+
simp only [free_obj_coe, Equiv.symm_trans_apply, Equiv.symm_symm, hom_comp,
74+
AddMonoidHom.coe_comp, Function.comp_apply]
7475
apply FreeAbelianGroup.lift_comp }
7576

7677
instance : free.{u}.IsLeftAdjoint :=

Mathlib/Algebra/Category/ModuleCat/Topology/Basic.lean

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -397,10 +397,9 @@ def freeMap {X Y : TopCat.{v}} (f : X ⟶ Y) : freeObj R X ⟶ freeObj R Y :=
397397
refine sInf_le ⟨continuousSMul_induced (Finsupp.lmapDomain _ _ f.hom),
398398
continuousAdd_induced (Finsupp.lmapDomain _ _ f.hom), ?_⟩
399399
rw [← coinduced_le_iff_le_induced]
400-
refine le_trans ?_ hτ₃
401-
refine le_of_eq_of_le ?_ (coinduced_mono (continuous_iff_coinduced_le.mp f.hom.2))
400+
grw [← hτ₃, ← coinduced_mono (continuous_iff_coinduced_le.mp f.hom.2)]
402401
rw [coinduced_compose, coinduced_compose]
403-
congr 1
402+
congr! 1
404403
ext x
405404
simp [coe_freeObj]⟩
406405

Mathlib/Algebra/Category/MonCat/Adjunctions.lean

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ namespace MonCat
3535
/-- The functor of adjoining a neutral element `zero` to a semigroup -/]
3636
def adjoinOne : Semigrp.{u} ⥤ MonCat.{u} where
3737
obj S := MonCat.of (WithOne S)
38-
map f := ofHom (WithOne.map f.hom)
39-
map_id _ := MonCat.hom_ext WithOne.map_id
40-
map_comp _ _ := MonCat.hom_ext (WithOne.map_comp _ _)
38+
map f := ofHom (WithOne.mapMulHom f.hom)
39+
map_id _ := MonCat.hom_ext WithOne.mapMulHom_id
40+
map_comp _ _ := MonCat.hom_ext (WithOne.mapMulHom_comp _ _)
4141

4242
@[to_additive]
4343
instance hasForgetToSemigroup : HasForget₂ MonCat Semigrp where

Mathlib/Algebra/ContinuedFractions/Basic.lean

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Copyright (c) 2019 Kevin Kappelmann. All rights reserved.
33
Released under Apache 2.0 license as described in the file LICENSE.
44
Authors: Kevin Kappelmann
55
-/
6-
import Mathlib.Data.Seq.Seq
6+
import Mathlib.Data.Seq.Basic
77
import Mathlib.Algebra.Field.Defs
88

99
/-!

0 commit comments

Comments
 (0)