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

acc: simplify interface using operators

Browse source 
* spot/twa/acc.hh, spot/twa/acc.cc: Here.  Also remove
some redundant functions.
* spot/parseaut/parseaut.yy, spot/priv/accmap.hh, spot/tests/acc.cc,
spot/tests/twagraph.cc, spot/twa/taatgba.hh, spot/twa/twaproduct.cc,
spot/twaalgos/dtwasat.cc, spot/twaalgos/hoa.cc, spot/twaalgos/lbtt.cc,
spot/twaalgos/ltl2tgba_fm.cc, spot/twaalgos/product.cc,
spot/twaalgos/remfin.cc, spot/twaalgos/simulation.cc,
spot/twaalgos/tau03opt.cc, spot/twaalgos/weight.cc,
spot/twaalgos/weight.hh: Adjust.
* NEWS: Mention the changes.
This commit is contained in:
Alexandre Duret-Lutz 2015-12-16 18:49:11 +01:00
parent c39d35d068
commit 4993e80706
19 changed files with 161 additions and 154 deletions
Download patch file Download diff file Expand all files Collapse all files

8
spot/twaalgos/tau03opt.cc
View file

@ -160,9 +160,9 @@ namespace spot
// FIXME: This should be improved.
std::vector<unsigned> res;
unsigned max = a_->num_sets();
for (unsigned n = 0; n < max && a_->acc().has(acc, n); ++n)
for (unsigned n = 0; n < max && acc.has(n); ++n)
res.push_back(n);
return a_->acc().marks(res.begin(), res.end());
return acc_cond::mark_t(res.begin(), res.end());
}
/// \brief weight of the state on top of the blue stack.
@ -209,7 +209,7 @@ namespace spot
{
trace << " It is white, go down" << std::endl;
if (use_weights)
current_weight.add(a_->acc(), acc);
current_weight.add(acc);
inc_states();
h.add_new_state(s_prime, CYAN, current_weight);
push(st_blue, s_prime, label, acc);
@ -260,7 +260,7 @@ namespace spot
stack_item f_dest(f);
pop(st_blue);
if (use_weights)
current_weight.sub(a_->acc(), f_dest.acc);
current_weight.sub(f_dest.acc);
typename heap::color_ref c_prime = h.get_color_ref(f_dest.s);
assert(!c_prime.is_white());
c_prime.set_color(BLUE);