Merge branch 'master' into next
This commit is contained in:
commit
694e485ec2
4 changed files with 31 additions and 400 deletions
|
|
@ -588,381 +588,4 @@ State: 4
|
|||
EOF
|
||||
|
||||
diff out 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: 3 "b" "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
|
||||
[!1&!2] 0
|
||||
[1&!2] 1
|
||||
[2] 2
|
||||
State: 1
|
||||
[!1&!2] 0
|
||||
[1&!2] 1
|
||||
[!1&2] 2
|
||||
[1&2] 3
|
||||
State: 2 {0}
|
||||
[t] 2
|
||||
State: 3
|
||||
[!1] 2
|
||||
[1] 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: 3 "b" "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
|
||||
[!1&!2] 0 {0}
|
||||
[1&!2] 1
|
||||
State: 1
|
||||
[!1&!2] 0 {0}
|
||||
[1&!2] 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
|
||||
|
||||
|
||||
test 2 = `autfilt -c --sccs=4 out`
|
||||
test 5 = `autfilt -c --sccs=2 out`
|
||||
test 1 = `autfilt -c -v --inherently-weak-sccs=1.. out`
|
||||
test 2 = `autfilt -c --weak-sccs=2 out`
|
||||
test 14 = `autfilt -c --terminal-sccs=1 out`
|
||||
test 2 = `autfilt -c --terminal-sccs=1 --inherently-weak-sccs=2 out`
|
||||
test 4 = `autfilt -c --rejecting-sccs=1 --accepting-sccs=1 out`
|
||||
test 0 = `autfilt -c --trivial-sccs=1.. out`
|
||||
autfilt -q expected
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue