rzk-lang / sHoTT

Formalisations for simplicial HoTT and synthetic ∞-categories.
https://rzk-lang.github.io/sHoTT/
44 stars 12 forks source link

Reorganize proof that discrete types are Segal #137

Closed TashiWalde closed 11 months ago

TashiWalde commented 11 months ago

Currently there are two completely independent proofs that every discrete type is Segal:

The second proof has many advantages over the first:

I have therefore made the following changes:

emilyriehl commented 11 months ago

@TashiWalde this is great. I'll look at everything more detail this evening.

I'm the one who wrote the original formalization of [RS17, 7.3] and don't mind if that proof is replaced by the improved one. What do others think @jonweinb?

One more question: will this cause problems for @StiephenPradal 's open PR? If so, I'd appreciate guidance on how best to merge them.

TashiWalde commented 11 months ago

@TashiWalde this is great. I'll look at everything more detail this evening.

I'm the one who wrote the original formalization of [RS17, 7.3] and don't mind if that proof is replaced by the improved one. What do others think @jonweinb?

One more question: will this cause problems for @StiephenPradal 's open PR? If so, I'd appreciate guidance on how best to merge them.

All of the changes to 07-discrete are in one big chunk moved from 08-covariant with a few additions. I did not mess with any of the existing code (except adding a ' to the former is-segal-is-discrete). Therefore I don't expect any merging issues unless @StiephenPradal made any breaking changes to the terms that were there before.

emilyriehl commented 11 months ago

@TashiWalde I may have messed something up by merging your later pull request before this one. Let me know if you'd like me to revert that.

I was delaying this because I wanted to give others a chance to weigh in on the duplicated proof. Maybe we merge a version with both proofs now and then open a new PR to cut the old one? Or you can go ahead and cut that out now if you prefer.

TashiWalde commented 11 months ago

@emilyriehl I have resolved the merge conflict. It was not your fault; I had made a non-compatible change in another pull-request.

From my side the PR is now ready to be merged. I'll leave it up to you if you want to keep or discard the original proof. There is also no real hurry in merging this PR, so we can leave time for others to weigh in.

emilyriehl commented 11 months ago

Let's merge this now and we can make further changes later. I'm glad to hear the merge conflict wasn't my fault this time ;)