simplify_acceptance: Use color inclusions to simplify a condition

This fixes #406.

* spot/twaalgos/cleanacc.cc: Add the simplification.
* tests/core/remfin.test, tests/python/automata.ipynb,
tests/python/remfin.py: Update tests.
* tests/python/simplacc.py: Update and add tests.
This commit is contained in:
Florian Renkin 2020-07-25 19:15:17 +02:00
parent 05e6e08859
commit 5ec9d55fea
5 changed files with 395 additions and 273 deletions

View file

@ -311,48 +311,46 @@ State: 2 {0}
[!1] 2
--END--
HOA: v1
States: 4
States: 3
Start: 0
AP: 2 "a" "b"
Acceptance: 4 Inf(0) | Inf(3) | (Inf(1)&Inf(2))
acc-name: Buchi
Acceptance: 1 Inf(0)
properties: trans-labels explicit-labels trans-acc
--BODY--
State: 0
[t] 0 {1 3}
[0] 1 {1 3}
[!0] 2 {1 3}
[t] 0 {0}
[0] 1 {0}
[!0] 2 {0}
State: 1
[1] 0 {1}
[0&1] 1 {1}
[!0&1] 2 {1 2}
[1] 0
[0&1] 1
[!0&1] 2 {0}
State: 2
[!1] 0
[0&!1] 1
[!0&!1] 2
[!0&!1] 3
State: 3
[!0&!1] 3 {0}
[!0&!1] 2 {0}
--END--
HOA: v1
States: 3
Start: 0
AP: 2 "a" "b"
acc-name: generalized-Buchi 2
Acceptance: 2 Inf(0)&Inf(1)
acc-name: Buchi
Acceptance: 1 Inf(0)
properties: trans-labels explicit-labels trans-acc
--BODY--
State: 0
[t] 0 {1}
[0] 1 {1}
[!0] 2 {0 1}
[t] 0
[0] 1
[!0] 2 {0}
State: 1
[1] 0 {1}
[0&1] 1 {0 1}
[!0&1] 2 {0 1}
[1] 0
[0&1] 1 {0}
[!0&1] 2 {0}
State: 2
[!1] 0
[0&!1] 1 {0 1}
[!0&!1] 2 {0 1}
[0&!1] 1 {0}
[!0&!1] 2 {0}
--END--
HOA: v1
States: 1
@ -842,25 +840,23 @@ HOA: v1
States: 4
Start: 0
AP: 2 "b" "c"
acc-name: generalized-Buchi 2
Acceptance: 2 Inf(0)&Inf(1)
acc-name: Buchi
Acceptance: 1 Inf(0)
properties: trans-labels explicit-labels trans-acc
--BODY--
State: 0
[!0] 0
[!0] 1
[0] 0
[0] 1
[0&!1] 2
[0&1] 3
[t] 0
[0&!1] 1
[0&1] 2
[!0] 3
State: 1
[!0] 1 {0 1}
[!0 | !1] 1 {0}
[0&1] 2
State: 2
[!0 | !1] 2 {0 1}
[0&1] 3 {0}
[!1] 1 {0}
[1] 2
State: 3
[!1] 2 {0 1}
[1] 3 {0}
[!0] 3 {0}
--END--
HOA: v1
States: 6
@ -912,7 +908,7 @@ State: 2 {0}
[!1] 2
--END--
HOA: v1
States: 4
States: 3
Start: 0
AP: 2 "a" "b"
acc-name: Buchi
@ -930,10 +926,7 @@ State: 1
State: 2
[!1] 0
[0&!1] 1
[!0&!1] 2
[!0&!1] 3
State: 3
[!0&!1] 3 {0}
[!0&!1] 2 {0}
--END--
HOA: v1
States: 3