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

69
tests/python/merge.py
View file

@ -36,28 +36,28 @@ State: 1
State: 2
[1] 0 {2 3}
--END--""")
spot.simplify_acceptance_here(aut)
hoa = aut.to_str('hoa')
out = spot.simplify_acceptance(aut)
hoa = out.to_str('hoa')
assert hoa == """HOA: v1
States: 3
Start: 0
AP: 2 "a" "b"
acc-name: parity min even 2
Acceptance: 2 Inf(0) | Fin(1)
acc-name: Buchi
Acceptance: 1 Inf(0)
properties: trans-labels explicit-labels trans-acc
--BODY--
State: 0
[0] 1 {0}
State: 1
[0] 1 {1}
[1] 2 {0 1}
[0] 1
[1] 2 {0}
State: 2
[1] 0 {1}
[1] 0
--END--"""
assert spot.are_equivalent(out, aut)
aut = spot.automaton("""
HOA: v1
aut = spot.automaton("""HOA: v1
States: 3
Start: 0
AP: 2 "a" "b"
@ -79,17 +79,17 @@ assert hoa == """HOA: v1
States: 3
Start: 0
AP: 2 "a" "b"
acc-name: parity min even 2
Acceptance: 2 Inf(0) | Fin(1)
acc-name: Buchi
Acceptance: 1 Inf(0)
properties: trans-labels explicit-labels trans-acc
--BODY--
State: 0
[0] 1 {0}
State: 1
[0] 1 {1}
[1] 2 {0 1}
[0] 1
[1] 2 {0}
State: 2
[1] 0 {1}
[1] 0
--END--"""
aut = spot.automaton("""
@ -128,8 +128,7 @@ State: 2
[1] 0
--END--"""
aut = spot.automaton("""
HOA: v1
aut = spot.automaton("""HOA: v1
States: 3
Start: 0
AP: 2 "a" "b"
@ -158,10 +157,10 @@ properties: trans-labels explicit-labels trans-acc
State: 0
[0] 1
State: 1
[0] 1 {0 1}
[0] 1 {0}
[1] 2 {1}
State: 2
[1] 0 {0 1}
[1] 0 {0}
--END--"""
aut = spot.automaton("""
@ -355,7 +354,7 @@ State: 1
[0&!1] 0
[!0&1] 3
[0&1] 2
State: 2 {0 1}
State: 2 {1}
[!0&!1] 1
[0&!1] 0
[!0&1] 3
@ -386,27 +385,29 @@ State: 2
[0] 2 {0 1 2}
[!0] 1 {0}
--END--""")
spot.simplify_acceptance_here(aut)
hoa = aut.to_str('hoa')
out = spot.simplify_acceptance(aut)
hoa = out.to_str('hoa')
assert hoa == """HOA: v1
States: 3
Start: 0
AP: 2 "p0" "p1"
Acceptance: 3 (Fin(0) | Inf(1)) & Fin(2)
acc-name: co-Buchi
Acceptance: 1 Fin(0)
properties: trans-labels explicit-labels trans-acc complete
properties: deterministic
--BODY--
State: 0
[0] 1
[!0] 0 {2}
[!0] 0 {0}
State: 1
[0] 1 {1 2}
[0] 1 {0}
[!0] 2
State: 2
[0] 2 {0 1 2}
[0] 2 {0}
[!0] 1 {0}
--END--"""
assert spot.are_equivalent(out, aut)
aut = spot.automaton("""HOA: v1
States: 4
@ -448,14 +449,14 @@ State: 0
[!0&!1] 0 {0}
[0] 3
State: 1
[0] 0 {1 2 3}
[0] 0 {1 3}
[!0] 3 {0 2}
State: 2
[t] 1 {1 2}
State: 3
[0&1] 0 {1}
[0&!1] 3 {1 2}
[!0] 1 {2 3}
[!0] 1 {3}
--END--"""
aut = spot.automaton("""HOA: v1
@ -668,24 +669,26 @@ State: 2 {1 2 3}
[t] 1
--END--
""")
spot.simplify_acceptance_here(aut)
hoa = aut.to_str('hoa')
out = spot.simplify_acceptance(aut)
hoa = out.to_str('hoa')
assert hoa == """HOA: v1
States: 3
Start: 0
AP: 2 "p0" "p1"
Acceptance: 3 (Fin(0) | Inf(1)) & (Fin(1) | Inf(2))
acc-name: generalized-Buchi 2
Acceptance: 2 Inf(0)&Inf(1)
properties: trans-labels explicit-labels state-acc complete
properties: deterministic
--BODY--
State: 0 {0 1}
State: 0 {0}
[t] 2
State: 1 {0 2}
State: 1 {1}
[t] 2
State: 2 {1 2}
State: 2 {0 1}
[t] 1
--END--"""
assert spot.are_equivalent(out, aut)
aut = spot.automaton("""HOA: v1
States: 2