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

simplify: resolve assertion failed.

Browse source 
* src/ltltest/reduc0.test, src/ltlvisit/simplify.cc: here.
This commit is contained in:
Etienne Renault 2015-02-11 11:17:45 +01:00
parent 58da54e79a
commit 5610d10ac3
2 changed files with 27 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/ltltest/reduc0.test
View file

@ -31,3 +31,7 @@ run 0 ../reduc 0 '(Xf W 0) | X(f W 0)' 'XGf'
# valid if r has a non-empty language. # valid if r has a non-empty language.
run 0 ../reduc 0 '{a[*];{b && !b}}' run 0 ../reduc 0 '{a[*];{b && !b}}'
run 0 ../reduc 0 '!{a[*];{b && !b}}' run 0 ../reduc 0 '!{a[*];{b && !b}}'
# Triggered an assert before
run 0 ../reduc 0 '(a | (Xa M a))'
run 0 ../reduc 0 '(b xor (Xb U b)) <-> e'

37
src/ltlvisit/simplify.cc
View file

@ -18,7 +18,7 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>. // along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <iostream> #include <iostream>
//#define TRACE // #define TRACE
#ifdef TRACE #ifdef TRACE
#define trace std::cerr #define trace std::cerr
#else #else
@ -2903,18 +2903,19 @@ namespace spot
// Make a second pass to check if the "a" // Make a second pass to check if the "a"
// terms can be used to simplify "Xa W b", // terms can be used to simplify "Xa W b",
// "Xa U b", "b | X(b R a)", or "b | X(b M a)". // "Xa U b", "b | X(b R a)", or "b | X(b M a)".
multop::vec resorig(*res);
for (unsigned n = 0; n < s; ++n) for (unsigned n = 0; n < s; ++n)
{ {
if (!(*res)[n]) const formula* x = resorig[n];
if (!x)
continue; continue;
fmap_t::const_iterator gs = fmap_t::const_iterator gs = wuset.find(x);
wuset.find((*res)[n]);
if (gs == wuset.end()) if (gs == wuset.end())
continue; continue;
for (unsigned pos: gs->second) for (unsigned pos: gs->second)
{ {
const binop* wu = is_binop((*res)[pos]); const binop* wu = is_binop(resorig[pos]);
if (wu) if (wu)
{ {
// a & (Xa W b) = b R a // a & (Xa W b) = b R a
@ -2925,23 +2926,26 @@ namespace spot
down_cast<const unop*>(wu->first()); down_cast<const unop*>(wu->first());
const formula* a = xa->child()->clone(); const formula* a = xa->child()->clone();
const formula* b = wu->second()->clone(); const formula* b = wu->second()->clone();
wu->destroy();
(*res)[pos] = binop::instance(t, b, a); (*res)[pos] = binop::instance(t, b, a);
} }
else else
{ {
// a & (b | X(b R a)) = b R a // a & (b | X(b R a)) = b R a
// a & (b | X(b M a)) = b M a // a & (b | X(b M a)) = b M a
wu = is_bXbRM((*res)[pos]); wu = is_bXbRM(resorig[pos]);
assert(wu); assert(wu);
wu->clone(); wu->clone();
(*res)[pos]->destroy();
(*res)[pos] = wu; (*res)[pos] = wu;
} }
// Remember to kill "a". // Remember to kill "a".
tokill[n] = true; tokill[n] = true;
} }
} }
for (unsigned n = 0; n < s; ++n)
if (resorig[n] != (*res)[n])
resorig[n]->destroy();
// Make third pass to search for terms 'a' // Make third pass to search for terms 'a'
// that also appears as 'XGa'. Replace them // that also appears as 'XGa'. Replace them
// by 'Ga' and delete XGa. // by 'Ga' and delete XGa.
@ -3629,9 +3633,10 @@ namespace spot
// Make a second pass to check if we can // Make a second pass to check if we can
// remove all instance of XF(a). // remove all instance of XF(a).
unsigned allofthem = xfset.size(); unsigned allofthem = xfset.size();
multop::vec resorig(*res);
for (unsigned n = 0; n < s; ++n) for (unsigned n = 0; n < s; ++n)
{ {
const formula* x = (*res)[n]; const formula* x = resorig[n];
if (!x) if (!x)
continue; continue;
fset_t::const_iterator f = xfset.find(x); fset_t::const_iterator f = xfset.find(x);
@ -3646,7 +3651,7 @@ namespace spot
continue; continue;
for (unsigned pos: gs->second) for (unsigned pos: gs->second)
{ {
const binop* rm = is_binop((*res)[pos]); const binop* rm = is_binop(resorig[pos]);
if (rm) if (rm)
{ {
// a | (Xa R b) = b W a // a | (Xa R b) = b W a
@ -3657,23 +3662,27 @@ namespace spot
down_cast<const unop*>(rm->first()); down_cast<const unop*>(rm->first());
const formula* a = xa->child()->clone(); const formula* a = xa->child()->clone();
const formula* b = rm->second()->clone(); const formula* b = rm->second()->clone();
rm->destroy();
(*res)[pos] = binop::instance(t, b, a); (*res)[pos] = binop::instance(t, b, a);
} }
else else
{ {
// a | (b & X(b W a)) = b W a // a | (b & X(b W a)) = b W a
// a | (b & X(b U a)) = b U a // a | (b & X(b U a)) = b U a
rm = is_bXbWU((*res)[pos]); rm = is_bXbWU(resorig[pos]);
assert(rm); assert(rm);
rm->clone(); rm->clone();
(*res)[pos]->destroy();
(*res)[pos] = rm; (*res)[pos] = rm;
} }
// Remember to kill "a". // Remember to kill "a".
tokill[n] = true; tokill[n] = true;
} }
} }
for (unsigned n = 0; n < s; ++n)
if (resorig[n] != (*res)[n])
resorig[n]->destroy();
// If we can remove all of them... // If we can remove all of them...
if (allofthem == 0) if (allofthem == 0)
// Make third pass to search for terms 'a' // Make third pass to search for terms 'a'