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

dot: add an option to display the acceptance

Browse source 
* src/tgbaalgos/dotty.cc: Display the acceptance if "a" is used.
* src/bin/common_aoutput.cc, src/bin/dstar2tgba.cc,
src/tgbaalgos/dotty.hh: Document it.
* src/tgbatest/readsave.test: Test it.
This commit is contained in:
Alexandre Duret-Lutz 2015-02-26 11:24:29 +01:00
parent 095ac93b5b
commit 5b3034b605
5 changed files with 68 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/tgbaalgos/dotty.cc
View file

@ -42,10 +42,12 @@ namespace spot
bool opt_horizontal_ = true;
bool opt_name_ = false;
bool opt_circles_ = false;
bool opt_show_acc_ = false;
bool mark_states_ = false;
bool opt_scc_ = false;
const_tgba_digraph_ptr aut_;
std::vector<std::string>* sn_;
std::string* name_ = nullptr;
public:
dotty_output(std::ostream& os, const char* options)
@ -55,6 +57,9 @@ namespace spot
while (char c = *options++)
switch (c)
{
case 'a':
opt_show_acc_ = true;
break;
case 'c':
opt_circles_ = true;
break;
@ -88,9 +93,19 @@ namespace spot
os_ << "digraph G {\n";
if (opt_horizontal_)
os_ << " rankdir=LR\n";
if (opt_name_)
if (auto n = aut_->get_named_prop<std::string>("automaton-name"))
escape_str(os_ << " label=\"", *n) << "\"\n labelloc=\"t\"\n";
if (name_ || opt_show_acc_)
{
os_ << " label=\"";
if (name_)
{
escape_str(os_, *name_);
if (opt_show_acc_)
os_ << "\\n";
}
if (opt_show_acc_)
os_ << aut_->get_acceptance();
os_ << "\"\n labelloc=\"t\"\n";
}
if (opt_circles_)
os_ << " node [shape=\"circle\"]\n";
os_ << " I [label=\"\", style=invis, ";
@ -137,6 +152,8 @@ namespace spot
{
aut_ = aut;
sn_ = aut->get_named_prop<std::vector<std::string>>("state-names");
if (opt_name_)
name_ = aut_->get_named_prop<std::string>("automaton-name");
mark_states_ = !opt_force_acc_trans_ && aut_->is_sba();
auto si =
std::unique_ptr<scc_info>(opt_scc_ ? new scc_info(aut) : nullptr);
@ -147,7 +164,7 @@ namespace spot
for (unsigned i = 0; i < sccs; ++i)
{
os_ << " subgraph cluster_" << i << " {\n";
if (opt_name_)
if (name_ || opt_show_acc_)
// Reset the label, otherwise the graph label would
// be inherited by the cluster.
os_ << " label=\"\"\n";

3
src/tgbaalgos/dotty.hh
View file

@ -39,7 +39,8 @@ namespace spot
/// different option. Presently the following options are
/// supported: 'v' for vertical output, 'h' for horizontal output,
/// 't' force transition-based acceptance, 'N' hide the name of the
/// automaton, 'n' shows the name, 'c' uses circle-shaped states.
/// automaton, 'n' shows the name, 'c' uses circle-shaped states,
/// 'a' shows the acceptance.
SPOT_API std::ostream&
dotty_reachable(std::ostream& os,
const const_tgba_ptr& g,