data.bool.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

8631e2d5

(last sync)

refactor(data/nat/parity): reduce imports, add/delete lemmas (#18221)

Sync mathlib3 with API changes introduced while porting data.nat.parity to Mathlib 4 in leanprover-community/mathlib4#1661.

Add even.two_dvd, even.trans_dvd, has_dvd.dvd.even, odd.of_dvd_nat, and odd.ne_two_of_dvd_nat.
Rename nat.even_sub_one_of_prime_ne_two to nat.prime.even_sub_one, move to data.nat.prime.
Delete odd.factors_ne_two.
Replace is_primitive_root.pow_sub_one_norm_prime_pow_of_one_le with is_primitive_root.pow_sub_one_norm_prime_pow_of_ne_zero, assume ≠ 0 instead of 1 ≤.

Diff

@@ -4,6 +4,7 @@ Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Yury Kudryashov
 -/
 import data.nat.parity
+import data.list.chain
 
 /-!
 # List of booleans

2445c98a

(first ported)

Changes in mathlib3port

mathlib3

mathlib3port

a11f9106

bump to nightly-2024-03-17-08

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

22f01ce4

Diff

@@ -71,7 +71,7 @@ variable {l : List Bool}
 theorem count_not_eq_count (hl : Chain' (· ≠ ·) l) (h2 : Even (length l)) (b : Bool) :
     count (!b) l = count b l := by
   cases' l with x l; · rfl
-  rw [length_cons, Nat.even_add_one, Nat.not_even_iff] at h2 
+  rw [length_cons, Nat.even_add_one, Nat.not_even_iff] at h2
   suffices count (!x) (x :: l) = count x (x :: l) by
     cases b <;> cases x <;> try exact this <;> exact this.symm
   rw [count_cons_of_ne x.bnot_ne_self, hl.count_bnot, h2, count_cons_self]
@@ -127,7 +127,7 @@ theorem two_mul_count_bool_eq_ite (hl : Chain' (· ≠ ·) l) (b : Bool) :
   · rw [if_pos h2, hl.two_mul_count_bool_of_even h2]
   · cases' l with x l; · exact (h2 even_zero).elim
     simp only [if_neg h2, count_cons', mul_add, head', Option.mem_some_iff, @eq_comm _ x]
-    rw [length_cons, Nat.even_add_one, Classical.not_not] at h2 
+    rw [length_cons, Nat.even_add_one, Classical.not_not] at h2
     replace hl : l.chain' (· ≠ ·) := hl.tail
     rw [hl.two_mul_count_bool_of_even h2]
     split_ifs <;> simp

a11f9106

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) 2022 Yury Kudryashov. All rights reserved.
 Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Yury Kudryashov
 -/
-import Mathbin.Data.Nat.Parity
-import Mathbin.Data.List.Chain
+import Data.Nat.Parity
+import Data.List.Chain
 
 #align_import data.bool.count from "leanprover-community/mathlib"@"a11f9106a169dd302a285019e5165f8ab32ff433"

a11f9106

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) 2022 Yury Kudryashov. All rights reserved.
 Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Yury Kudryashov
-
-! This file was ported from Lean 3 source module data.bool.count
-! leanprover-community/mathlib commit a11f9106a169dd302a285019e5165f8ab32ff433
-! Please do not edit these lines, except to modify the commit id
-! if you have ported upstream changes.
 -/
 import Mathbin.Data.Nat.Parity
 import Mathbin.Data.List.Chain
 
+#align_import data.bool.count from "leanprover-community/mathlib"@"a11f9106a169dd302a285019e5165f8ab32ff433"
+
 /-!
 # List of booleans

a11f9106

bump to nightly-2023-06-01-16

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

b9c87c70

Diff

@@ -74,7 +74,7 @@ variable {l : List Bool}
 theorem count_not_eq_count (hl : Chain' (· ≠ ·) l) (h2 : Even (length l)) (b : Bool) :
     count (!b) l = count b l := by
   cases' l with x l; · rfl
-  rw [length_cons, Nat.even_add_one, Nat.not_even_iff] at h2
+  rw [length_cons, Nat.even_add_one, Nat.not_even_iff] at h2 
   suffices count (!x) (x :: l) = count x (x :: l) by
     cases b <;> cases x <;> try exact this <;> exact this.symm
   rw [count_cons_of_ne x.bnot_ne_self, hl.count_bnot, h2, count_cons_self]
@@ -130,7 +130,7 @@ theorem two_mul_count_bool_eq_ite (hl : Chain' (· ≠ ·) l) (b : Bool) :
   · rw [if_pos h2, hl.two_mul_count_bool_of_even h2]
   · cases' l with x l; · exact (h2 even_zero).elim
     simp only [if_neg h2, count_cons', mul_add, head', Option.mem_some_iff, @eq_comm _ x]
-    rw [length_cons, Nat.even_add_one, Classical.not_not] at h2
+    rw [length_cons, Nat.even_add_one, Classical.not_not] at h2 
     replace hl : l.chain' (· ≠ ·) := hl.tail
     rw [hl.two_mul_count_bool_of_even h2]
     split_ifs <;> simp

a11f9106

bump to nightly-2023-05-28-04

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

6797a637

Diff

@@ -73,8 +73,7 @@ variable {l : List Bool}
 #print List.Chain'.count_not_eq_count /-
 theorem count_not_eq_count (hl : Chain' (· ≠ ·) l) (h2 : Even (length l)) (b : Bool) :
     count (!b) l = count b l := by
-  cases' l with x l
-  · rfl
+  cases' l with x l; · rfl
   rw [length_cons, Nat.even_add_one, Nat.not_even_iff] at h2
   suffices count (!x) (x :: l) = count x (x :: l) by
     cases b <;> cases x <;> try exact this <;> exact this.symm
@@ -92,8 +91,7 @@ theorem count_false_eq_count_true (hl : Chain' (· ≠ ·) l) (h2 : Even (length
 #print List.Chain'.count_not_le_count_add_one /-
 theorem count_not_le_count_add_one (hl : Chain' (· ≠ ·) l) (b : Bool) :
     count (!b) l ≤ count b l + 1 := by
-  cases' l with x l
-  · exact zero_le _
+  cases' l with x l; · exact zero_le _
   obtain rfl | rfl : b = x ∨ b = !x := by simp only [Bool.eq_not_iff, em]
   · rw [count_cons_of_ne b.bnot_ne_self, count_cons_self, hl.count_bnot, add_assoc]
     exact add_le_add_left (Nat.mod_lt _ two_pos).le _
@@ -130,8 +128,7 @@ theorem two_mul_count_bool_eq_ite (hl : Chain' (· ≠ ·) l) (b : Bool) :
   by
   by_cases h2 : Even (length l)
   · rw [if_pos h2, hl.two_mul_count_bool_of_even h2]
-  · cases' l with x l
-    · exact (h2 even_zero).elim
+  · cases' l with x l; · exact (h2 even_zero).elim
     simp only [if_neg h2, count_cons', mul_add, head', Option.mem_some_iff, @eq_comm _ x]
     rw [length_cons, Nat.even_add_one, Classical.not_not] at h2
     replace hl : l.chain' (· ≠ ·) := hl.tail
@@ -142,9 +139,7 @@ theorem two_mul_count_bool_eq_ite (hl : Chain' (· ≠ ·) l) (b : Bool) :
 
 #print List.Chain'.length_sub_one_le_two_mul_count_bool /-
 theorem length_sub_one_le_two_mul_count_bool (hl : Chain' (· ≠ ·) l) (b : Bool) :
-    length l - 1 ≤ 2 * count b l :=
-  by
-  rw [hl.two_mul_count_bool_eq_ite]
+    length l - 1 ≤ 2 * count b l := by rw [hl.two_mul_count_bool_eq_ite];
   split_ifs <;> simp [le_tsub_add, Nat.le_succ_of_le]
 #align list.chain'.length_sub_one_le_two_mul_count_bool List.Chain'.length_sub_one_le_two_mul_count_bool
 -/
@@ -160,9 +155,7 @@ theorem length_div_two_le_count_bool (hl : Chain' (· ≠ ·) l) (b : Bool) :
 
 #print List.Chain'.two_mul_count_bool_le_length_add_one /-
 theorem two_mul_count_bool_le_length_add_one (hl : Chain' (· ≠ ·) l) (b : Bool) :
-    2 * count b l ≤ length l + 1 :=
-  by
-  rw [hl.two_mul_count_bool_eq_ite]
+    2 * count b l ≤ length l + 1 := by rw [hl.two_mul_count_bool_eq_ite];
   split_ifs <;> simp [Nat.le_succ_of_le]
 #align list.chain'.two_mul_count_bool_le_length_add_one List.Chain'.two_mul_count_bool_le_length_add_one
 -/

a11f9106

bump to nightly-2023-02-21-16

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

1107b979

Changes in mathlib4

mathlib3

mathlib4

8631e2d5

chore: avoid lean3 style have/suffices (#6964)

Many proofs use the "stream of consciousness" style from Lean 3, rather than have ... := or suffices ... from/by.

This PR updates a fraction of these to the preferred Lean 4 style.

I think a good goal would be to delete the "deferred" versions of have, suffices, and let at the bottom of Mathlib.Tactic.Have

(Anyone who would like to contribute more cleanup is welcome to push directly to this branch.)

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

bdc47f68

Diff

@@ -25,7 +25,7 @@ theorem count_not_add_count (l : List Bool) (b : Bool) : count (!b) l + count b
   -- Porting note: Proof re-written
   -- Old proof: simp only [length_eq_countP_add_countP (Eq (!b)), Bool.not_not_eq, count]
   simp only [length_eq_countP_add_countP (· == !b), count, add_right_inj]
-  suffices : (fun x => x == b) = (fun a => decide ¬(a == !b) = true); rw [this]
+  suffices (fun x => x == b) = (fun a => decide ¬(a == !b) = true) by rw [this]
   ext x; cases x <;> cases b <;> rfl
 #align list.count_bnot_add_count List.count_not_add_count

8631e2d5

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

@@ -23,8 +23,8 @@ namespace List
 @[simp]
 theorem count_not_add_count (l : List Bool) (b : Bool) : count (!b) l + count b l = length l := by
   -- Porting note: Proof re-written
-  -- Old proof: simp only [length_eq_countp_add_countp (Eq (!b)), Bool.not_not_eq, count]
-  simp only [length_eq_countp_add_countp (· == !b), count, add_right_inj]
+  -- Old proof: simp only [length_eq_countP_add_countP (Eq (!b)), Bool.not_not_eq, count]
+  simp only [length_eq_countP_add_countP (· == !b), count, add_right_inj]
   suffices : (fun x => x == b) = (fun a => decide ¬(a == !b) = true); rw [this]
   ext x; cases x <;> cases b <;> rfl
 #align list.count_bnot_add_count List.count_not_add_count
@@ -110,7 +110,7 @@ theorem two_mul_count_bool_eq_ite (hl : Chain' (· ≠ ·) l) (b : Bool) :
   · rw [if_pos h2, hl.two_mul_count_bool_of_even h2]
   · cases' l with x l
     · exact (h2 even_zero).elim
-    simp only [if_neg h2, count_cons', mul_add, head?, Option.mem_some_iff, @eq_comm _ x]
+    simp only [if_neg h2, count_cons, mul_add, head?, Option.mem_some_iff, @eq_comm _ x]
     rw [length_cons, Nat.even_add_one, not_not] at h2
     replace hl : l.Chain' (· ≠ ·) := hl.tail
     rw [hl.two_mul_count_bool_of_even h2]
@@ -138,4 +138,3 @@ theorem two_mul_count_bool_le_length_add_one (hl : Chain' (· ≠ ·) l) (b : Bo
 end Chain'
 
 end List
-

8631e2d5

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) 2022 Yury Kudryashov. All rights reserved.
 Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Yury Kudryashov
-
-! This file was ported from Lean 3 source module data.bool.count
-! leanprover-community/mathlib commit 8631e2d5ea77f6c13054d9151d82b83069680cb1
-! Please do not edit these lines, except to modify the commit id
-! if you have ported upstream changes.
 -/
 import Mathlib.Data.Nat.Parity
 import Mathlib.Data.List.Chain
 
+#align_import data.bool.count from "leanprover-community/mathlib"@"8631e2d5ea77f6c13054d9151d82b83069680cb1"
+
 /-!
 # List of booleans

8631e2d5

chore: resync ported files (#2135)

This PR resyncs the first 28 entries of https://leanprover-community.github.io/mathlib-port-status/out-of-sync.html after sorting by diff size.

resync Mathlib/Data/Bool/Count
resync Mathlib/Order/Max
resync Mathlib/Algebra/EuclideanDomain/Instances
resync Mathlib/Data/List/Duplicate
resync Mathlib/Data/Multiset/Nodup
resync Mathlib/Data/Set/Pointwise/ListOfFn
resync Mathlib/Dynamics/FixedPoints/Basic
resync Mathlib/Order/OmegaCompletePartialOrder
resync Mathlib/Order/PropInstances
resync Mathlib/Topology/LocallyFinite
resync Mathlib/Data/Bool/Set
resync Mathlib/Data/Fintype/Card
resync Mathlib/Data/Multiset/Bind
resync Mathlib/Data/Rat/Floor
resync Mathlib/Algebra/Order/Floor
resync Mathlib/Data/Int/Basic
resync Mathlib/Data/Int/Dvd/Basic
resync Mathlib/Data/List/Sort
resync Mathlib/Data/Nat/GCD/Basic
resync Mathlib/Data/Set/Enumerate
resync Mathlib/Data/Set/Intervals/OrdConnectedComponent
resync Mathlib/GroupTheory/Subsemigroup/Basic
resync Mathlib/Topology/Connected
resync Mathlib/Topology/NhdsSet
resync Mathlib/Algebra/BigOperators/Multiset/Lemmas
resync Mathlib/Algebra/CharZero/Infinite
resync Mathlib/Data/Multiset/Range
resync Mathlib/Data/Set/Pointwise/Finite

a7eb5ab3

Diff

@@ -4,12 +4,11 @@ Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Yury Kudryashov
 
 ! This file was ported from Lean 3 source module data.bool.count
-! leanprover-community/mathlib commit 2445c98ae4b87eabebdde552593519b9b6dc350c
+! leanprover-community/mathlib commit 8631e2d5ea77f6c13054d9151d82b83069680cb1
 ! Please do not edit these lines, except to modify the commit id
 ! if you have ported upstream changes.
 -/
 import Mathlib.Data.Nat.Parity
-import Mathlib.Data.List.Count
 import Mathlib.Data.List.Chain
 
 /-!

2445c98a

feat: Port Data.Bool.Count (#1761)

8aef3ee9

`data.bool.count` ⟷ `Mathlib.Data.Bool.Count`

Changes since the initial port

Changes in mathlib3

Changes in mathlib3port

Changes in mathlib4

Dependencies 3 + 139

data.bool.count ⟷ Mathlib.Data.Bool.Count

Changes since the initial port

Changes in mathlib3

Changes in mathlib3port

Changes in mathlib4

Dependencies 3 + 139

`data.bool.count` ⟷ `Mathlib.Data.Bool.Count`