Skip to content

Commit a71c7b3

Browse files
Merge pull request #464 from jacquescomeaux/missing-merge-combinators
Minor reasoning combinator updates
2 parents 5f4ee43 + 51ae6c4 commit a71c7b3

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

src/Categories/Category/Monoidal/Reasoning.agda

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,15 @@ split₂ˡ {f = f} {g} {h} = begin
135135
id ⊗₁ g ∘ f ⊗₁ h ∎
136136

137137
-- The opposite, i.e. merge
138-
merge₂ʳ : {X₁ Y₁ X₂ Y₂ Z₂} {f : X₁ ⇒ Y₁} {g : Y₂ ⇒ Z₂} {h : X₂ ⇒ Y₂}
138+
merge₁ʳ : {X₁ Y₁ Z₁ X₂ Y₂} {f : Y₁ ⇒ Z₁} {g : X₁ ⇒ Y₁} {h : X₂ ⇒ Y₂}
139+
f ⊗₁ h ∘ g ⊗₁ id ≈ (f ∘ g) ⊗₁ h
140+
merge₁ʳ = Equiv.sym split₁ʳ
141+
142+
merge₁ˡ : {X₁ Y₁ Z₁ X₂ Y₂} {f : Y₁ ⇒ Z₁} {g : X₁ ⇒ Y₁} {h : X₂ ⇒ Y₂}
143+
f ⊗₁ id ∘ g ⊗₁ h ≈ (f ∘ g) ⊗₁ h
144+
merge₁ˡ = Equiv.sym split₁ˡ
145+
146+
merge₂ʳ : {X₁ Y₁ X₂ Y₂ Z₂} {f : X₁ ⇒ Y₁} {g : Y₂ ⇒ Z₂} {h : X₂ ⇒ Y₂}
139147
f ⊗₁ g ∘ id ⊗₁ h ≈ f ⊗₁ (g ∘ h)
140148
merge₂ʳ = Equiv.sym split₂ʳ
141149

src/Categories/Morphism/Reasoning/Core.agda

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -309,8 +309,8 @@ pull-first {f = f} {g = g} {a = a} {h = h} {i = i} eq = begin
309309
pull-center : g ∘ h ≈ a f ∘ (g ∘ (h ∘ i)) ≈ f ∘ (a ∘ i)
310310
pull-center eq = ∘-resp-≈ʳ (pullˡ eq)
311311

312-
push-center : g ∘ h ≈ a f ∘ (a ∘ i) ≈ f ∘ (g ∘ (h ∘ i))
313-
push-center eq = Equiv.sym (pull-center eq)
312+
push-center : a ≈ g ∘ h f ∘ (a ∘ i) ≈ f ∘ (g ∘ (h ∘ i))
313+
push-center eq = Equiv.sym (pull-center (Equiv.sym eq))
314314

315315
intro-first : a ∘ b ≈ id f ∘ g ≈ a ∘ ((b ∘ f) ∘ g)
316316
intro-first {a = a} {b = b} {f = f} {g = g} eq = begin

0 commit comments

Comments
 (0)