55575a11e3
Fixes #555 reported by Dávid Smolka. * spot/twa/twagraph.cc (defrag_states): Update highlight-edge. * spot/graph/graph.hh (defrag_states): Just point to twa_graph::defrag_states in a comment, because the latter relies on the implementation detail of graph::defrag_state. * tests/python/parsetgba.py: Add test case. * NEWS: Mention the bug.
125 lines
2.9 KiB
Python
Executable file
125 lines
2.9 KiB
Python
Executable file
# -*- 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 os
|
|
import spot
|
|
from unittest import TestCase
|
|
tc = TestCase()
|
|
|
|
contents = '''
|
|
HOA: v1 name: "a U b" States: 2 Start: 1 AP: 2 "a" "b" acc-name: Buchi
|
|
Acceptance: 1 Inf(0) properties: trans-labels explicit-labels state-acc
|
|
deterministic --BODY-- State: 0 {0} [t] 0 State: 1 [1] 0 [0&!1] 1 --END--
|
|
'''
|
|
|
|
filename = 'parsetgba.hoa'
|
|
|
|
out = open(filename, 'w+')
|
|
out.write(contents)
|
|
out.close()
|
|
|
|
a = spot.parse_aut(filename, spot.make_bdd_dict())
|
|
tc.assertFalse(a.errors)
|
|
spot.print_dot(spot.get_cout(), a.aut)
|
|
del a
|
|
os.unlink(filename)
|
|
|
|
|
|
autstr = """
|
|
HOA: v1
|
|
States: 2
|
|
Start: 0
|
|
AP: 0
|
|
Acceptance: 0 t
|
|
spot.highlight.edges: 1 1 2 2 3 3 4 4
|
|
--BODY--
|
|
State: 0
|
|
[t] 1
|
|
[f] 0
|
|
State: 1
|
|
[f] 0
|
|
[t] 0
|
|
--END--
|
|
"""
|
|
|
|
a1 = spot.automaton(autstr)
|
|
tc.assertEqual(a1.to_str("hoa", "1.1"), """HOA: v1.1
|
|
States: 2
|
|
Start: 0
|
|
AP: 0
|
|
acc-name: all
|
|
Acceptance: 0 t
|
|
properties: trans-labels explicit-labels state-acc complete
|
|
properties: deterministic weak
|
|
spot.highlight.edges: 1 1 2 4
|
|
--BODY--
|
|
State: 0
|
|
[t] 1
|
|
State: 1
|
|
[t] 0
|
|
--END--""")
|
|
a2 = spot.automaton(autstr, drop_false_edges=False)
|
|
tc.assertEqual(a2.to_str("hoa", "1.1"), """HOA: v1.1
|
|
States: 2
|
|
Start: 0
|
|
AP: 0
|
|
acc-name: all
|
|
Acceptance: 0 t
|
|
properties: trans-labels explicit-labels state-acc complete
|
|
properties: deterministic weak
|
|
spot.highlight.edges: 1 1 2 2 3 3 4 4
|
|
--BODY--
|
|
State: 0
|
|
[t] 1
|
|
[f] 0
|
|
State: 1
|
|
[f] 0
|
|
[t] 0
|
|
--END--""")
|
|
|
|
# Issue #555.
|
|
a3 = spot.automaton("""HOA: v1.1 States: 6 Start: 0 AP: 3 "a" "b" "c"
|
|
acc-name: Buchi Acceptance: 1 Inf(0) properties: trans-labels
|
|
explicit-labels state-acc !complete properties: !deterministic
|
|
exist-branch spot.highlight.edges: 5 3 6 1 7 3 8 2 --BODY-- State: 0 [0] 1 [0] 2
|
|
State: 1 [0] 3 State: 2 [0] 5 State: 3 {0} [0] 3 State: 4 {0} [0] 4
|
|
[1] 4 State: 5 {0} [1] 5 [2] 5 --END--""")
|
|
a3.purge_dead_states()
|
|
tc.assertEqual(a3.to_str("hoa", "1.1"), """HOA: v1.1
|
|
States: 5
|
|
Start: 0
|
|
AP: 3 "a" "b" "c"
|
|
acc-name: Buchi
|
|
Acceptance: 1 Inf(0)
|
|
properties: trans-labels explicit-labels state-acc !complete
|
|
properties: !deterministic exist-branch
|
|
spot.highlight.edges: 5 3 6 2
|
|
--BODY--
|
|
State: 0
|
|
[0] 1
|
|
[0] 2
|
|
State: 1
|
|
[0] 3
|
|
State: 2
|
|
[0] 4
|
|
State: 3 {0}
|
|
[0] 3
|
|
State: 4 {0}
|
|
[1] 4
|
|
[2] 4
|
|
--END--""")
|