Skip to content

Commit f940cae

Browse files
jamesmckinnaandreasabel
authored andcommitted
fixes issue #2237 (#2238)
* fixes issue #2237 * leftover from #2182: subtle naming 'bug'/anomaly
1 parent d80dfdb commit f940cae

File tree

3 files changed

+16
-16
lines changed

3 files changed

+16
-16
lines changed

CHANGELOG.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ Additions to existing modules
5858
```agda
5959
quotient≢0 : m ∣ n → .{{NonZero n}} → NonZero quotient
6060
61-
m|n⇒n≡quotient*m : m ∣ n → n ≡ quotient * m
62-
m|n⇒n≡m*quotient : m ∣ n → n ≡ m * quotient
61+
mn⇒n≡quotient*m : m ∣ n → n ≡ quotient * m
62+
mn⇒n≡m*quotient : m ∣ n → n ≡ m * quotient
6363
quotient-∣ : m ∣ n → quotient ∣ n
6464
quotient>1 : m ∣ n → m < n → 1 < quotient
6565
quotient-< : m ∣ n → .{{NonTrivial m}} → .{{NonZero n}} → quotient < n

src/Data/Nat/Divisibility.agda

+13-13
Original file line numberDiff line numberDiff line change
@@ -42,20 +42,20 @@ open import Data.Nat.Divisibility.Core public hiding (*-pres-∣)
4242
quotient≢0 : (m∣n : m ∣ n) .{{NonZero n}} NonZero (quotient m∣n)
4343
quotient≢0 m∣n rewrite _∣_.equality m∣n = m*n≢0⇒m≢0 (quotient m∣n)
4444

45-
m|n⇒n≡quotient*m : (m∣n : m ∣ n) n ≡ (quotient m∣n) * m
46-
m|n⇒n≡quotient*m m∣n = _∣_.equality m∣n
45+
mn⇒n≡quotient*m : (m∣n : m ∣ n) n ≡ (quotient m∣n) * m
46+
mn⇒n≡quotient*m m∣n = _∣_.equality m∣n
4747

48-
m|n⇒n≡m*quotient : (m∣n : m ∣ n) n ≡ m * (quotient m∣n)
49-
m|n⇒n≡m*quotient {m = m} m∣n rewrite _∣_.equality m∣n = *-comm (quotient m∣n) m
48+
mn⇒n≡m*quotient : (m∣n : m ∣ n) n ≡ m * (quotient m∣n)
49+
mn⇒n≡m*quotient {m = m} m∣n rewrite _∣_.equality m∣n = *-comm (quotient m∣n) m
5050

5151
quotient-∣ : (m∣n : m ∣ n) (quotient m∣n) ∣ n
52-
quotient-∣ {m = m} m∣n = divides m (m|n⇒n≡m*quotient m∣n)
52+
quotient-∣ {m = m} m∣n = divides m (mn⇒n≡m*quotient m∣n)
5353

5454
quotient>1 : (m∣n : m ∣ n) m < n 1 < quotient m∣n
5555
quotient>1 {m} {n} m∣n m<n = *-cancelˡ-< m 1 (quotient m∣n) $ begin-strict
5656
m * 1 ≡⟨ *-identityʳ m ⟩
5757
m <⟨ m<n ⟩
58-
n ≡⟨ m|n⇒n≡m*quotient m∣n ⟩
58+
n ≡⟨ mn⇒n≡m*quotient m∣n ⟩
5959
m * quotient m∣n ∎
6060
where open ≤-Reasoning
6161

@@ -113,8 +113,8 @@ m%n≡0⇔n∣m m n = mk⇔ (m%n≡0⇒n∣m m n) (n∣m⇒m%n≡0 m n)
113113
divides (q * p) (sym (*-assoc q p _))
114114

115115
∣-antisym : Antisymmetric _≡_ _∣_
116-
∣-antisym {m} {zero} _ q∣p = m|n⇒n≡m*quotient q∣p
117-
∣-antisym {zero} {n} p∣q _ = sym (m|n⇒n≡m*quotient p∣q)
116+
∣-antisym {m} {zero} _ q∣p = mn⇒n≡m*quotient q∣p
117+
∣-antisym {zero} {n} p∣q _ = sym (mn⇒n≡m*quotient p∣q)
118118
∣-antisym {suc m} {suc n} p∣q q∣p = ≤-antisym (∣⇒≤ p∣q) (∣⇒≤ q∣p)
119119

120120
infix 4 _∣?_
@@ -233,7 +233,7 @@ m*n∣⇒n∣ m n rewrite *-comm m n = m*n∣⇒m∣ n m
233233

234234
*-cancelˡ-∣ : o .{{_ : NonZero o}} o * m ∣ o * n m ∣ n
235235
*-cancelˡ-∣ {m} {n} o o*m∣o*n = divides q $ *-cancelˡ-≡ n (q * m) o $ begin-equality
236-
o * n ≡⟨ m|n⇒n≡m*quotient o*m∣o*n ⟩
236+
o * n ≡⟨ mn⇒n≡m*quotient o*m∣o*n ⟩
237237
o * m * q ≡⟨ *-assoc o m q ⟩
238238
o * (m * q) ≡⟨ cong (o *_) (*-comm q m) ⟨
239239
o * (q * m) ∎
@@ -349,12 +349,12 @@ hasNonTrivialDivisor-≢ d≢n d∣n
349349

350350
hasNonTrivialDivisor-∣ : m HasNonTrivialDivisorLessThan n m ∣ o
351351
o HasNonTrivialDivisorLessThan n
352-
hasNonTrivialDivisor-∣ (hasNonTrivialDivisor d<n d∣m) n∣o
353-
= hasNonTrivialDivisor d<n (∣-trans d∣m n∣o)
352+
hasNonTrivialDivisor-∣ (hasNonTrivialDivisor d<n d∣m) m∣o
353+
= hasNonTrivialDivisor d<n (∣-trans d∣m m∣o)
354354

355355
-- Monotonicity wrt ≤
356356

357357
hasNonTrivialDivisor-≤ : m HasNonTrivialDivisorLessThan n n ≤ o
358358
m HasNonTrivialDivisorLessThan o
359-
hasNonTrivialDivisor-≤ (hasNonTrivialDivisor d<n d∣m) m≤o
360-
= hasNonTrivialDivisor (<-≤-trans d<n m≤o) d∣m
359+
hasNonTrivialDivisor-≤ (hasNonTrivialDivisor d<n d∣m) n≤o
360+
= hasNonTrivialDivisor (<-≤-trans d<n n≤o) d∣m

src/Data/Nat/Primality.agda

+1-1
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ prime⇒¬composite (prime p) = p
317317
where 2≡1⊎2≡0 = irr[0] {2} (divides-refl 0)
318318

319319
irreducible[1] : Irreducible 1
320-
irreducible[1] m|1 = inj₁ (∣1⇒≡1 m|1)
320+
irreducible[1] m1 = inj₁ (∣1⇒≡1 m1)
321321

322322
irreducible[2] : Irreducible 2
323323
irreducible[2] {zero} 0∣2 with () 0∣⇒≡0 0∣2

0 commit comments

Comments
 (0)