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

acc: extend top_disjuncts and top_conjuncts to acc_cond as well

Browse source 
* spot/twa/acc.hh, spot/twa/acc.cc: Implement the new methods.
* python/spot/impl.i: Add bindings for vectors of acc_cond.
* tests/python/acc_cond.ipynb: Test the two methods.
* NEWS: Adjust.
This commit is contained in:
Alexandre Duret-Lutz 2019-03-29 11:39:40 +01:00
parent 01edf4f8e1
commit 0d9c81a6d9
5 changed files with 87 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

50
spot/twa/acc.cc
View file

@ -1234,12 +1234,12 @@ namespace spot
namespace
{
static std::vector<acc_cond::acc_code>
template<typename Fun>
static void
top_clauses(const acc_cond::acc_code& code,
acc_cond::acc_op connect, acc_cond::acc_op inf_fin)
acc_cond::acc_op connect, acc_cond::acc_op inf_fin,
Fun store)
{
std::vector<acc_cond::acc_code> res;
if (!code.empty())
{
auto pos = &code.back();
@ -1259,17 +1259,17 @@ namespace spot
tmp[0].mark = {d};
tmp[1].sub.op = inf_fin;
tmp[1].sub.size = 1;
res.emplace_back(tmp);
store(tmp);
}
}
else
{
res.emplace_back(pos);
store(pos);
}
pos -= pos->sub.size;
}
while (pos > start);
return res;
return;
}
if (pos->sub.op == inf_fin)
{
@ -1280,24 +1280,48 @@ namespace spot
tmp[0].mark = {d};
tmp[1].sub.op = inf_fin;
tmp[1].sub.size = 1;
res.emplace_back(tmp);
store(tmp);
}
return res;
return;
}
}
res.emplace_back(code);
return res;
store(code);
return;
}
}
std::vector<acc_cond::acc_code> acc_cond::acc_code::top_disjuncts() const
{
return top_clauses(*this, acc_cond::acc_op::Or, acc_cond::acc_op::Fin);
std::vector<acc_cond::acc_code> res;
top_clauses(*this, acc_cond::acc_op::Or, acc_cond::acc_op::Fin,
[&](const acc_cond::acc_code& c) { res.emplace_back(c); });
return res;
}
std::vector<acc_cond::acc_code> acc_cond::acc_code::top_conjuncts() const
{
return top_clauses(*this, acc_cond::acc_op::And, acc_cond::acc_op::Inf);
std::vector<acc_cond::acc_code> res;
top_clauses(*this, acc_cond::acc_op::And, acc_cond::acc_op::Inf,
[&](const acc_cond::acc_code& c) { res.emplace_back(c); });
return res;
}
std::vector<acc_cond> acc_cond::top_disjuncts() const
{
std::vector<acc_cond> res;
top_clauses(code_, acc_cond::acc_op::Or, acc_cond::acc_op::Fin,
[&](const acc_cond::acc_code& c)
{ res.emplace_back(num_, c); });
return res;
}
std::vector<acc_cond> acc_cond::top_conjuncts() const
{
std::vector<acc_cond> res;
top_clauses(code_, acc_cond::acc_op::And, acc_cond::acc_op::Inf,
[&](const acc_cond::acc_code& c)
{ res.emplace_back(num_, c); });
return res;
}
std::pair<bool, acc_cond::mark_t>

20
spot/twa/acc.hh
View file

@ -1978,6 +1978,26 @@ namespace spot
return code_.fin_one();
}
/// \brief Return the top-level disjuncts.
///
/// For instance, if the formula is
/// (5, Fin(0)|Fin(1)|(Fin(2)&(Inf(3)|Fin(4)))), this returns
/// [(5, Fin(0)), (5, Fin(1)), (5, Fin(2)&(Inf(3)|Fin(4)))].
///
/// If the formula is not a disjunction, this returns
/// a vector with the formula as only element.
std::vector<acc_cond> top_disjuncts() const;
/// \brief Return the top-level conjuncts.
///
/// For instance, if the formula is
/// (5, Fin(0)|Fin(1)|(Fin(2)&(Inf(3)|Fin(4)))), this returns
/// [(5, Fin(0)), (5, Fin(1)), (5, Fin(2)&(Inf(3)|Fin(4)))].
///
/// If the formula is not a conjunction, this returns
/// a vector with the formula as only element.
std::vector<acc_cond> top_conjuncts() const;
protected:
mark_t all_sets_() const
{