Skip to content

Fix build against Mathlib at Lean v4.29.1 #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
edu-ap wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix build against Mathlib at Lean v4.29.1 #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Interval/Fixed.lean
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -902,7 +902,9 @@ lemma Real.cast_natCast (n : ℤ) (n0 : 0 ≤ n) : (n : ℝ) = (n.toNat : ℝ) :
simp only [Nat.log2_lt n0', ← Nat.cast_lt (α := ℤ), Nat.cast_pow, Nat.cast_two, Nat.cast_natAbs] at nn
rw [Int64.toInt_ofInt' nn]

@[simp] lemma Fixed.ofInt0_natCast (n : ℕ) : ofInt0 (n : ℤ) = ofNat0 n := by simp [ofInt0, ofNat0]
@[simp] lemma Fixed.ofInt0_natCast (n : ℕ) : ofInt0 (n : ℤ) = ofNat0 n := by
simp [ofInt0, ofNat0]
rfl

/-- `Fixed.ofNat0` is conservative -/
@[approx] lemma Fixed.approx_ofNat0 (n : ℕ) : approx (ofNat0 n) (n : ℝ) := by
Expand Down
2 changes: 1 addition & 1 deletion Interval/Interval/Mul.lean
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ variable {x y : Interval} {x' y' : ℝ}

/-- Multiply two intervals -/
@[irreducible] def mul (x : Interval) (y : Interval) : Interval :=
(x.premul y).mix' (approx_premul x.lo_mem y.lo_mem)
(x.premul y).mix' ⟨_, approx_premul x.lo_mem y.lo_mem⟩

/-- `* = mul` -/
instance : Mul Interval where
Expand Down
7 changes: 4 additions & 3 deletions Interval/Interval/Preinterval.lean
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,9 @@ instance : ApproxNan Preinterval ℝ where
Interval.mix x.lo x.hi le

/-- If a `Preinterval` is nonempty`, it can be turned into an `Interval` -/
@[irreducible, inline] def mix' (x : Preinterval) {a : ℝ} (m : approx x a) : Interval :=
@[irreducible, inline] def mix' (x : Preinterval) (m : ∃ a : ℝ, approx x a) : Interval :=
x.mix (by
obtain ⟨a, m⟩ := m
intro ln hn
simp only [approx, ln, hn, mem_Icc, false_or] at m
linarith)
Expand All @@ -73,7 +74,7 @@ instance : ApproxNan Preinterval ℝ where
simp only [approx, ln, hn, or_self, dite_false, false_or, mem_Icc]

/-- `mix'` commutes with `approx` -/
@[simp] lemma approx_mix' (x : Preinterval) {a b : ℝ} (m : approx x a) :
@[simp] lemma approx_mix' (x : Preinterval) {b : ℝ} (m : ∃ a : ℝ, approx x a) :
approx (x.mix' m) b = approx x b := by
rw [mix', approx_mix]

Expand All @@ -84,5 +85,5 @@ instance : ApproxNan Preinterval ℝ where
rw [mix]; simp only [lo_nan, hi_nan, Interval.mix_self, Interval.coe_nan]

/-- `mix'` propagates `nan` -/
@[simp] lemma mix_nan' {a : ℝ} (m : approx (nan : Preinterval) a) : mix' nan m = nan := by
@[simp] lemma mix_nan' (m : ∃ a : ℝ, approx (nan : Preinterval) a) : mix' nan m = nan := by
rw [mix', mix_nan]