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

dot: --dot=B to use bullets for all automata but Büchi and co-Büchi

Browse source 
* src/twaalgos/dotty.cc: Add option 'B'.
* src/taalgos/dotty.cc: Ignore it.
* src/bin/common_aoutput.cc, src/bin/dstar2tgba.cc: Document it.
* wrap/python/spot.py (setup): Use it by default, and rewrite
the function to be a bit more flexible.
* wrap/python/tests/automata-io.ipynb, wrap/python/tests/automata.ipynb,
wrap/python/tests/piperead.ipynb, wrap/python/tests/randaut.ipynb,
wrap/python/tests/testingaut.ipynb: Use setup() everywhere.
This commit is contained in:
Alexandre Duret-Lutz 2015-04-28 17:27:22 +02:00
parent 51309cf742
commit 8aa88c2951
10 changed files with 950 additions and 936 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/twaalgos/dotty.cc
View file

@ -59,6 +59,7 @@ namespace spot
acc_cond::mark_t fin_sets_ = 0U;
bool opt_rainbow = false;
bool opt_bullet = false;
bool opt_bullet_but_buchi = false;
bool opt_all_bullets = false;
bool opt_numbered_trans = false;
bool opt_want_state_names_ = true;
@ -117,6 +118,10 @@ namespace spot
case 'b':
opt_bullet = true;
break;
case 'B':
opt_bullet = true;
opt_bullet_but_buchi = true;
break;
case 'c':
opt_circles_ = true;
break;
@ -346,7 +351,9 @@ namespace spot
void
process_state(unsigned s)
{
if (mark_states_ && (opt_bullet || aut_->acc().num_sets() != 1))
if (mark_states_ &&
((opt_bullet && !opt_bullet_but_buchi)
|| aut_->acc().num_sets() != 1))
{
acc_cond::mark_t acc = 0U;
for (auto& t: aut_->out(s))