1c2c914d7e
Also introduce twa::unregister_ap() and twa_graph::remove_unused_ap() so that the methods where this behavior is expected can be fixed. And fix ltsmin::kripke() which did not register APs. Part of #170. * spot/twaalgos/hoa.cc: Use apvars() to print all registerd APs. Throw an exception when printing automata using unregistered APs. * spot/ltsmin/ltsmin.cc: Call register_ap(). * spot/twa/twa.cc, spot/twa/twa.hh, spot/twa/twagraph.cc, spot/twa/twagraph.hh (twa::unregister_ap, twa_graph::remove_unused_ap): New methods. * spot/tl/exclusive.cc, spot/twaalgos/postproc.cc, spot/twaalgos/remprop.cc, spot/twaalgos/relabel.cc: Use them. * tests/core/maskacc.test, tests/core/maskkeep.test, tests/core/strength.test: Adjust expected results. * NEWS: Mention those changes.
161 lines
2.7 KiB
Bash
Executable file
161 lines
2.7 KiB
Bash
Executable file
#!/bin/sh
|
|
# -*- coding: utf-8 -*-
|
|
# Copyright (C) 2014, 2015, 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 >input1 <<EOF
|
|
HOA: v1
|
|
States: 4
|
|
Start: 0
|
|
AP: 2 "a" "b"
|
|
Acceptance: 2 Fin(0)&Fin(1)
|
|
properties: trans-labels explicit-labels trans-acc
|
|
--BODY--
|
|
State: 0
|
|
[0] 1 {0}
|
|
[1] 2 {1}
|
|
State: 1
|
|
[0] 2
|
|
[0] 3 {1}
|
|
State: 2
|
|
[1] 1
|
|
[1] 3 {0}
|
|
State: 3
|
|
[0] 3 {0 1}
|
|
--END--
|
|
EOF
|
|
|
|
cat >expect1 <<EOF
|
|
HOA: v1
|
|
States: 4
|
|
Start: 0
|
|
AP: 2 "a" "b"
|
|
acc-name: co-Buchi
|
|
Acceptance: 1 Fin(0)
|
|
properties: trans-labels explicit-labels trans-acc
|
|
--BODY--
|
|
State: 0
|
|
[1] 1 {0}
|
|
State: 1
|
|
[1] 2
|
|
State: 2
|
|
[0] 1
|
|
[0] 3 {0}
|
|
State: 3
|
|
--END--
|
|
EOF
|
|
|
|
run 0 autfilt --mask-acc=0 input1 -H >output
|
|
diff output expect1
|
|
|
|
cat >expect2 <<EOF
|
|
HOA: v1
|
|
States: 4
|
|
Start: 0
|
|
AP: 2 "a" "b"
|
|
acc-name: co-Buchi
|
|
Acceptance: 1 Fin(0)
|
|
properties: trans-labels explicit-labels trans-acc
|
|
--BODY--
|
|
State: 0
|
|
[0] 1 {0}
|
|
State: 1
|
|
[0] 2
|
|
State: 2
|
|
[1] 1
|
|
[1] 3 {0}
|
|
State: 3
|
|
--END--
|
|
EOF
|
|
|
|
run 0 autfilt --mask-acc=1 input1 -H >output
|
|
diff output expect2
|
|
|
|
cat >expect3 <<EOF
|
|
HOA: v1
|
|
States: 1
|
|
Start: 0
|
|
AP: 2 "a" "b"
|
|
acc-name: all
|
|
Acceptance: 0 t
|
|
properties: trans-labels explicit-labels state-acc deterministic
|
|
--BODY--
|
|
State: 0
|
|
--END--
|
|
EOF
|
|
|
|
run 0 autfilt --mask-acc=0,1,2 input1 -H >output
|
|
diff output expect3
|
|
|
|
run 0 autfilt --mask-acc=0 --mask-acc=1 input1 -H >output
|
|
diff output expect3
|
|
|
|
cat >input4 <<EOF
|
|
HOA: v1
|
|
States: 4
|
|
Start: 0
|
|
AP: 2 "a" "b"
|
|
acc-name: generalized-Buchi 2
|
|
Acceptance: 3 Inf(1)|Fin(0)
|
|
properties: trans-labels explicit-labels trans-acc
|
|
--BODY--
|
|
State: 0
|
|
[0] 1 {1}
|
|
[1] 2 {0}
|
|
State: 1
|
|
[0] 2
|
|
[0] 3 {0}
|
|
State: 2
|
|
[1] 1
|
|
[1] 3 {1}
|
|
State: 3
|
|
[0] 3 {0 1}
|
|
--END--
|
|
EOF
|
|
|
|
cat >expect4 <<EOF
|
|
HOA: v1
|
|
States: 4
|
|
Start: 0
|
|
AP: 2 "a" "b"
|
|
Acceptance: 2 Fin(0)
|
|
properties: trans-labels explicit-labels trans-acc
|
|
--BODY--
|
|
State: 0
|
|
[1] 1 {0}
|
|
State: 1
|
|
[1] 2
|
|
State: 2
|
|
[0] 1
|
|
[0] 3 {0}
|
|
State: 3
|
|
--END--
|
|
EOF
|
|
|
|
run 0 autfilt --mask-acc=1 input4 -H >output
|
|
diff output expect4
|
|
|
|
# Errors
|
|
run 2 autfilt --mask-acc=a3 input1
|
|
run 2 autfilt --mask-acc=3-2 input1
|
|
run 2 autfilt --mask-acc=0,9999,1 input1
|