Skip to content
New issue

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

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

Already on GitHub? # to your account

Coq 8.20, rm infra.v, minor fixes #38

Merged
merged 9 commits into from
Feb 25, 2025
Merged

Coq 8.20, rm infra.v, minor fixes #38

merged 9 commits into from
Feb 25, 2025

Conversation

affeldt-aist
Copy link
Member

This PR:

  • removes the file infra.v (whose purpose was essentially to equip
    Z from the stdlib with the MathComp structures -> use ssrZ.v instead)
  • update the opam file to support Coq 8.20
  • other minor fixes so that make -j3 compiles up-to general_position.v
    that I am not sure is a file that actually ought to compile

@ybertot
Copy link
Member

ybertot commented Feb 19, 2025

We need to change CI to use coq-8.20 and mathcomp2.3.0, if possible.

@affeldt-aist
Copy link
Member Author

Let me try to add them.

between the full sequence of events and the concatenation of the processed
and future events
@ybertot
Copy link
Member

ybertot commented Feb 20, 2025

The new error message states that the build of infotheo is breaking. @affeldt-aist I need your help for this, but there is no hurry.

@affeldt-aist
Copy link
Member Author

affeldt-aist commented Feb 21, 2025

We have released recent versions of infotheo and I PRed a fix for an older version. This should fix the problem but we need to wait a bit for opam to be updated.

@affeldt-aist
Copy link
Member Author

affeldt-aist commented Feb 22, 2025

The second CI error (with Coq 8.20) is:

  - File "./theories/general_position.v", line 159, characters 12-57:
  - Error:
  - In environment
  - R : realFieldType
  - common_general_position_invariant :
  -   edge -> edge -> seq edge -> scan_state -> seq event -> Type
  - bottom : edge
  - top : edge
  - edge_set : seq edge
  - s : scan_state
  - events : seq event
  - The term "common_invariant bottom top edge_set s events" has type
  - "seq event -> seq event -> Prop" which should be Set, Prop or Type.

and indeed I have the same error on my laptop
(commit b857457).

@ybertot
Copy link
Member

ybertot commented Feb 24, 2025

I know I corrected that file, that is why I believed I had pushed a correct version, but now I can't find my corrected version anymore. This is pain because I had a difficult modification of an inductive proof to perform, and I can't remember the exact trick. I will have to think again.

Yves

ybertot and others added 2 commits February 24, 2025 10:33
…duction

proof in complete_disjoint_general_position has been fine-tuned
@ybertot
Copy link
Member

ybertot commented Feb 25, 2025

This PR is now ready for squashing and merging. The problem with coq-8.19 has been studied and a solution is proposed in https://github.com/ybertot/trajectories/tree/lra_patch_for_coq_8.19 , but cannot be merged here because it adds workarounds that should not be kept for the long term.

@affeldt-aist affeldt-aist merged commit 6a37b7a into main Feb 25, 2025
1 check passed
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants