acc: parse standard acceptance names

* src/twa/acc.cc, src/twa/acc.hh: Add method to create
standard acceptance conditions, and adjust the parse_acc_code
to recognize them
* wrap/python/spot_impl.i (acc_cond::acc_code): Add a printer.
* wrap/python/tests/accparse.ipynb: New test file.
* wrap/python/tests/Makefile.am: Add it.
* src/tests/satmin2.test: Use the new syntax.
This commit is contained in:
Alexandre Duret-Lutz 2015-04-28 09:48:45 +02:00
parent 7880b25aae
commit 8e1c846984
6 changed files with 306 additions and 7 deletions

View file

@ -451,6 +451,74 @@ namespace spot
return inf_neg(mark_t(vals));
}
static acc_code buchi()
{
return inf({0});
}
static acc_code cobuchi()
{
return fin({0});
}
static acc_code generalized_buchi(unsigned n)
{
acc_cond::mark_t m = (1U << n) - 1;
return inf(m);
}
static acc_code generalized_co_buchi(unsigned n)
{
acc_cond::mark_t m = (1U << n) - 1;
return fin(m);
}
// n is a number of pairs.
static acc_code rabin(unsigned n)
{
acc_cond::acc_code res = f();
while (n > 0)
{
acc_cond::acc_code pair = inf({2*n - 1});
pair.append_and(fin({2*n - 2}));
res.append_or(std::move(pair));
--n;
}
return res;
}
// n is a number of pairs.
static acc_code streett(unsigned n)
{
acc_cond::acc_code res = t();
while (n > 0)
{
acc_cond::acc_code pair = inf({2*n - 1});
pair.append_or(fin({2*n - 2}));
res.append_and(std::move(pair));
--n;
}
return res;
}
template<class iterator>
static acc_code generalized_rabin(iterator begin, iterator end)
{
acc_cond::acc_code res = f();
unsigned n = 0;
for (iterator i = begin; i != end; ++i)
{
acc_cond::acc_code pair = fin({n++});
acc_cond::mark_t m = 0U;
for (unsigned ni = *i; ni > 0; --ni)
m.set({n++});
pair.append_and(inf(m));
std::swap(pair, res);
res.append_or(std::move(pair));
}
return res;
}
void append_and(acc_code&& r)
{
if (is_true() || r.is_false())