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

acc: make &= and |= symmetrical

Browse source 
Operator &= used to always move Fin to the front, it does not anymore.
The only thing it does now is to merge Inf(x)&Inf(y) as Inf({x,y}).
Operator |= is now symmetrical and merges Fin()s.

Fixes #253.

* spot/twa/acc.cc, spot/twa/acc.hh: Simplify &= and make |= symmetrical.
* spot/twaalgos/cleanacc.cc: Fix conjunction order.
* tests/core/acc.test, tests/core/acc2.test, tests/core/parseaut.test,
tests/core/readsave.test, tests/core/satmin2.test,
tests/core/sccdot.test, tests/python/acc_cond.ipynb,
tests/python/accparse.ipynb, tests/python/automata.ipynb,
tests/python/product.ipynb, tests/python/randaut.ipynb: Adjust test
cases.
This commit is contained in:
Alexandre Duret-Lutz 2017-07-25 17:38:24 +02:00
parent 8e685e00c9
commit abe2c08b78
15 changed files with 254 additions and 295 deletions
Download patch file Download diff file Expand all files Collapse all files

18
spot/twa/acc.cc
View file

@ -914,7 +914,7 @@ namespace spot
while ((cube = isop.next()) != bddfalse)
{
mark_t i = 0U;
acc_code c;
acc_code f;
while (cube != bddtrue)
{
// The acceptance set associated to this BDD variable
@ -928,8 +928,7 @@ namespace spot
// The strange order here make sure we can smaller set
// numbers at the end of the acceptance code, i.e., at
// the front of the output.
auto a = fin(s) & std::move(c);
std::swap(a, c);
f = fin(s) & f;
}
else // Positive variable? -> Inf
{
@ -937,10 +936,8 @@ namespace spot
cube = h;
}
}
c &= inf(i);
// See comment above for the order.
c |= std::move(rescode);
std::swap(c, rescode);
rescode = (inf(i) & f) | rescode;
}
return rescode;
@ -986,7 +983,7 @@ namespace spot
while ((cube = isop.next()) != bddfalse)
{
mark_t m = 0U;
acc_code c = f();
acc_code i = f();
while (cube != bddtrue)
{
// The acceptance set associated to this BDD variable
@ -1000,8 +997,7 @@ namespace spot
// The strange order here make sure we can smaller set
// numbers at the end of the acceptance code, i.e., at
// the front of the output.
auto a = inf(s) | std::move(c);
std::swap(a, c);
i = inf(s) | i;
}
else // Positive variable? -> Fin
{
@ -1009,10 +1005,8 @@ namespace spot
cube = h;
}
}
c |= fin(m);
// See comment above for the order.
c &= std::move(rescode);
std::swap(c, rescode);
rescode = (fin(m) | i) & rescode;
}
return rescode;
}