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

twa_graph: add a merge_univ_dests() method

Browse source 
and call it after parsing

* spot/twa/twagraph.cc, spot/twa/twagraph.hh
(twa_graph::merge_univ_dests): New method.
* spot/parseaut/parseaut.yy: Call it.
* spot/twaalgos/dot.cc: Improve output, now that
several edges can use the same universal destination.
* tests/core/alternating.test, tests/core/complete.test,
tests/core/parseaut.test, tests/python/_altscc.ipynb,
tests/python/alternating.py, tests/python/alternation.ipynb: Adjust
test case.
* doc/org/tut24.org: Adjust example.
This commit is contained in:
Alexandre Duret-Lutz 2016-12-27 12:35:16 +01:00
parent 3d0a971aa8
commit 12f6c8cf10
11 changed files with 567 additions and 517 deletions
Download patch file Download diff file Expand all files Collapse all files

38
tests/core/parseaut.test
View file

@ -1946,7 +1946,7 @@ State: 5 "F!((c2))" {0}
[t] 5
State: 6 "GF!((c1))"
[!1] 6
[t] 7&6
[t] 6&7
State: 7 "F!((c1))" {0}
[!1] 11
[t] 7
@ -1954,9 +1954,9 @@ State: 8 "((!((c1)) U (!((c1)) && !((p1)))) R F!((p2)))"
[!0&!1&!2] 11
[!1&!2] 10
[!0&!1] 9
[!1] 10&9
[!1] 9&10
[!0] 8
[t] 10&8
[t] 8&10
State: 9 "(!((c1)) U (!((c1)) && !((p1))))" {0}
[!1&!2] 11
[!1] 9
@ -2407,8 +2407,8 @@ properties: univ-branch trans-labels explicit-labels state-acc
properties: very-weak
--BODY--
State: 0 "((((a) U (b)) && GF(b)) && FG(a))"
[0] 3&1
[!0&1] 5&3&1
[0] 1&3
[!0&1] 1&3&5
State: 1 "FG(a)" {0}
[1] 2
[t] 1
@ -2416,7 +2416,7 @@ State: 2 "G(a)"
[1] 2
State: 3 "GF(b)"
[0] 3
[!0] 4&3
[!0] 3&4
State: 4 "F(b)" {0}
[0] 6
[!0] 4
@ -2438,18 +2438,18 @@ properties: deterministic
State: 0
[!0&!1] 0&1
[0&!1] 1
[!0&1] 0&2&1
[!0&1] 0&1&2
[0&1] 0&1
State: 1
[!0&!1] 0&1
[0&!1] 2&1
[0&!1] 1&2
[!0&1] 2
[0&1] 1&1
[0&1] 1
State: 2
[!0&!1] 0&1
[0&!1] 2&1
[0&!1] 1&2
[!0&1] 2
[0&1] 0&2&1
[0&1] 0&1&2
--END--
EOF
@ -2613,8 +2613,8 @@ properties: univ-branch trans-labels explicit-labels state-acc
properties: very-weak
--BODY--
State: 0 "((((a) U (b)) && GF(b)) && FG(a))"
[0] 3&1
[!0&1] 5&3&1
[0] 1&3
[!0&1] 1&3&5
State: 1 "FG(a)" {0}
[1] 2
[t] 1
@ -2622,7 +2622,7 @@ State: 2 "G(a)"
[1] 2
State: 3 "GF(b)"
[0] 3
[!0] 4&3
[!0] 3&4
State: 4 "F(b)" {0}
[0] 6
[!0] 4
@ -2644,18 +2644,18 @@ properties: deterministic
State: 0
[!0&!1] 0&1
[0&!1] 1
[!0&1] 0&2&1
[!0&1] 0&1&2
[0&1] 0&1
State: 1
[!0&!1] 0&1
[0&!1] 2&1
[0&!1] 1&2
[!0&1] 2
[0&1] 1&1
[0&1] 1
State: 2
[!0&!1] 0&1
[0&!1] 2&1
[0&!1] 1&2
[!0&1] 2
[0&1] 0&2&1
[0&1] 0&1&2
--END--
EOF