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

dot: preserve highlights for <N output

Browse source 
* spot/twa/twagraph.hh (twa_graph::edge_number): New method.
* spot/twaalgos/copy.cc: Copy the highlights if requested.
* tests/python/highlighting.ipynb: More tests.
This commit is contained in:
Alexandre Duret-Lutz 2016-07-19 02:41:34 +02:00
parent 014a9dbd6b
commit 69b687ab66
3 changed files with 242 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

18
spot/twa/twagraph.hh
View file

@ -318,10 +318,15 @@ namespace spot
return format_state(state_number(st));
}
twa_graph_edge_data& edge_data(const twa_succ_iterator* it)
unsigned edge_number(const twa_succ_iterator* it) const
{
auto* i = down_cast<const twa_graph_succ_iterator<graph_t>*>(it);
return g_.edge_data(i->pos());
return i->pos();
}
twa_graph_edge_data& edge_data(const twa_succ_iterator* it)
{
return g_.edge_data(edge_number(it));
}
twa_graph_edge_data& edge_data(unsigned t)
@ -331,8 +336,7 @@ namespace spot
const twa_graph_edge_data& edge_data(const twa_succ_iterator* it) const
{
auto* i = down_cast<const twa_graph_succ_iterator<graph_t>*>(it);
return g_.edge_data(i->pos());
return g_.edge_data(edge_number(it));
}
const twa_graph_edge_data& edge_data(unsigned t) const
@ -342,8 +346,7 @@ namespace spot
edge_storage_t& edge_storage(const twa_succ_iterator* it)
{
auto* i = down_cast<const twa_graph_succ_iterator<graph_t>*>(it);
return g_.edge_storage(i->pos());
return g_.edge_storage(edge_number(it));
}
edge_storage_t& edge_storage(unsigned t)
@ -354,8 +357,7 @@ namespace spot
const edge_storage_t
edge_storage(const twa_succ_iterator* it) const
{
auto* i = down_cast<const twa_graph_succ_iterator<graph_t>*>(it);
return g_.edge_storage(i->pos());
return g_.edge_storage(edge_number(it));
}
const edge_storage_t edge_storage(unsigned t) const