Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
9.2.2023: Due to updates GitLab will be unavailable for some minutes between 9:00 and 11:00.
Open sidebar
i7
peregrine
Commits
7a3e1c37
Commit
7a3e1c37
authored
Jan 12, 2017
by
Philipp J. Meyer
Browse files
using mval instead of map val
parent
a17f6534
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/Solver/UniqueTerminalMarking.hs
View file @
7a3e1c37
...
...
@@ -50,8 +50,8 @@ checkTrap net m0 m1 m2 x1 x2 trap =
(
markedByMarking
m0
==>
(
markedByMarking
m1
&&&
markedByMarking
m2
))
&&&
(
markedBySequence
x1
==>
markedByMarking
m1
)
&&&
(
markedBySequence
x2
==>
markedByMarking
m2
)
where
markedByMarking
m
=
sum
(
m
ap
(
val
m
)
trap
)
.>
0
markedBySequence
x
=
sum
(
m
ap
(
val
x
)
(
mpre
net
trap
))
.>
0
where
markedByMarking
m
=
sum
(
mval
m
trap
)
.>
0
markedBySequence
x
=
sum
(
mval
x
(
mpre
net
trap
))
.>
0
checkTrapConstraints
::
PetriNet
->
SRMap
Place
->
SRMap
Place
->
SRMap
Place
->
SRMap
Transition
->
SRMap
Transition
->
[
Trap
]
->
SBool
checkTrapConstraints
net
m0
m1
m2
x1
x2
traps
=
...
...
@@ -60,8 +60,8 @@ checkTrapConstraints net m0 m1 m2 x1 x2 traps =
checkSiphon
::
PetriNet
->
SRMap
Place
->
SRMap
Place
->
SRMap
Place
->
SRMap
Transition
->
SRMap
Transition
->
Siphon
->
SBool
checkSiphon
net
m0
m1
m2
x1
x2
siphon
=
unmarkedByMarking
m0
==>
(
unmarkedByMarking
m1
&&&
unmarkedByMarking
m2
&&&
notPresetOfSequence
x1
&&&
notPresetOfSequence
x2
)
where
unmarkedByMarking
m
=
sum
(
m
ap
(
val
m
)
siphon
)
.==
0
notPresetOfSequence
x
=
sum
(
m
ap
(
val
x
)
(
mpost
net
siphon
))
.==
0
where
unmarkedByMarking
m
=
sum
(
mval
m
siphon
)
.==
0
notPresetOfSequence
x
=
sum
(
mval
x
(
mpost
net
siphon
))
.==
0
checkSiphonConstraints
::
PetriNet
->
SRMap
Place
->
SRMap
Place
->
SRMap
Place
->
SRMap
Transition
->
SRMap
Transition
->
[
Siphon
]
->
SBool
checkSiphonConstraints
net
m0
m1
m2
x1
x2
siphons
=
...
...
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