9a7590a646
This is an implementation of Krishnan's ISAAC'94 paper to convert deterministic Rabin automata into DBA when possible. * src/dstarparse/dra2dba.cc: New file. * src/dstarparse/dstar2tgba.cc: New file. * src/dstarparse/Makefile.am: Add them. * src/dstarparse/nra2nba.cc (nra_to_nba): Adjust so that dra_to_dba() can call it using a masked automaton. * src/dstarparse/public.hh (dra_to_dba, dstar_to_tgba): Declare. * src/tgbatest/ltl2tgba.cc: Add an -XDD option. * src/tgbatest/dstar.test: More tests.
235 lines
4.2 KiB
Bash
Executable file
235 lines
4.2 KiB
Bash
Executable file
#!/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
|
|
|
|
|
|
# DRA generated with
|
|
# ltlfilt -f 'a U b' -l | ltl2dstar --ltl2nba=spin:path/ltl2tgba@-s - -
|
|
cat >dra.dstar <<EOF
|
|
DRA v2 explicit
|
|
Comment: "Safra[NBA=2]"
|
|
States: 3
|
|
Acceptance-Pairs: 1
|
|
Start: 0
|
|
AP: 2 "a" "b"
|
|
---
|
|
State: 0
|
|
Acc-Sig:
|
|
1
|
|
0
|
|
2
|
|
2
|
|
State: 1
|
|
Acc-Sig: -0
|
|
1
|
|
1
|
|
1
|
|
1
|
|
State: 2
|
|
Acc-Sig: +0
|
|
2
|
|
2
|
|
2
|
|
2
|
|
EOF
|
|
|
|
run 0 ../ltl2tgba -XD dra.dstar | tee stdout
|
|
|
|
cat >expected <<EOF
|
|
digraph G {
|
|
0 [label="", style=invis, height=0]
|
|
0 -> 1
|
|
1 [label="0"]
|
|
1 -> 1 [label="a & !b\n"]
|
|
1 -> 2 [label="!a & !b\n"]
|
|
1 -> 3 [label="b\n"]
|
|
2 [label="1"]
|
|
2 -> 2 [label="1\n"]
|
|
3 [label="2"]
|
|
3 -> 3 [label="1\n"]
|
|
}
|
|
EOF
|
|
|
|
diff expected stdout
|
|
|
|
|
|
run 0 ../ltl2tgba -XDD dra.dstar | tee stdout
|
|
|
|
cat >expected <<EOF
|
|
digraph G {
|
|
0 [label="", style=invis, height=0]
|
|
0 -> 1
|
|
1 [label="1"]
|
|
1 -> 1 [label="a & !b\n"]
|
|
1 -> 2 [label="b\n"]
|
|
2 [label="3", peripheries=2]
|
|
2 -> 2 [label="1\n{Acc[1]}"]
|
|
}
|
|
EOF
|
|
|
|
diff expected stdout
|
|
|
|
|
|
|
|
# DSA generated with
|
|
# ltlfilt -f 'FGa' -l |
|
|
# ltl2dstar --automata=streett --ltl2nba=spin:path/ltl2tgba@-s - -
|
|
cat >dsa.dstar <<EOF
|
|
DSA v2 explicit
|
|
Comment: "Streett{Safra[NBA=2]}"
|
|
States: 3
|
|
Acceptance-Pairs: 1
|
|
Start: 1
|
|
AP: 1 "a"
|
|
---
|
|
State: 0
|
|
Acc-Sig: +0
|
|
0
|
|
2
|
|
State: 1
|
|
Acc-Sig:
|
|
0
|
|
0
|
|
State: 2
|
|
Acc-Sig:
|
|
0
|
|
2
|
|
EOF
|
|
|
|
run 0 ../ltl2tgba -XDB dsa.dstar | tee stdout
|
|
|
|
cat >expected <<EOF
|
|
digraph G {
|
|
0 [label="", style=invis, height=0]
|
|
0 -> 1
|
|
1 [label="0"]
|
|
1 -> 2 [label="1\n"]
|
|
1 -> 3 [label="1\n"]
|
|
2 [label="1"]
|
|
2 -> 2 [label="!a\n"]
|
|
2 -> 3 [label="!a\n"]
|
|
2 -> 4 [label="a\n"]
|
|
2 -> 5 [label="a\n"]
|
|
3 [label="2"]
|
|
3 -> 6 [label="!a\n"]
|
|
3 -> 5 [label="a\n{Acc[\"0\"]}"]
|
|
4 [label="3"]
|
|
4 -> 2 [label="!a\n"]
|
|
4 -> 3 [label="!a\n"]
|
|
4 -> 4 [label="a\n"]
|
|
4 -> 5 [label="a\n"]
|
|
5 [label="4"]
|
|
5 -> 6 [label="!a\n"]
|
|
5 -> 5 [label="a\n{Acc[\"0\"]}"]
|
|
6 [label="5"]
|
|
6 -> 6 [label="!a\n"]
|
|
6 -> 7 [label="a\n"]
|
|
7 [label="6"]
|
|
7 -> 6 [label="!a\n"]
|
|
7 -> 7 [label="a\n"]
|
|
}
|
|
EOF
|
|
|
|
diff expected stdout
|
|
|
|
|
|
|
|
|
|
# DRA generated with
|
|
# ltlfilt -f 'Ga | Fb' -l | ltl2dstar --ltl2nba=spin:path/ltl2tgba@-sD - -
|
|
# (State name and comments added by hand to test the parser.)
|
|
cat >dra.dstar <<EOF
|
|
DRA v2 explicit
|
|
Comment: "Union{Safra[NBA=1],Safra[NBA=2]}"
|
|
States: 5
|
|
Acceptance-Pairs: 2
|
|
Start: 0
|
|
AP: 2 "a" "b"
|
|
---
|
|
State: 0 "bla"
|
|
Acc-Sig:
|
|
1
|
|
2 /* This is a comment */
|
|
3
|
|
4
|
|
State: 1 "foo"
|
|
Acc-Sig: -0
|
|
1
|
|
1 // This is another comment.
|
|
3
|
|
3
|
|
State: 2 "baz"
|
|
Acc-Sig: +0
|
|
1
|
|
2
|
|
// more
|
|
/// comment
|
|
3
|
|
4
|
|
State: 3 "str\n\"ing"
|
|
Acc-Sig: -0 +1
|
|
3 /***
|
|
**** Some multiline comment
|
|
***/
|
|
3
|
|
3
|
|
3
|
|
State: 4 "more\"string\""
|
|
Acc-Sig: +0 +1
|
|
3
|
|
4
|
|
3
|
|
4
|
|
EOF
|
|
|
|
run 0 ../ltl2tgba -XDD dra.dstar | tee stdout
|
|
|
|
cat >expected <<EOF
|
|
digraph G {
|
|
0 [label="", style=invis, height=0]
|
|
0 -> 1
|
|
1 [label="1"]
|
|
1 -> 2 [label="!a & !b\n"]
|
|
1 -> 3 [label="a & !b\n"]
|
|
1 -> 4 [label="b & !a\n"]
|
|
1 -> 5 [label="a & b\n"]
|
|
2 [label="2"]
|
|
2 -> 2 [label="!b\n"]
|
|
2 -> 4 [label="b\n"]
|
|
3 [label="3", peripheries=2]
|
|
3 -> 2 [label="!a & !b\n{Acc[1]}"]
|
|
3 -> 3 [label="a & !b\n{Acc[1]}"]
|
|
3 -> 4 [label="b & !a\n{Acc[1]}"]
|
|
3 -> 5 [label="a & b\n{Acc[1]}"]
|
|
4 [label="4", peripheries=2]
|
|
4 -> 4 [label="1\n{Acc[1]}"]
|
|
5 [label="5", peripheries=2]
|
|
5 -> 4 [label="!a\n{Acc[1]}"]
|
|
5 -> 5 [label="a\n{Acc[1]}"]
|
|
}
|
|
EOF
|
|
|
|
diff expected stdout
|