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

dtgbasat: Fix dtgbasat bench errors

Browse source 
* bench/dtgbasat/formulas: Fix bin's path.
* bench/dtgbasat/prepare.sh: Fix bin's path & ltl2tgba@-sD option.
* bench/dtgbasat/stats.sh: Fix bin's path.
* bench/dtgbasat/stat.sh: Fix bin's path, ltl2tgba@-sD option
This commit is contained in:
Alexandre GBAGUIDI AISSE 2016-09-21 17:27:11 +02:00 • committed by Alexandre Duret-Lutz
parent 3b5fa22a3b
commit ba4345a42b
4 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
bench/dtgbasat/formulas
View file

@ -93,7 +93,7 @@ G(G!a | F!c | G!b)
# randltl -n -1 a b c | # randltl -n -1 a b c |
# ltlfilt --remove-wm -r -u --size-min=3 --size-max=15 --syntactic-recurrence | # ltlfilt --remove-wm -r -u --size-min=3 --size-max=15 --syntactic-recurrence |
# ltlfilt -v --obligation | # ltlfilt -v --obligation |
# ../../src/bin/ltl2tgba -F - -x tba-det -D --stats='%d,%f' | ../../bin/ltl2tgba -F - -x tba-det -D --stats='%d,%f' |
# grep 0, | head -n 30 # grep 0, | head -n 30
X(Fc W b) R Fa X(Fc W b) R Fa

8
bench/dtgbasat/prepare.sh
View file

@ -1,8 +1,8 @@
#!/bin/sh #!/bin/sh
ltlfilt=../../src/bin/ltlfilt ltlfilt=../../bin/ltlfilt
ltl2tgba=../../src/bin/ltl2tgba ltl2tgba=../../bin/ltl2tgba
dstar2tgba=../../src/bin/dstar2tgba dstar2tgba=../../bin/dstar2tgba
# Rename all formulas using a b c... suppress duplicates. # Rename all formulas using a b c... suppress duplicates.
$ltlfilt --ignore-errors --relabel=abc -u formulas > nodups.ltl $ltlfilt --ignore-errors --relabel=abc -u formulas > nodups.ltl
@ -16,7 +16,7 @@ while read f; do
echo "$f, trad, $acc, $acc2" echo "$f, trad, $acc, $acc2"
elif test `$ltl2tgba "$f" -x tba-det -D --stats="%d"` = 1; then elif test `$ltl2tgba "$f" -x tba-det -D --stats="%d"` = 1; then
echo "$f, TCONG, $acc, $acc2" echo "$f, TCONG, $acc, $acc2"
elif test `$ltlfilt --remove-wm -f "$f" -l | ltl2dstar --ltl2nba=spin:$ltl2tgba@-sD - - | $dstar2tgba -D --low --stats="%d"` = 1; then elif test `$ltlfilt --remove-wm -f "$f" -l | ltl2dstar --ltl2nba=spin:$ltl2tgba@-Ds - - | $dstar2tgba -D --low --stats="%d"` = 1; then
echo "$f, DRA, $acc, $acc2" echo "$f, DRA, $acc, $acc2"
else else
echo "$f, not DBA-realizable, $acc, $acc2" echo "$f, not DBA-realizable, $acc, $acc2"

12
bench/dtgbasat/stat.sh
View file

@ -1,8 +1,8 @@
#!/bin/sh #!/bin/sh
ltlfilt=../../src/bin/ltlfilt ltlfilt=../../bin/ltlfilt
ltl2tgba=../../src/bin/ltl2tgba ltl2tgba=../../bin/ltl2tgba
dstar2tgba=../../src/bin/dstar2tgba dstar2tgba=../../bin/dstar2tgba
timeout='timeout -sKILL 2h' timeout='timeout -sKILL 2h'
stats=--stats="%s, %e, %t, %a, %c, %d, %p, %r" stats=--stats="%s, %e, %t, %a, %c, %d, %p, %r"
empty='-, -, -, -, -, -, -, -' empty='-, -, -, -, -, -, -, -'
@ -49,7 +49,7 @@ case $type in
mindtba=`get_stats DTBA $ltl2tgba "$f" -D -x 'sat-minimize=-1,sat-acc=1'` mindtba=`get_stats DTBA $ltl2tgba "$f" -D -x 'sat-minimize=-1,sat-acc=1'`
echo "$f, $accmax, $type, $input, DBA, $dba, minDBA, $mindba, minDTGBA, $mindtgba, minDTBA, $mindtba, dbaminimizer..." 1>&2 echo "$f, $accmax, $type, $input, DBA, $dba, minDBA, $mindba, minDTGBA, $mindtgba, minDTBA, $mindtba, dbaminimizer..." 1>&2
$ltlfilt --remove-wm -f "$f" -l | $ltlfilt --remove-wm -f "$f" -l |
ltl2dstar --ltl2nba=spin:$ltl2tgba@-sD - dra.$$ ltl2dstar --ltl2nba=spin:$ltl2tgba@-Ds - dra.$$
dbamin=`get_dbamin_stats dra.$$` dbamin=`get_dbamin_stats dra.$$`
dra=`sed -n 's/States: \(.*\)/\1/p' dra.$$` dra=`sed -n 's/States: \(.*\)/\1/p' dra.$$`
rm dra.$$ rm dra.$$
@ -70,7 +70,7 @@ case $type in
*TCONG*) dbamin="n/a, n/a" dra="n/a";; *TCONG*) dbamin="n/a, n/a" dra="n/a";;
*trad*) *trad*)
$ltlfilt --remove-wm -f "$f" -l | $ltlfilt --remove-wm -f "$f" -l |
ltl2dstar --ltl2nba=spin:$ltl2tgba@-sD - dra.$$ ltl2dstar --ltl2nba=spin:$ltl2tgba@-Ds - dra.$$
dbamin=`get_dbamin_stats dra.$$` dbamin=`get_dbamin_stats dra.$$`
dra=`sed -n 's/States: \(.*\)/\1/p' dra.$$` dra=`sed -n 's/States: \(.*\)/\1/p' dra.$$`
rm dra.$$ rm dra.$$
@ -80,7 +80,7 @@ case $type in
*DRA*) *DRA*)
echo "$f, $accmax, $type... " 1>&2 echo "$f, $accmax, $type... " 1>&2
$ltlfilt --remove-wm -f "$f" -l | $ltlfilt --remove-wm -f "$f" -l |
ltl2dstar --ltl2nba=spin:$ltl2tgba@-sD - dra.$$ ltl2dstar --ltl2nba=spin:$ltl2tgba@-Ds - dra.$$
input=`get_stats TBA $dstar2tgba dra.$$ -D -x '!wdba-minimize'` input=`get_stats TBA $dstar2tgba dra.$$ -D -x '!wdba-minimize'`
echo "$f, $accmax, $type, $input, DBA, ... " 1>&2 echo "$f, $accmax, $type, $input, DBA, ... " 1>&2
dba=`get_stats BA $dstar2tgba dra.$$ -BD -x '!wdba-minimize'` dba=`get_stats BA $dstar2tgba dra.$$ -BD -x '!wdba-minimize'`

6
bench/dtgbasat/stats.sh
View file

@ -1,8 +1,8 @@
#!/bin/sh #!/bin/sh
ltlfilt=../../src/bin/ltlfilt ltlfilt=../../bin/ltlfilt
ltl2tgba=../../src/bin/ltl2tgba ltl2tgba=../../bin/ltl2tgba
dstar2tgba=../../src/bin/dstar2tgba dstar2tgba=../../bin/dstar2tgba
timeout='timeout -sKILL 1h' timeout='timeout -sKILL 1h'
stats=--stats="%s, %e, %t, %a, %c, %d, %p, %r" stats=--stats="%s, %e, %t, %a, %c, %d, %p, %r"
empty='-, -, -, -, -, -, -, -' empty='-, -, -, -, -, -, -, -'