Skip to content

compatibility with coq 8.12 #241

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.

Sign up for GitHub

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

Merged
CohenCyril merged 2 commits into from
Jul 27, 2020
Merged

compatibility with coq 8.12 #241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ce3ddb
compatibility with coq 8.12
affeldt-aist Jul 26, 2020
64f2f5e
restrict to Coq 8.10 and add Coq 8.12 to travis
affeldt-aist Jul 27, 2020
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
1 change: 1 addition & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ env:
jobs:
- DOCKERIMAGE="mathcomp/mathcomp:1.11.0-coq-8.10"
- DOCKERIMAGE="mathcomp/mathcomp:1.11.0-coq-8.11"
- DOCKERIMAGE="mathcomp/mathcomp:1.11.0-coq-8.12"

install:
- docker pull ${DOCKERIMAGE}
Expand Down
4 changes: 2 additions & 2 deletions opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ install: [
[make "install"]
]
depends: [
"coq" { ((>= "8.7" & < "8.12~") | = "dev") }
"coq" { ((>= "8.10" & < "8.13~") | = "dev") }
"coq-mathcomp-field" {(>= "1.11.0" & < "1.12~")}
"coq-mathcomp-finmap" {(>= "1.5.0" & < "1.6~")}
]
Expand All @@ -36,5 +36,5 @@ tags: [
"keyword: topology"
"keyword: real numbers"
"logpath: mathcomp.analysis"
"date:2020-05-26"
"date:2020-07-27"
]
8 changes: 4 additions & 4 deletions theories/landau.v
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -978,7 +978,7 @@ move->; apply/eqOP; have [k c1 kOg] := bigO _ g. have [k' c2 k'Ok] := bigO _ k.
near=> c; move: k'Ok kOg; apply: filter_app2; near=> x => lek'c2k.
rewrite -(@ler_pmul2l _ c2%:num) // mulrA => /(le_trans lek'c2k) /le_trans; apply.
by rewrite ler_pmul //; near: c; apply: nbhs_pinfty_ge.
Unshelve. end_near. Grab Existential Variables. all: end_near. Qed.
Copy link
Member

@CohenCyril CohenCyril Jul 27, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@affeldt-aist I wonder if this still compiles with Coq 8.10 and 8.11

Copy link
Member Author

@affeldt-aist affeldt-aist Jul 27, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It went through. But we'd better get rid of it.

Copy link
Member

@CohenCyril CohenCyril Jul 27, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, I meant: does removing this still make Coq 8.10 pass?

Copy link
Member Author

@affeldt-aist affeldt-aist Jul 27, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think so: https://travis-ci.org/github/math-comp/analysis/jobs/711965366.

Grab Existential Variables. all: end_near. Qed.
Arguments bigO_bigO_eqO {F}.

End Limit_realFieldType.
Expand Down Expand Up @@ -1054,7 +1054,7 @@ near=> k; move: Oh1 Oh2; apply: filter_app2; near=> x => leOh1 leOh2.
rewrite [`|_|]normrM (le_trans (ler_pmul _ _ leOh1 leOh2)) //.
rewrite mulrACA [`|_| in X in _ <= X]normrM ler_wpmul2r // ?mulr_ge0 //.
by near: k; apply: nbhs_pinfty_ge.
Unshelve. end_near. Grab Existential Variables. end_near. Qed.
Grab Existential Variables. all: end_near. Qed.

End rule_of_products_rcfType.

Expand Down Expand Up @@ -1085,7 +1085,7 @@ near=> k; move: Oh1 Oh2; apply: filter_app2; near=> x => leOh1 leOh2.
rewrite [`|_|]normrM (le_trans (ler_pmul _ _ leOh1 leOh2)) //.
rewrite mulrACA [`|_| in X in _ <= X]normrM ler_wpmul2r // ?mulr_ge0 //.
by near: k; apply: nbhs_pinfty_ge.
Unshelve. end_near. Grab Existential Variables. end_near. Qed.
Grab Existential Variables. all: end_near. Qed.

End rule_of_products_numClosedFieldType.

Expand Down Expand Up @@ -1366,7 +1366,7 @@ rewrite 2!eqOmegaE !eqOmegaO => /eqOP hOf; apply/eqOP.
apply: filter_app hOf; near=> k; apply: filter_app; near=> x => /le_trans.
apply; rewrite ler_pmul2l //; last by near: k; exists 0; rewrite real0.
by rewrite !ger0_norm // ?addr_ge0 // ler_addl.
Unshelve. end_near. Grab Existential Variables. end_near. Qed.
Grab Existential Variables. all: end_near. Qed.

Lemma mulOmega (R : realFieldType) (F : filter_on pT) (h1 h2 f g : pT -> R^o) :
[Omega_F h1 of f] * [Omega_F h2 of g] =Omega_F (h1 * h2).
Expand Down