Implement sum(..) and sum_and(..).
Fixes #231. * NEWS: Mention of implementation of sum, sum_and. * bin/autfilt.cc: Add --sum, --sum-or and --sum-and options. * python/spot/impl.i: Add bindings for sum, sum_and. * spot/twaalgos/Makefile.am: Add sum.cc, sum.hh. * spot/twaalgos/sum.cc: Implement sum, sum_and. * spot/twaalgos/sum.hh: Declaration of sum, sum_and. * tests/Makefile.am: Add sum tests. * tests/core/explsum.test: Test the sum of two automatons, false or false, unsatisfied mark propagation, handling of univ. transitions. * tests/python/sum.py: Check that two automatons that does not share their bdd dict are not accepted, then run tests over the sum of randomly generated LTL formulas.
This commit is contained in:
Thomas Medioni
parent
5793cf32f9
commit
194c199232
9 changed files with 615 additions and 0 deletions
|
|
@ -231,6 +231,7 @@ TESTS_twa = \
|
|||
core/explpro2.test \
|
||||
core/explpro3.test \
|
||||
core/explpro4.test \
|
||||
core/explsum.test \
|
||||
core/tripprod.test \
|
||||
core/dupexp.test \
|
||||
core/exclusive-tgba.test \
|
||||
|
|
@ -349,6 +350,7 @@ TESTS_python = \
|
|||
python/setacc.py \
|
||||
python/sccfilter.py \
|
||||
python/setxor.py \
|
||||
python/sum.py \
|
||||
python/trival.py \
|
||||
python/twagraph.py \
|
||||
$(TESTS_ipython)
|
||||
|
|
|
|||
217
tests/core/explsum.test
Executable file
217
tests/core/explsum.test
Executable file
|
|
@ -0,0 +1,217 @@
|
|||
#!/bin/sh
|
||||
# -*- coding: utf-8 -*-
|
||||
# Copyright (C) 2017 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
|
||||
|
||||
cat >input1 <<EOF
|
||||
HOA: v1
|
||||
States: 3
|
||||
Start: 0
|
||||
AP: 3 "a" "b" "c"
|
||||
acc-name: Buchi
|
||||
Acceptance: 1 Inf(0)
|
||||
properties: trans-labels explicit-labels state-acc
|
||||
--BODY--
|
||||
State: 0 {0}
|
||||
[0] 1
|
||||
[1] 2
|
||||
State: 1
|
||||
State: 2 {0}
|
||||
[!0] 0
|
||||
[2] 1
|
||||
--END--
|
||||
EOF
|
||||
|
||||
cat >input2 <<EOF
|
||||
HOA: v1
|
||||
States: 2
|
||||
Start: 0
|
||||
AP: 2 "b" "a"
|
||||
acc-name: generalized-Buchi 2
|
||||
Acceptance: 2 Inf(0)&Inf(1)
|
||||
properties: trans-labels explicit-labels state-acc deterministic
|
||||
--BODY--
|
||||
State: 0 {0}
|
||||
[0] 1
|
||||
State: 1 {1}
|
||||
[1] 0
|
||||
--END--
|
||||
EOF
|
||||
|
||||
cat >input3 <<EOF
|
||||
HOA: v1
|
||||
States: 2
|
||||
Start: 0
|
||||
AP: 2 "a" "b"
|
||||
Acceptance: 1 Fin(0)
|
||||
properties: trans-labels explicit-labels trans-acc
|
||||
--BODY--
|
||||
State: 0
|
||||
[0] 0 {0}
|
||||
[1] 1
|
||||
State: 1
|
||||
[1] 1
|
||||
--END--
|
||||
EOF
|
||||
|
||||
cat >input4 <<EOF
|
||||
HOA: v1
|
||||
States: 2
|
||||
Start: 0
|
||||
AP: 2 "a" "b"
|
||||
Acceptance: 1 Inf(0)
|
||||
properties: trans-labels explicit-labels trans-acc univ-branch
|
||||
--BODY--
|
||||
State: 0
|
||||
[0] 1&0
|
||||
State: 1
|
||||
[1] 0 {0}
|
||||
--END--
|
||||
EOF
|
||||
|
||||
cat >false1 <<EOF
|
||||
HOA: v1
|
||||
States: 1
|
||||
Start: 0
|
||||
AP: 1 "a"
|
||||
Acceptance: 1 Fin(0)
|
||||
properties: trans-labels explicit-labels trans-acc deterministic
|
||||
--BODY--
|
||||
State: 0
|
||||
[t] 0 {0}
|
||||
--END--
|
||||
EOF
|
||||
|
||||
cat >false2 <<EOF
|
||||
HOA: v1
|
||||
States: 1
|
||||
Start: 0
|
||||
AP: 1 "a"
|
||||
Acceptance: 1 Inf(0)
|
||||
properties: trans-labels explicit-labels trans-acc deterministic
|
||||
--BODY--
|
||||
State: 0
|
||||
[t] 0
|
||||
--END--
|
||||
EOF
|
||||
|
||||
cat >expected <<EOF
|
||||
HOA: v1
|
||||
States: 6
|
||||
Start: 5
|
||||
AP: 3 "a" "b" "c"
|
||||
Acceptance: 3 (Inf(0)&Inf(1)) | Inf(2)
|
||||
properties: trans-labels explicit-labels trans-acc
|
||||
--BODY--
|
||||
State: 0
|
||||
[1] 1 {0}
|
||||
State: 1
|
||||
[0] 0 {1}
|
||||
State: 2
|
||||
[0] 3 {2}
|
||||
[1] 4 {2}
|
||||
State: 3
|
||||
State: 4
|
||||
[!0] 2 {2}
|
||||
[2] 3 {2}
|
||||
State: 5
|
||||
[1] 1
|
||||
[0] 3
|
||||
[1] 4
|
||||
--END--
|
||||
HOA: v1
|
||||
States: 6
|
||||
Start: 5
|
||||
AP: 3 "a" "b" "c"
|
||||
acc-name: Streett 1
|
||||
Acceptance: 2 Fin(0) | Inf(1)
|
||||
properties: trans-labels explicit-labels trans-acc
|
||||
--BODY--
|
||||
State: 0
|
||||
[0] 0 {0}
|
||||
[1] 1
|
||||
State: 1
|
||||
[1] 1
|
||||
State: 2
|
||||
[0] 3 {0 1}
|
||||
[1] 4 {0 1}
|
||||
State: 3
|
||||
State: 4
|
||||
[!0] 2 {0 1}
|
||||
[2] 3 {0 1}
|
||||
State: 5
|
||||
[0] 0
|
||||
[1] 1
|
||||
[0] 3
|
||||
[1] 4
|
||||
--END--
|
||||
HOA: v1
|
||||
States: 6
|
||||
Start: 5
|
||||
AP: 3 "a" "b" "c"
|
||||
Acceptance: 2 Inf(0) | Inf(1)
|
||||
properties: univ-branch trans-labels explicit-labels trans-acc
|
||||
--BODY--
|
||||
State: 0
|
||||
[0] 0&1
|
||||
State: 1
|
||||
[1] 0 {0}
|
||||
State: 2
|
||||
[0] 3 {1}
|
||||
[1] 4 {1}
|
||||
State: 3
|
||||
State: 4
|
||||
[!0] 2 {1}
|
||||
[2] 3 {1}
|
||||
State: 5
|
||||
[0] 0&1
|
||||
[0] 3
|
||||
[1] 4
|
||||
--END--
|
||||
EOF
|
||||
|
||||
run 0 autfilt input2 --sum input1 input3 input4 --hoaf=t | tee stdout
|
||||
diff stdout expected
|
||||
|
||||
cat >expected <<EOF
|
||||
HOA: v1
|
||||
States: 3
|
||||
Start: 2
|
||||
AP: 1 "a"
|
||||
acc-name: Streett 1
|
||||
Acceptance: 2 Fin(0) | Inf(1)
|
||||
properties: trans-labels explicit-labels trans-acc complete
|
||||
--BODY--
|
||||
State: 0
|
||||
[t] 0 {0}
|
||||
State: 1
|
||||
[t] 1 {0}
|
||||
State: 2
|
||||
[t] 0
|
||||
[t] 1
|
||||
--END--
|
||||
EOF
|
||||
|
||||
run 0 autfilt false1 --sum false2 --hoaf=t | tee stdout
|
||||
diff stdout expected
|
||||
rm false1 false2 input1 input2 input3 input4 expected stdout
|
||||
91
tests/python/sum.py
Normal file
91
tests/python/sum.py
Normal file
|
|
@ -0,0 +1,91 @@
|
|||
# -*- mode: python; coding: utf-8 -*-
|
||||
# Copyright (C) 2017 Laboratoire de Recherche et Développement
|
||||
# de l'Epita
|
||||
#
|
||||
# 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/>.
|
||||
|
||||
import spot
|
||||
import sys
|
||||
import itertools
|
||||
|
||||
# make sure that we are not allowed to build the sum of two automata with
|
||||
# different dictionaries.
|
||||
|
||||
aut1 = spot.translate('Xa')
|
||||
aut2 = spot.translate('Xb', dict=spot.make_bdd_dict())
|
||||
|
||||
try:
|
||||
spot.sum(aut1, aut2)
|
||||
exit(2)
|
||||
except RuntimeError:
|
||||
pass
|
||||
|
||||
|
||||
opts = spot.option_map()
|
||||
opts.set('output', spot.OUTPUTLTL)
|
||||
opts.set('tree_size_min', 15)
|
||||
opts.set('tree_size_max', 15)
|
||||
opts.set('wf', False)
|
||||
opts.set('seed', 0)
|
||||
opts.set('simplification_level', 0)
|
||||
spot.srand(0)
|
||||
rg = spot.randltlgenerator(2, opts)
|
||||
|
||||
|
||||
dict = spot.make_bdd_dict()
|
||||
|
||||
def produce_phi(rg, n):
|
||||
phi = []
|
||||
while len(phi) < n:
|
||||
f = rg.next()
|
||||
if f.is_syntactic_persistence():
|
||||
phi.append(f)
|
||||
return phi
|
||||
|
||||
def equivalent(a, phi):
|
||||
negphi = spot.formula.Not(phi)
|
||||
nega = spot.dtwa_complement(spot.tgba_determinize(a))
|
||||
a2 = spot.ltl_to_tgba_fm(phi, dict)
|
||||
nega2 = spot.ltl_to_tgba_fm(negphi, dict)
|
||||
return spot.product(a, nega2).is_empty()\
|
||||
and spot.product(nega, a2).is_empty()
|
||||
|
||||
phi1 = produce_phi(rg, 1000)
|
||||
phi2 = produce_phi(rg, 1000)
|
||||
inputres = []
|
||||
aut = []
|
||||
for p in zip(phi1, phi2):
|
||||
inputres.append(spot.formula.Or(p))
|
||||
a1 = spot.ltl_to_tgba_fm(p[0], dict)
|
||||
a2 = spot.ltl_to_tgba_fm(p[1], dict)
|
||||
aut.append(spot.to_generalized_buchi( \
|
||||
spot.remove_alternation(spot.sum(a1, a2), True)))
|
||||
|
||||
for p in zip(aut, inputres):
|
||||
assert equivalent(p[0], p[1])
|
||||
|
||||
aut = []
|
||||
inputres = []
|
||||
|
||||
for p in zip(phi1, phi2):
|
||||
inputres.append(spot.formula.And(p))
|
||||
a1 = spot.ltl_to_tgba_fm(p[0], dict)
|
||||
a2 = spot.ltl_to_tgba_fm(p[1], dict)
|
||||
aut.append(spot.to_generalized_buchi( \
|
||||
spot.remove_alternation(spot.sum_and(a1, a2), True)))
|
||||
|
||||
for p in zip(aut, inputres):
|
||||
assert equivalent(p[0], p[1])
|
||||
Loading…
Add table
Add a link
Reference in a new issue