data.nat.count | 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

dc6c365e

(last sync)

Changes in mathlib3port

mathlib3

mathlib3port

1ead2234

bump to nightly-2023-12-06-06

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

d09917f6

Diff

@@ -168,7 +168,7 @@ theorem count_strict_mono {m n : ℕ} (hm : p m) (hmn : m < n) : count p m < cou
 #print Nat.count_injective /-
 theorem count_injective {m n : ℕ} (hm : p m) (hn : p n) (heq : count p m = count p n) : m = n :=
   by
-  by_contra' h : m ≠ n
+  by_contra! h : m ≠ n
   wlog hmn : m < n
   · exact this hn hm HEq.symm h.symm (h.lt_or_lt.resolve_left hmn)
   · simpa [HEq] using count_strict_mono hm hmn

1ead2234

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) 2021 Vladimir Goryachev. All rights reserved.
 Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Yaël Dillies, Vladimir Goryachev, Kyle Miller, Scott Morrison, Eric Rodriguez
 -/
-import Mathbin.SetTheory.Cardinal.Basic
-import Mathbin.Tactic.Ring
+import SetTheory.Cardinal.Basic
+import Tactic.Ring
 
 #align_import data.nat.count from "leanprover-community/mathlib"@"1ead22342e1a078bd44744ace999f85756555d35"

1ead2234

bump to nightly-2023-08-23-23

mathlib commit https://github.com/leanprover-community/mathlib/commit/32a7e535287f9c73f2e4d2aef306a39190f0b504

f612b9e0

Diff

@@ -35,13 +35,13 @@ variable [DecidablePred p]
 #print Nat.count /-
 /-- Count the number of naturals `k < n` satisfying `p k`. -/
 def count (n : ℕ) : ℕ :=
-  (List.range n).countp p
+  (List.range n).countP p
 #align nat.count Nat.count
 -/
 
 #print Nat.count_zero /-
 @[simp]
-theorem count_zero : count p 0 = 0 := by rw [count, List.range_zero, List.countp]
+theorem count_zero : count p 0 = 0 := by rw [count, List.range_zero, List.countP]
 #align nat.count_zero Nat.count_zero
 -/
 
@@ -60,7 +60,7 @@ scoped[Count] attribute [instance] Nat.CountSet.fintype
 
 #print Nat.count_eq_card_filter_range /-
 theorem count_eq_card_filter_range (n : ℕ) : count p n = ((range n).filterₓ p).card := by
-  rw [count, List.countp_eq_length_filter]; rfl
+  rw [count, List.countP_eq_length_filter]; rfl
 #align nat.count_eq_card_filter_range Nat.count_eq_card_filter_range
 -/
 
@@ -139,10 +139,10 @@ theorem count_succ_eq_count_iff {n : ℕ} : count p (n + 1) = count p n ↔ ¬p
 #align nat.count_succ_eq_count_iff Nat.count_succ_eq_count_iff
 -/
 
-alias count_succ_eq_succ_count_iff ↔ _ count_succ_eq_succ_count
+alias ⟨_, count_succ_eq_succ_count⟩ := count_succ_eq_succ_count_iff
 #align nat.count_succ_eq_succ_count Nat.count_succ_eq_succ_count
 
-alias count_succ_eq_count_iff ↔ _ count_succ_eq_count
+alias ⟨_, count_succ_eq_count⟩ := count_succ_eq_count_iff
 #align nat.count_succ_eq_count Nat.count_succ_eq_count
 
 #print Nat.count_le_cardinal /-

1ead2234

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) 2021 Vladimir Goryachev. All rights reserved.
 Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Yaël Dillies, Vladimir Goryachev, Kyle Miller, Scott Morrison, Eric Rodriguez
-
-! This file was ported from Lean 3 source module data.nat.count
-! leanprover-community/mathlib commit 1ead22342e1a078bd44744ace999f85756555d35
-! Please do not edit these lines, except to modify the commit id
-! if you have ported upstream changes.
 -/
 import Mathbin.SetTheory.Cardinal.Basic
 import Mathbin.Tactic.Ring
 
+#align_import data.nat.count from "leanprover-community/mathlib"@"1ead22342e1a078bd44744ace999f85756555d35"
+
 /-!
 # Counting on ℕ

1ead2234

bump to nightly-2023-06-13-21

mathlib commit https://github.com/leanprover-community/mathlib/commit/9fb8964792b4237dac6200193a0d533f1b3f7423

829520ac

Diff

@@ -148,11 +148,13 @@ alias count_succ_eq_succ_count_iff ↔ _ count_succ_eq_succ_count
 alias count_succ_eq_count_iff ↔ _ count_succ_eq_count
 #align nat.count_succ_eq_count Nat.count_succ_eq_count
 
+#print Nat.count_le_cardinal /-
 theorem count_le_cardinal (n : ℕ) : (count p n : Cardinal) ≤ Cardinal.mk {k | p k} :=
   by
   rw [count_eq_card_fintype, ← Cardinal.mk_fintype]
   exact Cardinal.mk_subtype_mono fun x hx => hx.2
 #align nat.count_le_cardinal Nat.count_le_cardinal
+-/
 
 #print Nat.lt_of_count_lt_count /-
 theorem lt_of_count_lt_count {a b : ℕ} (h : count p a < count p b) : a < b :=

1ead2234

bump to nightly-2023-06-04-18

mathlib commit https://github.com/leanprover-community/mathlib/commit/5f25c089cb34db4db112556f23c50d12da81b297

3fb4268b

Diff

@@ -148,7 +148,7 @@ alias count_succ_eq_succ_count_iff ↔ _ count_succ_eq_succ_count
 alias count_succ_eq_count_iff ↔ _ count_succ_eq_count
 #align nat.count_succ_eq_count Nat.count_succ_eq_count
 
-theorem count_le_cardinal (n : ℕ) : (count p n : Cardinal) ≤ Cardinal.mk { k | p k } :=
+theorem count_le_cardinal (n : ℕ) : (count p n : Cardinal) ≤ Cardinal.mk {k | p k} :=
   by
   rw [count_eq_card_fintype, ← Cardinal.mk_fintype]
   exact Cardinal.mk_subtype_mono fun x hx => hx.2

1ead2234

bump to nightly-2023-05-28-06

mathlib commit https://github.com/leanprover-community/mathlib/commit/917c3c072e487b3cccdbfeff17e75b40e45f66cb

ba5d8b97

Diff

@@ -148,12 +148,6 @@ alias count_succ_eq_succ_count_iff ↔ _ count_succ_eq_succ_count
 alias count_succ_eq_count_iff ↔ _ count_succ_eq_count
 #align nat.count_succ_eq_count Nat.count_succ_eq_count
 
-/- warning: nat.count_le_cardinal -> Nat.count_le_cardinal is a dubious translation:
-lean 3 declaration is
-  forall {p : Nat -> Prop} [_inst_1 : DecidablePred.{1} Nat p] (n : Nat), LE.le.{1} Cardinal.{0} Cardinal.hasLe.{0} ((fun (a : Type) (b : Type.{1}) [self : HasLiftT.{1, 2} a b] => self.0) Nat Cardinal.{0} (HasLiftT.mk.{1, 2} Nat Cardinal.{0} (CoeTCₓ.coe.{1, 2} Nat Cardinal.{0} (Nat.castCoe.{1} Cardinal.{0} Cardinal.hasNatCast.{0}))) (Nat.count p (fun (a : Nat) => _inst_1 a) n)) (Cardinal.mk.{0} (coeSort.{1, 2} (Set.{0} Nat) Type (Set.hasCoeToSort.{0} Nat) (setOf.{0} Nat (fun (k : Nat) => p k))))
-but is expected to have type
-  forall {p : Nat -> Prop} [_inst_1 : DecidablePred.{1} Nat p] (n : Nat), LE.le.{1} Cardinal.{0} Cardinal.instLECardinal.{0} (Nat.cast.{1} Cardinal.{0} Cardinal.instNatCastCardinal.{0} (Nat.count p (fun (a : Nat) => _inst_1 a) n)) (Cardinal.mk.{0} (Set.Elem.{0} Nat (setOf.{0} Nat (fun (k : Nat) => p k))))
-Case conversion may be inaccurate. Consider using '#align nat.count_le_cardinal Nat.count_le_cardinalₓ'. -/
 theorem count_le_cardinal (n : ℕ) : (count p n : Cardinal) ≤ Cardinal.mk { k | p k } :=
   by
   rw [count_eq_card_fintype, ← Cardinal.mk_fintype]

1ead2234

bump to nightly-2023-05-28-04

mathlib commit https://github.com/leanprover-community/mathlib/commit/917c3c072e487b3cccdbfeff17e75b40e45f66cb

6797a637

Diff

@@ -62,19 +62,15 @@ def CountSet.fintype (n : ℕ) : Fintype { i // i < n ∧ p i } :=
 scoped[Count] attribute [instance] Nat.CountSet.fintype
 
 #print Nat.count_eq_card_filter_range /-
-theorem count_eq_card_filter_range (n : ℕ) : count p n = ((range n).filterₓ p).card :=
-  by
-  rw [count, List.countp_eq_length_filter]
-  rfl
+theorem count_eq_card_filter_range (n : ℕ) : count p n = ((range n).filterₓ p).card := by
+  rw [count, List.countp_eq_length_filter]; rfl
 #align nat.count_eq_card_filter_range Nat.count_eq_card_filter_range
 -/
 
 #print Nat.count_eq_card_fintype /-
 /-- `count p n` can be expressed as the cardinality of `{k // k < n ∧ p k}`. -/
-theorem count_eq_card_fintype (n : ℕ) : count p n = Fintype.card { k : ℕ // k < n ∧ p k } :=
-  by
-  rw [count_eq_card_filter_range, ← Fintype.card_ofFinset, ← count_set.fintype]
-  rfl
+theorem count_eq_card_fintype (n : ℕ) : count p n = Fintype.card { k : ℕ // k < n ∧ p k } := by
+  rw [count_eq_card_filter_range, ← Fintype.card_ofFinset, ← count_set.fintype]; rfl
 #align nat.count_eq_card_fintype Nat.count_eq_card_fintype
 -/
 
@@ -108,10 +104,8 @@ theorem count_add (a b : ℕ) : count p (a + b) = count p a + count (fun k => p
 -/
 
 #print Nat.count_add' /-
-theorem count_add' (a b : ℕ) : count p (a + b) = count (fun k => p (k + b)) a + count p b :=
-  by
-  rw [add_comm, count_add, add_comm]
-  simp_rw [add_comm b]
+theorem count_add' (a b : ℕ) : count p (a + b) = count (fun k => p (k + b)) a + count p b := by
+  rw [add_comm, count_add, add_comm]; simp_rw [add_comm b]
 #align nat.count_add' Nat.count_add'
 -/

1ead2234

bump to nightly-2023-02-21-16

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

1107b979

Changes in mathlib4

mathlib3

mathlib4

dc6c365e

chore(*): remove empty lines between variable statements (#11418)

Empty lines were removed by executing the following Python script twice

import os
import re


# Loop through each file in the repository
for dir_path, dirs, files in os.walk('.'):
  for filename in files:
    if filename.endswith('.lean'):
      file_path = os.path.join(dir_path, filename)

      # Open the file and read its contents
      with open(file_path, 'r') as file:
        content = file.read()

      # Use a regular expression to replace sequences of "variable" lines separated by empty lines
      # with sequences without empty lines
      modified_content = re.sub(r'(variable.*\n)\n(variable(?! .* in))', r'\1\2', content)

      # Write the modified content back to the file
      with open(file_path, 'w') as file:
        file.write(modified_content)

75c86f04

Diff

@@ -147,7 +147,6 @@ theorem count_lt_card {n : ℕ} (hp : (setOf p).Finite) (hpn : p n) : count p n
 #align nat.count_lt_card Nat.count_lt_card
 
 variable {q : ℕ → Prop}
-
 variable [DecidablePred q]
 
 theorem count_mono_left {n : ℕ} (hpq : ∀ k, p k → q k) : count p n ≤ count q n := by

dc6c365e

feat: (s ∩ t).card = s.card + t.card - (s ∪ t).card (#10224)

once coerced to an AddGroupWithOne. Also unify Finset.card_disjoint_union and Finset.card_union_eq

From LeanAPAP

80bf34f1

Diff

@@ -78,7 +78,7 @@ theorem count_add (a b : ℕ) : count p (a + b) = count p a + count (fun k ↦ p
     simp_rw [mem_map, mem_range, addLeftEmbedding_apply]
     rintro x hx ⟨c, _, rfl⟩
     exact (self_le_add_right _ _).not_lt hx
-  simp_rw [count_eq_card_filter_range, range_add, filter_union, card_disjoint_union this,
+  simp_rw [count_eq_card_filter_range, range_add, filter_union, card_union_of_disjoint this,
     filter_map, addLeftEmbedding, card_map]
   rfl
 #align nat.count_add Nat.count_add

dc6c365e

chore: Improve Finset lemma names (#8894)

Change a few lemma names that have historically bothered me.

Finset.card_le_of_subset → Finset.card_le_card
Multiset.card_le_of_le → Multiset.card_le_card
Multiset.card_lt_of_lt → Multiset.card_lt_card
Set.ncard_le_of_subset → Set.ncard_le_ncard
Finset.image_filter → Finset.filter_image
CompleteLattice.finset_sup_compact_of_compact → CompleteLattice.isCompactElement_finset_sup

7d3d6e43

Diff

@@ -152,7 +152,7 @@ variable [DecidablePred q]
 
 theorem count_mono_left {n : ℕ} (hpq : ∀ k, p k → q k) : count p n ≤ count q n := by
   simp only [count_eq_card_filter_range]
-  exact card_le_of_subset ((range n).monotone_filter_right hpq)
+  exact card_le_card ((range n).monotone_filter_right hpq)
 #align nat.count_mono_left Nat.count_mono_left
 
 end Count

dc6c365e

chore: rename by_contra' to by_contra! (#8797)

To fit with the "please try harder" convention of ! tactics.

Co-authored-by: Scott Morrison <scott.morrison@gmail.com>

738b1a97

Diff

@@ -131,7 +131,7 @@ theorem count_strict_mono {m n : ℕ} (hm : p m) (hmn : m < n) : count p m < cou
 #align nat.count_strict_mono Nat.count_strict_mono
 
 theorem count_injective {m n : ℕ} (hm : p m) (hn : p n) (heq : count p m = count p n) : m = n := by
-  by_contra' h : m ≠ n
+  by_contra! h : m ≠ n
   wlog hmn : m < n
   · exact this hn hm heq.symm h.symm (h.lt_or_lt.resolve_left hmn)
   · simpa [heq] using count_strict_mono hm hmn

dc6c365e

feat: patch for new alias command (#6172)

19e0ba92

Diff

@@ -111,10 +111,10 @@ theorem count_succ_eq_count_iff {n : ℕ} : count p (n + 1) = count p n ↔ ¬p
   by_cases h : p n <;> simp [h, count_succ]
 #align nat.count_succ_eq_count_iff Nat.count_succ_eq_count_iff
 
-alias count_succ_eq_succ_count_iff ↔ _ count_succ_eq_succ_count
+alias ⟨_, count_succ_eq_succ_count⟩ := count_succ_eq_succ_count_iff
 #align nat.count_succ_eq_succ_count Nat.count_succ_eq_succ_count
 
-alias count_succ_eq_count_iff ↔ _ count_succ_eq_count
+alias ⟨_, count_succ_eq_count⟩ := count_succ_eq_count_iff
 #align nat.count_succ_eq_count Nat.count_succ_eq_count
 
 theorem count_le_cardinal (n : ℕ) : (count p n : Cardinal) ≤ Cardinal.mk { k | p k } := by

dc6c365e

chore: bump Std (#6721)

This incorporates changes from https://github.com/leanprover-community/mathlib4/pull/6575

I have also renamed Multiset.countp to Multiset.countP for consistency.

Co-authored-by: James Gallichio <jamesgallicchio@gmail.com>

Co-authored-by: James <jamesgallicchio@gmail.com> Co-authored-by: Scott Morrison <scott.morrison@gmail.com>

f59eee0e

Diff

@@ -31,12 +31,12 @@ variable [DecidablePred p]
 
 /-- Count the number of naturals `k < n` satisfying `p k`. -/
 def count (n : ℕ) : ℕ :=
-  (List.range n).countp p
+  (List.range n).countP p
 #align nat.count Nat.count
 
 @[simp]
 theorem count_zero : count p 0 = 0 := by
-  rw [count, List.range_zero, List.countp, List.countp.go]
+  rw [count, List.range_zero, List.countP, List.countP.go]
 #align nat.count_zero Nat.count_zero
 
 /-- A fintype instance for the set relevant to `Nat.count`. Locally an instance in locale `count` -/
@@ -52,7 +52,7 @@ scoped[Count] attribute [instance] Nat.CountSet.fintype
 open Count
 
 theorem count_eq_card_filter_range (n : ℕ) : count p n = ((range n).filter p).card := by
-  rw [count, List.countp_eq_length_filter]
+  rw [count, List.countP_eq_length_filter]
   rfl
 #align nat.count_eq_card_filter_range Nat.count_eq_card_filter_range

dc6c365e

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) 2021 Vladimir Goryachev. All rights reserved.
 Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Yaël Dillies, Vladimir Goryachev, Kyle Miller, Scott Morrison, Eric Rodriguez
-
-! This file was ported from Lean 3 source module data.nat.count
-! leanprover-community/mathlib commit dc6c365e751e34d100e80fe6e314c3c3e0fd2988
-! Please do not edit these lines, except to modify the commit id
-! if you have ported upstream changes.
 -/
 import Mathlib.SetTheory.Cardinal.Basic
 import Mathlib.Tactic.Ring
 
+#align_import data.nat.count from "leanprover-community/mathlib"@"dc6c365e751e34d100e80fe6e314c3c3e0fd2988"
+
 /-!
 # Counting on ℕ

dc6c365e

feat: add Mathlib.Tactic.Common, and import (#4056)

This makes a mathlib4 version of mathlib3's tactic.basic, now called Mathlib.Tactic.Common, which imports all tactics which do not have significant theory requirements, and then is imported all across the base of the hierarchy.

This ensures that all common tactics are available nearly everywhere in the library, rather than having to be imported one-by-one as you need them.

Co-authored-by: Scott Morrison <scott.morrison@gmail.com>

a4eaf1c4

Diff

@@ -10,7 +10,6 @@ Authors: Yaël Dillies, Vladimir Goryachev, Kyle Miller, Scott Morrison, Eric Ro
 -/
 import Mathlib.SetTheory.Cardinal.Basic
 import Mathlib.Tactic.Ring
-import Mathlib.Tactic.WLOG
 
 /-!
 # Counting on ℕ

dc6c365e

chore: Restore most of the mono attribute (#2491)

Restore most of the mono attribute now that #1740 is merged.

I think I got all of the monos.

ffb5ddde

Diff

@@ -70,8 +70,7 @@ theorem count_succ (n : ℕ) : count p (n + 1) = count p n + if p n then 1 else
   split_ifs with h <;> simp [count, List.range_succ, h]
 #align nat.count_succ Nat.count_succ
 
--- Porting note: tactic does not exist yet
--- @[mono]
+@[mono]
 theorem count_monotone : Monotone (count p) :=
   monotone_nat_of_le_succ fun n ↦ by by_cases h : p n <;> simp [count_succ, h]
 #align nat.count_monotone Nat.count_monotone

dc6c365e

feat: port Data.Nat.Count (#2209)

Co-authored-by: Moritz Doll <moritz.doll@googlemail.com> Co-authored-by: Xavier-François Roblot <46200072+xroblot@users.noreply.github.com>

cc5c152a

`data.nat.count` ⟷ `Mathlib.Data.Nat.Count`

Changes since the initial port

Changes in mathlib3

Changes in mathlib3port

Changes in mathlib4

Dependencies 7 + 302

data.nat.count ⟷ Mathlib.Data.Nat.Count

Changes since the initial port

Changes in mathlib3

Changes in mathlib3port

Changes in mathlib4

Dependencies 7 + 302

`data.nat.count` ⟷ `Mathlib.Data.Nat.Count`