-
Notifications
You must be signed in to change notification settings - Fork 47
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
Application of s-finite kernels to program semantics #912
Draft
affeldt-aist
wants to merge
31
commits into
math-comp:master
Choose a base branch
from
affeldt-aist:prob_lang
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+7,504
−2
Draft
Changes from all commits
Commits
Show all changes
31 commits
Select commit
Hold shift + click to select a range
cd8a4c4
probabilistic language using mca's kernels
affeldt-aist 1dc9ecf
syntax and denotational semantics
AyumuSaito 4d81519
rm duplicate, more uniform naming
affeldt-aist 002fee9
add binary operations
AyumuSaito 349e227
minor fixes, updates, rebases
affeldt-aist 1fc0252
casino example and extensions
AyumuSaito bb0b030
bernoulli_trunc measurable
affeldt-aist aaf8c53
add Nat and 0<=p<=1 problem
AyumuSaito 49e926d
progress
affeldt-aist b02175b
minor fixes
AyumuSaito 177ee65
several admits proved
affeldt-aist dabde4b
definition beta
AyumuSaito 8649b5a
fix
affeldt-aist 63e011a
write casino (wip)
AyumuSaito 1abe53e
WIP
affeldt-aist 0e73db9
progress in proving the casino exampl
AyumuSaito 4162893
admit about fact and adjustment of exp but casino broken
affeldt-aist a1a624c
fix
AyumuSaito 98344f0
minor progress
affeldt-aist ff9223a
casion example (wip)
AyumuSaito f692e1d
complete the casino example
affeldt-aist 37e75cd
shorter measurability proofs
affeldt-aist 40cb574
cleaning/rebase
affeldt-aist 395c350
wip
affeldt-aist 5018703
beta_bdf_uniq_ae
IshiguroYoshihiro 867d065
integral_indicator_function
IshiguroYoshihiro 2088ec3
fix
IshiguroYoshihiro 882dc3f
rebase
affeldt-aist 702bde5
add dep to algebra-tactics in nix
affeldt-aist 6db6439
rebase
affeldt-aist 639b4dd
fix
affeldt-aist File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,46 @@ | ||
# This file was generated from `meta.yml`, please do not edit manually. | ||
# Follow the instructions on https://github.com/coq-community/templates to regenerate. | ||
name: Nix CI | ||
|
||
on: | ||
push: | ||
branches: | ||
- master | ||
pull_request: | ||
paths: | ||
- .github/workflows/** | ||
pull_request_target: | ||
|
||
jobs: | ||
build: | ||
runs-on: ubuntu-latest | ||
strategy: | ||
matrix: | ||
overrides: | ||
- 'coq = "master"' | ||
fail-fast: false | ||
steps: | ||
- name: Determine which commit to test | ||
run: | | ||
if [[ ${{ github.event_name }} =~ "pull_request" ]]; then | ||
merge_commit=$(git ls-remote ${{ github.event.repository.html_url }} refs/pull/${{ github.event.number }}/merge | cut -f1) | ||
if [ -z "$merge_commit" ]; then | ||
echo "tested_commit=${{ github.event.pull_request.head.sha }}" >> $GITHUB_ENV | ||
else | ||
echo "tested_commit=$merge_commit" >> $GITHUB_ENV | ||
fi | ||
else | ||
echo "tested_commit=${{ github.sha }}" >> $GITHUB_ENV | ||
fi | ||
- uses: cachix/install-nix-action@v14 | ||
with: | ||
nix_path: nixpkgs=channel:nixpkgs-unstable | ||
- uses: cachix/cachix-action@v10 | ||
with: | ||
name: coq-community | ||
extraPullNames: coq, math-comp | ||
- uses: actions/checkout@v2 | ||
with: | ||
ref: ${{ env.tested_ref }} | ||
- run: > | ||
nix-build https://coq.inria.fr/nix/toolbox --argstr job analysis --arg override '{ ${{ matrix.overrides }}; analysis = builtins.filterSource (path: _: baseNameOf path != ".git") ./.; }' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,93 @@ | ||
{ lib, | ||
mkCoqDerivation, recurseIntoAttrs, | ||
mathcomp, mathcomp-finmap, mathcomp-bigenough, | ||
hierarchy-builder, mathcomp-algebra-tactics, | ||
single ? false, | ||
coqPackages, coq, version ? null }@args: | ||
with builtins // lib; | ||
let | ||
repo = "analysis"; | ||
owner = "math-comp"; | ||
|
||
release."0.6.1".sha256 = "sha256-1VyNXu11/pDMuH4DmFYSUF/qZ4Bo+/Zl3Y0JkyrH/r0="; | ||
release."0.6.0".sha256 = "sha256-0msICcIrK6jbOSiBu0gIVU3RHwoEEvB88CMQqW/06rg="; | ||
release."0.5.3".sha256 = "sha256-1NjFsi5TITF8ZWx1NyppRmi8g6YaoUtTdS9bU/sUe5k="; | ||
release."0.5.2".sha256 = "0yx5p9zyl8jv1vg7rgkyq8dqzkdnkqv969mi62whmhkvxbavgzbw"; | ||
release."0.5.1".sha256 = "1hnzqb1gxf88wgj2n1b0f2xm6sxg9j0735zdsv6j12hlvx5lwk68"; | ||
release."0.3.13".sha256 = "sha256-Yaztew79KWRC933kGFOAUIIoqukaZOdNOdw4XszR1Hg="; | ||
release."0.3.10".sha256 = "sha256-FBH2c8QRibq5Ycw/ieB8mZl0fDiPrYdIzZ6W/A3pIhI="; | ||
release."0.3.9".sha256 = "sha256-uUU9diBwUqBrNRLiDc0kz0CGkwTZCUmigPwLbpDOeg4="; | ||
release."0.3.6".sha256 = "0g2j7b2hca4byz62ssgg90bkbc8wwp7xkb2d3225bbvihi92b4c5"; | ||
release."0.3.4".sha256 = "18mgycjgg829dbr7ps77z6lcj03h3dchjbj5iir0pybxby7gd45c"; | ||
release."0.3.3".sha256 = "1m2mxcngj368vbdb8mlr91hsygl430spl7lgyn9qmn3jykack867"; | ||
release."0.3.1".sha256 = "1iad288yvrjv8ahl9v18vfblgqb1l5z6ax644w49w9hwxs93f2k8"; | ||
release."0.2.3".sha256 = "0p9mr8g1qma6h10qf7014dv98ln90dfkwn76ynagpww7qap8s966"; | ||
|
||
defaultVersion = with versions; lib.switch [ coq.version mathcomp.version ] [ | ||
{ cases = [ (isGe "8.14") (isGe "1.13.0") ]; out = "0.6.1"; } | ||
{ cases = [ (isGe "8.14") (range "1.13" "1.15") ]; out = "0.5.2"; } | ||
{ cases = [ (range "8.13" "8.15") (range "1.13" "1.14") ]; out = "0.5.1"; } | ||
{ cases = [ (range "8.13" "8.15") (range "1.12" "1.14") ]; out = "0.3.13"; } | ||
{ cases = [ (range "8.11" "8.14") (range "1.12" "1.13") ]; out = "0.3.10"; } | ||
{ cases = [ (range "8.11" "8.12") "1.11.0" ]; out = "0.3.4"; } | ||
{ cases = [ (range "8.10" "8.12") "1.11.0" ]; out = "0.3.3"; } | ||
{ cases = [ (range "8.10" "8.11") "1.11.0" ]; out = "0.3.1"; } | ||
{ cases = [ (range "8.8" "8.11") (range "1.8" "1.10") ]; out = "0.2.3"; } | ||
] null; | ||
|
||
# list of analysis packages sorted by dependency order | ||
packages = [ "classical" "analysis" ]; | ||
|
||
mathcomp_ = package: let | ||
classical-deps = [ mathcomp.algebra mathcomp-finmap hierarchy-builder ]; | ||
analysis-deps = [ mathcomp.field mathcomp-bigenough ]; | ||
intra-deps = if package == "single" then [] | ||
else map mathcomp_ (head (splitList (lib.pred.equal package) packages)); | ||
pkgpath = if package == "single" then "." | ||
else if package == "analysis" then "theories" else "${package}"; | ||
pname = if package == "single" then "mathcomp-analysis-single" | ||
else "mathcomp-${package}"; | ||
derivation = mkCoqDerivation ({ | ||
inherit version pname defaultVersion release repo owner; | ||
|
||
namePrefix = [ "coq" "mathcomp" ]; | ||
|
||
propagatedBuildInputs = | ||
intra-deps | ||
++ optionals (elem package [ "classical" "single" ]) classical-deps | ||
++ optionals (elem package [ "analysis" "single" ]) analysis-deps | ||
++ optionals (elem package [ "analysis" "single" ]) [mathcomp-algebra-tactics]; | ||
|
||
preBuild = '' | ||
cd ${pkgpath} | ||
''; | ||
|
||
meta = { | ||
description = "Analysis library compatible with Mathematical Components"; | ||
maintainers = [ maintainers.cohencyril ]; | ||
license = licenses.cecill-c; | ||
}; | ||
|
||
passthru = genAttrs packages mathcomp_; | ||
}); | ||
# split packages didn't exist before 0.6, so bulding nothing in that case | ||
patched-derivation1 = derivation.overrideAttrs (o: | ||
optionalAttrs (o.pname != null && o.pname != "mathcomp-analysis" && | ||
o.version != null && o.version != "dev" && versions.isLt "0.6" o.version) | ||
{ preBuild = ""; buildPhase = "echo doing nothing"; installPhase = "echo doing nothing"; } | ||
); | ||
patched-derivation2 = patched-derivation1.overrideAttrs (o: | ||
optionalAttrs (o.pname != null && o.pname == "mathcomp-analysis" && | ||
o.version != null && o.version != "dev" && versions.isLt "0.6" o.version) | ||
{ preBuild = ""; } | ||
); | ||
patched-derivation = patched-derivation2.overrideAttrs (o: | ||
optionalAttrs (o.version != null | ||
&& (o.version == "dev" || versions.isGe "0.3.4" o.version)) | ||
{ | ||
propagatedBuildInputs = o.propagatedBuildInputs ++ [ hierarchy-builder ]; | ||
} | ||
); | ||
in patched-derivation; | ||
in | ||
mathcomp_ (if single then "single" else "analysis") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It seems that you are depending on mczify only transitively, and not directly using it. If so, this line can be removed.