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

Kill src/ltltest/genltl now that src/bin/genltl does everything it did.

Browse source 
* src/ltltest/genltl.cc: Delete.
* src/ltltest/Makefile.am (noinst_PROGRAMS): Remove genltl.
* src/tgbatest/ltlcounter.test, bench/ltlclasses/run,
bench/ltlcounter/run: Adjust to call bin/genltl.
This commit is contained in:
Alexandre Duret-Lutz 2012-09-07 13:53:09 +02:00
parent 0990de50df
commit 1257893fb2
5 changed files with 25 additions and 760 deletions
Download patch file Download diff file Expand all files Collapse all files

10
bench/ltlclasses/run
View file

@ -22,17 +22,17 @@
. ./defs
gen="$builddir/../../src/ltltest/genltl"
gen="$builddir/../../src/bin/genltl"
for F in 1 2 3 4 5; do
echo "# Benching ltl2tgba_fm for family F=$F"
echo "# e.g. `$gen $F 3`"
for F in alpha beta beta-prime phi xi; do
echo "# Benching ltl2tgba_fm for family ccj-$F"
echo "# e.g. `$gen --ccj-$F 3`"
echo "# the following values are also saved to file 'results$F.fm'"
echo "# time1 = translation time"
echo "# time2 = exploration time"
echo "# n, states, transitions, user time1, system time1, wall time1, user time2, system time2, wall time2"
for n in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20; do
$LTL2TGBA -T -r1 -DS -ks -f "`"$gen" $F $n`" >out 2>&1
$LTL2TGBA -T -r1 -DS -ks -f "`"$gen" --ccj-$F $n`" >out 2>&1
states=`sed -n 's/^states: \([0-9]*\)$/\1/p' out`
transitions=`sed -n 's/^transitions: \([0-9]*\)$/\1/p' out`
time=`sed -n 's/ *translating formula *| *\([0-9]*\) .*| *\([0-9]*\) .*| *\([0-9]*\) .*|.*/\1,\2,\3/p' out`

10
bench/ltlcounter/run
View file

@ -1,7 +1,7 @@
#!/bin/sh
# Copyright (C) 2009, 2010, 2011 Laboratoire de Recherche et Développement de
# l'EPITA (LRDE)
# Copyright (C) 2009, 2010, 2011, 2012 Laboratoire de Recherche et
# Développement de l'EPITA (LRDE)
#
# This file is part of Spot, a model checking library.
#
@ -22,7 +22,7 @@
. ./defs
lcdir=../../src/ltltest
gen=../../src/bin/genltl
echo "# Benching ltl2tgba_fm..."
echo "# the following values are also saved to file 'results.fm'"
@ -30,7 +30,7 @@ echo "# time1 = translation time"
echo "# time2 = exploration time"
echo "# n, states, transitions, user time1, system time1, wall time1, user time1, system time2, wall time2"
for n in 1 2 3 4 5 6 7 8 9 10 11 12 13; do
$LTL2TGBA -T -ks -f "`$lcdir/genltl 18 $n`" >out 2>&1
$LTL2TGBA -T -ks -f "`$gen --rv-counter-linear $n`" >out 2>&1
states=`sed -n 's/^states: \([0-9]*\)$/\1/p' out`
transitions=`sed -n 's/^transitions: \([0-9]*\)$/\1/p' out`
time=`sed -n 's/ *translating formula *| *\([0-9]*\) .*| *\([0-9]*\) .*| *\([0-9]*\) .*|.*/\1,\2,\3/p' out`
@ -44,7 +44,7 @@ echo "# time1 = translation time"
echo "# time2 = exploration time"
echo "# n, states, transitions, user time1, system time1, wall time1, user time1, system time2, wall time2"
for n in 1 2 3 4 5 6 7; do
$LTL2TGBA -T -ks "`$lcdir/genltl 18 $n`" >out 2>&1
$LTL2TGBA -T -ks -l "`$gen --rv-counter-linear $n`" >out 2>&1
states=`sed -n 's/^states: \([0-9]*\)$/\1/p' out`
transitions=`sed -n 's/^transitions: \([0-9]*\)$/\1/p' out`
time=`sed -n 's/ *translating formula *| *\([0-9]*\) .*| *\([0-9]*\) .*| *\([0-9]*\) .*|.*/\1,\2,\3/p' out`