Commit 17dc2f86 authored by Alexandre Duret-Lutz's avatar Alexandre Duret-Lutz
Browse files

Rename src/tests/ltl2tgba as src/tests/ikwiad.

Fixes #23.

* src/tests/ltl2tgba.cc: Rename as ...
* src/tests/ikwiad.cc: ... this.
* src/tests/Makefile.am, src/tests/babiak.test, src/tests/checkta.cc,
src/tests/complementation.test, src/tests/cycles.test,
src/tests/dbacomp.test, src/tests/degendet.test,
src/tests/degenid.test, src/tests/det.test, src/tests/dfs.test,
src/tests/dstar.test, src/tests/dupexp.test, src/tests/emptchke.test,
src/tests/kv.test, src/tests/ltl2neverclaim-lbtt.test,
src/tests/ltl2neverclaim.test, src/tests/ltl2tgba.test,
src/tests/ltlcounter.test, src/tests/ltlcross.test,
src/tests/neverclaimread.test, src/tests/obligation.test,
src/tests/parseaut.test, src/tests/randaut.test,
src/tests/randpsl.test, src/tests/renault.test,
src/tests/satmin2.test, src/tests/sccsimpl.test, src/tests/sim2.test,
src/tests/simdet.test, src/tests/spotlbtt.test, src/tests/wdba.test,
src/tests/wdba2.test, bench/emptchk/README, bench/emptchk/defs.in,
bench/ltlclasses/run, bench/ltlcounter/run, bench/wdba/run: Adjust.
parent 4d848e98
......@@ -276,4 +276,4 @@ This directory contains:
http://spot.lip6.fr/wiki/EmptinessCheckOptions)
Besides randtgba, two other tools that you might find handy we
experimenting are src/bin/randltl and src/tgbatest/ltl2tgba.
experimenting are src/bin/randltl and src/tests/ikwiad.
......@@ -33,6 +33,6 @@ test -f "$srcdir/defs.in" || {
}
RANDTGBA='@top_builddir@/src/tgbatest/randtgba@EXEEXT@'
LTL2TGBA='@top_builddir@/src/tgbatest/ltl2tgba@EXEEXT@'
LTL2TGBA='@top_builddir@/src/tests/ikwiad@EXEEXT@'
FORMULAE=$srcdir/formulae.ltl
ALGORITHMS=$srcdir/algorithms
......@@ -19,7 +19,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
gen=../../src/bin/genltl
LTL2TGBA=../../src/tgbatest/ltl2tgba
LTL2TGBA=../../src/tests/ikwiad
for F in alpha beta beta-prime phi xi; do
echo "# Benching ltl2tgba_fm for family ccj-$F"
......
......@@ -19,7 +19,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
gen=../../src/bin/genltl
LTL2TGBA=../../src/tgbatest/ltl2tgba
LTL2TGBA=../../src/tests/ikwiad
echo "# Benching ltl2tgba_fm..."
echo "# the following values are also saved to file 'results.fm'"
......
......@@ -61,7 +61,7 @@ Fr->(p->(!r U (s&!r&!z&X((!r&!z) U t)))) U r
G((q&Fr)->(p->(!r U (s&!r&!z&X((!r&!z) U t)))) U r)
EOF
LTL2TGBA=../../src/tgbatest/ltl2tgba
LTL2TGBA=../../src/tests/ikwiad
(
line=0
......
......@@ -26,7 +26,7 @@ LDADD = ../libspot.la
# These are the most used test programs, and they are also useful
# to run manually outside the test suite. Always build them.
noinst_PROGRAMS = ltl2tgba randtgba
noinst_PROGRAMS = ikwiad randtgba
check_SCRIPTS = defs
# Keep this sorted alphabetically.
......@@ -73,9 +73,9 @@ checkta_SOURCES = checkta.cc
complement_SOURCES = complementation.cc
emptchk_SOURCES = emptchk.cc
graph_SOURCES = graph.cc
ikwiad_SOURCES = ikwiad.cc
intvcomp_SOURCES = intvcomp.cc
intvcmp2_SOURCES = intvcmp2.cc
ltl2tgba_SOURCES = ltl2tgba.cc
ltlprod_SOURCES = ltlprod.cc
ngraph_SOURCES = ngraph.cc
parse_print_SOURCES = parse_print_test.cc
......
......@@ -39,7 +39,7 @@ X((X(!p1 V F!p6)V F!p4)U p2)&(F(G((0 U(F p6))U((p1 U(G(p4 U F p0)))U X p7))))
(G(G(((F p5)U((((F!p1)V(p2 &!p4))|!p2)|((X!p7 U!p4)V(F(F((G p2)&p5))))))U p6)))
EOF
ltl2tgba=../ltl2tgba
ltl2tgba=../ikwiad
../../bin/ltlcross <formulae \
"$ltl2tgba -t %f >%T" \
......
......@@ -95,8 +95,8 @@ main(int argc, char** argv)
auto a = ltl_to_tgba_fm(f, d);
bdd ap_set = atomic_prop_collect_as_bdd(f, a);
// run 0 ../ltl2tgba -TGTA -ks "$1"
// run 0 ../ltl2tgba -TGTA -RT -ks "$1"
// run 0 ../ikwiad -TGTA -ks "$1"
// run 0 ../ikwiad -TGTA -RT -ks "$1"
{
auto t = spot::tgba_to_tgta(a, ap_set);
stats("-TGTA", t);
......@@ -104,8 +104,8 @@ main(int argc, char** argv)
}
{
// run 0 ../ltl2tgba -TA -ks "$1"
// run 0 ../ltl2tgba -TA -RT -ks "$1"
// run 0 ../ikwiad -TA -ks "$1"
// run 0 ../ikwiad -TA -RT -ks "$1"
auto t = spot::tgba_to_ta(a, ap_set,
false, // degen (-DS)
false, // artificial_initial_state (-in)
......@@ -116,8 +116,8 @@ main(int argc, char** argv)
}
{
// run 0 ../ltl2tgba -TA -lv -ks "$1"
// run 0 ../ltl2tgba -TA -lv -RT -ks "$1"
// run 0 ../ikwiad -TA -lv -ks "$1"
// run 0 ../ikwiad -TA -lv -RT -ks "$1"
auto t = spot::tgba_to_ta(a, ap_set,
false, // degen (-DS)
false, // artificial_initial_state (-in)
......@@ -128,8 +128,8 @@ main(int argc, char** argv)
}
{
// run 0 ../ltl2tgba -TA -sp -ks "$1"
// run 0 ../ltl2tgba -TA -sp -RT -ks "$1"
// run 0 ../ikwiad -TA -sp -ks "$1"
// run 0 ../ikwiad -TA -sp -RT -ks "$1"
auto t = spot::tgba_to_ta(a, ap_set,
false, // degen (-DS)
false, // artificial_initial_state (-in)
......@@ -140,8 +140,8 @@ main(int argc, char** argv)
}
{
// run 0 ../ltl2tgba -TA -lv -sp -ks "$1"
// run 0 ../ltl2tgba -TA -lv -sp -RT -ks "$1"
// run 0 ../ikwiad -TA -lv -sp -ks "$1"
// run 0 ../ikwiad -TA -lv -sp -RT -ks "$1"
auto t = spot::tgba_to_ta(a, ap_set,
false, // degen (-DS)
false, // artificial_initial_state (-in)
......@@ -154,8 +154,8 @@ main(int argc, char** argv)
a = spot::degeneralize(a);
{
// run 0 ../ltl2tgba -TA -DS -ks "$1"
// run 0 ../ltl2tgba -TA -DS -RT -ks "$1"
// run 0 ../ikwiad -TA -DS -ks "$1"
// run 0 ../ikwiad -TA -DS -RT -ks "$1"
auto t = spot::tgba_to_ta(a, ap_set,
true, // degen (-DS)
false, // artificial_initial_state (-in)
......@@ -166,8 +166,8 @@ main(int argc, char** argv)
}
{
// run 0 ../ltl2tgba -TA -DS -lv -ks "$1"
// run 0 ../ltl2tgba -TA -DS -lv -RT -ks "$1"
// run 0 ../ikwiad -TA -DS -lv -ks "$1"
// run 0 ../ikwiad -TA -DS -lv -RT -ks "$1"
auto t = spot::tgba_to_ta(a, ap_set,
true, // degen (-DS)
false, // artificial_initial_state (-in)
......@@ -178,8 +178,8 @@ main(int argc, char** argv)
}
{
// run 0 ../ltl2tgba -TA -DS -sp -ks "$1"
// run 0 ../ltl2tgba -TA -DS -sp -RT -ks "$1"
// run 0 ../ikwiad -TA -DS -sp -ks "$1"
// run 0 ../ikwiad -TA -DS -sp -RT -ks "$1"
auto t = spot::tgba_to_ta(a, ap_set,
true, // degen (-DS)
false, // artificial_initial_state (-in)
......@@ -190,8 +190,8 @@ main(int argc, char** argv)
}
{
// run 0 ../ltl2tgba -TA -DS -lv -sp -ks "$1"
// run 0 ../ltl2tgba -TA -DS -lv -sp -RT -ks "$1"
// run 0 ../ikwiad -TA -DS -lv -sp -ks "$1"
// run 0 ../ikwiad -TA -DS -lv -sp -RT -ks "$1"
auto t = spot::tgba_to_ta(a, ap_set,
true, // degen (-DS)
false, // artificial_initial_state (-in)
......@@ -207,8 +207,8 @@ main(int argc, char** argv)
bdd ap_set = atomic_prop_collect_as_bdd(f, a);
{
// run 0 ../ltl2tgba -x -R3 -DS -TA -in -ks "$1"
// run 0 ../ltl2tgba -x -R3 -DS -TA -in -RT -ks "$1"
// run 0 ../ikwiad -x -R3 -DS -TA -in -ks "$1"
// run 0 ../ikwiad -x -R3 -DS -TA -in -RT -ks "$1"
auto t = spot::tgba_to_ta(a, ap_set,
true, // degen (-DS)
false, // artificial_initial_state (-in)
......
......@@ -60,10 +60,10 @@ State: 2
--END--
EOF
# x.tgba accepts some run
run 0 ../ltl2tgba -XH -e x.hoa
run 0 ../ikwiad -XH -e x.hoa
# so does its complement
run 0 ../complement -H -a x.hoa > nx.hoa
run 0 ../ltl2tgba -XH -e nx.hoa
run 0 ../ikwiad -XH -e nx.hoa
# however the intersection of both should not
# accept any run.
run 1 ../../bin/autfilt -q nx.hoa --intersect x.hoa
......@@ -66,9 +66,9 @@ State: 11
--END--
EOF
run 0 ../ltl2tgba -KC -XH johnson-fig1.hoa > out
run 0 ../ikwiad -KC -XH johnson-fig1.hoa > out
test `wc -l < out` -eq 10
run 0 ../ltl2tgba -KW '(Ga -> Gb) W c' > out
run 0 ../ikwiad -KW '(Ga -> Gb) W c' > out
test `grep 'is weak' out | wc -l` -eq 4
test `grep 'is not weak' out | wc -l` -eq 1
......@@ -55,5 +55,5 @@ State: 2
EOF
# Check emptiness of product with complement.
run 0 ../ltl2tgba -H -DC -C -XH input.hoa > output.hoa
run 0 ../ikwiad -H -DC -C -XH input.hoa > output.hoa
run 1 ../../bin/autfilt -q input.hoa --intersect output.hoa
......@@ -30,9 +30,9 @@ set -e
# Make sure all these runs output the same automaton.
# With valgrind
run 0 ../ltl2tgba -r7 -x -R3 -N "XF(Gp2 | F(p0 U (p1 & (! p4 | p3))))" > out1
run 0 ../ikwiad -r7 -x -R3 -N "XF(Gp2 | F(p0 U (p1 & (! p4 | p3))))" > out1
# Without valgrind
for i in 2 3 4 5; do
../ltl2tgba -r7 -x -R3 -N "XF(Gp2 | F(p0 U (p1 & (! p4 | p3))))" > out
../ikwiad -r7 -x -R3 -N "XF(Gp2 | F(p0 U (p1 & (! p4 | p3))))" > out
cmp out out1 || exit 1
done
......@@ -26,12 +26,12 @@ set -e
for f in 'FGa|GFb' 'GFa & GFb & GFc' 'GF(a->FGb)&GF(c->FGd)'; do
for opt in -DS -DT; do
../ltl2tgba $opt -H "$f" > autX.spot
../ltl2tgba -XH -kt autX.spot > base.size
../ikwiad $opt -H "$f" > autX.spot
../ikwiad -XH -kt autX.spot > base.size
cat base.size
for x in X XX XXX; do
../ltl2tgba -XH $opt -H aut$x.spot > autX$x.spot
../ltl2tgba -XH -kt autX$x.spot > new.size
../ikwiad -XH $opt -H aut$x.spot > autX$x.spot
../ikwiad -XH -kt autX$x.spot > new.size
cat new.size
cmp base.size new.size
done
......@@ -78,7 +78,7 @@ State: 5
--END--
EOF
run 0 ../ltl2tgba -ks -XH -DS bug > out
run 0 ../ikwiad -ks -XH -DS bug > out
grep 'states: 6' out
......@@ -126,7 +126,7 @@ State: 7
--END--
EOF
run 0 ../ltl2tgba -ks -XH -DS bug2 >out
run 0 ../ikwiad -ks -XH -DS bug2 >out
grep 'states: 8' out
......
......@@ -110,11 +110,11 @@ State: 4 {0}
--END--
EOF
run 0 ../ltl2tgba -H -DC -XH in.hoa > out.hoa
run 0 ../ikwiad -H -DC -XH in.hoa > out.hoa
run 1 ../../bin/autfilt -q --are-isomorph in.hoa out.hoa
run 0 ../../bin/autfilt -q --are-isomorph ex.hoa out.hoa
run 0 ../ltl2tgba -x -DC 'GFa & XGFb' > out.tgba
run 0 ../ikwiad -x -DC 'GFa & XGFb' > out.tgba
cat >ex.tgba <<EOF
digraph G {
rankdir=LR
......
......@@ -95,8 +95,8 @@ State: 8
--END--
EOF
run 0 ../ltl2tgba -CR -eSE05 -XH blue_counter
run 0 ../ltl2tgba -CR -eTau03_opt -XH blue_counter
run 0 ../ikwiad -CR -eSE05 -XH blue_counter
run 0 ../ikwiad -CR -eTau03_opt -XH blue_counter
# s1->s2->s3->(large composant from s4 to s9)
# ^ ||
......@@ -164,8 +164,8 @@ State: 8
--END--
EOF
run 0 ../ltl2tgba -CR -eSE05 -XH blue_last
run 0 ../ltl2tgba -CR -eTau03_opt -XH blue_last
run 0 ../ikwiad -CR -eSE05 -XH blue_last
run 0 ../ikwiad -CR -eTau03_opt -XH blue_last
# _______
# | |
......@@ -237,7 +237,7 @@ State: 8
--END--
EOF
run 0 ../ltl2tgba -CR -eSE05 -XH red
run 0 ../ltl2tgba -CR -eTau03_opt -XH red
run 0 ../ikwiad -CR -eSE05 -XH red
run 0 ../ikwiad -CR -eTau03_opt -XH red
rm -f red blue_counter blue_last
......@@ -56,7 +56,7 @@ Acc-Sig: +0
2
EOF
run 0 ../ltl2tgba -XD dra.dstar | tee stdout
run 0 ../ikwiad -XD dra.dstar | tee stdout
cat >expected <<EOF
digraph G {
......@@ -78,7 +78,7 @@ EOF
diff expected stdout
run 0 ../ltl2tgba -XDD dra.dstar | tee stdout
run 0 ../ikwiad -XDD dra.dstar | tee stdout
cat >expected <<EOF
digraph G {
......@@ -123,7 +123,7 @@ Acc-Sig:
2
EOF
run 0 ../ltl2tgba -XDB dsa.dstar | tee stdout
run 0 ../ikwiad -XDB dsa.dstar | tee stdout
cat >expected <<EOF
digraph G {
......@@ -213,7 +213,7 @@ Acc-Sig: +0 +1
4
EOF
run 0 ../ltl2tgba -XDD dra.dstar | tee stdout
run 0 ../ikwiad -XDD dra.dstar | tee stdout
cat >expected <<EOF
digraph G {
......
......@@ -28,8 +28,8 @@ set -e
dorun()
{
run 0 ../ltl2tgba -f -s "$1" >output1
run 0 ../ltl2tgba -f -S "$1" >output2
run 0 ../ikwiad -f -s "$1" >output1
run 0 ../ikwiad -f -S "$1" >output2
test `wc -l <output1` = `wc -l <output2`
}
......
......@@ -28,14 +28,14 @@ set -e
expect_ce()
{
run 0 ../ltl2tgba -CR -e -XH "$1"
run 0 ../ltl2tgba -CR -e -DT -XH "$1"
run 0 ../ltl2tgba -CR -e'Cou99(shy)' -XH "$1"
run 0 ../ltl2tgba -CR -e'Cou99(shy)' -DT -XH "$1"
run 0 ../ltl2tgba -CR -eCVWY90 -XH "$1"
run 0 ../ltl2tgba -CR -eGV04 -XH "$1"
run 0 ../ltl2tgba -CR -eSE05 -XH "$1"
run 0 ../ltl2tgba -CR -eTau03 -XH "$1"
run 0 ../ikwiad -CR -e -XH "$1"
run 0 ../ikwiad -CR -e -DT -XH "$1"
run 0 ../ikwiad -CR -e'Cou99(shy)' -XH "$1"
run 0 ../ikwiad -CR -e'Cou99(shy)' -DT -XH "$1"
run 0 ../ikwiad -CR -eCVWY90 -XH "$1"
run 0 ../ikwiad -CR -eGV04 -XH "$1"
run 0 ../ikwiad -CR -eSE05 -XH "$1"
run 0 ../ikwiad -CR -eTau03 -XH "$1"
}
cat >input <<'EOF'
......
......@@ -25,7 +25,7 @@ set -e
check ()
{
run 0 ../ltl2tgba -f -KV "$1" > out.dot
run 0 ../ikwiad -f -KV "$1" > out.dot
test -z "$DOT" || "$DOT" out.dot > /dev/null
rm -f out.dot
}
......@@ -46,7 +46,7 @@ check '"G1"U"GG" && "FF"'
# even after iterated simulation
# Report from Etienne Renault.
../ltl2tgba -KV -R3 -RIS >out \
../ikwiad -KV -R3 -RIS >out \
'G("P_1.p2" <-> (F"P_1.p3" & ("P_0.p3" | (X"P_1.CS" U "P_1.p2")))) U G"P_1.p2"'
x=`sed -n '/APrec/{
s/.*APrec=\[\([^]]*\)\].*/\1/p
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment