hoa,dot: propagate state names

* src/hoaparse/hoaparse.yy: Store state names.
* src/tgbaalgos/dotty.cc, src/tgbaalgos/hoa.cc: Output them.
* src/tgbatest/readsave.test: Test this.
* src/tgbatest/hoaparse.test: Update.
This commit is contained in:
Alexandre Duret-Lutz 2015-01-23 18:34:57 +01:00
parent ae50155297
commit 9add895ba7
5 changed files with 50 additions and 23 deletions

View file

@ -270,7 +270,7 @@ acc-name: generalized-Buchi 2
Acceptance: 2 Inf(0)&Inf(1)
properties: trans-labels explicit-labels state-acc complete deterministic
--BODY--
State: 0 {0}
State: 0 "foo" {0}
[!0&!1] 2
[0&!1] 0
[!0&1] 1
@ -280,7 +280,7 @@ State: 1 {1}
[0&!1] 1
[!0&1] 1
[0&1] 1
State: 2 {0}
State: 2 "sink state" {0}
[!0&!1] 2
[0&!1] 2
[!0&1] 2
@ -1191,30 +1191,30 @@ acc-name: Buchi
Acceptance: 1 Inf(0)
properties: trans-labels explicit-labels state-acc complete
--BODY--
State: 0
State: 0 "T0_init"
[5] 5
[t] 4
[0] 3
[0&1&2] 2
[0&1&2&3 | 0&1&2&4] 1
State: 1 {0}
State: 1 "accept_S1" {0}
[t] 4
[0] 3
[0&1&2] 2
[0&1&2&3 | 0&1&2&4] 1
State: 2
State: 2 "T2_S1"
[t] 2
[3 | 4] 1
State: 3
State: 3 "T1_S1"
[t] 3
[1&2] 2
[1&2&3 | 1&2&4] 1
State: 4
State: 4 "T0_S1"
[t] 4
[0] 3
[0&1&2] 2
[0&1&2&3 | 0&1&2&4] 1
State: 5 {0}
State: 5 "accept_all" {0}
[t] 5
--END--
EOF
@ -1260,7 +1260,7 @@ acc-name: generalized-Buchi 3
Acceptance: 3 Inf(0)&Inf(1)&Inf(2)
properties: trans-labels explicit-labels trans-acc complete
--BODY--
State: 0
State: 0 "(x)"
[5] 1 {0 1 2}
[t] 2
[0] 2
@ -1270,9 +1270,9 @@ State: 0
[0&3 | 0&4] 2
[1&2&3 | 1&2&4] 2
[0&1&2&3 | 0&1&2&4] 2
State: 1
State: 1 "t"
[t] 1 {0 1 2}
State: 2
State: 2 "G((F(a) && F((b) && (c))) && F((d) || (e)))"
[t] 2
[0] 2 {0}
[1&2] 2 {1}

View file

@ -286,7 +286,7 @@ EOF
diff output expected
$autfilt --dot=vcsn >output <<EOF
$autfilt -H <<EOF | $autfilt --dot=vcsn >output
HOA: v1
States: 4
Start: 2
@ -296,13 +296,13 @@ acc-name: Buchi
Acceptance: 1 Inf(0)
properties: trans-labels explicit-labels state-acc
--BODY--
State: 0 {0}
State: 0 "s0" {0}
[1] 0
State: 1 {0}
State: 1 "s1" {0}
[0] 1
State: 2
State: 2 "s2"
[1] 0
State: 3
State: 3 "s3"
[0] 1
--END--
EOF
@ -314,19 +314,19 @@ digraph G {
I -> 3
subgraph cluster_0 {
label=""
1 [label="1"]
1 [label="s1"]
}
subgraph cluster_1 {
label=""
0 [label="0"]
0 [label="s0"]
}
subgraph cluster_2 {
label=""
3 [label="3"]
3 [label="s3"]
}
0 -> 0 [label="b\n{0}"]
1 -> 1 [label="a\n{0}"]
2 [label="2"]
2 [label="s2"]
2 -> 0 [label="b"]
3 -> 1 [label="a"]
3 -> 0 [label="b"]