product: add a product_or variant
* src/twaalgos/product.cc, src/twaalgos/product.hh: Implement the variance. * src/bin/autfilt.cc: Expose it. * src/tests/prodor.test: New file. * src/tests/Makefile.am: Add it. * NEWS: Mention it.
This commit is contained in:
parent
b77f7e24c3
commit
51a3cfcede
6 changed files with 331 additions and 84 deletions
|
|
@ -181,6 +181,7 @@ TESTS_twa = \
|
|||
ltldo2.test \
|
||||
maskacc.test \
|
||||
maskkeep.test \
|
||||
prodor.test \
|
||||
simdet.test \
|
||||
sim2.test \
|
||||
sim3.test \
|
||||
|
|
|
|||
169
src/tests/prodor.test
Executable file
169
src/tests/prodor.test
Executable file
|
|
@ -0,0 +1,169 @@
|
|||
#!/bin/sh
|
||||
# -*- coding: utf-8 -*-
|
||||
# Copyright (C) 2015 Laboratoire de Recherche et Développement
|
||||
# de l'Epita (LRDE).
|
||||
#
|
||||
# This file is part of Spot, a model checking library.
|
||||
#
|
||||
# Spot is free software; you can redistribute it and/or modify it
|
||||
# under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# Spot is distributed in the hope that it will be useful, but WITHOUT
|
||||
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
||||
# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
|
||||
# License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
. ./defs
|
||||
set -e
|
||||
|
||||
ltl2tgba=../../bin/ltl2tgba
|
||||
autfilt=../../bin/autfilt
|
||||
|
||||
$ltl2tgba -DH 'GFa' > gfa.hoa
|
||||
$ltl2tgba -DH 'FGb' > fgb.hoa
|
||||
$autfilt --product-or gfa.hoa fgb.hoa -H > por.hoa
|
||||
cat por.hoa
|
||||
|
||||
cat >exp <<EOF
|
||||
HOA: v1
|
||||
States: 3
|
||||
Start: 0
|
||||
AP: 2 "a" "b"
|
||||
Acceptance: 2 Inf(0) | Inf(1)
|
||||
properties: trans-labels explicit-labels trans-acc complete
|
||||
--BODY--
|
||||
State: 0
|
||||
[0&1] 1 {1}
|
||||
[!0&1] 1
|
||||
[0] 0 {1}
|
||||
[!0] 0
|
||||
State: 1
|
||||
[0&1] 1 {0 1}
|
||||
[!0&1] 1 {0}
|
||||
[0&!1] 2 {0 1}
|
||||
[!0&!1] 2 {0}
|
||||
State: 2
|
||||
[0] 2 {1}
|
||||
[!0] 2
|
||||
--END--
|
||||
EOF
|
||||
diff por.hoa exp
|
||||
|
||||
test 2 = `$autfilt -c --intersect por.hoa gfa.hoa fgb.hoa`
|
||||
|
||||
$autfilt --product-and gfa.hoa fgb.hoa -H > pand.hoa
|
||||
cat pand.hoa
|
||||
|
||||
cat >exp <<EOF
|
||||
HOA: v1
|
||||
States: 2
|
||||
Start: 0
|
||||
AP: 2 "a" "b"
|
||||
acc-name: generalized-Buchi 2
|
||||
Acceptance: 2 Inf(0)&Inf(1)
|
||||
properties: trans-labels explicit-labels trans-acc
|
||||
--BODY--
|
||||
State: 0
|
||||
[0&1] 1 {1}
|
||||
[!0&1] 1
|
||||
[0] 0 {1}
|
||||
[!0] 0
|
||||
State: 1
|
||||
[0&1] 1 {0 1}
|
||||
[!0&1] 1 {0}
|
||||
--END--
|
||||
EOF
|
||||
diff pand.hoa exp
|
||||
|
||||
test 2 = `$autfilt -c --intersect pand.hoa gfa.hoa fgb.hoa`
|
||||
|
||||
$ltl2tgba -BDH 'GFa' > gfa.hoa
|
||||
$ltl2tgba -BDH 'Xb' > xb.hoa
|
||||
$autfilt --product-or gfa.hoa xb.hoa -H > por.hoa
|
||||
cat por.hoa
|
||||
|
||||
cat >exp <<EOF
|
||||
HOA: v1
|
||||
States: 7
|
||||
Start: 0
|
||||
AP: 2 "a" "b"
|
||||
Acceptance: 2 Inf(0) | Inf(1)
|
||||
properties: trans-labels explicit-labels state-acc complete
|
||||
properties: deterministic
|
||||
--BODY--
|
||||
State: 0 {0 1}
|
||||
[0] 1
|
||||
[!0] 2
|
||||
State: 1 {0 1}
|
||||
[0&1] 3
|
||||
[!0&1] 4
|
||||
[0&!1] 5
|
||||
[!0&!1] 6
|
||||
State: 2 {0}
|
||||
[0&1] 3
|
||||
[!0&1] 4
|
||||
[0&!1] 5
|
||||
[!0&!1] 6
|
||||
State: 3 {0 1}
|
||||
[0] 3
|
||||
[!0] 4
|
||||
State: 4 {0}
|
||||
[0] 3
|
||||
[!0] 4
|
||||
State: 5 {1}
|
||||
[0] 5
|
||||
[!0] 6
|
||||
State: 6
|
||||
[0] 5
|
||||
[!0] 6
|
||||
--END--
|
||||
EOF
|
||||
diff por.hoa exp
|
||||
|
||||
$ltl2tgba -BDH 'GFa' > gfa.hoa
|
||||
$ltl2tgba -x '!wdba-minimize' -DH 'Xb' > xb.hoa
|
||||
$autfilt --product-or gfa.hoa xb.hoa -H > por.hoa
|
||||
cat por.hoa
|
||||
|
||||
cat >exp <<EOF
|
||||
HOA: v1
|
||||
States: 7
|
||||
Start: 0
|
||||
AP: 2 "a" "b"
|
||||
Acceptance: 2 Inf(0) | Inf(1)
|
||||
properties: trans-labels explicit-labels state-acc complete
|
||||
properties: deterministic
|
||||
--BODY--
|
||||
State: 0 {0 1}
|
||||
[0] 1
|
||||
[!0] 2
|
||||
State: 1 {0 1}
|
||||
[0&1] 3
|
||||
[!0&1] 4
|
||||
[0&!1] 5
|
||||
[!0&!1] 6
|
||||
State: 2 {0}
|
||||
[0&1] 3
|
||||
[!0&1] 4
|
||||
[0&!1] 5
|
||||
[!0&!1] 6
|
||||
State: 3 {0 1}
|
||||
[0] 3
|
||||
[!0] 4
|
||||
State: 4 {0}
|
||||
[0] 3
|
||||
[!0] 4
|
||||
State: 5 {1}
|
||||
[0] 5
|
||||
[!0] 6
|
||||
State: 6
|
||||
[0] 5
|
||||
[!0] 6
|
||||
--END--
|
||||
EOF
|
||||
diff por.hoa exp
|
||||
Loading…
Add table
Add a link
Reference in a new issue