hoa: add option to output version 1.1
* spot/twaalgos/hoa.cc: Implement the option. * bin/common_aoutput.cc, doc/org/hoa.org, doc/org/oaut.org, spot/twaalgos/hoa.hh, NEWS: Document it. * tests/core/strength.test: Test that.
This commit is contained in:
Alexandre Duret-Lutz
parent
fd33eedf4b
commit
7144efabb9
7 changed files with 484 additions and 5 deletions
|
|
@ -588,4 +588,371 @@ State: 4
|
|||
EOF
|
||||
|
||||
diff out expected
|
||||
autfilt -q expected
|
||||
|
||||
# Test HOA v1.1
|
||||
autfilt expected -H1.1 --check > out2
|
||||
|
||||
cat >expected2 <<EOF
|
||||
HOA: v1.1
|
||||
States: 2
|
||||
Start: 0
|
||||
AP: 2 "a" "b"
|
||||
acc-name: Buchi
|
||||
Acceptance: 1 Inf(0)
|
||||
properties: trans-labels explicit-labels state-acc !complete
|
||||
properties: deterministic stutter-invariant terminal
|
||||
--BODY--
|
||||
State: 0
|
||||
[1] 1
|
||||
[0&!1] 0
|
||||
State: 1 {0}
|
||||
[t] 1
|
||||
--END--
|
||||
HOA: v1.1
|
||||
States: 2
|
||||
Start: 0
|
||||
AP: 1 "a"
|
||||
acc-name: Buchi
|
||||
Acceptance: 1 Inf(0)
|
||||
properties: trans-labels explicit-labels state-acc colored complete
|
||||
properties: deterministic stutter-invariant terminal
|
||||
--BODY--
|
||||
State: 0 {0}
|
||||
[0] 1
|
||||
[!0] 0
|
||||
State: 1 {0}
|
||||
[t] 0
|
||||
--END--
|
||||
HOA: v1.1
|
||||
States: 2
|
||||
Start: 0
|
||||
AP: 1 "a"
|
||||
acc-name: Buchi
|
||||
Acceptance: 1 Inf(0)
|
||||
properties: trans-labels explicit-labels state-acc colored complete
|
||||
properties: deterministic stutter-invariant terminal
|
||||
--BODY--
|
||||
State: 0 {0}
|
||||
[0] 1
|
||||
[!0] 0
|
||||
State: 1 {0}
|
||||
[t] 0
|
||||
--END--
|
||||
HOA: v1.1
|
||||
States: 2
|
||||
Start: 0
|
||||
AP: 0
|
||||
acc-name: Buchi
|
||||
Acceptance: 1 Inf(0)
|
||||
properties: trans-labels explicit-labels state-acc colored complete
|
||||
properties: deterministic stutter-invariant terminal
|
||||
--BODY--
|
||||
State: 0 {0}
|
||||
[t] 1
|
||||
State: 1 {0}
|
||||
[t] 0
|
||||
--END--
|
||||
HOA: v1.1
|
||||
States: 4
|
||||
Start: 0
|
||||
AP: 2 "a" "c"
|
||||
acc-name: Buchi
|
||||
Acceptance: 1 Inf(0)
|
||||
properties: trans-labels explicit-labels state-acc complete
|
||||
properties: deterministic stutter-invariant terminal
|
||||
--BODY--
|
||||
State: 0
|
||||
[!0&!1] 0
|
||||
[0&!1] 1
|
||||
[1] 2
|
||||
State: 1
|
||||
[!0&!1] 0
|
||||
[0&!1] 1
|
||||
[!0&1] 2
|
||||
[0&1] 3
|
||||
State: 2 {0}
|
||||
[t] 2
|
||||
State: 3
|
||||
[!0] 2
|
||||
[0] 3
|
||||
--END--
|
||||
HOA: v1.1
|
||||
States: 1
|
||||
Start: 0
|
||||
AP: 1 "a"
|
||||
acc-name: Buchi
|
||||
Acceptance: 1 Inf(0)
|
||||
properties: trans-labels explicit-labels state-acc colored !complete
|
||||
properties: deterministic stutter-invariant weak !terminal
|
||||
--BODY--
|
||||
State: 0 {0}
|
||||
[!0] 0
|
||||
--END--
|
||||
HOA: v1.1
|
||||
States: 3
|
||||
Start: 0
|
||||
AP: 3 "b" "a" "c"
|
||||
acc-name: Buchi
|
||||
Acceptance: 1 Inf(0)
|
||||
properties: trans-labels explicit-labels state-acc !complete
|
||||
properties: !deterministic !unambiguous weak !terminal
|
||||
--BODY--
|
||||
State: 0
|
||||
[0&1&!2] 1
|
||||
[!1&!2] 0
|
||||
[1&!2] 2
|
||||
State: 1 {0}
|
||||
[0] 1
|
||||
State: 2
|
||||
[!1&!2] 0
|
||||
[1&!2] 2
|
||||
--END--
|
||||
HOA: v1.1
|
||||
States: 2
|
||||
Start: 0
|
||||
AP: 2 "a" "c"
|
||||
acc-name: Buchi
|
||||
Acceptance: 1 Inf(0)
|
||||
properties: trans-labels explicit-labels trans-acc !complete
|
||||
properties: deterministic stutter-invariant !inherently-weak
|
||||
--BODY--
|
||||
State: 0
|
||||
[!0&!1] 0 {0}
|
||||
[0&!1] 1
|
||||
State: 1
|
||||
[!0&!1] 0 {0}
|
||||
[0&!1] 1
|
||||
--END--
|
||||
HOA: v1.1
|
||||
States: 2
|
||||
Start: 0
|
||||
AP: 2 "a" "b"
|
||||
acc-name: Buchi
|
||||
Acceptance: 1 Inf(0)
|
||||
properties: trans-labels explicit-labels state-acc !complete
|
||||
properties: deterministic stutter-invariant terminal
|
||||
--BODY--
|
||||
State: 0
|
||||
[1] 1
|
||||
[0&!1] 0
|
||||
State: 1 {0}
|
||||
[t] 1
|
||||
--END--
|
||||
HOA: v1.1
|
||||
States: 2
|
||||
Start: 0
|
||||
AP: 1 "a"
|
||||
acc-name: Buchi
|
||||
Acceptance: 1 Inf(0)
|
||||
properties: trans-labels explicit-labels state-acc colored complete
|
||||
properties: deterministic stutter-invariant terminal
|
||||
--BODY--
|
||||
State: 0 {0}
|
||||
[0] 1
|
||||
[!0] 0
|
||||
State: 1 {0}
|
||||
[t] 0
|
||||
--END--
|
||||
HOA: v1.1
|
||||
States: 2
|
||||
Start: 0
|
||||
AP: 1 "a"
|
||||
acc-name: Buchi
|
||||
Acceptance: 1 Inf(0)
|
||||
properties: trans-labels explicit-labels state-acc colored complete
|
||||
properties: deterministic stutter-invariant terminal
|
||||
--BODY--
|
||||
State: 0 {0}
|
||||
[0] 1
|
||||
[!0] 0
|
||||
State: 1 {0}
|
||||
[t] 0
|
||||
--END--
|
||||
HOA: v1.1
|
||||
States: 2
|
||||
Start: 0
|
||||
AP: 0
|
||||
acc-name: Buchi
|
||||
Acceptance: 1 Inf(0)
|
||||
properties: trans-labels explicit-labels state-acc colored complete
|
||||
properties: deterministic stutter-invariant terminal
|
||||
--BODY--
|
||||
State: 0 {0}
|
||||
[t] 1
|
||||
State: 1 {0}
|
||||
[t] 0
|
||||
--END--
|
||||
HOA: v1.1
|
||||
States: 1
|
||||
Start: 0
|
||||
AP: 1 "a"
|
||||
acc-name: Buchi
|
||||
Acceptance: 1 Inf(0)
|
||||
properties: trans-labels explicit-labels state-acc colored !complete
|
||||
properties: deterministic stutter-invariant weak !terminal
|
||||
--BODY--
|
||||
State: 0 {0}
|
||||
[!0] 0
|
||||
--END--
|
||||
HOA: v1.1
|
||||
States: 5
|
||||
Start: 0
|
||||
AP: 3 "b" "a" "c"
|
||||
acc-name: Buchi
|
||||
Acceptance: 1 Inf(0)
|
||||
properties: trans-labels explicit-labels state-acc !complete
|
||||
properties: !deterministic !unambiguous weak !terminal
|
||||
--BODY--
|
||||
State: 0
|
||||
[0&1&!2] 1
|
||||
[!1&!2] 0
|
||||
[1&!2] 2
|
||||
[2] 3
|
||||
State: 1 {0}
|
||||
[0] 1
|
||||
State: 2
|
||||
[!1&!2] 0
|
||||
[1&!2] 2
|
||||
[!1&2] 3
|
||||
[1&2] 4
|
||||
State: 3 {0}
|
||||
[t] 3
|
||||
State: 4
|
||||
[!1] 3
|
||||
[1] 4
|
||||
--END--
|
||||
HOA: v1.1
|
||||
States: 1
|
||||
Start: 0
|
||||
AP: 1 "a"
|
||||
acc-name: Buchi
|
||||
Acceptance: 1 Inf(0)
|
||||
properties: trans-labels explicit-labels state-acc colored !complete
|
||||
properties: deterministic stutter-invariant weak !terminal
|
||||
--BODY--
|
||||
State: 0 {0}
|
||||
[!0] 0
|
||||
--END--
|
||||
HOA: v1.1
|
||||
States: 3
|
||||
Start: 0
|
||||
AP: 3 "b" "a" "c"
|
||||
acc-name: Buchi
|
||||
Acceptance: 1 Inf(0)
|
||||
properties: trans-labels explicit-labels trans-acc !complete
|
||||
properties: !deterministic !unambiguous !inherently-weak
|
||||
--BODY--
|
||||
State: 0
|
||||
[0&1&!2] 1
|
||||
[!1&!2] 0 {0}
|
||||
[1&!2] 2
|
||||
State: 1
|
||||
[0] 1 {0}
|
||||
State: 2
|
||||
[!1&!2] 0 {0}
|
||||
[1&!2] 2
|
||||
--END--
|
||||
HOA: v1.1
|
||||
States: 2
|
||||
Start: 0
|
||||
AP: 2 "a" "b"
|
||||
acc-name: Buchi
|
||||
Acceptance: 1 Inf(0)
|
||||
properties: trans-labels explicit-labels state-acc !complete
|
||||
properties: deterministic stutter-invariant terminal
|
||||
--BODY--
|
||||
State: 0
|
||||
[1] 1
|
||||
[0&!1] 0
|
||||
State: 1 {0}
|
||||
[t] 1
|
||||
--END--
|
||||
HOA: v1.1
|
||||
States: 2
|
||||
Start: 0
|
||||
AP: 1 "a"
|
||||
acc-name: Buchi
|
||||
Acceptance: 1 Inf(0)
|
||||
properties: trans-labels explicit-labels state-acc colored complete
|
||||
properties: deterministic stutter-invariant terminal
|
||||
--BODY--
|
||||
State: 0 {0}
|
||||
[0] 1
|
||||
[!0] 0
|
||||
State: 1 {0}
|
||||
[t] 0
|
||||
--END--
|
||||
HOA: v1.1
|
||||
States: 2
|
||||
Start: 0
|
||||
AP: 1 "a"
|
||||
Acceptance: 2 Inf(0) | Inf(1)
|
||||
properties: trans-labels explicit-labels trans-acc colored complete
|
||||
properties: deterministic stutter-invariant inherently-weak !weak
|
||||
--BODY--
|
||||
State: 0
|
||||
[0] 1 {1}
|
||||
[!0] 0 {0}
|
||||
State: 1
|
||||
[t] 0 {0}
|
||||
--END--
|
||||
HOA: v1.1
|
||||
States: 2
|
||||
Start: 0
|
||||
AP: 0
|
||||
acc-name: Buchi
|
||||
Acceptance: 1 Inf(0)
|
||||
properties: trans-labels explicit-labels state-acc colored complete
|
||||
properties: deterministic stutter-invariant terminal
|
||||
--BODY--
|
||||
State: 0 {0}
|
||||
[t] 1
|
||||
State: 1 {0}
|
||||
[t] 0
|
||||
--END--
|
||||
HOA: v1.1
|
||||
States: 1
|
||||
Start: 0
|
||||
AP: 1 "a"
|
||||
acc-name: Buchi
|
||||
Acceptance: 1 Inf(0)
|
||||
properties: trans-labels explicit-labels state-acc colored !complete
|
||||
properties: deterministic stutter-invariant weak !terminal
|
||||
--BODY--
|
||||
State: 0 {0}
|
||||
[!0] 0
|
||||
--END--
|
||||
HOA: v1.1
|
||||
States: 5
|
||||
Start: 0
|
||||
AP: 3 "b" "a" "c"
|
||||
acc-name: Buchi
|
||||
Acceptance: 1 Inf(0)
|
||||
properties: trans-labels explicit-labels trans-acc !complete
|
||||
properties: !deterministic !unambiguous !inherently-weak
|
||||
--BODY--
|
||||
State: 0
|
||||
[0&1&!2] 1
|
||||
[!1&!2] 0 {0}
|
||||
[1&!2] 2
|
||||
[2] 3
|
||||
State: 1
|
||||
[0] 1 {0}
|
||||
State: 2
|
||||
[!1&!2] 0 {0}
|
||||
[1&!2] 2
|
||||
[!1&2] 3
|
||||
[1&2] 4
|
||||
State: 3
|
||||
[t] 3 {0}
|
||||
State: 4
|
||||
[!1] 3
|
||||
[1] 4
|
||||
--END--
|
||||
EOF
|
||||
|
||||
diff out2 expected2
|
||||
|
||||
# Make sure no property are lost
|
||||
autfilt -H1.1 out2 > out3
|
||||
diff out3 expected2
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue