data.rat.basic | Mathlib porting status

Changes since the initial port

The following section lists changes to this file in mathlib3 and mathlib4 that occured after the initial port. Most recent changes are shown first. Hovering over a commit will show all commits associated with the same mathlib3 commit.

Changes in mathlib3

a59dad53

(last sync)

Changes in mathlib3port

mathlib3

mathlib3port

c3291da4

bump to nightly-2024-04-08-08

mathlib commit https://github.com/leanprover-community/mathlib/commit/65a1391a0106c9204fe45bc73a039f056558cb83

e7589225

Diff

@@ -47,7 +47,7 @@ instance : Field ℚ :=
     mul := (· * ·)
     inv := Inv.inv
     ratCast := id
-    ratCast_mk := fun a b h1 h2 => (num_div_den _).symm
+    ratCast_def := fun a b h1 h2 => (num_div_den _).symm
     qsmul := (· * ·) }
 
 -- Extra instances to short-circuit type class resolution

c3291da4

bump to nightly-2023-09-24-06

mathlib commit https://github.com/leanprover-community/mathlib/commit/ce64cd319bb6b3e82f31c2d38e79080d377be451

5655435f

Diff

@@ -3,8 +3,8 @@ Copyright (c) 2019 Johannes Hölzl. All rights reserved.
 Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Johannes Hölzl, Mario Carneiro
 -/
-import Mathbin.Algebra.Field.Defs
-import Mathbin.Data.Rat.Defs
+import Algebra.Field.Defs
+import Data.Rat.Defs
 
 #align_import data.rat.basic from "leanprover-community/mathlib"@"c3291da49cfa65f0d43b094750541c0731edc932"

c3291da4

bump to nightly-2023-07-20-09

mathlib commit https://github.com/leanprover-community/mathlib/commit/8ea5598db6caeddde6cb734aa179cc2408dbd345

9c56d0dd

Diff

@@ -2,15 +2,12 @@
 Copyright (c) 2019 Johannes Hölzl. All rights reserved.
 Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Johannes Hölzl, Mario Carneiro
-
-! This file was ported from Lean 3 source module data.rat.basic
-! leanprover-community/mathlib commit c3291da49cfa65f0d43b094750541c0731edc932
-! Please do not edit these lines, except to modify the commit id
-! if you have ported upstream changes.
 -/
 import Mathbin.Algebra.Field.Defs
 import Mathbin.Data.Rat.Defs
 
+#align_import data.rat.basic from "leanprover-community/mathlib"@"c3291da49cfa65f0d43b094750541c0731edc932"
+
 /-!
 # Field Structure on the Rational Numbers

c3291da4

bump to nightly-2023-02-21-16

mathlib commit https://github.com/leanprover-community/mathlib/commit/bd9851ca476957ea4549eb19b40e7b5ade9428cc

1107b979

Changes in mathlib4

mathlib3

mathlib4

a59dad53

feat: NNRat.cast (#11203)

Define the canonical coercion from the nonnegative rationals to any division semiring.

From LeanAPAP

1a5d1288

Diff

@@ -38,7 +38,10 @@ namespace Rat
 instance instField : Field ℚ where
   __ := commRing
   __ := commGroupWithZero
+  nnqsmul := _
   qsmul := _
+  nnratCast_def q := by
+    rw [← NNRat.den_coe, ← Int.cast_natCast q.num, ← NNRat.num_coe]; exact(num_div_den _).symm
   ratCast_def q := (num_div_den _).symm
 
 -- Extra instances to short-circuit type class resolution

a59dad53

chore: Final cleanup before NNRat.cast (#12360)

This is the parts of the diff of #11203 which don't mention NNRat.cast.

Use more where notation.
Write qsmul := _ instead of qsmul := qsmulRec _ to make the instances more robust to definition changes.
Delete qsmulRec.
Move qsmul before ratCast_def in instance declarations.
Name more instances.
Rename rat_smul to qsmul.

cb179b1b

Diff

@@ -38,8 +38,8 @@ namespace Rat
 instance instField : Field ℚ where
   __ := commRing
   __ := commGroupWithZero
-  ratCast_def q := (num_div_den _).symm
   qsmul := _
+  ratCast_def q := (num_div_den _).symm
 
 -- Extra instances to short-circuit type class resolution
 instance instDivisionRing : DivisionRing ℚ := by infer_instance

a59dad53

refactor(Rat): Streamline basic theory (#11504)

Rat has a long history in (and before) mathlib and as such its development is full of cruft. Now that NNRat is a thing, there is a need for the theory of Rat to be mimickable to yield the theory of NNRat, which is not currently the case.

Broadly, this PR aims at mirroring the Rat and NNRat declarations. It achieves this by:

Relying more on Rat.num and Rat.den, and less on the structure representation of Rat
Abandoning the vestigial Rat.Nonneg (which was replaced in Std by a new development of the order on Rat)
Renaming many Rat lemmas with dubious names. This creates quite a lot of conflicts with Std lemmas, whose names are themselves dubious. I am priming the relevant new mathlib names and leaving TODOs to fix the Std names.
Handling most of the Rat porting notes

Reduce the diff of #11203

28bea03d

Diff

@@ -3,7 +3,8 @@ Copyright (c) 2019 Johannes Hölzl. All rights reserved.
 Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Johannes Hölzl, Mario Carneiro
 -/
-import Mathlib.Algebra.Order.Field.Defs
+import Mathlib.Algebra.Order.Nonneg.Field
+import Mathlib.Data.NNRat.Defs
 import Mathlib.Data.Rat.Order
 
 #align_import data.rat.basic from "leanprover-community/mathlib"@"a59dad53320b73ef180174aae867addd707ef00e"
@@ -35,16 +36,34 @@ rat, rationals, field, ℚ, numerator, denominator, num, denom
 namespace Rat
 
 instance instField : Field ℚ where
-  toCommRing := commRing
+  __ := commRing
   __ := commGroupWithZero
   ratCast_def q := (num_div_den _).symm
-  qsmul := qsmulRec (↑)
+  qsmul := _
 
 -- Extra instances to short-circuit type class resolution
-instance divisionRing : DivisionRing ℚ := by infer_instance
+instance instDivisionRing : DivisionRing ℚ := by infer_instance
 
 instance instLinearOrderedField : LinearOrderedField ℚ where
   __ := instLinearOrderedCommRing
   __ := instField
 
 end Rat
+
+-- The `LinearOrderedSemifield` and `LinearOrderedCommGroupWithZero` instances are shortcut
+-- instances for performance
+deriving instance CanonicallyLinearOrderedSemifield, LinearOrderedSemifield,
+  LinearOrderedCommGroupWithZero for NNRat
+
+namespace NNRat
+
+@[simp, norm_cast] lemma coe_inv (q : ℚ≥0) : ((q⁻¹ : ℚ≥0) : ℚ) = (q : ℚ)⁻¹ := rfl
+#align nnrat.coe_inv NNRat.coe_inv
+@[simp, norm_cast] lemma coe_div (p q : ℚ≥0) : ((p / q : ℚ≥0) : ℚ) = p / q := rfl
+#align nnrat.coe_div NNRat.coe_div
+
+lemma inv_def (q : ℚ≥0) : q⁻¹ = divNat q.den q.num := by ext; simp [Rat.inv_def', num_coe, den_coe]
+lemma div_def (p q : ℚ≥0) : p / q = divNat (p.num * q.den) (p.den * q.num) := by
+  ext; simp [Rat.div_def', num_coe, den_coe]
+
+end NNRat

a59dad53

refactor: Avoid Rat internals in the definition of Field (#11639)

Soon, there will be NNRat analogs of the Rat fields in the definition of Field. NNRat is less nicely a structure than Rat, hence there is a need to reduce the dependency of Field on the internals of Rat.

This PR achieves this by restating Field.ratCast_mk' in terms of Rat.num, Rat.den. This requires fixing a few downstream instances.

Reduce the diff of #11203.

Co-authored-by: Floris van Doorn <fpvdoorn@gmail.com>

9160ea19

Diff

@@ -18,33 +18,33 @@ was defined in `Mathlib.Data.Rat.Defs`.
 
 ## Main Definitions
 
-- `Rat.field` is the field structure on `ℚ`.
+- `Rat.instField` is the field structure on `ℚ`.
 
 ## Implementation notes
 
 We have to define the field structure in a separate file to avoid cyclic imports:
 the `Field` class contains a map from `ℚ` (see `Field`'s docstring for the rationale),
-so we have a dependency `Rat.field → Field → Rat` that is reflected in the import
-hierarchy `Mathlib.Data.Rat.basic → Mathlib.Algebra.Field.Defs → Std.Data.Rat`.
+so we have a dependency `Rat.Field → Field → Rat` that is reflected in the import
+hierarchy `Mathlib.Data.Rat.Basic → Mathlib.Algebra.Field.Defs → Std.Data.Rat`.
 
 ## Tags
 
 rat, rationals, field, ℚ, numerator, denominator, num, denom
 -/
 
-
 namespace Rat
 
-instance field : Field ℚ :=
-  { mul_inv_cancel := Rat.commGroupWithZero.mul_inv_cancel
-    inv_zero := Rat.commGroupWithZero.inv_zero
-    ratCast := Rat.cast
-    ratCast_mk := fun a b h1 h2 => (num_div_den _).symm
-    qsmul := (· * ·) }
+instance instField : Field ℚ where
+  toCommRing := commRing
+  __ := commGroupWithZero
+  ratCast_def q := (num_div_den _).symm
+  qsmul := qsmulRec (↑)
 
 -- Extra instances to short-circuit type class resolution
 instance divisionRing : DivisionRing ℚ := by infer_instance
 
-instance instLinearOrderedField : LinearOrderedField ℚ := { field, instLinearOrderedCommRing with }
+instance instLinearOrderedField : LinearOrderedField ℚ where
+  __ := instLinearOrderedCommRing
+  __ := instField
 
 end Rat

a59dad53

chore(NNRat): Rearrange imports (#10392)

The goal is to separate the field material on Rat/NNRat from everything before to make way for NNRat.cast. We achieve this by

splitting Data.Rat.NNRat into
- Data.NNRat.Defs for the foundationl stuff that will be needed in the definition of Field
- Data.NNRat.Lemmas for the field and big operators material
moving the field material from Data.Rat.Order to Data.Rat.Basic
proving a few lemmas by rfl rather than coeHom.some_now_unavailable_lemma
renaming Data.Rat.NNRat.BigOperators to Data.NNRat.BigOperators

2357b645

Diff

@@ -3,8 +3,8 @@ Copyright (c) 2019 Johannes Hölzl. All rights reserved.
 Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Johannes Hölzl, Mario Carneiro
 -/
-import Mathlib.Algebra.Field.Defs
-import Mathlib.Data.Rat.Defs
+import Mathlib.Algebra.Order.Field.Defs
+import Mathlib.Data.Rat.Order
 
 #align_import data.rat.basic from "leanprover-community/mathlib"@"a59dad53320b73ef180174aae867addd707ef00e"
 
@@ -45,4 +45,6 @@ instance field : Field ℚ :=
 -- Extra instances to short-circuit type class resolution
 instance divisionRing : DivisionRing ℚ := by infer_instance
 
+instance instLinearOrderedField : LinearOrderedField ℚ := { field, instLinearOrderedCommRing with }
+
 end Rat

a59dad53

perf (Data.Rat): reduce algebra instances for Rat (#6282)

This removes the with pattern from the Field and CommSemiGroupWithZero instances on Rat.

The resulting term decreases in size by an order of magnitude (at least).

Co-authored-by: Matthew Robert Ballard <100034030+mattrobball@users.noreply.github.com>

7a9401a0

Diff

@@ -36,13 +36,8 @@ rat, rationals, field, ℚ, numerator, denominator, num, denom
 namespace Rat
 
 instance field : Field ℚ :=
-  { Rat.commRing, Rat.commGroupWithZero with
-    zero := 0
-    add := (· + ·)
-    neg := Neg.neg
-    one := 1
-    mul := (· * ·)
-    inv := Inv.inv
+  { mul_inv_cancel := Rat.commGroupWithZero.mul_inv_cancel
+    inv_zero := Rat.commGroupWithZero.inv_zero
     ratCast := Rat.cast
     ratCast_mk := fun a b h1 h2 => (num_div_den _).symm
     qsmul := (· * ·) }

a59dad53

chore: script to replace headers with #align_import statements (#5979)

depends on: #5966

Co-authored-by: Eric Wieser <wieser.eric@gmail.com> Co-authored-by: Scott Morrison <scott.morrison@gmail.com>

89aa3a3b

Diff

@@ -2,15 +2,12 @@
 Copyright (c) 2019 Johannes Hölzl. All rights reserved.
 Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Johannes Hölzl, Mario Carneiro
-
-! This file was ported from Lean 3 source module data.rat.basic
-! leanprover-community/mathlib commit a59dad53320b73ef180174aae867addd707ef00e
-! Please do not edit these lines, except to modify the commit id
-! if you have ported upstream changes.
 -/
 import Mathlib.Algebra.Field.Defs
 import Mathlib.Data.Rat.Defs
 
+#align_import data.rat.basic from "leanprover-community/mathlib"@"a59dad53320b73ef180174aae867addd707ef00e"
+
 /-!
 # Field Structure on the Rational Numbers

a59dad53

chore: bump to nightly-2023-03-09 (#2762)

2941a890

Diff

@@ -46,7 +46,7 @@ instance field : Field ℚ :=
     one := 1
     mul := (· * ·)
     inv := Inv.inv
-    ratCast := id
+    ratCast := Rat.cast
     ratCast_mk := fun a b h1 h2 => (num_div_den _).symm
     qsmul := (· * ·) }

a59dad53

feat: port Data.Rat.Defs and Data.Rat.Basic (#998)

fc2ed6f8

depends on: #996
depends on: #1096

Co-authored-by: Scott Morrison <scott.morrison@gmail.com> Co-authored-by: Patrick Massot <patrickmassot@free.fr> Co-authored-by: Ruben Van de Velde <65514131+Ruben-VandeVelde@users.noreply.github.com> Co-authored-by: ChrisHughes24 <chrishughes24@gmail.com> Co-authored-by: Arien Malec <arien.malec@gmail.com>

6bc2e2c8

`data.rat.basic` ⟷ `Mathlib.Data.Rat.Field`

Changes since the initial port

Changes in mathlib3

Changes in mathlib3port

Changes in mathlib4

Dependencies 2 + 116

data.rat.basic ⟷ Mathlib.Data.Rat.Field

Changes since the initial port

Changes in mathlib3

Changes in mathlib3port

Changes in mathlib4

Dependencies 2 + 116

`data.rat.basic` ⟷ `Mathlib.Data.Rat.Field`