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

Implements is_streett_like() and streett_like_pairs(), is_rabin_like...

Browse source 
Adds the method spot::acc_cond::is_streett_like() that behaves like
spot::acc_cond::is_streett() except that it works on a wider range
of acceptance conditions, called Streett-like. Also adds
spot::acc_cond::streett_like_pairs() that returns a boolean assessing
whether the acceptance condition is Streett-like and also returns all
the Streett_like pairs.
Defines the new struct type spot::acc_cond::rs_pair.
Similarily, Adds the methods spot::acc_cond::is_rabin_like() and
spot::acc_cond::rabin_like_pairs().

* NEWS: Mention this modification
* python/spot/impl.i: Declares the new struct to SWIG, and defines
the streett_like_pairs() vector as an output parameter, which makes
the python code return a tuple (boolean, vector) rather than a
pass-by-reference vector.
* spot/twa/acc.cc, spot/twa/acc.hh: Declares an implements the new
methods and the new nested struct.
* tests/Makefile.am: Add new tests to the suite
* tests/python/rs_like.py: Tests the new methods and
the SWIG bindings.
This commit is contained in:
Thomas Medioni 2017-04-06 13:01:52 +02:00
parent 07c2dd3b64
commit b428ed31ec
6 changed files with 307 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

118
spot/twa/acc.cc
View file

@ -381,7 +381,7 @@ namespace spot
{
if (s != 4 || mainop != lowop)
return false;
// Pretend we where in a unary highop.
// Pretend we were in a unary highop.
s = 5;
}
acc_cond::mark_t seen_fin = 0U;
@ -416,6 +416,96 @@ namespace spot
return (!(seen_fin & seen_inf)
&& (seen_fin | seen_inf) == all_sets);
}
// Is Rabin-like or Streett-like, depending on highop and lowop.
static bool
is_rs_like(const acc_cond::acc_code& code,
acc_cond::acc_op highop,
acc_cond::acc_op lowop,
std::vector<acc_cond::rs_pair>& pairs)
{
assert(pairs.empty());
unsigned s = code.back().sub.size;
auto mainop = code.back().sub.op;
if (mainop == acc_cond::acc_op::Fin || mainop == acc_cond::acc_op::Inf)
{
assert(code.size() != 2);
auto m = code[0].mark;
if (m.count() != 1)
return false;
acc_cond::mark_t fin(0U);
acc_cond::mark_t inf(0U);
if (mainop == acc_cond::acc_op::Fin)
fin = m;
else
inf = m;
pairs.emplace_back(fin, inf);
return true;
}
else if (mainop == lowop) // Single pair?
{
if (s != 4)
return false;
// Pretend we were in a unary highop.
s = 5;
}
else if (mainop != highop)
{
return false;
}
while (s)
{
auto op = code[--s].sub.op;
auto size = code[s].sub.size;
if (op == acc_cond::acc_op::Fin
|| op == acc_cond::acc_op::Inf)
{
auto m = code[--s].mark;
acc_cond::mark_t fin(0U);
acc_cond::mark_t inf(0U);
if (m.count() != 1)
return false;
if (op == acc_cond::acc_op::Fin)
fin = m;
else //fin
inf = m;
pairs.emplace_back(fin, inf);
}
else
{
if (op != lowop || size != 4)
return false;
auto o1 = code[--s].sub.op;
auto m1 = code[--s].mark;
auto o2 = code[--s].sub.op;
auto m2 = code[--s].mark;
// We assume
// Fin(n) lowop Inf(n+1)
// o1 (m1) o2 (m2)
// swap if it is the converse
if (o2 == acc_cond::acc_op::Fin)
{
std::swap(o1, o2);
std::swap(m1, m2);
}
if (o1 != acc_cond::acc_op::Fin
|| o2 != acc_cond::acc_op::Inf
|| m1.count() != 1
|| m2.count() != 1)
return false;
pairs.emplace_back(m1, m2);
}
}
return true;
}
}
int acc_cond::is_rabin() const
@ -444,6 +534,32 @@ namespace spot
return -1;
}
bool acc_cond::is_streett_like(std::vector<rs_pair>& pairs) const
{
pairs.clear();
if (code_.is_t())
return true;
if (code_.is_f())
{
pairs.emplace_back(0U, 0U);
return true;
}
return is_rs_like(code_, acc_op::And, acc_op::Or, pairs);
}
bool acc_cond::is_rabin_like(std::vector<rs_pair>& pairs) const
{
pairs.clear();
if (code_.is_f())
return true;
if (code_.is_t())
{
pairs.emplace_back(0U, 0U);
return true;
}
return is_rs_like(code_, acc_op::Or, acc_op::And, pairs);
}
// PAIRS contains the number of Inf in each pair.
bool acc_cond::is_generalized_rabin(std::vector<unsigned>& pairs) const
{

60
spot/twa/acc.hh
View file

@ -1070,6 +1070,66 @@ namespace spot
// Returns a number of pairs (>=0) if Streett, or -1 else.
int is_streett() const;
struct SPOT_API rs_pair
{
rs_pair() = default;
rs_pair(acc_cond::mark_t fin, acc_cond::mark_t inf):
fin(fin),
inf(inf)
{}
acc_cond::mark_t fin;
acc_cond::mark_t inf;
bool operator==(rs_pair o) const
{
return fin == o.fin && inf == o.inf;
}
bool operator!=(rs_pair o) const
{
return fin != o.fin || inf != o.inf;
}
bool operator<(rs_pair o) const
{
return fin < o.fin || (!(o.fin < fin) && inf < o.inf);
}
bool operator<=(rs_pair o) const
{
return !(o < *this);
}
bool operator>(rs_pair o) const
{
return o < *this;
}
bool operator>=(rs_pair o) const
{
return !(*this < o);
}
};
/// \brief Test whether an acceptance condition is Streett-like
/// and returns each Streett pair in an std::vector<rs_pair>.
///
/// An acceptance condition is Streett-like if it can be transformed into
/// a Streett acceptance with little modification to its automaton.
/// A Streett-like acceptance condition follow one of those rules:
/// -It is a conjunction of disjunctive clauses containing at most one
/// Inf and at most one Fin.
/// -It is true (with 0 pair)
/// -It is false (1 pair [0U, 0U])
bool is_streett_like(std::vector<rs_pair>& pairs) const;
/// \brief Test whether an acceptance condition is Rabin-like
/// and returns each Rabin pair in an std::vector<rs_pair>.
///
/// An acceptance condition is Rabin-like if it can be transformed into
/// a Rabin acceptance with little modification to its automaton.
/// A Rabin-like acceptance condition follow one of those rules:
/// -It is a disjunction of conjunctive clauses containing at most one
/// Inf and at most one Fin.
/// -It is true (1 pair [0U, 0U])
/// -It is false (0 pairs)
bool is_rabin_like(std::vector<rs_pair>& pairs) const;
// Return the number of Inf in each pair.
bool is_generalized_rabin(std::vector<unsigned>& pairs) const;