Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ Minor improvements
Data.Nat.Binary.Subtraction
Data.Nat.Combinatorics
```
Moreover, these have been strengthened to take an irrelevant `m ≤ n` argument.

* In `Data.Vec.Relation.Binary.Pointwise.{Inductive,Extensional}`, the types of
`refl`, `sym`, and `trans` have been weakened to allow relations of different
Expand Down Expand Up @@ -281,7 +282,7 @@ Additions to existing modules
* In `Data.Nat.Properties`:
```agda
≟-≢ : (m≢n : m ≢ n) → (m ≟ n) ≡ no m≢n
∸-suc : m ≤ n → suc n ∸ m ≡ suc (n ∸ m)
∸-suc : .(m ≤ n) → suc n ∸ m ≡ suc (n ∸ m)
^-distribʳ-* : ∀ m n o → (n * o) ^ m ≡ n ^ m * o ^ m
2*suc[n]≡2+n+n : ∀ n → 2 * (suc n) ≡ 2 + (n + n)
```
Expand Down
18 changes: 10 additions & 8 deletions src/Data/Nat/Properties.agda
Original file line number Diff line number Diff line change
Expand Up @@ -1540,9 +1540,9 @@ pred[m∸n]≡m∸[1+n] (suc m) (suc n) = pred[m∸n]≡m∸[1+n] m n
------------------------------------------------------------------------
-- Properties of _∸_ and _≤_/_<_

∸-suc : m ≤ n → suc n ∸ m ≡ suc (n ∸ m)
∸-suc z≤n = refl
∸-suc (s≤s m≤n) = ∸-suc m≤n
∸-suc : .(m ≤ n) → suc n ∸ m ≡ suc (n ∸ m)
∸-suc {m = zero} _ = refl
∸-suc {m = suc _} {n = suc _} m≤n = ∸-suc (s≤s⁻¹ m≤n)

m∸n≤m : ∀ m n → m ∸ n ≤ m
m∸n≤m n zero = ≤-refl
Expand Down Expand Up @@ -1633,7 +1633,7 @@ m≤n⇒n∸m≤n (s≤s m≤n) = m≤n⇒m≤1+n (m≤n⇒n∸m≤n m≤n)
∸-+-assoc (suc m) zero o = refl
∸-+-assoc (suc m) (suc n) o = ∸-+-assoc m n o

+-∸-assoc : ∀ m {n o} → o ≤ n → (m + n) ∸ o ≡ m + (n ∸ o)
+-∸-assoc : ∀ m {n o} → .(o ≤ n) → (m + n) ∸ o ≡ m + (n ∸ o)
+-∸-assoc zero {n = n} {o = o} _ = begin-equality n ∸ o ∎
+-∸-assoc (suc m) {n = n} {o = o} o≤n = begin-equality
suc (m + n) ∸ o ≡⟨ ∸-suc (m≤n⇒m≤o+n m o≤n) ⟩
Expand Down Expand Up @@ -1674,16 +1674,16 @@ m+n∸n≡m m n = begin-equality
m+n∸m≡n : ∀ m n → m + n ∸ m ≡ n
m+n∸m≡n m n = trans (cong (_∸ m) (+-comm m n)) (m+n∸n≡m n m)

m+[n∸m]≡n : m ≤ n → m + (n ∸ m) ≡ n
m+[n∸m]≡n : .(m ≤ n) → m + (n ∸ m) ≡ n
m+[n∸m]≡n {m} {n} m≤n = begin-equality
m + (n ∸ m) ≡⟨ sym $ +-∸-assoc m m≤n
m + (n ∸ m) ≡⟨ +-∸-assoc m m≤n
(m + n) ∸ m ≡⟨ cong (_∸ m) (+-comm m n) ⟩
(n + m) ∸ m ≡⟨ m+n∸n≡m n m ⟩
n ∎

m∸n+n≡m : ∀ {m n} → n ≤ m → (m ∸ n) + n ≡ m
m∸n+n≡m {m} {n} n≤m = begin-equality
(m ∸ n) + n ≡⟨ sym (+-∸-comm n n≤m) ⟩
(m ∸ n) + n ≡⟨ +-∸-comm n n≤m
(m + n) ∸ n ≡⟨ m+n∸n≡m m n ⟩
m ∎

Expand Down Expand Up @@ -2136,9 +2136,11 @@ n≤′m+n (suc m) n = ≤′-step (n≤′m+n m n)
------------------------------------------------------------------------

-- equivalence of _≤″_ to _≤_
-- NB the change in #2939 making the m≤n argument to m+[n∸m]≡n irrelevant
-- means that this proof must now be eta-expanded in order to typecheck.

≤⇒≤″ : _≤_ ⇒ _≤″_
≤⇒≤″ = (_ ,_) ∘ m+[n∸m]≡n
≤⇒≤″ m≤n = (_ , m+[n∸m]≡n m≤n)

<⇒<″ : _<_ ⇒ _<″_
<⇒<″ = ≤⇒≤″
Expand Down