postproc: fix default for acd and interaction with colored
* spot/twaalgos/postproc.hh (postprocess::acd_): Default to true. * spot/twaalgos/postproc.cc (postprocess::run): When acd is used to color an automaton, do not run scc_filter to remove color from transiant edges. * tests/python/acd.py: New file. * tests/Makefile.am: Add it.
This commit is contained in:
parent
dc5a569582
commit
27b8e5aa73
5 changed files with 90 additions and 18 deletions
12
NEWS
12
NEWS
|
|
@ -207,6 +207,18 @@ New in spot 2.11.6.dev (not yet released)
|
|||
- spot::minimize_obligation will skip attempts to complement very
|
||||
weak automata when those would require too many acceptance sets.
|
||||
|
||||
- acd_transform() was not used by spot::postprocessor unless an
|
||||
option_map was passed. This was due to some bad default for the
|
||||
"acd" option: it defaulted to true when an option_map was given,
|
||||
and to false otherwise. This had no consequences on
|
||||
ltl2tgba/autfilt were some option_map is always passed, but for
|
||||
instance the parity automata generated by spot.postprocessor in
|
||||
Python were not using ACD by default.
|
||||
|
||||
- Using spot::postprocessor to produce colored parity automata could
|
||||
fail to color some transiant edges when the "acd" option was
|
||||
activated.
|
||||
|
||||
New in spot 2.11.6 (2023-08-01)
|
||||
|
||||
Bug fixes:
|
||||
|
|
|
|||
|
|
@ -407,7 +407,7 @@ namespace spot
|
|||
// ignored.
|
||||
a = scc_filter_states(a);
|
||||
else
|
||||
a = do_scc_filter(a, (PREF_ == Any));
|
||||
a = do_scc_filter(a, (PREF_ == Any) && !COLORED_);
|
||||
|
||||
if (type_ == Monitor)
|
||||
{
|
||||
|
|
@ -721,23 +721,11 @@ namespace spot
|
|||
sim = nullptr;
|
||||
}
|
||||
|
||||
if (level_ == High && scc_filter_ != 0)
|
||||
{
|
||||
if (dba)
|
||||
{
|
||||
// Do that even for WDBA, to remove marks from transitions
|
||||
// leaving trivial SCCs.
|
||||
dba = do_scc_filter(dba, true);
|
||||
assert(!sim);
|
||||
}
|
||||
else if (sim)
|
||||
{
|
||||
sim = do_scc_filter(sim, true);
|
||||
assert(!dba);
|
||||
}
|
||||
}
|
||||
|
||||
sim = dba ? dba : sim;
|
||||
if (level_ == High && scc_filter_ != 0 && !(acd_was_used_ && COLORED_))
|
||||
// Do that even for WDBA, to remove marks from transitions
|
||||
// leaving trivial SCCs.
|
||||
sim = do_scc_filter(sim, true);
|
||||
|
||||
if (type_ == CoBuchi)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -269,7 +269,7 @@ namespace spot
|
|||
int simul_max_ = 4096;
|
||||
int merge_states_min_ = 128;
|
||||
int wdba_det_max_ = 4096;
|
||||
bool acd_ = false;
|
||||
bool acd_ = true;
|
||||
bool acd_was_used_;
|
||||
};
|
||||
/// @}
|
||||
|
|
|
|||
|
|
@ -395,6 +395,7 @@ TESTS_python = \
|
|||
python/_autparserr.ipynb \
|
||||
python/_aux.ipynb \
|
||||
python/acc.py \
|
||||
python/acd.py \
|
||||
python/accparse2.py \
|
||||
python/alarm.py \
|
||||
python/aliases.py \
|
||||
|
|
|
|||
71
tests/python/acd.py
Normal file
71
tests/python/acd.py
Normal file
|
|
@ -0,0 +1,71 @@
|
|||
#!/usr/bin/python3
|
||||
# -*- mode: python; coding: utf-8 -*-
|
||||
# Copyright (C) by the Spot authors, see the AUTHORS file for details.
|
||||
#
|
||||
# This file is part of Spot, a model checking library.
|
||||
#
|
||||
# Spot is free software; you can redistribute it and/or modify it
|
||||
# under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# Spot is distributed in the hope that it will be useful, but WITHOUT
|
||||
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
||||
# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
|
||||
# License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
import spot
|
||||
from unittest import TestCase
|
||||
tc = TestCase()
|
||||
|
||||
|
||||
a = spot.automaton("""
|
||||
HOA: v1
|
||||
States: 3
|
||||
Start: 0
|
||||
AP: 3 "p0" "p1" "p2"
|
||||
Acceptance: 3 Fin(0) & Inf(1) & Fin(2)
|
||||
properties: trans-labels explicit-labels trans-acc deterministic
|
||||
--BODY--
|
||||
State: 0
|
||||
[!0] 1
|
||||
[0&!1&2] 0
|
||||
[0&!1&!2] 0 {2}
|
||||
[0&1&2] 0 {1}
|
||||
[0&1&!2] 0 {1 2}
|
||||
State: 1
|
||||
[!1&2] 2
|
||||
[!1&!2] 2 {2}
|
||||
[1&2] 2 {1}
|
||||
[1&!2] 2 {1 2}
|
||||
State: 2
|
||||
[0&!1&2] 2
|
||||
[0&!1&!2] 2 {2}
|
||||
[0&1&2] 2 {1}
|
||||
[0&1&!2] 2 {1 2}
|
||||
--END--""")
|
||||
res = a.postprocess("small", "high", "parity min odd", "colored")
|
||||
tc.assertEqual(res.to_str(), """HOA: v1
|
||||
States: 3
|
||||
Start: 0
|
||||
AP: 3 "p0" "p1" "p2"
|
||||
acc-name: parity min odd 3
|
||||
Acceptance: 3 Fin(0) & (Inf(1) | Fin(2))
|
||||
properties: trans-labels explicit-labels trans-acc colored
|
||||
properties: deterministic
|
||||
--BODY--
|
||||
State: 0
|
||||
[0&!2] 0 {0}
|
||||
[0&1&2] 0 {1}
|
||||
[0&!1&2] 0 {2}
|
||||
[!0] 1 {0}
|
||||
State: 1
|
||||
[t] 2 {0}
|
||||
State: 2
|
||||
[0&!2] 2 {0}
|
||||
[0&1&2] 2 {1}
|
||||
[0&!1&2] 2 {2}
|
||||
--END--""")
|
||||
Loading…
Add table
Add a link
Reference in a new issue