0c4b701630
This fixes issue #418. * spot/twa/acc.cc, spot/twa/acc.hh (acc_cond::acc_code::useless_colors_patterns): New method to detect patterns of colors allowing other colors to be added or removed at will. * spot/twaalgos/cleanacc.cc (simplify_acceptance_here): Use the above patterns to remove some useless colors from transitions and hope that this can help simplify the acceptance condition. * spot/twaalgos/degen.cc (propagate_marks_vector): Use the pattern to add more colors. * tests/core/ltl2tgba2.test: Add the test case from issue #418. * tests/core/ltl2dstar4.test, tests/core/satmin3.test, tests/core/sccdot.test, tests/core/sim3.test, tests/python/automata.ipynb, tests/python/decompose.ipynb, tests/python/merge.py, tests/python/pdegen.py, tests/python/remfin.py, tests/python/toparity.py, tests/python/tra2tba.py: Adjust all test cases. * NEWS: Mention this new feature.
97 lines
2.7 KiB
Bash
Executable file
97 lines
2.7 KiB
Bash
Executable file
#!/bin/sh
|
|
# -*- coding: utf-8 -*-
|
|
# Copyright (C) 2017, 2019, 2020 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
|
|
|
|
|
|
# Make sure the SPOT_SATSOLVER envar works.
|
|
|
|
# DRA for GFp0 -> GFp1 produced using the SAT-based synthesis (i.e.,
|
|
# "minimization with fixed number of states"). We used to take the
|
|
# output of ltl2dstar, unfortunately our preprocessing reduced that to
|
|
# one state right away, even after some manual touches.
|
|
|
|
cat >test.hoa <<EOF
|
|
HOA: v1
|
|
States: 4
|
|
Start: 0
|
|
AP: 2 "p0" "p1"
|
|
acc-name: Rabin 2
|
|
Acceptance: 4 (Fin(0) & Inf(1)) | (Fin(2) & Inf(3))
|
|
properties: trans-labels explicit-labels state-acc complete
|
|
properties: deterministic
|
|
--BODY--
|
|
State: 0 {1 2}
|
|
[!0&!1] 1
|
|
[!0&1] 2
|
|
[0] 3
|
|
State: 1 {0}
|
|
[0&!1] 1
|
|
[!0&!1] 2
|
|
[1] 3
|
|
State: 2 {1}
|
|
[0&!1] 1
|
|
[!0&!1] 2
|
|
[1] 3
|
|
State: 3 {0 3}
|
|
[0 | 1] 2
|
|
[!0&!1] 3
|
|
--END--
|
|
EOF
|
|
|
|
# Try fake SAT-solvers
|
|
SPOT_SATSOLVER=false \
|
|
autfilt --sat-minimize test.hoa --stats=%s 2>err && exit 1
|
|
grep 'autfilt: SPOT_SATSOLVER should use %I' err
|
|
|
|
SPOT_SATSOLVER='false %I' \
|
|
autfilt --sat-minimize test.hoa --stats=%s 2>err && exit 1
|
|
grep 'autfilt: SPOT_SATSOLVER should use %O' err
|
|
|
|
SPOT_SATSOLVER='false %I %O' \
|
|
autfilt --sat-minimize test.hoa --stats=%s >output
|
|
test `cat output` = 3
|
|
|
|
SPOT_SATSOLVER='this-does-not-exist %I %O' \
|
|
autfilt --sat-minimize test.hoa --stats=%s 2>err && exit
|
|
grep 'this-does-not-exist.*failed' err
|
|
|
|
# Now use some real one if we can find one.
|
|
|
|
if (picosat -h >/dev/null) 2>/dev/null; then
|
|
SPOT_SATSOLVER='picosat %I >%O'
|
|
elif (glucose --help >/dev/null) 2>/dev/null; then
|
|
SPOT_SATSOLVER='glucose -model -verb=0 %I >%O'
|
|
else
|
|
exit 77
|
|
fi
|
|
|
|
export SPOT_SATSOLVER
|
|
|
|
# Let's try to find a smaller transition-based Streett automaton We
|
|
# easily really check the expected automaton, because different SAT
|
|
# solver (even different versions of glucose) can return different
|
|
# automata.
|
|
autfilt --sat-minimize='acc="Fin(0)|Inf(1)"' test.hoa --stats=%s >output
|
|
test `cat output` = 1
|
|
|
|
autfilt -S --sat-minimize='acc="Fin(0)|Inf(1)"' test.hoa --stats=%s >output
|
|
test `cat output` = 3
|