alarsyo/spot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

improve acceptance simplifications using useless colors

Browse source 
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.
This commit is contained in:
Alexandre Duret-Lutz 2020-07-28 22:09:33 +02:00
parent c341a3cabf
commit 0c4b701630
17 changed files with 412 additions and 287 deletions
Download patch file Download diff file Expand all files Collapse all files

29
tests/core/sim3.test
View file

@ -1,6 +1,6 @@
#! /bin/sh
# -*- coding: utf-8 -*-
# Copyright (C) 2015, 2018, 2019 Laboratoire de Recherche et Développement
# Copyright (C) 2015, 2018, 2019, 2020 Laboratoire de Recherche et Développement
# de l'Epita (LRDE).
#
# This file is part of Spot, a model checking library.
@ -52,7 +52,7 @@ test "`autfilt --small input --stats=%S,%s`" = 7,1
autfilt -S --high --small input -H > out
cat >expected <<EOF
HOA: v1
States: 5
States: 4
Start: 0
AP: 2 "b" "a"
acc-name: Streett 1
@ -61,28 +61,19 @@ properties: trans-labels explicit-labels state-acc complete
properties: deterministic
--BODY--
State: 0
[!1] 1
[1] 3
[t] 1
State: 1 {1}
[0&!1] 1
[0] 1
[!0&!1] 2
[0&1] 3
[!0&1] 4
[!0&1] 3
State: 2
[0&!1] 1
[0] 1
[!0&!1] 2
[0&1] 3
[!0&1] 4
State: 3 {0 1}
[0&!1] 1
[!0&1] 3
State: 3 {0}
[0] 1
[!0&!1] 2
[0&1] 3
[!0&1] 4
State: 4 {0}
[0&!1] 1
[!0&!1] 2
[0&1] 3
[!0&1] 4
[!0&1] 3
--END--
EOF
diff out expected