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

Separate theories directory, explicit require-import #22

Merged
merged 2 commits into from
Jul 14, 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
22 changes: 11 additions & 11 deletions _CoqProject
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
-R . DedekindReals
-Q theories DedekindReals

-arg -w -arg -deprecated-instance-without-locality

Additive.v
Archimedean.v
Cauchy.v
Completeness.v
Cut.v
DecOrder.v
MinMax.v
MiscLemmas.v
Multiplication.v
Order.v
theories/Additive.v
theories/Archimedean.v
theories/Cauchy.v
theories/Completeness.v
theories/Cut.v
theories/DecOrder.v
theories/MinMax.v
theories/MiscLemmas.v
theories/Multiplication.v
theories/Order.v
10 changes: 5 additions & 5 deletions Additive.v → theories/Additive.v
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
(** The additive structure of reals. *)

Require Import Setoid Morphisms SetoidClass.
Require Import MiscLemmas.
Require Import QArith QOrderedType Qminmax Qabs.
Require Import Cut.
Require Import Archimedean.
From Coq Require Import Setoid Morphisms SetoidClass.
From DedekindReals Require Import MiscLemmas.
From Coq Require Import QArith QOrderedType Qminmax Qabs.
From DedekindReals Require Import Cut.
From DedekindReals Require Import Archimedean.

Local Open Scope Q_scope.

Expand Down
6 changes: 3 additions & 3 deletions Archimedean.v → theories/Archimedean.v
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
can find a straddling pair (u, l). In other words, this means we cna find arbitrarily
good lower and upper rational approximations to x. *)

Require Import QArith.
Require Import MiscLemmas.
Require Import Cut.
From Coq Require Import QArith.
From DedekindReals Require Import MiscLemmas.
From DedekindReals Require Import Cut.

Local Open Scope Q_scope.

Expand Down
10 changes: 5 additions & 5 deletions Cauchy.v → theories/Cauchy.v
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
(** The inclusion of Cauchy reals into Dedekind reals,
and the proof that Dedekind reals are Cauchy-complete. *)

Require Import QArith.
Require Import Qabs.
Require Import Qpower.
Require Import Cut.
Require Import MiscLemmas.
From Coq Require Import QArith.
From Coq Require Import Qabs.
From Coq Require Import Qpower.
From DedekindReals Require Import Cut.
From DedekindReals Require Import MiscLemmas.

Definition CauchyQ (un : nat -> Q) : Set
:= forall eps:Q,
Expand Down
6 changes: 3 additions & 3 deletions Completeness.v → theories/Completeness.v
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
get R back.
*)

Require Import Morphisms.
Require Import QArith.
Require Import Cut Order.
From Coq Require Import Morphisms.
From Coq Require Import QArith.
From DedekindReals Require Import Cut Order.

Local Open Scope R_scope.

Expand Down
6 changes: 3 additions & 3 deletions Cut.v → theories/Cut.v
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
(** The definition of Dedekind cuts. *)

Require Import QArith QOrderedType.
Require Import Morphisms SetoidClass.
Require Import MiscLemmas.
From Coq Require Import QArith QOrderedType.
From Coq Require Import Morphisms SetoidClass.
From DedekindReals Require Import MiscLemmas.

(** In the definition below we use disjunction and existence where one might
expect sums and disjoint sums, in particular in [lower_open], [upper_open],
Expand Down
18 changes: 9 additions & 9 deletions DecOrder.v → theories/DecOrder.v
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
The series vn is convergent, because bounded by the convergent
series 2^{-n}. *)

Require Import Logic.ConstructiveEpsilon.
Require Import QArith.
Require Import Qabs.
Require Import Qpower.
Require Import Cut.
Require Import Cauchy.
Require Import Additive.
Require Import MiscLemmas.
Require Import Qminmax.
From Coq Require Import ConstructiveEpsilon.
From Coq Require Import QArith.
From Coq Require Import Qabs.
From Coq Require Import Qpower.
From DedekindReals Require Import Cut.
From DedekindReals Require Import Cauchy.
From DedekindReals Require Import Additive.
From DedekindReals Require Import MiscLemmas.
From Coq Require Import Qminmax.

Local Open Scope R_scope.

Expand Down Expand Up @@ -200,7 +200,7 @@
apply Pos2Z.is_nonneg. unfold Z.le. rewrite <- Pos2Z.inj_compare.
apply Pos2Nat.inj_le. destruct (Pos.to_nat b) eqn:des.
exfalso. pose proof (Pos2Nat.is_pos b). rewrite des in H0.
inversion H0. apply le_n_S. apply le_0_n.

Check warning on line 203 in theories/DecOrder.v

View workflow job for this annotation

GitHub Actions / build (coqorg/coq:8.18)

Notation le_0_n is deprecated since 8.16.

Check warning on line 203 in theories/DecOrder.v

View workflow job for this annotation

GitHub Actions / build (coqorg/coq:8.18)

Notation le_0_n is deprecated since 8.16.

Check warning on line 203 in theories/DecOrder.v

View workflow job for this annotation

GitHub Actions / build (coqorg/coq:8.17)

Notation le_0_n is deprecated since 8.16.

Check warning on line 203 in theories/DecOrder.v

View workflow job for this annotation

GitHub Actions / build (coqorg/coq:8.17)

Notation le_0_n is deprecated since 8.16.

Check warning on line 203 in theories/DecOrder.v

View workflow job for this annotation

GitHub Actions / build (coqorg/coq:8.16)

Notation le_0_n is deprecated since 8.16.

Check warning on line 203 in theories/DecOrder.v

View workflow job for this annotation

GitHub Actions / build (coqorg/coq:8.16)

Notation le_0_n is deprecated since 8.16.
+ apply xIsNegative. apply (upper_upper x (Z.neg p # b)).
reflexivity. exact qmaj.
- exact X.
Expand Down
8 changes: 4 additions & 4 deletions MinMax.v → theories/MinMax.v
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
(* The lattice structure of the reals. *)

Require Import Setoid Morphisms.
Require Import QArith.
Require Import Qminmax.
From Coq Require Import Setoid Morphisms.
From Coq Require Import QArith.
From Coq Require Import Qminmax.

Require Import Cut MiscLemmas Additive Multiplication Order.
From DedekindReals Require Import Cut MiscLemmas Additive Multiplication Order.

Local Open Scope R_scope.

Expand Down
File renamed without changes.
10 changes: 5 additions & 5 deletions Multiplication.v → theories/Multiplication.v
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
(** The multiplicative structure of reals. *)

Require Import Setoid Morphisms SetoidClass.
Require Import MiscLemmas.
Require Import QArith QOrderedType Qminmax Qabs.
Require Import Psatz.
Require Import Cut Additive Archimedean.
From Coq Require Import Setoid Morphisms SetoidClass.
From DedekindReals Require Import MiscLemmas.
From Coq Require Import QArith QOrderedType Qminmax Qabs.
From Coq Require Import Psatz.
From DedekindReals Require Import Cut Additive Archimedean.

Local Open Scope Q_scope.

Expand Down
10 changes: 5 additions & 5 deletions Order.v → theories/Order.v
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
(* The order relations < and <=. *)

Require Import Morphisms Setoid.
Require Import QArith.
Require Import Cut.
Require Import Additive Multiplication.
Require Import Archimedean.
From Coq Require Import Morphisms Setoid.
From Coq Require Import QArith.
From DedekindReals Require Import Cut.
From DedekindReals Require Import Additive Multiplication.
From DedekindReals Require Import Archimedean.

Local Open Scope R_scope.

Expand Down
Loading