d3607a7ce3
Fixes #212. * spot/parseaut/parseaut.yy, spot/twaalgos/hoa.cc: Recognize exist-branch, and adjust printer to the 1.1 semantics. * tests/core/alternating.test, tests/core/complete.test, tests/core/det.test, tests/core/explsum.test, tests/core/parseaut.test, tests/core/readsave.test, tests/core/sbacc.test, tests/core/tgbagraph.test, tests/python/alternating.py, tests/python/dualize.py: Adjust test cases. * NEWS: Mention the change.
267 lines
4.4 KiB
Bash
Executable file
267 lines
4.4 KiB
Bash
Executable file
#! /bin/sh
|
|
# -*- coding: utf-8 -*-
|
|
# Copyright (C) 2015, 2016, 2017 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 || exit 1
|
|
|
|
set -e
|
|
|
|
ltl2tgba=ltl2tgba
|
|
autfilt=autfilt
|
|
|
|
$ltl2tgba 'GFa & GFb' -H | run 0 $autfilt --sbacc -H > out.hoa
|
|
|
|
cat >expected<<EOF
|
|
HOA: v1
|
|
States: 4
|
|
Start: 0
|
|
AP: 2 "a" "b"
|
|
acc-name: generalized-Buchi 2
|
|
Acceptance: 2 Inf(0)&Inf(1)
|
|
properties: trans-labels explicit-labels state-acc complete
|
|
properties: deterministic stutter-invariant
|
|
--BODY--
|
|
State: 0 {0}
|
|
[0&!1] 0
|
|
[0&1] 1
|
|
[!0&!1] 2
|
|
[!0&1] 3
|
|
State: 1 {0 1}
|
|
[0&!1] 0
|
|
[0&1] 1
|
|
[!0&!1] 2
|
|
[!0&1] 3
|
|
State: 2
|
|
[0&!1] 0
|
|
[0&1] 1
|
|
[!0&!1] 2
|
|
[!0&1] 3
|
|
State: 3 {1}
|
|
[0&!1] 0
|
|
[0&1] 1
|
|
[!0&!1] 2
|
|
[!0&1] 3
|
|
--END--
|
|
EOF
|
|
|
|
diff out.hoa expected
|
|
|
|
# This procedure should be acceptance-agnostic.
|
|
cat >in.hoa<<EOF
|
|
HOA: v1
|
|
Start: 0
|
|
AP: 1 "a"
|
|
Acceptance: 2 Fin(0)|Inf(1)
|
|
--BODY--
|
|
State: 0
|
|
[0] 1
|
|
State: 1 {0}
|
|
[0] 2
|
|
State: 2
|
|
[0] 0 {1}
|
|
--END--
|
|
/* The following example used to be converted into a
|
|
3-state automaton instead of just 2 states, due to
|
|
a typo in the code. */
|
|
HOA: v1
|
|
States: 2
|
|
Start: 1
|
|
AP: 2 "a" "b"
|
|
Acceptance: 2 Fin(0) & Inf(1)
|
|
--BODY--
|
|
State: 0
|
|
[t] 0 {0}
|
|
State: 1
|
|
[1] 0
|
|
[0&!1] 1 {1}
|
|
--END--
|
|
|
|
EOF
|
|
|
|
run 0 $autfilt --state-based-acceptance in.hoa -H > out.hoa
|
|
|
|
cat >expected <<EOF
|
|
HOA: v1
|
|
States: 3
|
|
Start: 0
|
|
AP: 1 "a"
|
|
acc-name: Streett 1
|
|
Acceptance: 2 Fin(0) | Inf(1)
|
|
properties: trans-labels explicit-labels state-acc deterministic
|
|
--BODY--
|
|
State: 0 {1}
|
|
[0] 1
|
|
State: 1 {0}
|
|
[0] 2
|
|
State: 2 {0 1}
|
|
[0] 0
|
|
--END--
|
|
HOA: v1
|
|
States: 2
|
|
Start: 0
|
|
AP: 2 "a" "b"
|
|
acc-name: Rabin 1
|
|
Acceptance: 2 Fin(0) & Inf(1)
|
|
properties: trans-labels explicit-labels state-acc deterministic
|
|
--BODY--
|
|
State: 0 {1}
|
|
[0&!1] 0
|
|
[1] 1
|
|
State: 1
|
|
[t] 1
|
|
--END--
|
|
EOF
|
|
|
|
diff out.hoa expected
|
|
|
|
$autfilt --sba -H expected > out.hoa
|
|
diff out.hoa expected
|
|
|
|
$autfilt --strip-acc -H expected -n1 > out.hoa
|
|
cat >expected <<EOF
|
|
HOA: v1
|
|
States: 3
|
|
Start: 0
|
|
AP: 1 "a"
|
|
acc-name: all
|
|
Acceptance: 0 t
|
|
properties: trans-labels explicit-labels state-acc deterministic weak
|
|
--BODY--
|
|
State: 0
|
|
[0] 1
|
|
State: 1
|
|
[0] 2
|
|
State: 2
|
|
[0] 0
|
|
--END--
|
|
EOF
|
|
diff out.hoa expected
|
|
|
|
randltl --weak-fairness -n 20 2 |
|
|
ltlcross "$ltl2tgba -DH %f >%O" \
|
|
"$ltl2tgba -S %f >%O" \
|
|
"$ltl2tgba -H %f | $autfilt -H >%O"
|
|
|
|
test 4 = `ltl2tgba -S 'F(a & X(!a &Xb))' --any --stats=%s`
|
|
|
|
|
|
# Test case from Thibaud Michaud. This used to fail, because sbacc()
|
|
# would remove acceptance marks from all rejecting SCCS...
|
|
autcross 'autfilt --sbacc' --language-preserve <<EOF
|
|
HOA: v1
|
|
States: 5
|
|
Start: 1
|
|
AP: 4 "req" "go" "ack" "cancel"
|
|
acc-name: parity max odd 3
|
|
Acceptance: 3 Fin(2) & (Inf(1) | Fin(0))
|
|
properties: trans-labels explicit-labels trans-acc colored complete
|
|
properties: deterministic
|
|
--BODY--
|
|
State: 0
|
|
[t] 1 {0}
|
|
State: 1
|
|
[!0] 0 {0}
|
|
[0] 2 {0}
|
|
State: 2
|
|
[2] 1 {0}
|
|
[!2] 3 {0}
|
|
State: 3
|
|
[t] 4 {0}
|
|
State: 4
|
|
[2] 1 {2}
|
|
[!2] 3 {1}
|
|
--END--
|
|
EOF
|
|
|
|
# Tautological acceptances are converted to "t"
|
|
cat >taut.hoa <<EOF
|
|
HOA: v1
|
|
States: 2
|
|
Start: 1
|
|
AP: 0
|
|
Acceptance: 2 Fin(0) | Inf(0) | Fin(1)
|
|
--BODY--
|
|
State: 0
|
|
[t] 1 {0}
|
|
State: 1
|
|
[t] 0
|
|
[t] 1 {1}
|
|
--END--
|
|
EOF
|
|
cat >expect.hoa <<EOF
|
|
HOA: v1
|
|
States: 2
|
|
Start: 1
|
|
AP: 0
|
|
acc-name: all
|
|
Acceptance: 0 t
|
|
properties: trans-labels explicit-labels state-acc complete weak
|
|
--BODY--
|
|
State: 0
|
|
[t] 1
|
|
State: 1
|
|
[t] 0
|
|
[t] 1
|
|
--END--
|
|
EOF
|
|
autfilt --sbacc taut.hoa > out.hoa
|
|
diff out.hoa expect.hoa
|
|
|
|
cat >alt.hoa <<EOF
|
|
HOA: v1
|
|
States: 4
|
|
Start: 0
|
|
AP: 1 "a"
|
|
Acceptance: 2 Inf(0) & Inf(1)
|
|
--BODY--
|
|
State: 0
|
|
[0] 1&2 {0}
|
|
[0] 3 {0}
|
|
State: 1
|
|
[0] 0 {1}
|
|
State: 2
|
|
[t] 2
|
|
State: 3
|
|
[!0] 0
|
|
--END--
|
|
EOF
|
|
|
|
cat >expect.hoa <<EOF
|
|
HOA: v1
|
|
States: 4
|
|
Start: 0
|
|
AP: 1 "a"
|
|
acc-name: generalized-Buchi 2
|
|
Acceptance: 2 Inf(0)&Inf(1)
|
|
properties: trans-labels explicit-labels state-acc univ-branch
|
|
--BODY--
|
|
State: 0 {0}
|
|
[0] 3
|
|
[0] 1&2
|
|
State: 1 {0 1}
|
|
[0] 0
|
|
State: 2
|
|
[t] 2
|
|
State: 3 {0}
|
|
[!0] 0
|
|
--END--
|
|
EOF
|
|
|
|
autfilt --sbacc alt.hoa > out.hoa
|
|
diff out.hoa expect.hoa
|