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

twa_graph: add a merge_univ_dests() method

Browse source 
and call it after parsing

* spot/twa/twagraph.cc, spot/twa/twagraph.hh
(twa_graph::merge_univ_dests): New method.
* spot/parseaut/parseaut.yy: Call it.
* spot/twaalgos/dot.cc: Improve output, now that
several edges can use the same universal destination.
* tests/core/alternating.test, tests/core/complete.test,
tests/core/parseaut.test, tests/python/_altscc.ipynb,
tests/python/alternating.py, tests/python/alternation.ipynb: Adjust
test case.
* doc/org/tut24.org: Adjust example.
This commit is contained in:
Alexandre Duret-Lutz 2016-12-27 12:35:16 +01:00
parent 3d0a971aa8
commit 12f6c8cf10
11 changed files with 567 additions and 517 deletions
Download patch file Download diff file Expand all files Collapse all files

15
spot/twaalgos/dot.cc
View file

@ -360,10 +360,14 @@ namespace spot
return bdd_format_formula(aut_->get_dict(), label);
}
std::set<int> done;
void
print_dst(int dst, const char* style = nullptr)
{
os_ << " " << dst << " [label=<>,width=0,height=0,shape=none]\n";
if (!done.emplace(dst).second)
return;
os_ << " " << dst << " [label=<>,shape=point]\n";
for (unsigned d: aut_->univ_dests(dst))
{
os_ << " " << dst << " -> " << d;
@ -465,7 +469,7 @@ namespace spot
}
else
{
os_ << " [dir=none]\n";
os_ << " [arrowhead=onormal]\n";
print_dst(init);
}
}
@ -626,11 +630,10 @@ namespace spot
os_ << ", " << highlight;
}
}
// No arrow tip of the common part of a universal transition
if ((int)t.dst < 0)
os_ << ", dir=none";
if (aut_->is_univ_dest(t.dst))
os_ << ", arrowhead=onormal";
os_ << "]\n";
if ((int)t.dst < 0) // Universal destination
if (aut_->is_univ_dest(t.dst))
print_dst(t.dst, highlight.c_str());
}