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

* src/tgbatest/ltl2tgba.cc, src/tgbaalgos/reductgba_sim_del.cc,

Browse source 
src/tgbaalgos/reductgba_sim.hh, src/tgbaalgos/reductgba_sim.cc:
bug in delayed simulation.

* src/tgbatest/reduccmp.test, src/tgbatest/reductgba.test,
src/tgba/tgbareduc.cc: bug in scc reduction.
This commit is contained in:
martinez 2004-06-22 15:30:12 +00:00
parent 6d5593ae48
commit eb0852257f
8 changed files with 254 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/tgbatest/ltl2tgba.cc
View file

@ -404,7 +404,7 @@ main(int argc, char** argv)
if (reduc_aut & spot::Reduce_Dir_Sim)
rel = spot::get_direct_relation_simulation(a);
else if (reduc_aut & spot::Reduce_Del_Sim)
rel = spot::get_delayed_relation_simulation(a, 1);
rel = spot::get_delayed_relation_simulation(a);
else
assert(0);

6
src/tgbatest/reduccmp.test
View file

@ -23,9 +23,6 @@
. ./defs
# FIXME
exit 0
set -e
cat >input <<EOF
@ -46,6 +43,9 @@ digraph G {
}
EOF
# FIXME
exit 0
# Sort out some possible inversions in the output.
# (The order is not guaranteed by SPOT.)
sed 's/!b & a/a \& !b/g' stdout > tmp_ && mv tmp_ stdout

66
src/tgbatest/reductgba.test
View file

@ -21,7 +21,7 @@
# 02111-1307, USA.
#. ./defs
. ./defs
set -e
@ -34,22 +34,22 @@ check()
# We don't check the output, but just running these might be enough to
# trigger assertions.
#check 0 'Fa & Xb & GFc & Gd'
#check 0 'Fc & X(a | Xb) & GF(a | Xb) & Gc'
check 0 'Fa & Xb & GFc & Gd'
check 0 'Fc & X(a | Xb) & GF(a | Xb) & Gc'
#check 0 a
#check 0 'a U b'
#check 0 'a U Fb'
#check 0 'X a'
#check 0 'a & b & c'
#check 0 'a | b | (c U (d & (g U (h ^ i))))'
#check 0 'Xa & (b U !a) & (b U !a)'
#check 0 'Fa & Xb & GFc & Gd'
#check 0 'Fa & Xa & GFc & Gc'
#check 0 'Fc & X(a | Xb) & GF(a | Xb) & Gc'
#check 0 'a R (b R c)'
#check 0 '(a U b) U (c U d)'
#check 0 '((Xp2)U(X(1)))*(p1 R(p2 R p0))'
check 0 a
check 0 'a U b'
check 0 'a U Fb'
check 0 'X a'
check 0 'a & b & c'
check 0 'a | b | (c U (d & (g U (h ^ i))))'
check 0 'Xa & (b U !a) & (b U !a)'
check 0 'Fa & Xb & GFc & Gd'
check 0 'Fa & Xa & GFc & Gc'
check 0 'Fc & X(a | Xb) & GF(a | Xb) & Gc'
check 0 'a R (b R c)'
check 0 '(a U b) U (c U d)'
check 0 '((Xp2)U(X(1)))*(p1 R(p2 R p0))'
# No reduction
check 1 a
@ -66,22 +66,22 @@ check 1 '(a U b) U (c U d)'
check 1 '((Xp2)U(X(1)))*(p1 R(p2 R p0))'
#reduction
#check 1 'a U Fb'
check 1 'a U Fb'
#check 3 a
#check 3 'a U b'
#check 3 'a U Fb'
check 3 a
check 3 'a U b'
check 3 'a U Fb'
#check 3 a
#check 3 'a U b'
#check 3 'a U Fb'
#check 3 'X a'
#check 3 'a & b & c'
#check 3 'a | b | (c U (d & (g U (h ^ i))))'
#check 3 'Xa & (b U !a) & (b U !a)'
#check 3 'Fa & Xb & GFc & Gd'
#check 3 'Fa & Xa & GFc & Gc'
#check 3 'Fc & X(a | Xb) & GF(a | Xb) & Gc'
#check 3 'a R (b R c)'
#check 3 '(a U b) U (c U d)'
#check 3 '((Xp2)U(X(1)))*(p1 R(p2 R p0))'
check 3 a
check 3 'a U b'
check 3 'a U Fb'
check 3 'X a'
check 3 'a & b & c'
check 3 'a | b | (c U (d & (g U (h ^ i))))'
check 3 'Xa & (b U !a) & (b U !a)'
check 3 'Fa & Xb & GFc & Gd'
check 3 'Fa & Xa & GFc & Gc'
check 3 'Fc & X(a | Xb) & GF(a | Xb) & Gc'
check 3 'a R (b R c)'
check 3 '(a U b) U (c U d)'
check 3 '((Xp2)U(X(1)))*(p1 R(p2 R p0))'