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

Rename altreals to experimental-reals #1378

Merged
merged 4 commits into from
Nov 6, 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
352 changes: 176 additions & 176 deletions .github/workflows/nix-action-8.19.yml

Large diffs are not rendered by default.

352 changes: 176 additions & 176 deletions .github/workflows/nix-action-8.20.yml

Large diffs are not rendered by default.

484 changes: 242 additions & 242 deletions .github/workflows/nix-action-master.yml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .nix/config.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ let
mathcomp-classical.job = true;
mathcomp-reals.job = true;
mathcomp-analysis.job = true;
mathcomp-altreals.job = true;
mathcomp-experimental-reals.job = true;
mathcomp-reals-stdlib.job = true;
mathcomp-analysis-stdlib.job = true;
ssprove.job = false;
Expand Down
2 changes: 1 addition & 1 deletion .nix/coq-nix-toolbox.nix
Original file line number Diff line number Diff line change
@@ -1 +1 @@
"37d20f7c53fc3ee7de52eece3f0f23044ec32546"
"7ff53c990ee876ed8aa55361cbf30a163702a13d"
2 changes: 1 addition & 1 deletion CHANGELOG_UNRELEASED.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
- in file `separation_axioms.v`,
+ new lemmas `compact_normal_local`, and `compact_normal`.

- package `coq-mathcomp-altreals` depending on `coq-mathcomp-reals`
- package `coq-mathcomp-experimental-reals` depending on `coq-mathcomp-reals`
with files
+ `xfinmap.v`
+ `discrete.v`
Expand Down
32 changes: 28 additions & 4 deletions MANIFEST
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,42 @@ NIX.md
Licence_CeCILL-C_V1-en.txt

# Build and meta data
reals_stdlib/Make
reals_stdlib/Makefile
analysis_stdlib/Make
analysis_stdlib/Makefile
classical/Make
classical/Makefile
Makefile.common
experimental_reals/Make
experimental_reals/Makefile
theories/Make
theories/Makefile
reals/Make
reals/Makefile
Makefile
Makefile.common
_CoqProject
.gitignore
.travis.yml
opam
shell.nix
coq-mathcomp-analysis-stdlib.opam
coq-mathcomp-analysis.opam
coq-mathcomp-classical.opam
coq-mathcomp-experimental-reals.opam
coq-mathcomp-reals-stdlib.opam
coq-mathcomp-reals.opam
default.nix

# Theory files
analysis_stdlib/*.v
analysis_stdlib/showcase/*.v
classical/*.v
experimental_reals/*.v
reals/*.v
reals_stdlib/*.v
theories/*.v
theories/altreals/*.v
theories/misc/*.v
theories/showcase/*.v
theories/topology_theory/*.v

# Build scripts
scripts/install-sh
Expand Down
12 changes: 6 additions & 6 deletions _CoqProject
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
-Q classical mathcomp.classical
-Q reals mathcomp.reals
-Q reals_stdlib mathcomp.reals_stdlib
-Q altreals mathcomp.altreals
-Q experimental_reals mathcomp.experimental_reals
-Q theories mathcomp.analysis
-Q analysis_stdlib mathcomp.analysis_stdlib

Expand Down Expand Up @@ -32,11 +32,11 @@ reals/itv.v
reals/prodnormedzmodule.v
reals/nsatz_realtype.v
reals/all_reals.v
altreals/xfinmap.v
altreals/discrete.v
altreals/realseq.v
altreals/realsum.v
altreals/distr.v
experimental_reals/xfinmap.v
experimental_reals/discrete.v
experimental_reals/realseq.v
experimental_reals/realsum.v
experimental_reals/distr.v
reals_stdlib/Rstruct.v
theories/all_analysis.v
theories/landau.v
Expand Down
2 changes: 1 addition & 1 deletion coq-mathcomp-analysis-stdlib.opam
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ license: "CECILL-C"

synopsis: "A library to link real numbers from mathematical components and Stdlib"
description: """
This repository contains a library to link real numbers for
This package contains a library to link real numbers for
the Coq proof-assistant using the Mathematical Components library and Stdlib."""

build: [make "-C" "analysis_stdlib" "-j%{jobs}%"]
Expand Down
4 changes: 1 addition & 3 deletions coq-mathcomp-analysis.opam
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ license: "CECILL-C"

synopsis: "An analysis library for mathematical components"
description: """
This repository contains an experimental library for real analysis for
This package contains a library for real analysis for
the Coq proof-assistant and using the Mathematical Components library."""

build: [make "-C" "theories" "-j%{jobs}%"]
Expand All @@ -24,8 +24,6 @@ depends: [
tags: [
"category:Mathematics/Real Calculus and Topology"
"keyword:analysis"
"keyword:extended real numbers"
"keyword:filter"
"keyword:Cantor"
"keyword:topology"
"keyword:real numbers"
Expand Down
1 change: 1 addition & 0 deletions coq-mathcomp-classical.opam
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ tags: [
"keyword:set theory"
"keyword:function"
"keyword:cardinal"
"keyword:filter"
"logpath:mathcomp.classical"
]
authors: [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,14 @@ license: "CECILL-C"

synopsis: "A library for alternative real numbers for mathematical components"
description: """
This repository contains a library for alternative real numbers for
the Coq proof-assistant and using the Mathematical Components library."""
This package contains an experiment along real numbers
made at the beginning of the MathComp-Analysis library
(which now offers the coq-mathcomp-reals package).

build: [make "-C" "altreals" "-j%{jobs}%"]
install: [make "-C" "altreals" "install"]
Beware that this still contains a few Admitted."""

build: [make "-C" "experimental_reals" "-j%{jobs}%"]
install: [make "-C" "experimental_reals" "install"]
depends: [
"coq-mathcomp-reals" { = version}
"coq-mathcomp-bigenough" { (>= "1.0.0") }
Expand All @@ -23,7 +26,7 @@ tags: [
"category:Mathematics/Real Numbers"
"keyword:real numbers"
"keyword:reals"
"logpath:mathcomp.altreals"
"logpath:mathcomp.experimental_reals"
]
authors: [
"Reynald Affeldt"
Expand Down
2 changes: 1 addition & 1 deletion coq-mathcomp-reals-stdlib.opam
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ license: "CECILL-C"

synopsis: "A library to link real numbers from mathematical components and Stdlib"
description: """
This repository contains a library to link real numbers for
This package contains a library to link real numbers for
the Coq proof-assistant using the Mathematical Components library and Stdlib."""

build: [make "-C" "reals_stdlib" "-j%{jobs}%"]
Expand Down
3 changes: 2 additions & 1 deletion coq-mathcomp-reals.opam
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ license: "CECILL-C"

synopsis: "A library for real numbers for mathematical components"
description: """
This repository contains a library for real numbers for
This package contains a library for real numbers for
the Coq proof-assistant and using the Mathematical Components library."""

build: [make "-C" "reals" "-j%{jobs}%"]
Expand All @@ -22,6 +22,7 @@ tags: [
"category:Mathematics/Real Numbers"
"keyword:real numbers"
"keyword:reals"
"keyword:extended real numbers"
"logpath:mathcomp.reals"
]
authors: [
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion altreals/Make → experimental_reals/Make
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
-Q . mathcomp.altreals
-Q . mathcomp.experimental_reals

-arg -w -arg -parsing
-arg -w -arg +undeclared-scope
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.