Commit a65b1fce authored by Philipp Meyer's avatar Philipp Meyer
Browse files

Combined both liveness refinement methods

parent 378f0e99
......@@ -501,9 +501,7 @@ checkLivenessProperty' verbosity net refine f cuts = do
Nothing -> return (Nothing, cuts)
Just x ->
if refine then do
rt <- findLivenessRefinementBySComponent verbosity net x
--rt <- findLivenessRefinementByEmptyTraps verbosity net
-- (initialMarking net) x []
rt <- findLivenessRefinement verbosity net x
case rt of
Nothing ->
return (Just x, cuts)
......@@ -513,6 +511,15 @@ checkLivenessProperty' verbosity net refine f cuts = do
else
return (Just x, cuts)
findLivenessRefinement :: Int -> PetriNet -> FiringVector ->
IO (Maybe Cut)
findLivenessRefinement verbosity net x = do
r1 <- findLivenessRefinementBySComponent verbosity net x
case r1 of
Nothing -> findLivenessRefinementByEmptyTraps verbosity net
(initialMarking net) x []
Just _ -> return r1
findLivenessRefinementBySComponent :: Int -> PetriNet -> FiringVector ->
IO (Maybe Cut)
findLivenessRefinementBySComponent verbosity net x =
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment