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

decompose: merge decompose_strength() and decompose_scc()

Browse source 
These two functions were doing almost identical work, the only
difference was the way to select the SCC to keep.  Now we have a more
uniform way to do that.  Closes #172.

* bin/autfilt.cc: Offer a unique --decompose-scc option, but keep
--decompose-strength as an alias for backward compatibility.
* spot/twaalgos/strength.cc, spot/twaalgos/strength.hh: Rename
decompose_strength as decompose_scc, and handle a way to list
all SCC numers in the string specifier.  This gets rid
of the nearly identical
* tests/core/scc.test, tests/core/strength.test,
tests/python/decompose.ipynb, tests/python/decompose_scc.py: Adjust
test cases.
* NEWS: Adjust.
This commit is contained in:
Alexandre Duret-Lutz 2017-06-30 23:05:43 +02:00
parent fba3c78206
commit 09e47d648a
8 changed files with 453 additions and 294 deletions
Download patch file Download diff file Expand all files Collapse all files

16
tests/python/decompose_scc.py
View file

@ -29,7 +29,7 @@ AP: 3 "b" "a" "c"
acc-name: Buchi
Acceptance: 1 Inf(0)
properties: trans-labels explicit-labels state-acc !complete
properties: deterministic
properties: deterministic terminal
--BODY--
State: 0
[!1&!2] 0
@ -44,19 +44,19 @@ State: 2
try:
spot.decompose_scc(si, 4)
except ValueError:
except RuntimeError:
pass
else:
raise AssertionError
assert (spot.decompose_acc_scc(aut, 0).to_str('hoa', '1.1') == """HOA: v1.1
assert (spot.decompose_scc(si, 0, True).to_str('hoa', '1.1') == """HOA: v1.1
States: 4
Start: 0
AP: 3 "b" "a" "c"
acc-name: Buchi
Acceptance: 1 Inf(0)
properties: trans-labels explicit-labels state-acc complete
properties: deterministic
properties: deterministic terminal
--BODY--
State: 0
[!1&!2] 0
@ -74,14 +74,14 @@ State: 3
[1] 3
--END--""")
assert (spot.decompose_acc_scc(aut, 2).to_str('hoa', '1.1') == """HOA: v1.1
assert (spot.decompose_scc(si, 2, True).to_str('hoa', '1.1') == """HOA: v1.1
States: 2
Start: 0
AP: 3 "b" "a" "c"
acc-name: Buchi
Acceptance: 1 Inf(0)
properties: trans-labels explicit-labels trans-acc !complete
properties: deterministic
properties: deterministic !weak
--BODY--
State: 0
[!1&!2] 0 {0}
@ -92,8 +92,8 @@ State: 1
--END--""")
try:
spot.decompose_acc_scc(aut, 3)
except ValueError:
spot.decompose_scc(si, 3, True)
except RuntimeError:
pass
else:
raise AssertionError