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

twa_graph: add support for universal initial states

Browse source 
The only missing point is that the HOA parser cannot deal with multiple
universal initial states, as seen in parseaut.test.

* spot/graph/graph.hh (new_univ_dests): New function, extracted from...
(new_univ_edge): ... this one.
* spot/twa/twagraph.hh (set_univ_init_state): Implement using
new_univ_dests.
* spot/twaalgos/dot.cc, spot/twaalgos/hoa.cc, python/spot/impl.i:
Add support for universal initial states.
* spot/parseaut/parseaut.yy: Add preliminary support for
universal initial states.  Multiple universal initial states
are still not supported.
* tests/core/alternating.test, tests/core/parseaut.test,
tests/python/alternating.py: Adjust tests and exercise this new feature.
This commit is contained in:
Alexandre Duret-Lutz 2016-11-30 14:22:44 +01:00
parent d5c9c34514
commit 48c812a595
9 changed files with 193 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

31
spot/graph/graph.hh
View file

@ -766,6 +766,27 @@ namespace spot
return t;
}
/// \brief Create a new universal destination group
///
/// The resulting state number can be used as the destination of
/// an edge.
///
/// \param dst_begin start of a non-empty container of destination states
/// \param dst_end end of a non-empty container of destination states
template <typename I>
state
new_univ_dests(I dst_begin, I dst_end)
{
unsigned sz = std::distance(dst_begin, dst_end);
if (sz == 1)
return *dst_begin;
SPOT_ASSERT(sz > 1);
unsigned d = dests_.size();
dests_.emplace_back(sz);
dests_.insert(dests_.end(), dst_begin, dst_end);
return ~d;
}
/// \brief Create a new universal edge
///
/// \param src the source state
@ -776,14 +797,8 @@ namespace spot
edge
new_univ_edge(state src, I dst_begin, I dst_end, Args&&... args)
{
unsigned sz = std::distance(dst_begin, dst_end);
if (sz == 1)
return new_edge(src, *dst_begin, std::forward<Args>(args)...);
SPOT_ASSERT(sz > 1);
unsigned d = dests_.size();
dests_.emplace_back(sz);
dests_.insert(dests_.end(), dst_begin, dst_end);
return new_edge(src, ~d, std::forward<Args>(args)...);
return new_edge(src, new_univ_dests(dst_begin, dst_end),
std::forward<Args>(args)...);
}
/// \brief Create a new universal edge