* src/tgbatest/reduccmp.test: Bug.
* src/tgbatest/reductgba.test: More Test. * src/tgbatest/ltl2tgba.cc: Adjust ... * src/tgbaalgos/reductgba_sim_del.cc, src/tgbaalgos/reductgba_sim.hh, src/tgbaalgos/reductgba_sim.cc: try to optimize. * src/tgba/tgbareduc.hh, src/tgba/tgbareduc.cc: Scc reduction and we remove some acceptance condition in scc which are not accepting. * src/ltlvisit/syntimpl.cc : Some case wasn't detect. * src/ltlvisit/basicreduce.cc: Case FGa || FGb = F(Ga | Gb) added. * src/ltltest/syntimpl.test: More Test. * src/ltltest/syntimpl.cc: Put the formula in negative normal form.
This commit is contained in:
parent
acee9e75a4
commit
8be67c1976
14 changed files with 771 additions and 231 deletions
|
|
@ -34,9 +34,6 @@ 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 a
|
||||
check 0 'a U b'
|
||||
check 0 'a U Fb'
|
||||
|
|
@ -50,8 +47,8 @@ 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 '((p3 | Xp3 | Xp2) & (X!p3 | (!p3 & X!p2))) R F(0)'
|
||||
|
||||
# No reduction
|
||||
check 1 a
|
||||
check 1 'a U b'
|
||||
check 1 'X a'
|
||||
|
|
@ -65,12 +62,18 @@ check 1 'a R (b R c)'
|
|||
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 3 a
|
||||
check 3 'a U b'
|
||||
check 3 'a U Fb'
|
||||
check 2 a
|
||||
check 2 'a U b'
|
||||
check 2 'X a'
|
||||
check 2 'a & b & c'
|
||||
check 2 'a | b | (c U (d & (g U (h ^ i))))'
|
||||
check 2 'Xa & (b U !a) & (b U !a)'
|
||||
check 2 'Fa & Xb & GFc & Gd'
|
||||
check 2 'Fa & Xa & GFc & Gc'
|
||||
check 2 'Fc & X(a | Xb) & GF(a | Xb) & Gc'
|
||||
check 2 'a R (b R c)'
|
||||
check 2 '(a U b) U (c U d)'
|
||||
check 2 '((Xp2)U(X(1)))*(p1 R(p2 R p0))'
|
||||
|
||||
check 3 a
|
||||
check 3 'a U b'
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue