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

Treat a deprecation warning about Qint #59

Merged
merged 1 commit into from
Jul 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 0 additions & 2 deletions .github/workflows/docker-action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ jobs:
strategy:
matrix:
image:
- 'mathcomp/mathcomp:2.0.0-coq-8.16'
- 'mathcomp/mathcomp:2.0.0-coq-8.18'
- 'mathcomp/mathcomp:2.1.0-coq-8.16'
- 'mathcomp/mathcomp:2.1.0-coq-8.18'
- 'mathcomp/mathcomp:2.2.0-coq-8.16'
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ basic plane topology definitions, and a theory of combinatorial hypermaps.
- License: [CeCILL-B](LICENSE)
- Compatible Coq versions: 8.16 or later
- Additional dependencies:
- [MathComp ssreflect 2.0 or later](https://math-comp.github.io)
- [MathComp ssreflect 2.1 or later](https://math-comp.github.io)
- [MathComp algebra](https://math-comp.github.io)
- Coq namespace: `fourcolor`
- Related publication(s):
Expand Down
2 changes: 1 addition & 1 deletion coq-fourcolor.opam
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ build: [make "-j%{jobs}%"]
install: [make "install"]
depends: [
"coq" {(>= "8.16" & < "8.20~") | (= "dev")}
"coq-mathcomp-ssreflect" {(>= "2.0.0" & < "2.3~") | (= "dev")}
"coq-mathcomp-ssreflect" {(>= "2.1.0" & < "2.3~") | (= "dev")}
"coq-mathcomp-algebra"
]

Expand Down
8 changes: 2 additions & 6 deletions meta.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,6 @@ supported_coq_versions:
opam: '{(>= "8.16" & < "8.20~") | (= "dev")}'

tested_coq_opam_versions:
- version: '2.0.0-coq-8.16'
repo: 'mathcomp/mathcomp'
- version: '2.0.0-coq-8.18'
repo: 'mathcomp/mathcomp'
- version: '2.1.0-coq-8.16'
repo: 'mathcomp/mathcomp'
- version: '2.1.0-coq-8.18'
Expand All @@ -64,9 +60,9 @@ ci_cron_schedule: '0 5 * * *'
dependencies:
- opam:
name: coq-mathcomp-ssreflect
version: '{(>= "2.0.0" & < "2.3~") | (= "dev")}'
version: '{(>= "2.1.0" & < "2.3~") | (= "dev")}'
description: |-
[MathComp ssreflect 2.0 or later](https://math-comp.github.io)
[MathComp ssreflect 2.1 or later](https://math-comp.github.io)
- opam:
name: coq-mathcomp-algebra
description: |-
Expand Down
4 changes: 2 additions & 2 deletions theories/realprop.v
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(* (c) Copyright 2006-2018 Microsoft Corporation and Inria. *)
(* Distributed under the terms of CeCILL-B. *)
From mathcomp Require Import ssreflect ssrfun ssrbool eqtype ssrnat div order.
From mathcomp Require Import ssralg ssrnum ssrint rat intdiv.
From mathcomp Require Import ssralg ssrnum ssrint archimedean rat intdiv.
From Coq Require Import Morphisms Setoid.
From fourcolor Require Import real realsyntax.

Expand Down Expand Up @@ -46,7 +46,7 @@ Definition max x y : R := IF x >= y then x else y.
Definition intR m : R := match m with Posz n => n%:R | Negz n => - n.+1%:R end.

Definition ratR (a : rat) :=
if a \is a Qint then intR (numq a) else intR (numq a) / intR (denq a).
if a \is a Num.int then intR (numq a) else intR (numq a) / intR (denq a).

Inductive floor_set x : Real.set R :=
FloorSet m of intR m <= x : floor_set x (intR m).
Expand Down
Loading