* src/tgbaalgos/ltl2tgba_fm.hh (ltl_to_tgba_fm): Add the

symb_merge argument.
* src/tgbaalgos/ltl2tgba_fm.cc (ltl_to_tgba_fm): Likewise.
* src/tgbatest/ltl2tgba.cc (main): Rename -fx as -x, and add -y
to unset symb_merge.
* wrap/python/cgi/ltl2tgba.in: Remove the exprop version
of the FM translator, make exprop and symb_merge options.
This commit is contained in:
Alexandre Duret-Lutz 2004-02-16 16:07:47 +00:00
parent 5cb4048120
commit 4e793ef418
6 changed files with 83 additions and 21 deletions

View file

@ -162,6 +162,9 @@ LTL-to-B&uuml;chi translator</H1>"""
formula = form.getfirst('formula', '')
options = [
('opt_exprop', 'optimize determinism (FM only)', 1),
('opt_symb_merge',
'merge states with same symbolic successor representation (FM only)', 1),
('show_parse', 'show traces during parsing', 0),
('show_formula_dot', 'print the formula as .dot', 0),
('show_formula_gif', 'draw the formula', 0),
@ -188,7 +191,6 @@ options = [
default_translator = 'trans_fm';
translators = [
('trans_fm', 'Convreur/FM'),
('trans_fm_exprop', 'Convreur/FM - exploded properties'),
('trans_lacim', 'Convreur/LaCIM'),
]
@ -339,12 +341,19 @@ dict = spot.bdd_dict()
print '<p>Building automaton...',
sys.stdout.flush()
if opt_exprop:
exprop = 1
else:
exprop = 0
if opt_symb_merge:
symb_merge = 1
else:
symb_merge = 0
if trans_lacim:
automaton = spot.ltl_to_tgba_lacim(f, dict)
elif trans_fm:
automaton = spot.ltl_to_tgba_fm(f, dict)
elif trans_fm_exprop:
automaton = spot.ltl_to_tgba_fm(f, dict, True)
automaton = spot.ltl_to_tgba_fm(f, dict, exprop, symb_merge)
print 'done.</p>'
sys.stdout.flush()