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

python: fix spot.py script for new acceptance interface

Browse source 
* wrap/python/ajax/spot.in: Adjust to the new interface.
* wrap/python/spot.i: Work around missing support for nested classes.
* wrap/python/tests/ltl2tgba.py, wrap/python/tests/ltl2tgba.test: More
test.
This commit is contained in:
Alexandre Duret-Lutz 2014-11-27 19:09:06 +01:00
parent c494a347c9
commit 10c4a92ddb
4 changed files with 30 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
wrap/python/ajax/spot.in
View file

@ -325,14 +325,14 @@ def print_stats(automaton, detinfo = False, ta = False):
's' if stats.transitions > 1 else '',
stats.sub_transitions,
's' if stats.sub_transitions > 1 else ''))
if hasattr(automaton, 'number_of_acceptance_conditions'):
count = automaton.number_of_acceptance_conditions()
if hasattr(automaton, 'acc'):
count = automaton.acc().num_sets()
if count > 0:
unbufprint(", %d acceptance condition" % count)
if count > 1:
unbufprint("s")
acc = automaton.all_acceptance_conditions()
unbufprint(": " + spot.bdd_format_accset(automaton.get_dict(), acc))
unbufprint(": " +
automaton.acc().format(automaton.acc().all_sets()))
else:
unbufprint(", no acceptance condition (all cycles are accepting)")
unbufprint("</p>\n")
@ -780,7 +780,7 @@ if output_type == 'r':
ec = 0
else:
ec_a = 0
n_acc = degen.number_of_acceptance_conditions()
n_acc = degen.acc().num_sets()
n_max = eci.max_acceptance_conditions()
n_min = eci.min_acceptance_conditions()
if (n_acc <= n_max):