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

highlight: do not reset existing highlights

Browse source 
* spot/twa/twa.hh (twa::get_or_set_named_prop): New method.
* spot/twaalgos/emptiness.cc, spot/twaalgos/isdet.cc: Use it to not
overwrite existing highlights.
* tests/core/det.test: Add test case.
This commit is contained in:
Alexandre Duret-Lutz 2016-07-18 15:36:19 +02:00
parent 57f47c16e7
commit 6793d6de7d
4 changed files with 101 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

4
spot/twaalgos/emptiness.cc
View file

@ -648,7 +648,8 @@ namespace spot
if (!a)
throw std::runtime_error("highlight() only work for twa_graph");
auto h = new std::map<unsigned, unsigned>; // highlighted edges
auto h = a->get_or_set_named_prop<std::map<unsigned, unsigned>>
("highlight-edges");
unsigned src = a->get_init_state_number();
auto l = prefix.empty() ? &cycle : &prefix;
@ -683,7 +684,6 @@ namespace spot
}
src = dst;
}
a->set_named_prop("highlight-edges", h);
}
twa_graph_ptr

36
spot/twaalgos/isdet.cc
View file

@ -79,18 +79,24 @@ namespace spot
if (aut->prop_deterministic())
return;
unsigned ns = aut->num_states();
auto* highlight = new std::map<unsigned, unsigned>;
auto* highlight = aut->get_or_set_named_prop<std::map<unsigned, unsigned>>
("highlight-states");
bool deterministic = true;
for (unsigned src = 0; src < ns; ++src)
{
bdd available = bddtrue;
for (auto& t: aut->out(src))
if (!bdd_implies(t.cond, available))
highlight->emplace(src, color);
{
(*highlight)[src] = color;
deterministic = false;
}
else
available -= t.cond;
{
available -= t.cond;
}
}
aut->prop_deterministic(highlight->empty());
aut->set_named_prop("highlight-states", highlight);
aut->prop_deterministic(deterministic);
}
void
@ -99,7 +105,9 @@ namespace spot
if (aut->prop_deterministic())
return;
unsigned ns = aut->num_states();
auto* highlight = new std::map<unsigned, unsigned>;
auto* highlight = aut->get_or_set_named_prop<std::map<unsigned, unsigned>>
("highlight-edges");
bool deterministic = true;
for (unsigned src = 0; src < ns; ++src)
{
// Make a first pass to gather non-deterministic labels
@ -107,17 +115,21 @@ namespace spot
bdd extra = bddfalse;
for (auto& t: aut->out(src))
if (!bdd_implies(t.cond, available))
extra |= (t.cond - available);
{
extra |= (t.cond - available);
deterministic = false;
}
else
available -= t.cond;
{
available -= t.cond;
}
// Second pass to gather the relevant edges.
if (extra != bddfalse)
if (!deterministic)
for (auto& t: aut->out(src))
if ((t.cond & extra) != bddfalse)
highlight->emplace(aut->get_graph().index_of_edge(t), color);
(*highlight)[aut->get_graph().index_of_edge(t)] = color;
}
aut->prop_deterministic(highlight->empty());
aut->set_named_prop("highlight-edges", highlight);
aut->prop_deterministic(deterministic);
}
bool