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

tgba_digraph: add a copy constructor, and obsolete dupexp

Browse source 
* 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
Download patch file Download diff file Expand all files Collapse all files

12
src/tgbaalgos/simulation.cc
View file

@ -256,7 +256,6 @@ namespace spot
scc_info_.reset(new scc_info(a_));
old_a_ = a_;
// Replace all the acceptance conditions by their complements.
// (In the case of Cosimulation, we also flip the transitions.)
{
@ -298,6 +297,8 @@ namespace spot
else
t.acc = acc;
}
if (Cosimulation)
a_->set_init_state(old_a_->get_init_state_number());
}
size_a_ = ns;
}
@ -435,7 +436,7 @@ namespace spot
// When we Cosimulate, we add a special flag to differentiate
// the initial state from the other.
if (Cosimulation && src == 0)
if (Cosimulation && src == a_->get_init_state_number())
res |= bdd_initial;
return res;
@ -696,6 +697,8 @@ namespace spot
}
}
res->purge_unreachable_states();
delete gb;
res->prop_copy(original_,
false, // state-based acc forced below
@ -835,6 +838,8 @@ namespace spot
bdd res = bddfalse;
unsigned scc = scc_info_->scc_of(src);
if (scc == -1U) // Unreachable
return bddfalse;
bool sccacc = scc_info_->is_accepting_scc(scc);
for (auto& t: a_->out(src))
@ -1353,12 +1358,13 @@ namespace spot
direct_simulation<true, Sba> cosimul(res);
res = cosimul.run();
next.set_size(res);
if (Sba)
res = scc_filter_states(res);
else
res = scc_filter(res, false);
next.set_size(res);
}
while (prev != next);
return res;