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

remfin: use an scc_info filter to avoid copying automata

Browse source 
* spot/twaalgos/remfin.cc (is_scc_ba_type): Replace the call
to mask_keep_states by the use of an scc_info filter.
This commit is contained in:
Alexandre Duret-Lutz 2017-05-30 15:31:49 +02:00
parent 425620150a
commit 967b1a4192
1 changed files with 16 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

23
spot/twaalgos/remfin.cc
View file

@ -101,12 +101,10 @@ namespace spot
// that do not visit Fᵢ. // that do not visit Fᵢ.
std::set<unsigned> unknown; std::set<unsigned> unknown;
for (auto s: states) for (auto s: states)
{ if (aut->state_acc_sets(s) & i)
if (aut->state_acc_sets(s) & i) final[s] = true;
final[s] = true; else
else unknown.insert(s);
unknown.insert(s);
}
// Check whether it is possible to build non-accepting cycles // Check whether it is possible to build non-accepting cycles
// using only the "unknown" states. // using only the "unknown" states.
while (!unknown.empty()) while (!unknown.empty())
@ -115,7 +113,18 @@ namespace spot
for (auto s: unknown) for (auto s: unknown)
keep[s] = true; keep[s] = true;
scc_info si(mask_keep_states(aut, keep, *unknown.begin())); scc_info::edge_filter filter =
[](const twa_graph::edge_storage_t&, unsigned dst,
void* filter_data) -> scc_info::edge_filter_choice
{
auto& keepref = *reinterpret_cast<decltype(keep)*>(filter_data);
if (keepref[dst])
return scc_info::edge_filter_choice::keep;
else
return scc_info::edge_filter_choice::ignore;
};
scc_info si(aut, *unknown.begin(), filter, &keep);
unsigned scc_max = si.scc_count(); unsigned scc_max = si.scc_count();
for (unsigned scc = 0; scc < scc_max; ++scc) for (unsigned scc = 0; scc < scc_max; ++scc)
{ {