Skip to content

Commit 437c015

Browse files
authored
Merge pull request #653 from Chessing234/fix/section-4-1-verso-labels
fix: disambiguate duplicate Verso labels in Section 4.1
2 parents d7725fe + 3c0a74e commit 437c015

1 file changed

Lines changed: 17 additions & 17 deletions

File tree

Analysis/Section_4_1.lean

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ abbrev Int.formalDiff (a b:ℕ) : Int := Quotient.mk PreInt.instSetoid ⟨ a,b
6262

6363
infix:100 " —— " => Int.formalDiff
6464

65-
/-- Definition 4.1.1 (Integers) -/
65+
/-- Definition 4.1.1 (Integers, equality) -/
6666
theorem Int.eq (a b c d:ℕ): a —— b = c —— d ↔ a + d = c + b :=
6767
⟨ Quotient.exact, by intro h; exact Quotient.sound h ⟩
6868

@@ -76,7 +76,7 @@ instance Int.decidableEq : DecidableEq Int := by
7676
exact decEq _ _
7777
exact Quotient.recOnSubsingleton₂ a b this
7878

79-
/-- Definition 4.1.1 (Integers) -/
79+
/-- Definition 4.1.1 (Integers, existence of a representation) -/
8080
theorem Int.eq_diff (n:Int) : ∃ a b, n = a —— b := by apply n.ind _; intro ⟨ a, b ⟩; use a, b
8181

8282
/-- Lemma 4.1.3 (Addition well-defined) -/
@@ -89,7 +89,7 @@ instance Int.instAdd : Add Int where
8989
/-- Definition 4.1.2 (Definition of addition) -/
9090
theorem Int.add_eq (a b c d:ℕ) : a —— b + c —— d = (a+c)——(b+d) := Quotient.lift₂_mk _ _ _ _
9191

92-
/-- Lemma 4.1.3 (Multiplication well-defined) -/
92+
/-- Lemma 4.1.3 (Multiplication well-defined, left argument) -/
9393
theorem Int.mul_congr_left (a b a' b' c d : ℕ) (h: a —— b = a' —— b') :
9494
(a*c+b*d) —— (a*d+b*c) = (a'*c+b'*d) —— (a'*d+b'*c) := by
9595
simp only [eq] at *
@@ -98,7 +98,7 @@ theorem Int.mul_congr_left (a b a' b' c d : ℕ) (h: a —— b = a' —— b')
9898
_ = c*(a'+b) + d*(a+b') := by rw [h]
9999
_ = _ := by ring
100100

101-
/-- Lemma 4.1.3 (Multiplication well-defined) -/
101+
/-- Lemma 4.1.3 (Multiplication well-defined, right argument) -/
102102
theorem Int.mul_congr_right (a b c d c' d' : ℕ) (h: c —— d = c' —— d') :
103103
(a*c+b*d) —— (a*d+b*c) = (a*c'+b*d') —— (a*d'+b*c') := by
104104
simp only [eq] at *
@@ -107,7 +107,7 @@ theorem Int.mul_congr_right (a b c d c' d' : ℕ) (h: c —— d = c' —— d')
107107
_ = a*(c'+d) + b*(c+d') := by rw [h]
108108
_ = _ := by ring
109109

110-
/-- Lemma 4.1.3 (Multiplication well-defined) -/
110+
/-- Lemma 4.1.3 (Multiplication well-defined, both arguments) -/
111111
theorem Int.mul_congr {a b c d a' b' c' d' : ℕ} (h1: a —— b = a' —— b') (h2: c —— d = c' —— d') :
112112
(a*c+b*d) —— (a*d+b*c) = (a'*c'+b'*d') —— (a'*d'+b'*c') := by
113113
rw [mul_congr_left a b a' b' c d h1, mul_congr_right a' b' c d c' d' h2]
@@ -187,15 +187,15 @@ theorem Int.not_pos_neg (x:Int) : x.IsPos ∧ x.IsNeg → False := by
187187
rintro ⟨ ⟨ n, _, rfl ⟩, ⟨ m, _, hm ⟩ ⟩; simp_rw [natCast_eq, neg_eq, eq] at hm
188188
linarith
189189

190-
/-- Proposition 4.1.6 (laws of algebra) / Exercise 4.1.4 -/
190+
/-- Proposition 4.1.6 (laws of algebra, additive group) / Exercise 4.1.4 -/
191191
instance Int.instAddGroup : AddGroup Int :=
192192
AddGroup.ofLeftAxioms (by sorry) (by sorry) (by sorry)
193193

194-
/-- Proposition 4.1.6 (laws of algebra) / Exercise 4.1.4 -/
194+
/-- Proposition 4.1.6 (laws of algebra, additive commutative group) / Exercise 4.1.4 -/
195195
instance Int.instAddCommGroup : AddCommGroup Int where
196196
add_comm := by sorry
197197

198-
/-- Proposition 4.1.6 (laws of algebra) / Exercise 4.1.4 -/
198+
/-- Proposition 4.1.6 (laws of algebra, commutative monoid) / Exercise 4.1.4 -/
199199
instance Int.instCommMonoid : CommMonoid Int where
200200
mul_comm := by sorry
201201
mul_assoc := by
@@ -208,7 +208,7 @@ instance Int.instCommMonoid : CommMonoid Int where
208208
one_mul := by sorry
209209
mul_one := by sorry
210210

211-
/-- Proposition 4.1.6 (laws of algebra) / Exercise 4.1.4 -/
211+
/-- Proposition 4.1.6 (laws of algebra, commutative ring) / Exercise 4.1.4 -/
212212
instance Int.instCommRing : CommRing Int where
213213
left_distrib := by sorry
214214
right_distrib := by sorry
@@ -226,11 +226,11 @@ theorem Int.mul_eq_zero {a b:Int} (h: a * b = 0) : a = 0 ∨ b = 0 := by sorry
226226
/-- Corollary 4.1.9 (Cancellation law) / Exercise 4.1.6 -/
227227
theorem Int.mul_right_cancel₀ (a b c:Int) (h: a*c = b*c) (hc: c ≠ 0) : a = b := by sorry
228228

229-
/-- Definition 4.1.10 (Ordering of the integers) -/
229+
/-- Definition 4.1.10 (Ordering of the integers, non-strict) -/
230230
instance Int.instLE : LE Int where
231231
le n m := ∃ a:ℕ, m = n + a
232232

233-
/-- Definition 4.1.10 (Ordering of the integers) -/
233+
/-- Definition 4.1.10 (Ordering of the integers, strict) -/
234234
instance Int.instLT : LT Int where
235235
lt n m := n ≤ m ∧ n ≠ m
236236

@@ -247,25 +247,25 @@ theorem Int.add_lt_add_right {a b:Int} (c:Int) (h: a < b) : a+c < b+c := by sorr
247247
/-- Lemma 4.1.11(c) (Positive multiplication preserves order) / Exercise 4.1.7 -/
248248
theorem Int.mul_lt_mul_of_pos_right {a b c:Int} (hab : a < b) (hc: 0 < c) : a*c < b*c := by sorry
249249

250-
/-- Lemma 4.1.11(d) (Negation reverses order) / Exercise 4.1.7 -/
250+
/-- Lemma 4.1.11(d) (Negation reverses order, strict) / Exercise 4.1.7 -/
251251
theorem Int.neg_gt_neg {a b:Int} (h: b < a) : -a < -b := by sorry
252252

253-
/-- Lemma 4.1.11(d) (Negation reverses order) / Exercise 4.1.7 -/
253+
/-- Lemma 4.1.11(d) (Negation reverses order, non-strict) / Exercise 4.1.7 -/
254254
theorem Int.neg_ge_neg {a b:Int} (h: b ≤ a) : -a ≤ -b := by sorry
255255

256256
/-- Lemma 4.1.11(e) (Order is transitive) / Exercise 4.1.7 -/
257257
theorem Int.lt_trans {a b c:Int} (hab: a < b) (hbc: b < c) : a < c := by sorry
258258

259-
/-- Lemma 4.1.11(f) (Order trichotomy) / Exercise 4.1.7 -/
259+
/-- Lemma 4.1.11(f) (Order trichotomy, trichotomy) / Exercise 4.1.7 -/
260260
theorem Int.trichotomous' (a b:Int) : a > b ∨ a < b ∨ a = b := by sorry
261261

262-
/-- Lemma 4.1.11(f) (Order trichotomy) / Exercise 4.1.7 -/
262+
/-- Lemma 4.1.11(f) (Order trichotomy, greater vs less) / Exercise 4.1.7 -/
263263
theorem Int.not_gt_and_lt (a b:Int) : ¬ (a > b ∧ a < b):= by sorry
264264

265-
/-- Lemma 4.1.11(f) (Order trichotomy) / Exercise 4.1.7 -/
265+
/-- Lemma 4.1.11(f) (Order trichotomy, greater vs equal) / Exercise 4.1.7 -/
266266
theorem Int.not_gt_and_eq (a b:Int) : ¬ (a > b ∧ a = b):= by sorry
267267

268-
/-- Lemma 4.1.11(f) (Order trichotomy) / Exercise 4.1.7 -/
268+
/-- Lemma 4.1.11(f) (Order trichotomy, less vs equal) / Exercise 4.1.7 -/
269269
theorem Int.not_lt_and_eq (a b:Int) : ¬ (a < b ∧ a = b):= by sorry
270270

271271
/-- (Not from textbook) Establish the decidability of this order. -/

0 commit comments

Comments
 (0)