2b9f17202c
* src/tgba/bdddict.cc (bdd_dict::is_registered): Split as ... (bdd_dict::is_registered_proposition, bdd_dict::is_registered_state, bdd_dict::is_registered_accepting_variable): ... these. * src/tgba/bdddict.hh: Likewise. * src/tgba/tgbaexplicit.cc (tgba_explicit::set_init_state): New method. (tgba_explicit::declare_accepting_condition): Arrange so that this function can be called during the construction of the automaton. (tgba_explicit::complement_all_accepting_conditions): New method. (tgba_explicit::has_accepting_condition): Adjust to call bdd_dict::is_registered_accepting_variable. * src/tgba/tgbaexplicit.hh (tgba_explicit::set_init_state, tgba_explicit::complement_all_accepting_conditions): New methods. * src/tgbaalgos/ltl2tgba_fm.cc, src/tgbaalgos/ltl2tgba_fm.hh: New files. * src/tgbaalgos/Makefile.am (tgbaalgos_HEADERS, libtgbaalgos_la_SOURCES): Add them. * src/tgbaalgos/ltl2tgba.hh: Add bibtex entry in comment. * src/tgbatest/Makefile.am (check_PROGRAMS): Remove spotlbtt and tbalbtt. (tbalbtt_SOURCES, tbalbtt_CXXFLAGS, spotlbtt_SOURCES): Remove. * src/tgbatest/spotlbtt.cc: Delete, superseded by "ltl2tgba -F -t". * src/tgbatest/ltl2tgba.cc: Implement the -f and -F options. * src/tgbatest/spotlbtt.test: Use "ltl2tgba -F -t" instead of "spotlbtt", "ltl2tgba -F -t -D" instead of "tbalbtt", and add also check the ltl2tgba_fm translator. * wrap/python/spot.i: Wrap ltl2tgba_fm. * wrap/python/cgi/ltl2tgba.in: Add radio buttons to select between ltl2tgba and ltl2tgba_fm. * wrap/python/tests/ltl2tgba.py: Add support for the -f option. * wrap/python/tests/ltl2tgba.test: Try the -f option.
129 lines
3.1 KiB
Python
Executable file
129 lines
3.1 KiB
Python
Executable file
# This is a python translation of the ltl2tgba C++ test program.
|
|
# Compare with src/tgbatest/ltl2tgba.test.
|
|
|
|
import sys
|
|
import getopt
|
|
import ltihooks
|
|
import spot
|
|
|
|
def usage(prog):
|
|
print "Usage: ", prog, """ [OPTIONS...] formula
|
|
|
|
Options:
|
|
-a display the accepting_conditions BDD, not the reachability graph
|
|
-A same as -a, but as a set
|
|
-d turn on traces during parsing
|
|
-D degeneralize the automaton
|
|
-f use Couvreur's FM algorithm for translation
|
|
-r display the relation BDD, not the reachability graph
|
|
-R same as -r, but as a set
|
|
-t display reachable states in LBTT's format
|
|
-v display the BDD variables used by the automaton"""
|
|
sys.exit(2)
|
|
|
|
|
|
prog = sys.argv[0]
|
|
try:
|
|
opts, args = getopt.getopt(sys.argv[1:], 'aAdDfrRtv')
|
|
except getopt.GetoptError:
|
|
usage(prog)
|
|
|
|
exit_code = 0
|
|
debug_opt = 0
|
|
degeneralize_opt = None
|
|
output = 0
|
|
fm_opt = 0
|
|
|
|
for o, a in opts:
|
|
if o == '-a':
|
|
output = 2
|
|
elif o == '-A':
|
|
output = 4
|
|
elif o == '-d':
|
|
debug_opt = 1
|
|
elif o == '-D':
|
|
degeneralize_opt = 1
|
|
elif o == '-f':
|
|
fm_opt = 1
|
|
elif o == '-r':
|
|
output = 1
|
|
elif o == '-R':
|
|
output = 3
|
|
elif o == '-t':
|
|
output = 6
|
|
elif o == '-v':
|
|
output = 5
|
|
else:
|
|
usage(prog)
|
|
|
|
if len(args) != 1:
|
|
usage(prog)
|
|
|
|
|
|
cout = spot.get_cout()
|
|
cerr = spot.get_cerr()
|
|
|
|
e = spot.default_environment.instance()
|
|
p = spot.empty_parse_error_list()
|
|
|
|
f = spot.parse(args[0], p, e, debug_opt)
|
|
if spot.format_parse_errors(cerr, args[0], p):
|
|
exit_code = 1
|
|
|
|
dict = spot.bdd_dict()
|
|
|
|
if f:
|
|
if fm_opt:
|
|
a = spot.ltl_to_tgba_fm(f, dict)
|
|
concrete = 0
|
|
else:
|
|
a = concrete = spot.ltl_to_tgba(f, dict)
|
|
spot.destroy(f)
|
|
del f
|
|
|
|
degeneralized = None
|
|
if degeneralize_opt:
|
|
a = degeneralized = spot.tgba_tba_proxy(a)
|
|
|
|
if output == 0:
|
|
spot.dotty_reachable(cout, a)
|
|
elif output == 1:
|
|
if concrete:
|
|
spot.bdd_print_dot(cout, concrete.get_dict(),
|
|
concrete.get_core_data().relation)
|
|
elif output == 2:
|
|
if concrete:
|
|
spot.bdd_print_dot(cout, concrete.get_dict(),
|
|
concrete.get_core_data().accepting_conditions)
|
|
elif output == 3:
|
|
if concrete:
|
|
spot.bdd_print_set(cout, concrete.get_dict(),
|
|
concrete.get_core_data().relation)
|
|
print
|
|
elif output == 4:
|
|
if concrete:
|
|
spot.bdd_print_set(cout, concrete.get_dict(),
|
|
concrete.get_core_data().accepting_conditions)
|
|
print
|
|
elif output == 5:
|
|
a.get_dict().dump(cout)
|
|
elif output == 6:
|
|
spot.lbtt_reachable(cout, a)
|
|
else:
|
|
assert "unknown output option"
|
|
|
|
if degeneralize_opt:
|
|
del degeneralized
|
|
# Must delete absolutely all references to an automaton
|
|
# so that the C++ destructor gets called.
|
|
del a, concrete
|
|
|
|
else:
|
|
exit_code = 1
|
|
|
|
del dict;
|
|
|
|
assert spot.atomic_prop.instance_count() == 0
|
|
assert spot.unop.instance_count() == 0
|
|
assert spot.binop.instance_count() == 0
|
|
assert spot.multop.instance_count() == 0
|