Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
N
NIWO
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Christian Müller
NIWO
Commits
57f880ed
Commit
57f880ed
authored
Mar 07, 2019
by
Christian Müller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
leaders
parent
565ddafd
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
107 additions
and
10 deletions
+107
-10
examples/tests/leaderelection_withA.spec
examples/tests/leaderelection_withA.spec
+16
-0
examples/tests/leaderelection_withB.spec
examples/tests/leaderelection_withB.spec
+16
-0
src/main/scala/de/tum/workflows/Preconditions.scala
src/main/scala/de/tum/workflows/Preconditions.scala
+2
-1
src/main/scala/de/tum/workflows/foltl/FOTransformers.scala
src/main/scala/de/tum/workflows/foltl/FOTransformers.scala
+6
-2
src/test/scala/de/tum/workflows/tests/papertests/LeaderElectionTest.scala
...e/tum/workflows/tests/papertests/LeaderElectionTest.scala
+67
-7
No files found.
examples/tests/leaderelection_withA.spec
0 → 100644
View file @
57f880ed
Workflow
forallmay a,b
Inext(a,b) -> msg += (a,b)
loop {
forall a
msg(a,a) -> leader += (a)
forallmay a,b,c
(Inext(b, c) ∧ msg(a, b) ∧ Ile(b, a)) -> msg += (a,c)
}
Target
msg(a1, a2)
Causality
examples/tests/leaderelection_withB.spec
0 → 100644
View file @
57f880ed
Workflow
forallmay a,b
B(a,b) -> msg += (a,b)
loop {
forall a
msg(a,a) -> leader += (a)
forallmay a,b,c
(Inext(b, c) ∧ msg(a, b) ∧ Ile(b, a)) -> msg += (a,c)
}
Target
msg(a1, a2)
Causality
src/main/scala/de/tum/workflows/Preconditions.scala
View file @
57f880ed
...
...
@@ -166,7 +166,8 @@ object Preconditions extends LazyLogging {
}
}
replaced
// replaced
removed
}
def
abstractedPrecondition
(
f
:
Formula
,
b
:
SimpleBlock
,
spec
:
NISpec
,
properties
:
InvProperties
,
untouched
:
Set
[
String
])
:
Formula
=
{
...
...
src/main/scala/de/tum/workflows/foltl/FOTransformers.scala
View file @
57f880ed
...
...
@@ -26,6 +26,7 @@ object FOTransformers extends LazyLogging {
def
collectClauses
(
f
:
Formula
)
:
List
[
List
[
Formula
]]
=
{
def
collectClause
(
f
:
Formula
)
:
List
[
Formula
]
=
f
collect
{
case
t
:
Equal
=>
List
(
t
)
case
t
:
Var
=>
List
(
t
)
case
t
:
Neg
=>
List
(
t
)
case
t
:
Fun
=>
List
(
t
)
...
...
@@ -151,7 +152,8 @@ object FOTransformers extends LazyLogging {
val
simpfFGineq
=
Z3BSFO
.
simplifyBS
(
fFGineq
)
// FIXME: is this correct? there are no quantifiers binding stuff
val
GHineq
=
for
((
hl
,
hargs
)
<-
hls
.
zip
(
HPositiveargs
);
(
gk
,
gargs
)
<-
gks
.
zip
(
Gargs
);
harg
<-
hargs
;
garg
<-
gargs
)
yield
{
Or
.
make
(
hl
,
gk
,
ineq
(
harg
,
garg
))
// Or.make(hl, gk, ineq(harg, garg))
Or
.
make
(
hl
,
gk
).
parallelRename
(
harg
,
garg
)
}
val
fGHineq
=
And
.
make
(
FGineq
)
val
simpfGHineq
=
Z3BSFO
.
simplifyBS
(
fGHineq
)
...
...
@@ -164,8 +166,10 @@ object FOTransformers extends LazyLogging {
val
freeparams
=
b
.
params
.
map
(
p
=>
FormulaFunctions
.
generateName
(
p
,
bounds
.
toSet
))
val
gkineq
=
for
((
gk
,
gargs
)
<-
gks
.
zip
(
Gargs
);
garg
<-
gargs
)
yield
{
Or
.
make
(
gk
,
ineq
(
garg
,
freeparams
))
// Or.make(gk, ineq(garg, freeparams))
gk
.
parallelRename
(
garg
,
freeparams
)
}
val
fsol
:
Formula
=
And
.
make
(
gkineq
)
val
fsolq
=
FormulaFunctions
.
rewrapQuantifiers
(
quantifiers
,
fsol
)
...
...
src/test/scala/de/tum/workflows/tests/papertests/LeaderElectionTest.scala
View file @
57f880ed
...
...
@@ -37,7 +37,7 @@ class LeaderElectionTest extends FlatSpec {
val
next_axioms
=
List
(
// "∀a (¬Inext(a,a))",
"∀a,b. (¬Inext(a,b) ∨ ∀x. (x = a ∨ x = b ∨ Ibtw(a,b,x)))"
,
"∀a,b. (Inext(a,b) ∨ ∃x. (x ≠ a ∧ x ≠ b ∧ ¬Ibtw(a,x,b)))"
//
"∀a,b. (Inext(a,b) ∨ ∃x. (x ≠ a ∧ x ≠ b ∧ ¬Ibtw(a,x,b)))"
).
map
(
WorkflowParser
.
parseTerm
).
map
(
_
.
get
)
val
inductive_inv
=
List
(
...
...
@@ -65,8 +65,69 @@ class LeaderElectionTest extends FlatSpec {
assert
(
check
(
name
,
inv
,
knowledge
,
properties
))
}
it
should
"be proven safe with As"
in
{
val
name
=
"tests/leaderelection_withA"
val
knowledge
=
And
.
make
(
And
.
make
(
le_total_order_axioms
),
And
.
make
(
ringtop_axioms
),
And
.
make
(
next_axioms
)
)
val
inv
=
And
.
make
(
inductive_inv
)
assert
(
check
(
name
,
inv
,
knowledge
,
properties
))
}
it
should
"be proven safe with Bs"
in
{
val
name
=
"tests/leaderelection_withB"
val
knowledge
=
And
.
make
(
And
.
make
(
le_total_order_axioms
),
And
.
make
(
ringtop_axioms
),
And
.
make
(
next_axioms
)
)
val
inv
=
And
.
make
(
inductive_inv
)
assert
(
check
(
name
,
inv
,
knowledge
,
properties
))
}
"Deterministic Leader election"
should
"be inferred safe"
in
{
val
name
=
"tests/leaderelection"
println
(
le_total_order_axioms
)
println
(
ringtop_axioms
)
println
(
next_axioms
)
val
knowledge
=
And
.
make
(
And
.
make
(
le_total_order_axioms
),
And
.
make
(
ringtop_axioms
),
And
.
make
(
next_axioms
)
)
println
(
inductive_inv
)
val
inv
=
inductive_inv
.
head
assert
(
check
(
name
,
inv
,
knowledge
,
properties
))
}
it
should
"be inferred safe with Bs"
in
{
val
name
=
"tests/leaderelection_withB"
val
knowledge
=
And
.
make
(
And
.
make
(
le_total_order_axioms
),
And
.
make
(
ringtop_axioms
),
And
.
make
(
next_axioms
)
)
val
inv
=
inductive_inv
.
head
assert
(
check
(
name
,
inv
,
knowledge
,
properties
))
}
"Unsafe Deterministic Leader election"
should
"be proven unsafe"
in
{
val
name
=
"tests/leaderelection_
nonext_
unsafe"
val
name
=
"tests/leaderelection_unsafe"
val
total_order
=
And
.
make
(
le_total_order_axioms
)
val
ringtop
=
And
.
make
(
ringtop_axioms
)
...
...
@@ -74,14 +135,13 @@ class LeaderElectionTest extends FlatSpec {
val
knowledge
=
And
.
make
(
total_order
,
ringtop
// ,
// next
ringtop
,
next
)
// val knowledge = True
//
val inv = And.make(inductive_inv)
val
inv
=
inductive_inv
.
head
val
inv
=
And
.
make
(
inductive_inv
)
//
val inv = inductive_inv.head
val
exists
=
WorkflowParser
.
parseTerm
(
"∃a,b. (a ≠ b)"
).
get
val
forall
=
WorkflowParser
.
parseTerm
(
"∃a,b,c. (a ≠ b ∧ b ≠ c ∧ Ibtw(a,b,c))"
).
get
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment