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.
105 lines
2.1 KiB
Bash
Executable file
105 lines
2.1 KiB
Bash
Executable file
#!/bin/sh
|
|
# -*- coding: utf-8 -*-
|
|
# Copyright (C) 2009, 2015, 2017 Laboratoire de Recherche et Developpement de
|
|
# l'Epita
|
|
#
|
|
# 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 >formulas<<EOF
|
|
((a U c) U b) & (b U c),15,6,5
|
|
b U a,3,2,2
|
|
0,0,1,1
|
|
(Gb | F!a) W GFc,22,6,5
|
|
(!a & G(Ga | F(!a & b))) | (a & F(F!a & G(a | !b))),16,7,6
|
|
EOF
|
|
|
|
run 0 ltl2tgba --low --any --stats='%f,%e,%s,%c' -F formulas/1 >out
|
|
cat out
|
|
diff out formulas
|
|
|
|
ltl2tgba 'a W b' > aut
|
|
|
|
cat >ref<<EOF
|
|
HOA: v1
|
|
States: 2
|
|
Start: 0
|
|
AP: 2 "a" "b"
|
|
acc-name: Buchi
|
|
Acceptance: 1 Inf(0)
|
|
properties: trans-labels explicit-labels state-acc deterministic
|
|
--BODY--
|
|
State: 0
|
|
[1] 1
|
|
[0&!1] 0
|
|
State: 1 {0}
|
|
[t] 1
|
|
--END--
|
|
EOF
|
|
|
|
run 0 autfilt --decompose-scc=0 -F aut> out
|
|
cat out
|
|
diff out ref
|
|
|
|
cat >ref<<EOF
|
|
HOA: v1
|
|
States: 1
|
|
Start: 0
|
|
AP: 2 "a" "b"
|
|
acc-name: Buchi
|
|
Acceptance: 1 Inf(0)
|
|
properties: trans-labels explicit-labels state-acc colored
|
|
properties: deterministic
|
|
--BODY--
|
|
State: 0 {0}
|
|
[0&!1] 0
|
|
--END--
|
|
EOF
|
|
|
|
run 0 autfilt --decompose-scc=1 -F aut> out
|
|
cat out
|
|
diff out ref
|
|
|
|
autfilt --decompose-scc=2 -F aut 2>stderr && exit 1
|
|
[ $? -eq 2 ]
|
|
grep "out of bounds" stderr
|
|
|
|
# always satisfied acceptance
|
|
ltl2tgba 'Ga R b | Gc R b' > aut
|
|
|
|
cat >ref<<EOF
|
|
HOA: v1
|
|
States: 2
|
|
Start: 0
|
|
AP: 3 "b" "a" "c"
|
|
acc-name: Buchi
|
|
Acceptance: 1 Inf(0)
|
|
properties: trans-labels explicit-labels state-acc
|
|
--BODY--
|
|
State: 0
|
|
[0] 0
|
|
[0&2] 1
|
|
State: 1 {0}
|
|
[2] 1
|
|
--END--
|
|
EOF
|
|
|
|
run 0 autfilt --decompose-scc=1 -F aut> out
|
|
cat out
|
|
diff out ref
|