* 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:
Denis Poitrenaud
parent
908b6129f4
commit
f52082bcfb
9 changed files with 1226 additions and 254 deletions
|
|
@ -80,9 +80,14 @@ TESTS = \
|
|||
reduccmp.test \
|
||||
reductgba.test \
|
||||
emptchk.test \
|
||||
magic.test \
|
||||
se05.test \
|
||||
emptchke.test \
|
||||
dfs.test \
|
||||
spotlbtt.test
|
||||
|
||||
EXTRA_DIST = $(TESTS) ltl2baw.pl
|
||||
|
||||
CLEANFILES = input input1 input2 input3 stdout expected config output1 output2
|
||||
CLEANFILES = input input1 input2 input3 stdout expected config output1 output2 \
|
||||
red blue_counter blue_last
|
||||
|
||||
|
|
|
|||
170
src/tgbatest/dfs.test
Executable file
170
src/tgbatest/dfs.test
Executable file
|
|
@ -0,0 +1,170 @@
|
|||
#!/bin/sh
|
||||
# Copyright (C) 2003, 2004 Laboratoire d'Informatique de Paris 6 (LIP6),
|
||||
# département Systèmes Répartis Coopératifs (SRC), Université Pierre
|
||||
# et Marie Curie.
|
||||
#
|
||||
# This file is part of Spot, a model checking library.
|
||||
#
|
||||
# Spot is free software; you can redistribute it and/or modify it
|
||||
# under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 2 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# Spot is distributed in the hope that it will be useful, but WITHOUT
|
||||
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
||||
# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
|
||||
# License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with Spot; see the file COPYING. If not, write to the Free
|
||||
# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
|
||||
# 02111-1307, USA.
|
||||
|
||||
|
||||
. ./defs
|
||||
|
||||
set -e
|
||||
|
||||
cat >blue_counter <<'EOF'
|
||||
acc = a;
|
||||
s1, s2,, a;
|
||||
s2, s3,,;
|
||||
s3, s1,,;
|
||||
s3, s4,,;
|
||||
s4, s4,,;
|
||||
s4, s5,,;
|
||||
s4, s6,,;
|
||||
s4, s7,,;
|
||||
s4, s8,,;
|
||||
s4, s9,,;
|
||||
s5, s4,,;
|
||||
s5, s5,,;
|
||||
s5, s6,,;
|
||||
s5, s7,,;
|
||||
s5, s8,,;
|
||||
s5, s9,,;
|
||||
s6, s4,,;
|
||||
s6, s5,,;
|
||||
s6, s6,,;
|
||||
s6, s7,,;
|
||||
s6, s8,,;
|
||||
s6, s9,,;
|
||||
s7, s4,,;
|
||||
s7, s5,,;
|
||||
s7, s6,,;
|
||||
s7, s7,,;
|
||||
s7, s8,,;
|
||||
s7, s9,,;
|
||||
s8, s4,,;
|
||||
s8, s5,,;
|
||||
s8, s6,,;
|
||||
s8, s7,,;
|
||||
s8, s8,,;
|
||||
s8, s9,,;
|
||||
s9, s4,,;
|
||||
s9, s5,,;
|
||||
s9, s6,,;
|
||||
s9, s7,,;
|
||||
s9, s8,,;
|
||||
s9, s9,,;
|
||||
EOF
|
||||
|
||||
run 0 ./ltl2tgba -emagic_search -X blue_counter
|
||||
run 0 ./ltl2tgba -ese05_search -X blue_counter
|
||||
|
||||
cat >blue_last <<'EOF'
|
||||
acc = a;
|
||||
s1, s2,,;
|
||||
s2, s3,,;
|
||||
s3, s1,, a;
|
||||
s3, s4,,;
|
||||
s4, s4,,;
|
||||
s4, s5,,;
|
||||
s4, s6,,;
|
||||
s4, s7,,;
|
||||
s4, s8,,;
|
||||
s4, s9,,;
|
||||
s5, s4,,;
|
||||
s5, s5,,;
|
||||
s5, s6,,;
|
||||
s5, s7,,;
|
||||
s5, s8,,;
|
||||
s5, s9,,;
|
||||
s6, s4,,;
|
||||
s6, s5,,;
|
||||
s6, s6,,;
|
||||
s6, s7,,;
|
||||
s6, s8,,;
|
||||
s6, s9,,;
|
||||
s7, s4,,;
|
||||
s7, s5,,;
|
||||
s7, s6,,;
|
||||
s7, s7,,;
|
||||
s7, s8,,;
|
||||
s7, s9,,;
|
||||
s8, s4,,;
|
||||
s8, s5,,;
|
||||
s8, s6,,;
|
||||
s8, s7,,;
|
||||
s8, s8,,;
|
||||
s8, s9,,;
|
||||
s9, s4,,;
|
||||
s9, s5,,;
|
||||
s9, s6,,;
|
||||
s9, s7,,;
|
||||
s9, s8,,;
|
||||
s9, s9,,;
|
||||
EOF
|
||||
|
||||
run 0 ./ltl2tgba -emagic_search -X blue_last
|
||||
run 0 ./ltl2tgba -ese05_search -X blue_last
|
||||
|
||||
cat >red <<'EOF'
|
||||
acc = a;
|
||||
s1, s2,,;
|
||||
s1, s3,, a;
|
||||
s2, s3,,;
|
||||
s3, s1,,;
|
||||
s3, s4,,;
|
||||
s4, s4,,;
|
||||
s4, s5,,;
|
||||
s4, s6,,;
|
||||
s4, s7,,;
|
||||
s4, s8,,;
|
||||
s4, s9,,;
|
||||
s5, s4,,;
|
||||
s5, s5,,;
|
||||
s5, s6,,;
|
||||
s5, s7,,;
|
||||
s5, s8,,;
|
||||
s5, s9,,;
|
||||
s6, s4,,;
|
||||
s6, s5,,;
|
||||
s6, s6,,;
|
||||
s6, s7,,;
|
||||
s6, s8,,;
|
||||
s6, s9,,;
|
||||
s7, s4,,;
|
||||
s7, s5,,;
|
||||
s7, s6,,;
|
||||
s7, s7,,;
|
||||
s7, s8,,;
|
||||
s7, s9,,;
|
||||
s8, s4,,;
|
||||
s8, s5,,;
|
||||
s8, s6,,;
|
||||
s8, s7,,;
|
||||
s8, s8,,;
|
||||
s8, s9,,;
|
||||
s9, s4,,;
|
||||
s9, s5,,;
|
||||
s9, s6,,;
|
||||
s9, s7,,;
|
||||
s9, s8,,;
|
||||
s9, s9,,;
|
||||
EOF
|
||||
|
||||
run 0 ./ltl2tgba -emagic_search -X red
|
||||
run 0 ./ltl2tgba -ese05_search -X red
|
||||
|
||||
rm -f red blue_counter blue_last
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -119,7 +119,9 @@ syntax(char* prog)
|
|||
<< " couvreur99 (the default)" << std::endl
|
||||
<< " couvreur99_shy" << std::endl
|
||||
<< " magic_search" << std::endl
|
||||
<< " magic_search_repeated" << std::endl;
|
||||
<< " magic_search_repeated" << std::endl
|
||||
<< " se05_search" << std::endl
|
||||
<< " se05_search_repeated" << std::endl;
|
||||
exit(2);
|
||||
}
|
||||
|
||||
|
|
@ -137,7 +139,7 @@ main(int argc, char** argv)
|
|||
int output = 0;
|
||||
int formula_index = 0;
|
||||
std::string echeck_algo;
|
||||
enum { None, Couvreur, Couvreur2, MagicSearch } echeck = None;
|
||||
enum { None, Couvreur, Couvreur2, MagicSearch, Se04Search } echeck = None;
|
||||
enum { NoneDup, BFS, DFS } dupexp = NoneDup;
|
||||
bool magic_many = false;
|
||||
bool expect_counter_example = false;
|
||||
|
|
@ -347,6 +349,17 @@ main(int argc, char** argv)
|
|||
degeneralize_opt = true;
|
||||
magic_many = true;
|
||||
}
|
||||
else if (echeck_algo == "se05_search")
|
||||
{
|
||||
echeck = Se04Search;
|
||||
degeneralize_opt = true;
|
||||
}
|
||||
else if (echeck_algo == "se05_search_repeated")
|
||||
{
|
||||
echeck = Se04Search;
|
||||
degeneralize_opt = true;
|
||||
magic_many = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
std::cerr << "unknown emptiness-check: " << echeck_algo << std::endl;
|
||||
|
|
@ -569,7 +582,12 @@ main(int argc, char** argv)
|
|||
|
||||
case MagicSearch:
|
||||
ec_a = degeneralized;
|
||||
ec = new spot::magic_search(degeneralized);
|
||||
ec = spot::explicit_magic_search(degeneralized);
|
||||
break;
|
||||
|
||||
case Se04Search:
|
||||
ec_a = degeneralized;
|
||||
ec = spot::explicit_se05_search(degeneralized);
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue