abe2c08b78
Operator &= used to always move Fin to the front, it does not anymore.
The only thing it does now is to merge Inf(x)&Inf(y) as Inf({x,y}).
Operator |= is now symmetrical and merges Fin()s.
Fixes #253.
* spot/twa/acc.cc, spot/twa/acc.hh: Simplify &= and make |= symmetrical.
* spot/twaalgos/cleanacc.cc: Fix conjunction order.
* tests/core/acc.test, tests/core/acc2.test, tests/core/parseaut.test,
tests/core/readsave.test, tests/core/satmin2.test,
tests/core/sccdot.test, tests/python/acc_cond.ipynb,
tests/python/accparse.ipynb, tests/python/automata.ipynb,
tests/python/product.ipynb, tests/python/randaut.ipynb: Adjust test
cases.
115 lines
2.9 KiB
Bash
Executable file
115 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 -H 'GFa & GFb' > in
|
|
grep 'Acceptance:' in > expected
|
|
ltl2tgba -H 'GFa & GFb' --stats='Acceptance: %a %g' > out1
|
|
autfilt -H in --stats='Acceptance: %A %G' > out2
|
|
diff out1 expected
|
|
diff out2 expected
|
|
|
|
cat >header <<EOF
|
|
HOA: v1
|
|
States: 1
|
|
Start: 0
|
|
AP: 2 "a" "b"
|
|
EOF
|
|
|
|
cat >body <<EOF
|
|
--BODY--
|
|
State: 0
|
|
[0&1] 0 {0 1}
|
|
[!0&!1] 0
|
|
[!0&1] 0 {1}
|
|
[0&!1] 0 {0}
|
|
--END--
|
|
EOF
|
|
|
|
#------------- DNF -------------
|
|
|
|
res="(Fin(1) & Fin(2) & Inf(0)) | (Inf(0)&Inf(1)&Inf(3))"
|
|
cat >acceptances<<EOF
|
|
2 Inf(0)&Inf(1), 2 Inf(0)&Inf(1)
|
|
2 Fin(0) & Inf(1), 2 Fin(0) & Inf(1)
|
|
2 t, 2 t
|
|
2 f, 2 f
|
|
3 (Inf(1) | Fin(2)) & Inf(0), 3 (Inf(0)&Inf(1)) | (Fin(2) & Inf(0))
|
|
4 (Inf(1) | Fin(2)) & (Fin(1) | Inf(3)) & Inf(0), 4 $res
|
|
4 $res, 4 $res
|
|
3 (Fin(0)|Fin(1)) & Fin(2), 3 (Fin(0) & Fin(2)) | (Fin(1) & Fin(2))
|
|
EOF
|
|
|
|
while IFS=, read a b
|
|
do
|
|
(cat header; echo 'Acceptance:' $a; cat body) |
|
|
autfilt -H --dnf-acc --stats '%A %G, %a %g'
|
|
done < acceptances > output
|
|
|
|
diff acceptances output
|
|
|
|
#------------- CNF -------------
|
|
|
|
res="Inf(0) & (Inf(1) | Fin(2)) & (Inf(3) | Fin(1))"
|
|
cat >acceptances<<EOF
|
|
2 Inf(0)&Inf(1), 2 Inf(0)&Inf(1)
|
|
2 Fin(0) & Inf(1), 2 Fin(0) & Inf(1)
|
|
2 t, 2 t
|
|
2 f, 2 f
|
|
3 (Inf(1) | Fin(2)) & Inf(0), 3 Inf(0) & (Inf(1) | Fin(2))
|
|
4 (Fin(1) & Fin(2) & Inf(0)) | (Inf(0)&Inf(1)&Inf(3)), 4 $res
|
|
4 $res, 4 $res
|
|
3 (Fin(0) & Fin(2)) | (Fin(1) & Fin(2)), 3 (Fin(0)|Fin(1)) & Fin(2)
|
|
EOF
|
|
|
|
while IFS=, read a b
|
|
do
|
|
(cat header; echo 'Acceptance:' $a; cat body) |
|
|
autfilt -H --cnf-acc --stats '%A %G, %a %g'
|
|
done < acceptances > output
|
|
|
|
diff acceptances output
|
|
|
|
#------------- COMP -------------
|
|
|
|
a="(Inf(1) | Fin(2)) & (Fin(1) | Inf(3)) & Inf(0)"
|
|
b="(Fin(1) & Inf(2)) | (Inf(1) & Fin(3)) | Fin(0)"
|
|
cat >acceptances<<EOF
|
|
2 Inf(0)&Inf(1), 2 Fin(0)|Fin(1)
|
|
2 Fin(0) & Inf(1), 2 Inf(0) | Fin(1)
|
|
2 t, 2 f
|
|
2 f, 2 t
|
|
3 (Inf(1) | Fin(2)) & Inf(0), 3 (Fin(1) & Inf(2)) | Fin(0)
|
|
4 $a, 4 $b
|
|
4 $b, 4 (Inf(1) | Fin(2)) & (Fin(1) | Inf(3)) & Inf(0)
|
|
3 (Fin(0)|Fin(1)) & Fin(2), 3 (Inf(0)&Inf(1)) | Inf(2)
|
|
EOF
|
|
|
|
while IFS=, read a b
|
|
do
|
|
(cat header; echo 'Acceptance:' $a; cat body) |
|
|
autfilt -H --complement-acc --stats '%A %G, %a %g'
|
|
done < acceptances > output
|
|
|
|
diff acceptances output
|