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

acc_cond: rename is_tt/is_ff as is_t/is_f and add printer

Browse source 
* spot/twa/acc.cc, spot/twa/acc.hh: Here.
* spot/parseaut/parseaut.yy, spot/twa/acc.hh,
spot/twaalgos/gtec/gtec.cc, spot/twaalgos/hoa.cc,
spot/twaalgos/neverclaim.cc, spot/twaalgos/product.cc,
spot/twaalgos/remfin.cc, spot/twaalgos/strength.cc: Adjust.
* NEWS: Mention the changes.
* wrap/python/spot_impl.i: Bind acc_cond the printer.
* wrap/python/tests/acc_cond.ipynb: Add more examples.
This commit is contained in:
Alexandre Duret-Lutz 2015-12-17 08:42:34 +01:00
parent 2927cf38ac
commit 94cca9de3d
12 changed files with 259 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

4
spot/twaalgos/gtec/gtec.cc
View file

@ -133,7 +133,7 @@ namespace spot
{
{
auto acc = ecs_->aut->acc();
if (acc.get_acceptance().is_ff())
if (acc.get_acceptance().is_f())
return nullptr;
if (acc.uses_fin_acceptance())
throw std::runtime_error
@ -395,7 +395,7 @@ namespace spot
{
{
auto acc = ecs_->aut->acc();
if (acc.get_acceptance().is_ff())
if (acc.get_acceptance().is_f())
return nullptr;
if (acc.uses_fin_acceptance())
throw std::runtime_error

4
spot/twaalgos/hoa.cc
View file

@ -313,7 +313,7 @@ namespace spot
acc_cond::acc_code acc_c = aut->acc().get_acceptance();
if (aut->acc().is_generalized_buchi())
{
if (aut->acc().is_tt())
if (aut->acc().is_all())
os << "acc-name: all";
else if (aut->acc().is_buchi())
os << "acc-name: Buchi";
@ -323,7 +323,7 @@ namespace spot
}
else if (aut->acc().is_generalized_co_buchi())
{
if (aut->acc().is_ff())
if (aut->acc().is_none())
os << "acc-name: none";
else if (aut->acc().is_co_buchi())
os << "acc-name: co-Buchi";

2
spot/twaalgos/neverclaim.cc
View file

@ -205,7 +205,7 @@ namespace spot
print_never_claim(std::ostream& os, const const_twa_ptr& g,
const char* options)
{
if (!(g->acc().is_buchi() || g->acc().is_tt()))
if (!(g->acc().is_buchi() || g->acc().is_all()))
throw std::runtime_error
("Never claim output only supports Büchi acceptance");
never_claim_output d(os, options);

2
spot/twaalgos/product.cc
View file

@ -80,7 +80,7 @@ namespace spot
};
res->set_init_state(new_state(left_state, right_state));
if (right_acc.is_ff())
if (right_acc.is_f())
// Do not bother doing any work if the resulting acceptance is
// false.
return res;

4
spot/twaalgos/remfin.cc
View file

@ -312,7 +312,7 @@ namespace spot
auto code = aut->get_acceptance();
if (code.is_tt())
if (code.is_t())
return nullptr;
acc_cond::mark_t inf_pairs = 0U;
@ -640,7 +640,7 @@ namespace spot
auto c = acc.inf(m);
for (unsigned i = 0; i < sz; ++i)
{
if (!code[i].is_tt())
if (!code[i].is_t())
continue;
add[i] = m;
code[i] &= std::move(c);

2
spot/twaalgos/strength.cc
View file

@ -126,7 +126,7 @@ namespace spot
bool is_safety_mwdba(const const_twa_graph_ptr& aut)
{
if (!(aut->acc().is_buchi() || aut->acc().is_tt()))
if (!(aut->acc().is_buchi() || aut->acc().is_all()))
throw std::runtime_error
("is_safety_mwdba() should be called on a Buchi automaton");