* src/tgbaalgos/magic.cc: rewrite to externalize the heap and
prepare it to a bit state hashing version. * src/tgbaalgos/magic.hh: adapt to the new interface of magic_search and se05_search. * src/tgbaalgos/se05.cc: new file. * src/tgbaalgos/Makefile.am: Add it. * src/tgbatest/ltl2tgba.cc: Add new emptiness check. * src/tgbatest/emptchk.test: more tests. * src/tgbatest/dfs.test: new file. * src/tgbatest/Makefile.am: Add it.
This commit is contained in:
parent
908b6129f4
commit
f52082bcfb
9 changed files with 1226 additions and 254 deletions
|
|
@ -43,6 +43,11 @@ expect_ce()
|
|||
expect_ce_do -ecouvreur99_shy -f -D "$1"
|
||||
expect_ce_do -emagic_search "$1"
|
||||
expect_ce_do -emagic_search -f "$1"
|
||||
run 0 ./ltl2tgba -ese05_search "$1"
|
||||
run 0 ./ltl2tgba -ese05_search -f "$1"
|
||||
# Expect multiple accepting runs
|
||||
test `./ltl2tgba -emagic_search_repeated "$1" | grep Prefix: | wc -l` -ge $2
|
||||
test `./ltl2tgba -ese05_search_repeated "$1" | grep Prefix: | wc -l` -ge $2
|
||||
}
|
||||
|
||||
expect_no()
|
||||
|
|
@ -57,22 +62,24 @@ expect_no()
|
|||
run 0 ./ltl2tgba -Ecouvreur99_shy -f -D "$1"
|
||||
run 0 ./ltl2tgba -Emagic_search "$1"
|
||||
run 0 ./ltl2tgba -Emagic_search -f "$1"
|
||||
run 0 ./ltl2tgba -Ese05_search "$1"
|
||||
run 0 ./ltl2tgba -Ese05_search -f "$1"
|
||||
test `./ltl2tgba -emagic_search_repeated "!($1)" |
|
||||
grep Prefix: | wc -l` -ge $2
|
||||
test `./ltl2tgba -ese05_search_repeated "!($1)" |
|
||||
grep Prefix: | wc -l` -ge $2
|
||||
}
|
||||
|
||||
expect_ce 'a'
|
||||
expect_ce 'a U b'
|
||||
expect_ce 'X a'
|
||||
expect_ce 'a & b & c'
|
||||
expect_ce 'a | b | (c U (d & (g U (h ^ i))))'
|
||||
expect_ce 'Xa & (b U !a) & (b U !a)'
|
||||
expect_ce 'Fa & Xb & GFc & Gd'
|
||||
expect_ce 'Fa & Xa & GFc & Gc'
|
||||
expect_ce 'Fc & X(a | Xb) & GF(a | Xb) & Gc'
|
||||
expect_ce '!((FF a) <=> (F x))'
|
||||
expect_no '!((FF a) <=> (F a))'
|
||||
expect_no 'Xa && (!a U b) && !b && X!b'
|
||||
expect_no '(a U !b) && Gb'
|
||||
|
||||
# Expect at least four accepting runs
|
||||
test `./ltl2tgba -emagic_search_repeated 'FFx <=> Fx' |
|
||||
grep Prefix: | wc -l` -ge 4
|
||||
expect_ce 'a' 1
|
||||
expect_ce 'a U b' 2
|
||||
expect_ce 'X a' 1
|
||||
expect_ce 'a & b & c' 1
|
||||
expect_ce 'a | b | (c U (d & (g U (h ^ i))))' 2
|
||||
expect_ce 'Xa & (b U !a) & (b U !a)' 1
|
||||
expect_ce 'Fa & Xb & GFc & Gd' 1
|
||||
expect_ce 'Fa & Xa & GFc & Gc' 2
|
||||
expect_ce 'Fc & X(a | Xb) & GF(a | Xb) & Gc' 1
|
||||
expect_ce '!((FF a) <=> (F x))' 3
|
||||
expect_no '!((FF a) <=> (F a))' 4
|
||||
expect_no 'Xa && (!a U b) && !b && X!b' 5
|
||||
expect_no '(a U !b) && Gb' 4
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue