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

twa_graph: support alternation in remove_dead/unreachable_states

Browse source 
* spot/graph/graph.hh (internal::univ_dest_mapper): New helper class.
* spot/twa/twagraph.cc (merge_univ_dests): Simplify using
univ_dest_mapper.
(purge_unreachable_states, purge_dead_states): Add support for
alternation.
* tests/core/alternating.test: More tests.
This commit is contained in:
Alexandre Duret-Lutz 2016-12-28 19:48:47 +01:00
parent 096c78a3f8
commit db5d9780f1
3 changed files with 286 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

35
spot/graph/graph.hh
View file

@ -26,6 +26,7 @@
#include <cassert>
#include <iterator>
#include <algorithm>
#include <map>
#include <iostream>
#include <type_traits>
@ -556,6 +557,33 @@ namespace spot
return end_;
}
};
template<class G>
class univ_dest_mapper
{
std::map<std::vector<unsigned>, unsigned> uniq_;
G& g_;
public:
univ_dest_mapper(G& graph)
: g_(graph)
{
}
template<class I>
unsigned new_univ_dests(I begin, I end)
{
std::vector<unsigned> tmp(begin, end);
std::sort(tmp.begin(), tmp.end());
tmp.erase(std::unique(tmp.begin(), tmp.end()), tmp.end());
auto p = uniq_.emplace(tmp, 0);
if (p.second)
p.first->second = g_.new_univ_dests(tmp.begin(), tmp.end());
return p.first->second;
}
};
} // namespace internal
@ -1126,7 +1154,7 @@ namespace spot
/// \param used_states the number of states used (after renumbering)
void defrag_states(std::vector<unsigned>&& newst, unsigned used_states)
{
SPOT_ASSERT(newst.size() == states_.size());
SPOT_ASSERT(newst.size() >= states_.size());
SPOT_ASSERT(used_states > 0);
//std::cerr << "\nbefore defrag\n";
@ -1175,10 +1203,9 @@ namespace spot
for (edge t = 1; t < dest; ++t)
{
auto& tr = edges_[t];
tr.next_succ = newidx[tr.next_succ];
tr.dst = newst[tr.dst];
tr.src = newst[tr.src];
SPOT_ASSERT(tr.dst != -1U);
tr.dst = newst[tr.dst];
tr.next_succ = newidx[tr.next_succ];
}
// Adjust succ and succ_tails pointers in all states.