dstar2tgba: new command.
* src/bin/dstar2tgba.cc, src/bin/man/dstar2tgba.x: New files. * src/bin/Makefile.am, src/bin/man/Makefile.am: Add them. * NEWS: Mention it. * src/bin/ltl2tgba.cc, src/tgbaalgos/stats.cc, doc/org/ltl2tgba.org: Rename the %S sequence as %c, for consistency with dstar2tgba. * src/tgbatest/ltl2dstar.test: Add more tests. * src/tgbatest/ltl2dstar2.test: New file. * src/tgbatest/Makefile.am: Add it.
This commit is contained in:
parent
9a7590a646
commit
d3b81809c8
11 changed files with 543 additions and 33 deletions
|
|
@ -111,6 +111,7 @@ TESTS = \
|
|||
wdba2.test \
|
||||
babiak.test \
|
||||
ltl2dstar.test \
|
||||
ltl2dstar2.test \
|
||||
randtgba.test \
|
||||
emptchk.test \
|
||||
emptchke.test \
|
||||
|
|
|
|||
|
|
@ -33,6 +33,7 @@ ltl2tgba=../../bin/ltl2tgba
|
|||
ltlcross=../../bin/ltlcross
|
||||
randltl=../../bin/randltl
|
||||
ltlfilt=../../bin/ltlfilt
|
||||
dstar2tgba=../../bin/dstar2tgba
|
||||
|
||||
$ltlfilt -f 'a U b' -l |
|
||||
ltl2dstar --ltl2nba=spin:$ltl2tgba@-s - - |
|
||||
|
|
@ -62,11 +63,16 @@ EOF
|
|||
|
||||
diff expected out
|
||||
|
||||
RAB=--automata=rabin
|
||||
STR=--automata=streett
|
||||
|
||||
$randltl -n 15 a b | $ltlfilt --nnf --remove-wm |
|
||||
$ltlcross -F - -f 'GFa & GFb & GFc' -f '(GFa -> GFb) & (GFc -> GFd)' \
|
||||
--timeout=10 \
|
||||
--timeout=30 \
|
||||
"$ltl2tgba -s %f >%N" \
|
||||
"ltl2dstar --automata=rabin --output=nba --ltl2nba=spin:$ltl2tgba@-s %L %T" \
|
||||
"ltl2dstar --automata=rabin --ltl2nba=spin:$ltl2tgba@-s %L %D" \
|
||||
"ltl2dstar --automata=streett --output=nba --ltl2nba=spin:$ltl2tgba@-s %L %T" \
|
||||
"ltl2dstar --automata=streett --ltl2nba=spin:$ltl2tgba@-s %L %D"
|
||||
"ltl2dstar $RAB --output=nba --ltl2nba=spin:$ltl2tgba@-s %L %T" \
|
||||
"ltl2dstar $RAB --ltl2nba=spin:$ltl2tgba@-s %L %D" \
|
||||
"ltl2dstar $RAB --ltl2nba=spin:$ltl2tgba@-s %L - | $dstar2tgba --low -s >%N" \
|
||||
"ltl2dstar $STR --output=nba --ltl2nba=spin:$ltl2tgba@-s %L %T" \
|
||||
"ltl2dstar $STR --ltl2nba=spin:$ltl2tgba@-s %L %D" \
|
||||
"ltl2dstar $STR --ltl2nba=spin:$ltl2tgba@-s %L - | $dstar2tgba --low -s >%N"
|
||||
|
|
|
|||
77
src/tgbatest/ltl2dstar2.test
Executable file
77
src/tgbatest/ltl2dstar2.test
Executable file
|
|
@ -0,0 +1,77 @@
|
|||
#!/bin/sh
|
||||
# -*- coding: utf-8 -*-
|
||||
# Copyright (C) 2013 Laboratoire de Recherche et
|
||||
# Développement de l'Epita (LRDE).
|
||||
#
|
||||
# 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 3 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 this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
# Do some quick translations to make sure the neverclaims produced by
|
||||
# spot actually look correct! We do that by parsing them via ltlcross.
|
||||
# ltl2neverclaim-lbtt.test does the same with LBTT if it is installed.
|
||||
|
||||
. ./defs
|
||||
set -e
|
||||
|
||||
# Skip this test if ltl2dstar is not installed.
|
||||
(ltl2dstar --version) || exit 77
|
||||
|
||||
ltlfilt=../../bin/ltlfilt
|
||||
ltl2tgba=../../bin/ltl2tgba
|
||||
dstar2tgba=../../bin/dstar2tgba
|
||||
randltl=../../bin/randltl
|
||||
|
||||
|
||||
# Make sure all recurrence formulas are translated into deterministic
|
||||
# Büchi automata by the DRA->TGBA converster.
|
||||
|
||||
$randltl -n -1 a b --tree-size=5..15 |
|
||||
$ltlfilt --syntactic-recurrence --remove-wm -r -u \
|
||||
--size-min=4 --size-max=15 --relabel=abc |
|
||||
head -n 20 > formulas
|
||||
|
||||
$randltl -n -1 a b --tree-size=5..15 |
|
||||
$ltlfilt -v --obligation |
|
||||
$ltlfilt --syntactic-recurrence --remove-wm -r -u \
|
||||
--size-min=4 --size-max=15 --relabel=abc |
|
||||
head -n 20 >> formulas
|
||||
|
||||
while read f; do
|
||||
$ltlfilt -f "$f" -l |
|
||||
ltl2dstar --ltl2nba=spin:$ltl2tgba@-s - foo
|
||||
echo "$f"
|
||||
det=`$dstar2tgba foo --stats '%d'`
|
||||
test $det -eq 1;
|
||||
done < formulas
|
||||
|
||||
|
||||
# Now make sure that some obviously non-deterministic property
|
||||
# are not translated to deterministic.
|
||||
|
||||
cat >formulas <<EOF
|
||||
FGa
|
||||
GFa->GFb
|
||||
GFa & FGb
|
||||
FGa | FGb
|
||||
FGa & FGb
|
||||
EOF
|
||||
|
||||
while read f; do
|
||||
$ltlfilt -f "$f" -l |
|
||||
ltl2dstar --ltl2nba=spin:$ltl2tgba@-s - foo
|
||||
echo "$f"
|
||||
det=`$dstar2tgba foo --stats '%d'`
|
||||
test $det -eq 0;
|
||||
done < formulas
|
||||
Loading…
Add table
Add a link
Reference in a new issue