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

length_boolone: fix inconsistency

Browse source 
* src/ltlvisit/length.cc: Consider length of all Boolean
expressions combined in a multop as one.
* src/ltltest/length.test: Test it.
This commit is contained in:
Alexandre Lewkowicz 2014-01-15 00:43:19 +01:00 • committed by Alexandre Duret-Lutz
parent b6e5ce7e15
commit 02334867da
2 changed files with 20 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/ltltest/length.test
View file

@ -34,3 +34,5 @@ len 'a|b|c' 5 1
len '!a|b|!c' 7 1 len '!a|b|!c' 7 1
len '!(!a|b|!c)' 8 1 len '!(!a|b|!c)' 8 1
len '!X(!a|b|!c)' 9 3 len '!X(!a|b|!c)' 9 3
len 'Xa|(b|c)' 6 4
len 'Xa&(b|c)' 6 4

20
src/ltlvisit/length.cc
View file

@ -88,11 +88,27 @@ namespace spot
} }
unsigned s = mo->size(); unsigned s = mo->size();
unsigned operator_count = s - 1;
for (unsigned i = 0; i < s; ++i) for (unsigned i = 0; i < s; ++i)
mo->nth(i)->accept(*this); {
// Ignore all boolean values. We only want to count them once.
if (!mo->nth(i)->is_boolean())
mo->nth(i)->accept(*this);
else
--operator_count;
}
// if operator_count has decreased, it means that we have encountered
// boolean values.
if (operator_count < s - 1)
{
++result_;
++operator_count;
}
// "a & b & c" should count for 5, even though it is // "a & b & c" should count for 5, even though it is
// stored as And(a,b,c). // stored as And(a,b,c).
result_ += s - 1; result_ += operator_count;
} }
}; };