Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
i7
peregrine
Commits
f8ce8a20
Commit
f8ce8a20
authored
Feb 07, 2017
by
Philipp J. Meyer
Browse files
changed order of constraints for terminal markings with unique consensus
parent
2c4fc15f
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/Solver/TerminalMarkingsUniqueConsensus.hs
View file @
f8ce8a20
...
...
@@ -84,10 +84,9 @@ checkInequalityConstraints net m0 m1 m2 inequalities =
checkTerminalMarkingsUniqueConsensus
::
PetriNet
->
SIMap
Place
->
SIMap
Place
->
SIMap
Place
->
SIMap
Transition
->
SIMap
Transition
->
[
Trap
]
->
[
Siphon
]
->
[
StableInequality
]
->
SBool
checkTerminalMarkingsUniqueConsensus
net
m0
m1
m2
x1
x2
traps
siphons
inequalities
=
initialMarkingConstraints
net
m0
&&&
differentConsensusConstraints
net
m1
m2
&&&
stateEquationConstraints
net
m0
m1
x1
&&&
stateEquationConstraints
net
m0
m2
x2
&&&
initialMarkingConstraints
net
m0
&&&
nonNegativityConstraints
m0
&&&
nonNegativityConstraints
m1
&&&
nonNegativityConstraints
m2
&&&
...
...
@@ -95,8 +94,10 @@ checkTerminalMarkingsUniqueConsensus net m0 m1 m2 x1 x2 traps siphons inequaliti
nonNegativityConstraints
x2
&&&
terminalConstraints
net
m1
&&&
terminalConstraints
net
m2
&&&
differentConsensusConstraints
net
m1
m2
&&&
checkTrapConstraints
net
m0
m1
m2
x1
x2
traps
&&&
checkSiphonConstraints
net
m0
m1
m2
x1
x2
siphons
&&&
checkSubnetSiphonConstraints
net
m0
m1
m2
x1
x2
siphons
&&&
checkInequalityConstraints
net
m0
m1
m2
inequalities
checkTerminalMarkingsUniqueConsensusSat
::
PetriNet
->
[
Trap
]
->
[
Siphon
]
->
[
StableInequality
]
->
ConstraintProblem
Integer
TerminalMarkingsUniqueConsensusCounterExample
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment