Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Iris
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Ike Mulder
Iris
Commits
0f273374
Commit
0f273374
authored
8 years ago
by
Robbert Krebbers
Browse files
Options
Downloads
Patches
Plain Diff
Notation for max and min.
parent
f70dd438
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
algebra/cmra.v
+2
-2
2 additions, 2 deletions
algebra/cmra.v
prelude/numbers.v
+2
-0
2 additions, 0 deletions
prelude/numbers.v
with
4 additions
and
2 deletions
algebra/cmra.v
+
2
−
2
View file @
0f273374
...
...
@@ -791,8 +791,8 @@ Section mnat.
Instance
mnat_valid
:
Valid
mnat
:=
λ
x
,
True
.
Instance
mnat_validN
:
ValidN
mnat
:=
λ
n
x
,
True
.
Instance
mnat_pcore
:
PCore
mnat
:=
Some
.
Instance
mnat_op
:
Op
mnat
:=
max
.
Definition
mnat_op_max
x
y
:
x
⋅
y
=
max
x
y
:=
eq_refl
.
Instance
mnat_op
:
Op
mnat
:=
Nat
.
max
.
Definition
mnat_op_max
x
y
:
x
⋅
y
=
x
`
max
`
y
:=
eq_refl
.
Lemma
mnat_included
(
x
y
:
mnat
)
:
x
≼
y
↔
x
≤
y
.
Proof
.
split
.
...
...
This diff is collapsed.
Click to expand it.
prelude/numbers.v
+
2
−
0
View file @
0f273374
...
...
@@ -32,6 +32,8 @@ Notation "(<)" := lt (only parsing) : nat_scope.
Infix
"`div`"
:=
Nat
.
div
(
at
level
35
)
:
nat_scope
.
Infix
"`mod`"
:=
Nat
.
modulo
(
at
level
35
)
:
nat_scope
.
Infix
"`max`"
:=
Nat
.
max
(
at
level
35
)
:
nat_scope
.
Infix
"`min`"
:=
Nat
.
min
(
at
level
35
)
:
nat_scope
.
Instance
nat_eq_dec
:
∀
x
y
:
nat
,
Decision
(
x
=
y
)
:=
eq_nat_dec
.
Instance
nat_le_dec
:
∀
x
y
:
nat
,
Decision
(
x
≤
y
)
:=
le_dec
.
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment