9ab4b840fd
Fixes #262 again. Reported by Maximilien Colange. * spot/twaalgos/simulation.cc: Use state numbers to order classes, not their signatures. The problem was that even if two simulation of the same automaton assign the same signature, the BDD identifier used for that signature might be different, and therefore the ordering obtained by using BDDs as keys in a map can be different. A side-effect of this change is that the order of states in automata produced by simulation-based reduction may change; many tests had to be updated. * tests/core/ltl2tgba.test: Add a new test case based on Maximilien's report. * tests/core/complement.test, tests/core/det.test, tests/core/parseaut.test, tests/core/prodor.test, tests/core/scc.test, tests/python/atva16-fig2a.ipynb, tests/python/automata.ipynb, tests/python/decompose.ipynb, tests/python/decompose_scc.py, tests/python/highlighting.ipynb, tests/python/piperead.ipynb, tests/python/sccinfo.py, tests/python/simstate.py, tests/python/testingaut.ipynb, tests/python/word.ipynb: Update test case for new order of states.
170 lines
2.9 KiB
Bash
Executable file
170 lines
2.9 KiB
Bash
Executable file
#!/bin/sh
|
|
# -*- coding: utf-8 -*-
|
|
# Copyright (C) 2015, 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
|
|
set -e
|
|
|
|
ltl2tgba=ltl2tgba
|
|
autfilt=autfilt
|
|
|
|
$ltl2tgba -DH 'GFa' > gfa.hoa
|
|
$ltl2tgba -DH 'FGb' > fgb.hoa
|
|
$autfilt --product-or gfa.hoa fgb.hoa -H > por.hoa
|
|
cat por.hoa
|
|
|
|
cat >exp <<EOF
|
|
HOA: v1
|
|
States: 3
|
|
Start: 0
|
|
AP: 2 "a" "b"
|
|
Acceptance: 2 Inf(0) | Inf(1)
|
|
properties: trans-labels explicit-labels trans-acc complete
|
|
properties: stutter-invariant
|
|
--BODY--
|
|
State: 0
|
|
[0] 0 {1}
|
|
[!0] 0
|
|
[0&1] 1 {1}
|
|
[!0&1] 1
|
|
State: 1
|
|
[0&1] 1 {0 1}
|
|
[!0&1] 1 {0}
|
|
[0&!1] 2 {0 1}
|
|
[!0&!1] 2 {0}
|
|
State: 2
|
|
[0] 2 {1}
|
|
[!0] 2
|
|
--END--
|
|
EOF
|
|
diff por.hoa exp
|
|
|
|
test 2 = `$autfilt -c --intersect por.hoa gfa.hoa fgb.hoa`
|
|
|
|
$autfilt --product-and gfa.hoa fgb.hoa -H > pand.hoa
|
|
cat pand.hoa
|
|
|
|
cat >exp <<EOF
|
|
HOA: v1
|
|
States: 2
|
|
Start: 0
|
|
AP: 2 "a" "b"
|
|
acc-name: generalized-Buchi 2
|
|
Acceptance: 2 Inf(0)&Inf(1)
|
|
properties: trans-labels explicit-labels trans-acc stutter-invariant
|
|
--BODY--
|
|
State: 0
|
|
[0] 0 {1}
|
|
[!0] 0
|
|
[0&1] 1 {1}
|
|
[!0&1] 1
|
|
State: 1
|
|
[0&1] 1 {0 1}
|
|
[!0&1] 1 {0}
|
|
--END--
|
|
EOF
|
|
diff pand.hoa exp
|
|
|
|
test 2 = `$autfilt -c --intersect pand.hoa gfa.hoa fgb.hoa`
|
|
|
|
$ltl2tgba -BDH 'GFa' > gfa.hoa
|
|
$ltl2tgba -BDH 'Xb' > xb.hoa
|
|
$autfilt --product-or gfa.hoa xb.hoa -H > por.hoa
|
|
cat por.hoa
|
|
|
|
cat >exp <<EOF
|
|
HOA: v1
|
|
States: 7
|
|
Start: 0
|
|
AP: 2 "a" "b"
|
|
Acceptance: 2 Inf(0) | Inf(1)
|
|
properties: trans-labels explicit-labels state-acc complete
|
|
properties: deterministic
|
|
--BODY--
|
|
State: 0 {1}
|
|
[0] 1
|
|
[!0] 2
|
|
State: 1 {1}
|
|
[0&1] 3
|
|
[!0&1] 4
|
|
[0&!1] 5
|
|
[!0&!1] 6
|
|
State: 2
|
|
[0&1] 3
|
|
[!0&1] 4
|
|
[0&!1] 5
|
|
[!0&!1] 6
|
|
State: 3 {0 1}
|
|
[0] 3
|
|
[!0] 4
|
|
State: 4 {0}
|
|
[0] 3
|
|
[!0] 4
|
|
State: 5 {1}
|
|
[0] 5
|
|
[!0] 6
|
|
State: 6
|
|
[0] 5
|
|
[!0] 6
|
|
--END--
|
|
EOF
|
|
diff por.hoa exp
|
|
|
|
$ltl2tgba -BDH 'GFa' > gfa.hoa
|
|
$ltl2tgba -x '!wdba-minimize' -DH 'Xb' > xb.hoa
|
|
$autfilt --product-or gfa.hoa xb.hoa -H > por.hoa
|
|
cat por.hoa
|
|
|
|
cat >exp <<EOF
|
|
HOA: v1
|
|
States: 7
|
|
Start: 0
|
|
AP: 2 "a" "b"
|
|
Acceptance: 2 Inf(0) | Inf(1)
|
|
properties: trans-labels explicit-labels state-acc complete
|
|
properties: deterministic
|
|
--BODY--
|
|
State: 0 {0 1}
|
|
[0] 1
|
|
[!0] 2
|
|
State: 1 {0 1}
|
|
[0&1] 3
|
|
[!0&1] 4
|
|
[0&!1] 5
|
|
[!0&!1] 6
|
|
State: 2 {0}
|
|
[0&1] 3
|
|
[!0&1] 4
|
|
[0&!1] 5
|
|
[!0&!1] 6
|
|
State: 3 {0 1}
|
|
[0] 3
|
|
[!0] 4
|
|
State: 4 {0}
|
|
[0] 3
|
|
[!0] 4
|
|
State: 5 {1}
|
|
[0] 5
|
|
[!0] 6
|
|
State: 6
|
|
[0] 5
|
|
[!0] 6
|
|
--END--
|
|
EOF
|
|
diff por.hoa exp
|