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

twa: forward num_sets() to acc_.

Browse source 
* src/twa/twa.hh (num_sets): New method.  Delegating to acc_.
* src/twa/twagraph.hh, src/twa/twaproduct.cc, src/twa/twaproxy.cc,
src/twaalgos/degen.cc, src/twaalgos/dot.cc, src/twaalgos/dtgbacomp.cc,
src/twaalgos/dtgbasat.cc, src/twaalgos/gv04.cc, src/twaalgos/hoa.cc,
src/twaalgos/lbtt.cc, src/twaalgos/magic.cc, src/twaalgos/mask.cc,
src/twaalgos/ndfs_result.hxx, src/twaalgos/postproc.cc,
src/twaalgos/powerset.cc, src/twaalgos/product.cc,
src/twaalgos/remfin.cc, src/twaalgos/se05.cc,
src/twaalgos/simulation.cc, src/twaalgos/stats.cc,
src/twaalgos/stutter.cc, src/twaalgos/tau03.cc,
src/twaalgos/tau03opt.cc, src/twaalgos/totgba.cc: Simplify
acc().num_sets() into num_sets().
This commit is contained in:
Alexandre Duret-Lutz 2015-06-11 21:55:23 +02:00
parent a86391ab77
commit 6f500f3f50
25 changed files with 44 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/twa/twa.hh
View file

@ -658,6 +658,11 @@ namespace spot
}
public:
unsigned num_sets() const
{
return acc_.num_sets();
}
const acc_cond::acc_code& get_acceptance() const
{
return acc_.get_acceptance();

6
src/twa/twagraph.hh
View file

@ -438,7 +438,7 @@ namespace spot
acc_cond::mark_t state_acc_sets(unsigned s) const
{
assert(has_state_based_acc() || acc_.num_sets() == 0);
assert(has_state_based_acc() || num_sets() == 0);
for (auto& t: g_.out(s))
// Stop at the first transition, since the remaining should be
// labeled identically.
@ -448,7 +448,7 @@ namespace spot
bool state_is_accepting(unsigned s) const
{
assert(has_state_based_acc() || acc_.num_sets() == 0);
assert(has_state_based_acc() || num_sets() == 0);
for (auto& t: g_.out(s))
// Stop at the first transition, since the remaining should be
// labeled identically.
@ -465,7 +465,7 @@ namespace spot
{
if (num_states() != aut.num_states() ||
num_transitions() != aut.num_transitions() ||
acc().num_sets() != aut.acc().num_sets())
num_sets() != aut.num_sets())
return false;
auto& trans1 = transition_vector();
auto& trans2 = aut.transition_vector();

6
src/twa/twaproduct.cc
View file

@ -310,12 +310,12 @@ namespace spot
d->register_all_propositions_of(&left_, this);
d->register_all_propositions_of(&right_, this);
assert(acc_.num_sets() == 0);
auto left_num = left->acc().num_sets();
assert(num_sets() == 0);
auto left_num = left->num_sets();
auto right_acc = right->get_acceptance();
right_acc.shift_left(left_num);
right_acc.append_and(left->get_acceptance());
set_acceptance(left_num + right->acc().num_sets(), right_acc);
set_acceptance(left_num + right->num_sets(), right_acc);
}
twa_product::~twa_product()

2
src/twa/twaproxy.cc
View file

@ -25,7 +25,7 @@ namespace spot
: twa(original->get_dict()), original_(original)
{
get_dict()->register_all_variables_of(original, this);
acc_.add_sets(original->acc().num_sets());
acc_.add_sets(original->num_sets());
}
twa_proxy::~twa_proxy()