0e71dd70c1
* spot/twaalgos/sccfilter.cc: If an inherently-weak automaton has no rejecting cycle, reduce its acceptance to t instead of Büchi. * spot/twa/acc.hh (operator==, operator<): Fix comparisons of true acceptances. * NEWS: Mention these two changes. * spot/twaalgos/sccfilter.hh: Update documentation. * spot/twaalgos/determinize.cc (tgba_determinize): The call to scc_filter assume that the input BA is never reduced to t acceptance. Call scc_filter with an extra option to ensure that. * spot/twaalgos/postproc.cc (do_scc_filter): Adjust to add the extra option when we want to build Büchi or coBuchi. (ensure_ba): Don't mark trivial SCCs as accepting. * tests/core/complement.test, tests/core/dstar.test, tests/core/ltlsynt.test, tests/core/readsave.test, tests/core/wdba2.test, tests/python/_product_susp.ipynb, tests/python/automata-io.ipynb, tests/python/dualize.py, tests/python/highlighting.ipynb, tests/python/intrun.py, tests/python/setacc.py, tests/python/simstate.py, tests/python/stutter-inv.ipynb, tests/python/zlktree.py: Adjust test cases.
78 lines
2.7 KiB
Python
78 lines
2.7 KiB
Python
# -*- mode: python; coding: utf-8 -*-
|
|
# Copyright (C) 2020, 2022, 2023 Laboratoire de Recherche et Développement
|
|
# de l'Epita (LRDE).
|
|
#
|
|
# 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()
|
|
|
|
# This issue was reported by Florian Renkin. The reduce() call used in
|
|
# intersecting_run() was bogus, and could incorrectly reduce a word
|
|
# intersecting the product into a word not intersecting the product if the
|
|
# acceptance condition uses some Fin.
|
|
a, b = spot.automata("""HOA: v1 States: 5 Start: 0 AP: 2 "p0" "p1" acc-name:
|
|
Rabin 2 Acceptance: 4 (Fin(0) & Inf(1)) | (Fin(2) & Inf(3)) properties:
|
|
trans-labels explicit-labels trans-acc complete properties: deterministic
|
|
--BODY-- State: 0 [t] 3 State: 1 [t] 4 {1} State: 2 [0] 2 {1} [!0] 1 {0} State:
|
|
3 [t] 1 {1} State: 4 [!0&1] 4 {3} [!0&!1] 3 [0] 2 {0} --END-- HOA: v1 States: 5
|
|
Start: 0 AP: 2 "p0" "p1" Acceptance: 3 Inf(2) | (Fin(0) & Inf(1)) properties:
|
|
trans-labels explicit-labels trans-acc complete properties: deterministic
|
|
--BODY-- State: 0 [t] 3 State: 1 [t] 4 {1 2} State: 2 [0] 2 {1 2} [!0] 1 {0 2}
|
|
State: 3 [t] 1 {1 2} State: 4 [!0&1] 4 {2} [!0&!1] 3 {2} [0] 2 {0 2} --END--""")
|
|
r = b.intersecting_run(spot.complement(a));
|
|
c = spot.twa_word(r).as_automaton()
|
|
tc.assertTrue(c.intersects(b))
|
|
tc.assertFalse(c.intersects(a))
|
|
|
|
# The next test came from Philipp Schlehuber-Caissier: running
|
|
# as_twa() on a run built from a A.intersecting_run(B) failed to build
|
|
# the automaton because it tried to rebuild the run on A and did not
|
|
# find transitions matching exactly. Additionally the idea of merging
|
|
# states in as_twa() seems to be a way to create some disasters, so we
|
|
# removed that too.
|
|
a = spot.translate("a");
|
|
b = spot.translate("{a;1;a}");
|
|
r = a.intersecting_run(b)
|
|
tc.assertEqual(str(r), """Prefix:
|
|
1
|
|
| a
|
|
0
|
|
| 1
|
|
0
|
|
| a
|
|
Cycle:
|
|
0
|
|
| 1
|
|
""")
|
|
tc.assertEqual(r.as_twa().to_str(), """HOA: v1
|
|
States: 4
|
|
Start: 0
|
|
AP: 1 "a"
|
|
acc-name: all
|
|
Acceptance: 0 t
|
|
properties: trans-labels explicit-labels state-acc deterministic
|
|
--BODY--
|
|
State: 0
|
|
[0] 1
|
|
State: 1
|
|
[t] 2
|
|
State: 2
|
|
[0] 3
|
|
State: 3
|
|
[t] 3
|
|
--END--""")
|