48c812a595
The only missing point is that the HOA parser cannot deal with multiple universal initial states, as seen in parseaut.test. * spot/graph/graph.hh (new_univ_dests): New function, extracted from... (new_univ_edge): ... this one. * spot/twa/twagraph.hh (set_univ_init_state): Implement using new_univ_dests. * spot/twaalgos/dot.cc, spot/twaalgos/hoa.cc, python/spot/impl.i: Add support for universal initial states. * spot/parseaut/parseaut.yy: Add preliminary support for universal initial states. Multiple universal initial states are still not supported. * tests/core/alternating.test, tests/core/parseaut.test, tests/python/alternating.py: Adjust tests and exercise this new feature.
101 lines
2.5 KiB
Bash
101 lines
2.5 KiB
Bash
#!/bin/sh
|
|
# -*- coding: utf-8 -*-
|
|
# Copyright (C) 2016 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/>.
|
|
|
|
. ./defs
|
|
set -e
|
|
|
|
cat >alt.hoa <<EOF
|
|
HOA: v1.1
|
|
States: 7
|
|
Start: 0&2
|
|
acc-name: co-Buchi
|
|
Acceptance: 1 Fin(0)
|
|
AP: 2 "b" "a"
|
|
properties: trans-labels explicit-labels state-acc univ-branch very-weak
|
|
spot.highlight.edges: 2 5 7 2
|
|
--BODY--
|
|
State: 0 "((((a) U (b)) && GF(b)) && FG(a))"
|
|
[(0)] 3&1
|
|
[(!0 & 1)] 5&3&1
|
|
State: 1 "FG(a)" {0}
|
|
[(1)] 2
|
|
[t] 1
|
|
State: 2 "G(a)"
|
|
[(1)] 2
|
|
State: 3 "GF(b)"
|
|
[(0)] 3
|
|
[(!0)] 4&3
|
|
State: 4 "F(b)" {0}
|
|
[(0)] 6
|
|
[(!0)] 4
|
|
State: 5 "((a) U (b))" {0}
|
|
[(0)] 6
|
|
[(!0 & 1)] 5
|
|
State: 6 "t"
|
|
[t] 6
|
|
--END--
|
|
EOF
|
|
|
|
# The 's' option should be ignored for alternating automata
|
|
autfilt --dot=bans alt.hoa >alt.dot
|
|
|
|
cat >expect.dot <<EOF
|
|
digraph G {
|
|
rankdir=LR
|
|
label="Fin(⓿)"
|
|
labelloc="t"
|
|
I [label="", style=invis, width=0]
|
|
I -> -11 [dir=none]
|
|
-11 [label=<>,width=0,height=0,shape=none]
|
|
-11 -> 0
|
|
-11 -> 2
|
|
0 [label="((((a) U (b)) && GF(b)) && FG(a))"]
|
|
0 -> -1 [label="b", dir=none]
|
|
-1 [label=<>,width=0,height=0,shape=none]
|
|
-1 -> 3
|
|
-1 -> 1
|
|
0 -> -4 [label="a & !b", style=bold, color="#F15854", dir=none]
|
|
-4 [label=<>,width=0,height=0,shape=none]
|
|
-4 -> 5 [style=bold, color="#F15854"]
|
|
-4 -> 3 [style=bold, color="#F15854"]
|
|
-4 -> 1 [style=bold, color="#F15854"]
|
|
1 [label="FG(a)\n⓿"]
|
|
1 -> 2 [label="a"]
|
|
1 -> 1 [label="1"]
|
|
2 [label="G(a)"]
|
|
2 -> 2 [label="a"]
|
|
3 [label="GF(b)"]
|
|
3 -> 3 [label="b"]
|
|
3 -> -8 [label="!b", style=bold, color="#FAA43A", dir=none]
|
|
-8 [label=<>,width=0,height=0,shape=none]
|
|
-8 -> 4 [style=bold, color="#FAA43A"]
|
|
-8 -> 3 [style=bold, color="#FAA43A"]
|
|
4 [label="F(b)\n⓿"]
|
|
4 -> 6 [label="b"]
|
|
4 -> 4 [label="!b"]
|
|
5 [label="((a) U (b))\n⓿"]
|
|
5 -> 6 [label="b"]
|
|
5 -> 5 [label="a & !b"]
|
|
6 [label="t"]
|
|
6 -> 6 [label="1"]
|
|
}
|
|
EOF
|
|
|
|
diff expect.dot alt.dot
|