diff --git a/bench/dtgbasat/formulas b/bench/dtgbasat/formulas index 3a5a04e52..a3962c30a 100644 --- a/bench/dtgbasat/formulas +++ b/bench/dtgbasat/formulas @@ -93,7 +93,7 @@ G(G!a | F!c | G!b) # randltl -n -1 a b c | # ltlfilt --remove-wm -r -u --size-min=3 --size-max=15 --syntactic-recurrence | # 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 X(Fc W b) R Fa diff --git a/bench/dtgbasat/prepare.sh b/bench/dtgbasat/prepare.sh index 94d3a206d..108d1338d 100755 --- a/bench/dtgbasat/prepare.sh +++ b/bench/dtgbasat/prepare.sh @@ -1,8 +1,8 @@ #!/bin/sh -ltlfilt=../../src/bin/ltlfilt -ltl2tgba=../../src/bin/ltl2tgba -dstar2tgba=../../src/bin/dstar2tgba +ltlfilt=../../bin/ltlfilt +ltl2tgba=../../bin/ltl2tgba +dstar2tgba=../../bin/dstar2tgba # Rename all formulas using a b c... suppress duplicates. $ltlfilt --ignore-errors --relabel=abc -u formulas > nodups.ltl @@ -16,7 +16,7 @@ while read f; do echo "$f, trad, $acc, $acc2" elif test `$ltl2tgba "$f" -x tba-det -D --stats="%d"` = 1; then 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" else echo "$f, not DBA-realizable, $acc, $acc2" diff --git a/bench/dtgbasat/stat.sh b/bench/dtgbasat/stat.sh index 646d2beac..84fd0dfdc 100755 --- a/bench/dtgbasat/stat.sh +++ b/bench/dtgbasat/stat.sh @@ -1,8 +1,8 @@ #!/bin/sh -ltlfilt=../../src/bin/ltlfilt -ltl2tgba=../../src/bin/ltl2tgba -dstar2tgba=../../src/bin/dstar2tgba +ltlfilt=../../bin/ltlfilt +ltl2tgba=../../bin/ltl2tgba +dstar2tgba=../../bin/dstar2tgba timeout='timeout -sKILL 2h' stats=--stats="%s, %e, %t, %a, %c, %d, %p, %r" empty='-, -, -, -, -, -, -, -' @@ -49,7 +49,7 @@ case $type in 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 $ltlfilt --remove-wm -f "$f" -l | - ltl2dstar --ltl2nba=spin:$ltl2tgba@-sD - dra.$$ + ltl2dstar --ltl2nba=spin:$ltl2tgba@-Ds - dra.$$ dbamin=`get_dbamin_stats dra.$$` dra=`sed -n 's/States: \(.*\)/\1/p' dra.$$` rm dra.$$ @@ -70,7 +70,7 @@ case $type in *TCONG*) dbamin="n/a, n/a" dra="n/a";; *trad*) $ltlfilt --remove-wm -f "$f" -l | - ltl2dstar --ltl2nba=spin:$ltl2tgba@-sD - dra.$$ + ltl2dstar --ltl2nba=spin:$ltl2tgba@-Ds - dra.$$ dbamin=`get_dbamin_stats dra.$$` dra=`sed -n 's/States: \(.*\)/\1/p' dra.$$` rm dra.$$ @@ -80,7 +80,7 @@ case $type in *DRA*) echo "$f, $accmax, $type... " 1>&2 $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'` echo "$f, $accmax, $type, $input, DBA, ... " 1>&2 dba=`get_stats BA $dstar2tgba dra.$$ -BD -x '!wdba-minimize'` diff --git a/bench/dtgbasat/stats.sh b/bench/dtgbasat/stats.sh index 70408fef7..0ec8a317c 100755 --- a/bench/dtgbasat/stats.sh +++ b/bench/dtgbasat/stats.sh @@ -1,8 +1,8 @@ #!/bin/sh -ltlfilt=../../src/bin/ltlfilt -ltl2tgba=../../src/bin/ltl2tgba -dstar2tgba=../../src/bin/dstar2tgba +ltlfilt=../../bin/ltlfilt +ltl2tgba=../../bin/ltl2tgba +dstar2tgba=../../bin/dstar2tgba timeout='timeout -sKILL 1h' stats=--stats="%s, %e, %t, %a, %c, %d, %p, %r" empty='-, -, -, -, -, -, -, -'