alarsyo/spot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

langmap: adjust to only color non-unique languages

Browse source 
Fixes #203.

* spot/twaalgos/langmap.hh (highlight_languages): Simplify the
interface by only taking the automaton to color.
* spot/twaalgos/langmap.cc (highlight_languages): Only introduce
color for states that have a non-unique language.
* tests/core/highlightstate.test: Update and add more tests.
* tests/python/langmap.py: Keep the tests simple.
* bin/autfilt.cc: Adjust usage and help string.
This commit is contained in:
Alexandre Duret-Lutz 2017-01-17 21:53:45 +01:00
parent aa457a204d
commit 0ad62cb97b
5 changed files with 131 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

107
tests/python/langmap.py
View file

@ -1,5 +1,6 @@
# -*- coding: utf-8 -*-
# Copyright (C) 2016 Laboratoire de Recherche et Développement de l'Epita.
# Copyright (C) 2016, 2017 Laboratoire de Recherche et Développement
# de l'Epita (LRDE)
#
# This file is part of Spot, a model checking library.
#
@ -17,88 +18,38 @@
# along with this program. If not, see <http:#www.gnu.org/licenses/>.
import spot
import re
import sys
def test_langmap_functions_for(aut, expected):
# First, let's get aut's languages map as v.
v = ''
try:
v = spot.language_map(aut)
except Exception as e:
# If aut is not deterministic and the exception is as expected then
# it is ok.
if 'language_map only works with deterministic automata' in str(e)\
and not spot.is_deterministic(aut):
return
else:
print(e, file=sys.stderr)
exit(1)
def hstates(txt):
for line in txt.split('\n'):
if line.startswith('spot.highlight.states:'):
return line[23:]
return ''
# Now let's check highligthed states.
spot.highlight_languages(aut, v)
lines = aut.to_str('hoa', '1.1').split('\n')
colors_l = []
for line in lines:
if 'spot.highlight.states' in line:
l = [int(w) for w in \
re.search(': (.+?)$', line).group(1).split(' ')]
if l[1::2] != expected:
print('expected:' + repr(expected) +
' but got:' + repr(l[1::2]), file=sys.stderr)
exit(1)
aut_l = []
expected_l = []
def test(f, opt, expected):
aut = spot.translate(f, opt, 'deterministic')
v = spot.language_map(aut)
assert len(v) == aut.num_states()
spot.highlight_languages(aut)
l = hstates(aut.to_str('hoa', '1.1'))
if l != expected:
print('for {}\nexpected: {}\n but got: {}'.format(f, expected, l),
file=sys.stderr)
exit(1)
aut_l.append(spot.translate('(a U b) & GFc & GFd', 'BA', 'deterministic'))
expected_l.append([0, 1, 1, 1])
aut_l.append(spot.translate('GF(a <-> b) | c', 'BA', 'deterministic'))
expected_l.append([0, 1, 2, 2])
test('GF(a) & GFb & c', 'BA', '1 0 2 0 3 0')
test('GF(a) & c & X!a', 'BA', '2 0 3 0')
test('(a U b) & GF(c & Xd)', 'generic', '1 0 2 0')
test('GF(a <-> Xb) & Fb', 'generic', '0 0 1 1 2 0 3 1 4 1')
test('Xa', 'BA', '')
aut_l.append(spot.translate('GF(a <-> b) | c | X!a', 'BA', 'deterministic'))
expected_l.append([0, 1, 2, 3, 3])
aut = spot.automaton("""
HOA: v1
States: 4
properties: implicit-labels trans-labels no-univ-branch deterministic complete
acc-name: Rabin 2
Acceptance: 4 (Fin(0)&Inf(1))|(Fin(2)&Inf(3))
Start: 0
AP: 2 "p0" "p1"
--BODY--
State: 0 {0}
1
0
3
2
State: 1 {1}
1
0
3
2
State: 2 {0 3}
1
0
3
2
State: 3 {1 3}
1
0
3
2
--END--
""")
aut_l.append(aut)
expected_l.append([0, 0, 0, 0])
# Add a non deterministic test:
aut_l.append(spot.translate('GF(a <-> XXb) | Xc', 'BA'))
expected_l.append([])
len_aut = len(aut_l)
for i in range(0, len_aut):
test_langmap_functions_for(aut_l[i], expected_l[i])
# Non-deterministic automata are not supported
try:
test('FGa', 'BA', '')
except RuntimeError as e:
assert 'language_map only works with deterministic automata'in str(e)
else:
exit(1)