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

rename two confusing methods of emptiness_check_instantiator

Browse source 
* spot/twaalgos/emptiness.hh (emptiness_check_instantiator): rename
min_acceptance_conditions and max_acceptance_conditions to
min_sets and max_sets.
* spot/twaalgos/emptiness.cc, python/ajax/spotcgi.in,
tests/core/ikwiad.cc, tests/core/emptchk.cc, tests/core/randtgba.cc:
Adjust.
* doc/org/upgrade2.org, NEWS: Mention the change.
This commit is contained in:
Alexandre Duret-Lutz 2016-03-03 18:16:25 +01:00
parent cf79cefd9a
commit ad08a585af
8 changed files with 76 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tests/core/emptchk.cc
View file

@ -132,7 +132,7 @@ main(int argc, char** argv)
auto a = aut[j];
std::cout << "** Testing aut[" << j << "] using " << algo << '\n';
unsigned n_acc = a->acc().num_sets();
unsigned n_max = i->max_acceptance_conditions();
unsigned n_max = i->max_sets();
if (n_max < n_acc)
{
std::cout << "Skipping because automaton has " << n_acc
@ -140,7 +140,7 @@ main(int argc, char** argv)
<< " accepts at most " << n_max << ".\n";
continue;
}
unsigned n_min = i->min_acceptance_conditions();
unsigned n_min = i->min_sets();
if (n_min > n_acc)
{
std::cout << "Skipping because automaton has " << n_acc

10
tests/core/ikwiad.cc
View file

@ -1103,7 +1103,7 @@ checked_main(int argc, char** argv)
if (echeck_inst
&& degeneralize_opt == NoDegen
&& n_acc > 1
&& echeck_inst->max_acceptance_conditions() < n_acc)
&& echeck_inst->max_sets() < n_acc)
{
degeneralize_opt = DegenTBA;
assume_sba = false;
@ -1334,7 +1334,7 @@ checked_main(int argc, char** argv)
if (echeck_inst
&& degeneralize_opt == NoDegen
&& n_acc > 1
&& echeck_inst->max_acceptance_conditions() < n_acc)
&& echeck_inst->max_sets() < n_acc)
degeneralize_opt = DegenTBA;
if (degeneralize_opt == DegenTBA)
{
@ -1359,13 +1359,13 @@ checked_main(int argc, char** argv)
if (echeck_inst
&& (a->acc().num_sets() < echeck_inst->min_acceptance_conditions()))
&& (a->acc().num_sets() < echeck_inst->min_sets()))
{
if (!paper_opt)
{
std::cerr << echeck_algo << " requires at least "
<< echeck_inst->min_acceptance_conditions()
<< " acceptance conditions." << std::endl;
<< echeck_inst->min_sets()
<< " acceptance sets." << std::endl;
exit(1);
}
else

3
tests/core/randtgba.cc
View file

@ -86,8 +86,7 @@ cons_emptiness_check(int num, spot::const_twa_graph_ptr a,
unsigned int n_acc)
{
auto inst = ec_algos[num].inst;
if (n_acc < inst->min_acceptance_conditions()
|| n_acc > inst->max_acceptance_conditions())
if (n_acc < inst->min_sets() || n_acc > inst->max_sets())
a = degen;
if (a)
return inst->instantiate(a);