67b5d2aa9a
This massive set of changes was triggered by issue #546. In addition to the better handling of !weak, this also adds some weak properties in a few places. * spot/twaalgos/product.cc (product_aux): Throw some exception if an automaton with t or f acceptance has the !weak property. This is a cheap sanity check to help detect algorithms that incorrectly assumed !weak input would necessarily become !weak output. * spot/twaalgos/hoa.cc (print_hoa): Likewise, also do not assume that terminal implies very-weak. * spot/parseaut/parseaut.yy: Add several diagnostics for similar cases. E.g., a one-state automaton cannot be declared as !very-weak. * tests/core/parseaut.test: Check those new diagnostics. * spot/twa/twa.cc (twa::intersecting_run): Temporary remove the weak property by setting it to maybe, not to false. * spot/twaalgos/minimize.cc, spot/twaalgos/parity.cc, spot/twaalgos/sccfilter.cc, spot/twaalgos/simulation.cc: Account for the fact that these algorithm may in fact improve the weakness. * spot/twaalgos/strength.cc: Only look at colors used by the acceptance condition when deciding weakness. * spot/twaalgos/synthesis.cc: Declare the strategy as weak. * bin/randaut.cc: Add weak to automata with t/f acceptance. * spot/kripke/kripke.hh: Make kripke structures as weak. * tests/core/acc_word.test, tests/core/alternating.test, tests/core/complement.test, tests/core/complete.test, tests/core/ltlsynt.test, tests/core/randomize.test, tests/core/readsave.test, tests/core/remfin.test, tests/core/sccsimpl.test, tests/core/strength.test, tests/core/wdba2.test, tests/ltsmin/kripke.test, tests/python/automata-io.ipynb, tests/python/automata.ipynb, tests/python/dbranch.py, tests/python/highlighting.ipynb, tests/python/kripke.py, tests/python/ltsmin-dve.ipynb, tests/python/mealy.py, tests/python/simstate.py: Adjust all these test cases. * NEWS: Mention the fixes.
114 lines
2.6 KiB
Python
114 lines
2.6 KiB
Python
# -*- mode: python; coding: utf-8 -*-
|
|
# Copyright (C) 2019, 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
|
|
import buddy
|
|
from unittest import TestCase
|
|
tc = TestCase()
|
|
|
|
bdict = spot.make_bdd_dict()
|
|
k = spot.make_kripke_graph(bdict)
|
|
p1 = buddy.bdd_ithvar(k.register_ap("p1"))
|
|
p2 = buddy.bdd_ithvar(k.register_ap("p2"))
|
|
cond1 = p1 & p2
|
|
cond2 = p1 & -p2
|
|
cond3 = -p1 & -p2
|
|
s0 = k.new_state(cond1)
|
|
s1 = k.new_state(cond2)
|
|
s2 = k.new_state(cond3)
|
|
k.new_edge(s1, s0)
|
|
k.new_edge(s0, s0)
|
|
k.new_edge(s1, s2)
|
|
k.new_edge(s2, s2)
|
|
k.new_edge(s2, s0)
|
|
k.set_init_state(s1)
|
|
|
|
hoa = """HOA: v1
|
|
States: 3
|
|
Start: 1
|
|
AP: 2 "p1" "p2"
|
|
acc-name: all
|
|
Acceptance: 0 t
|
|
properties: state-labels explicit-labels state-acc weak
|
|
--BODY--
|
|
State: [0&1] 0
|
|
0
|
|
State: [0&!1] 1
|
|
0 2
|
|
State: [!0&!1] 2
|
|
2 0
|
|
--END--"""
|
|
tc.assertEqual(hoa, k.to_str('HOA'))
|
|
tc.assertEqual(k.num_states(), 3)
|
|
tc.assertEqual(k.num_edges(), 5)
|
|
|
|
k.set_state_names(["s0", "s1", "s2"])
|
|
hoa = """HOA: v1
|
|
States: 3
|
|
Start: 1
|
|
AP: 2 "p1" "p2"
|
|
acc-name: all
|
|
Acceptance: 0 t
|
|
properties: state-labels explicit-labels state-acc weak
|
|
--BODY--
|
|
State: [0&1] 0 "s0"
|
|
0
|
|
State: [0&!1] 1 "s1"
|
|
0 2
|
|
State: [!0&!1] 2 "s2"
|
|
2 0
|
|
--END--"""
|
|
tc.assertEqual(hoa, k.to_str('HOA'))
|
|
|
|
k.set_state_names(["s0", "s1", "s2"])
|
|
hoa = """HOA: v1
|
|
States: 3
|
|
Start: 1
|
|
AP: 2 "p1" "p2"
|
|
acc-name: all
|
|
Acceptance: 0 t
|
|
properties: state-labels explicit-labels state-acc weak
|
|
--BODY--
|
|
State: [0&1] 0 "s0"
|
|
0
|
|
State: [0&!1] 1 "s1"
|
|
0 2
|
|
State: [!0&!1] 2 "s2"
|
|
2 0
|
|
--END--"""
|
|
tc.assertEqual(hoa, k.to_str('HOA'))
|
|
|
|
res = []
|
|
for e in k.out(s1):
|
|
res.append((e.src, e.dst))
|
|
tc.assertEqual(res, [(1, 0), (1, 2)])
|
|
|
|
res = []
|
|
for e in k.edges():
|
|
res.append((e.src, e.dst))
|
|
tc.assertEqual(res, [(1, 0), (0, 0), (1, 2), (2, 2), (2, 0)])
|
|
|
|
res = []
|
|
for s in k.states():
|
|
res.append(s.cond())
|
|
tc.assertEqual(res, [cond1, cond2, cond3])
|
|
|
|
tc.assertEqual(k.states()[0].cond(), cond1)
|
|
tc.assertEqual(k.states()[1].cond(), cond2)
|
|
tc.assertEqual(k.states()[2].cond(), cond3)
|