Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Package for bridge to gaia #56

Merged
merged 17 commits into from
Aug 15, 2021
Merged

Package for bridge to gaia #56

merged 17 commits into from
Aug 15, 2021

Conversation

palmskog
Copy link
Member

As per discussion in #55, I have added the package coq-gaia-hydras based on Dune in this branch created by @Casteran. However, this branch is currently in conflict with master due to changes previous to my commits in the regular ordinals part that are unrelated to the gaia proofs or packaging.

Since I'm not sure how to proceed to get the branch mergeable (e.g., rebase and fix conflicts or just cherry-pick the gaia work in another branch?) I'm opening this draft PR.

@Casteran
Copy link
Member

@palmskog I fixed the conflicts in my (local )branch Bridge. So, the procedure is now to commit, then push Bridge ?

@palmskog
Copy link
Member Author

palmskog commented Aug 14, 2021

@Casteran yes, if you fixed the conflicts on top of my (unrelated) changes, all you need to do is to commit locally and push to the upstream (GitHub) Bridge branch.

@Casteran
Copy link
Member

OK,
I plan to complete the file T1Bridge.v : relationship between hydra-battle's and gaia's T1.
When it's OK, we may discuss about the style (proof scripts, theorem naming, documentation) before writing other modules.

For the time being, I'm writing in a strange cocktail of vanilla Coq and SSreflect, but I hope I'll improve the consistency of my scripts soon ...

@palmskog
Copy link
Member Author

@Casteran feel free to roll back my SSReflect proof changes if you want. Also, recall that you can get lia and nia to work with MathComp operators if you install the package coq-mathcomp-zify, and do after the usual MathComp requires:

From mathcomp Require Import zify.

See an example.

@Casteran
Copy link
Member

Casteran commented Aug 14, 2021 via email

doc/part-hydras.tex Outdated Show resolved Hide resolved
Co-authored-by: Karl Palmskog <palmskog@gmail.com>
@palmskog palmskog marked this pull request as ready for review August 15, 2021 07:17
@palmskog palmskog merged commit bebe59c into master Aug 15, 2021
@palmskog palmskog deleted the Bridge branch August 15, 2021 07:21
@Casteran
Copy link
Member

@palmskog @Zimmi48
I've achieved the importation of Gaia's theorem asserting associativity of multiplication on T1 into theories/gaia.
The script is an awfull draft, so I will clean it up before commiting it.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants