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

14
spot/parseaut/parseaut.yy
View file

@ -786,13 +786,13 @@ acceptance-cond: IDENTIFIER '(' acc-set ')'
}
| acceptance-cond '&' acceptance-cond
{
$3->append_and(std::move(*$1));
*$3 &= std::move(*$1);
$$ = $3;
delete $1;
}
| acceptance-cond '|' acceptance-cond
{
$3->append_or(std::move(*$1));
*$3 |= std::move(*$1);
$$ = $3;
delete $1;
}
@ -1804,7 +1804,7 @@ fix_acceptance_aux(spot::acc_cond& acc,
while (sub < pos)
{
--pos;
c.append_and(fix_acceptance_aux(acc, in, pos, onlyneg, both, base));
c &= fix_acceptance_aux(acc, in, pos, onlyneg, both, base);
pos -= in[pos].size;
}
return c;
@ -1818,7 +1818,7 @@ fix_acceptance_aux(spot::acc_cond& acc,
while (sub < pos)
{
--pos;
c.append_or(fix_acceptance_aux(acc, in, pos, onlyneg, both, base));
c |= fix_acceptance_aux(acc, in, pos, onlyneg, both, base);
pos -= in[pos].size;
}
return c;
@ -1839,7 +1839,7 @@ fix_acceptance_aux(spot::acc_cond& acc,
++base;
}
if (tmp)
c.append_or(acc.fin(tmp));
c |= acc.fin(tmp);
return c;
}
case spot::acc_cond::acc_op::InfNeg:
@ -1854,7 +1854,7 @@ fix_acceptance_aux(spot::acc_cond& acc,
++base;
}
if (tmp)
c.append_and(acc.inf(tmp));
c &= acc.inf(tmp);
return c;
}
}
@ -1886,7 +1886,7 @@ static void fix_acceptance(result_& r)
unsigned base = 0;
if (both)
{
auto v = acc.sets(both);
auto v = both.sets();
auto vs = v.size();
base = acc.add_sets(vs);
for (auto& t: r.h->aut->edge_vector())