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
Terraform modules
Monitor
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
Pierre Roux
Iris
Commits
96455f78
Commit
96455f78
authored
4 years ago
by
Ralf Jung
Browse files
Options
Downloads
Patches
Plain Diff
fix combining two q/2 fractions to a q
parent
af0efbba
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
tests/proofmode_iris.ref
+29
-0
29 additions, 0 deletions
tests/proofmode_iris.ref
tests/proofmode_iris.v
+11
-0
11 additions, 0 deletions
tests/proofmode_iris.v
theories/algebra/frac.v
+1
-1
1 addition, 1 deletion
theories/algebra/frac.v
with
41 additions
and
1 deletion
tests/proofmode_iris.ref
+
29
−
0
View file @
96455f78
...
@@ -115,6 +115,35 @@ The command has indeed failed with message:
...
@@ -115,6 +115,35 @@ The command has indeed failed with message:
Tactic failure: iInv: invariant nroot not found.
Tactic failure: iInv: invariant nroot not found.
The command has indeed failed with message:
The command has indeed failed with message:
Tactic failure: iInv: invariant "H2" not found.
Tactic failure: iInv: invariant "H2" not found.
"test_frac_split_combine"
: string
1 subgoal
Σ : gFunctors
invG0 : invG Σ
cinvG0 : cinvG Σ
na_invG0 : na_invG Σ
inG0 : inG Σ fracR
γ : gname
============================
"H1" : own γ (1 / 2)%Qp
"H2" : own γ (1 / 2)%Qp
--------------------------------------∗
own γ 1%Qp
1 subgoal
Σ : gFunctors
invG0 : invG Σ
cinvG0 : cinvG Σ
na_invG0 : na_invG Σ
inG0 : inG Σ fracR
γ : gname
============================
"H" : own γ 1%Qp
--------------------------------------∗
own γ 1%Qp
"test_iInv"
"test_iInv"
: string
: string
1 subgoal
1 subgoal
...
...
This diff is collapsed.
Click to expand it.
tests/proofmode_iris.v
+
11
−
0
View file @
96455f78
From
iris
.
proofmode
Require
Import
tactics
monpred
.
From
iris
.
proofmode
Require
Import
tactics
monpred
.
From
iris
.
algebra
Require
Import
frac
.
From
iris
.
base_logic
Require
Import
base_logic
.
From
iris
.
base_logic
Require
Import
base_logic
.
From
iris
.
base_logic
.
lib
Require
Import
invariants
cancelable_invariants
na_invariants
.
From
iris
.
base_logic
.
lib
Require
Import
invariants
cancelable_invariants
na_invariants
.
...
@@ -236,6 +237,16 @@ Section iris_tests.
...
@@ -236,6 +237,16 @@ Section iris_tests.
x'
≼
x
→
x'
≼
x
→
own
γ
x
-∗
own
γ
x'
.
own
γ
x
-∗
own
γ
x'
.
Proof
.
intros
.
by
iApply
own_mono
.
Qed
.
Proof
.
intros
.
by
iApply
own_mono
.
Qed
.
Check
"test_frac_split_combine"
.
Lemma
test_frac_split_combine
`{
!
inG
Σ
fracR
}
γ
:
own
γ
1
%
Qp
-∗
own
γ
1
%
Qp
.
Proof
.
iIntros
"[H1 H2]"
.
Show
.
iCombine
"H1 H2"
as
"H"
.
Show
.
iExact
"H"
.
Qed
.
End
iris_tests
.
End
iris_tests
.
Section
monpred_tests
.
Section
monpred_tests
.
...
...
This diff is collapsed.
Click to expand it.
theories/algebra/frac.v
+
1
−
1
View file @
96455f78
...
@@ -60,5 +60,5 @@ Proof. by rewrite /IsOp' /IsOp frac_op' Qp_div_2. Qed.
...
@@ -60,5 +60,5 @@ Proof. by rewrite /IsOp' /IsOp frac_op' Qp_div_2. Qed.
(* This one has a higher precendence than [is_op_op] so we get a [+] instead
(* This one has a higher precendence than [is_op_op] so we get a [+] instead
of an [⋅]. *)
of an [⋅]. *)
Global
Instance
frac_is_op
q1
q2
:
IsOp
(
q1
+
q2
)
%
Qp
q1
q2
.
Global
Instance
frac_is_op
q1
q2
:
IsOp
(
q1
+
q2
)
%
Qp
q1
q2
|
10
.
Proof
.
done
.
Qed
.
Proof
.
done
.
Qed
.
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