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

autfilt: add option (y) to --dot to split universal transitions

Browse source 
Fixes #207

* NEWS: Informations about the option 'y' for --dot added
* bin/common_aoutput.cc: Documentation for the option 'y'
for --dot added
* spot/twaalgos/dot.cc (print_dst, process_link): Functions
modified for the new option
* tests/core/alternating.test: Tests added
This commit is contained in:
Arthur Remaud 2017-02-02 15:18:32 +01:00
parent 5516209d8c
commit 34859568cd
4 changed files with 376 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

40
spot/twaalgos/dot.cc
View file

@ -37,6 +37,7 @@
#include <cstring>
#include <algorithm>
#include <ctype.h>
#include <utility>
namespace spot
@ -95,6 +96,8 @@ namespace spot
bool opt_want_state_names_ = true;
unsigned max_states_ = -1U; // related to max_states_given_
bool opt_shared_univ_dest_ = true;
public:
unsigned max_states()
@ -244,6 +247,9 @@ namespace spot
case 't':
opt_force_acc_trans_ = true;
break;
case 'y':
opt_shared_univ_dest_ = false;
break;
default:
throw std::runtime_error
(std::string("unknown option for print_dot(): ") + c);
@ -360,17 +366,24 @@ namespace spot
return bdd_format_formula(aut_->get_dict(), label);
}
std::set<int> done;
std::set<std::pair<int, int>> done;
void
print_dst(int dst, const char* style = nullptr)
print_dst(int dst, const char* style = nullptr, int color_num = -1)
{
if (!done.emplace(dst).second)
std::ostringstream tmp_dst;
tmp_dst << dst;
if (scc_num >= 0)
tmp_dst << '.' << scc_num;
if (!done.emplace(std::make_pair(dst, color_num)).second)
return;
os_ << " " << dst << " [label=<>,shape=point]\n";
else if (!opt_shared_univ_dest_ && color_num > 0)
tmp_dst << '.' << color_num;
std::string dest = tmp_dst.str();
os_ << " " << dest << " [label=<>,shape=point]\n";
for (unsigned d: aut_->univ_dests(dst))
{
os_ << " " << dst << " -> " << d;
os_ << " " << dest << " -> " << d;
if (style && *style)
os_ << " [" << style << ']';
os_ << '\n';
@ -574,6 +587,13 @@ namespace spot
process_link(const twa_graph::edge_storage_t& t, int number)
{
os_ << " " << t.src << " -> " << (int)t.dst;
if (aut_->is_univ_dest(t.dst) && highlight_edges_
&& !opt_shared_univ_dest_)
{
auto idx = aut_->get_graph().index_of_edge(t);
auto iter = highlight_edges_->find(idx);
os_ << '.' << iter->second % palette_mod;
}
std::string label;
if (!opt_state_labels_)
label = bdd_format_formula(aut_->get_dict(), t.cond);
@ -616,6 +636,7 @@ namespace spot
}
std::string highlight;
auto color_num = -1;
if (highlight_edges_)
{
auto idx = aut_->get_graph().index_of_edge(t);
@ -628,13 +649,20 @@ namespace spot
<< '"';
highlight = o.str();
os_ << ", " << highlight;
if (!opt_shared_univ_dest_)
color_num = iter->second % palette_mod;
}
}
if (aut_->is_univ_dest(t.dst))
os_ << ", arrowhead=onormal";
os_ << "]\n";
if (aut_->is_univ_dest(t.dst))
print_dst(t.dst, highlight.c_str());
{
if (color_num >= 0)
print_dst(t.dst, highlight.c_str(), color_num);
else
print_dst(t.dst, highlight.c_str());
}
}
void print(const const_twa_graph_ptr& aut)