tgba_digraph: add a copy constructor, and obsolete dupexp

* src/tgba/tgbagraph.hh, src/tgba/tgbagraph.cc: Add a copy constructor,
and some method to purge unreachable states.
* src/graph/graph.hh (defrag_states): Erase transition of removed
states.
* src/tgbaalgos/complete.cc, src/tgbaalgos/compsusp.cc,
src/tgbaalgos/dtgbacomp.cc, src/tgbaalgos/simulation.cc,
src/tgbatest/checkpsl.cc, src/tgbatest/emptchk.cc,
src/tgbatest/ltl2tgba.cc: Adjust to use make_tgba_digraph() instead
of tgba_dupexp_dfs() or tgba_dupexp_bfs().
* src/tgbaalgos/dupexp.cc, src/tgbaalgos/dupexp.hh: Use
make_tgba_digraph() when possible.
* src/tgbatest/det.test, src/tgbatest/sim.test: Adjust expected results.
This commit is contained in:
Alexandre Duret-Lutz 2014-10-28 18:47:19 +01:00
parent 971788fdbe
commit 923785f76a
14 changed files with 128 additions and 27 deletions

View file

@ -62,6 +62,40 @@ namespace spot
g_.defrag();
}
void tgba_digraph::purge_unreachable_states()
{
unsigned num_states = g_.num_states();
if (num_states == 0)
return;
std::vector<unsigned> seen(num_states, 0);
std::vector<unsigned> todo;
todo.reserve(num_states);
todo.push_back(init_number_);
seen[init_number_] = 1;
auto todo_pos = todo.begin();
while (todo_pos != todo.end())
{
for (auto& t: g_.out(*todo_pos))
if (!seen[t.dst])
{
seen[t.dst] = 1;
todo.push_back(t.dst);
}
++todo_pos;
}
// Now renumber each used state.
unsigned current = 0;
for (auto& v: seen)
if (!v)
v = -1U;
else
v = current++;
if (current == seen.size())
return; // No useless state.
init_number_ = seen[init_number_];
g_.defrag_states(std::move(seen), current);
}
void tgba_digraph::purge_dead_states()
{
unsigned num_states = g_.num_states();