alarsyo/spot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

ltl_simplifier: add a boolean_to_isop option and method

Browse source 
* src/ltlvisit/simplify.hh (ltl_simplifier_options): add
a boolean_to_isop option
(ltl_simplifier::boolean_to_isop): New method.
* src/ltlvisit/simplify.cc: Implement these.
* src/bin/ltlfilt.cc: Add a --boolean-to-isop option.
* src/ltltest/isop.test: New file.
* src/ltltest/Makefile.am: Add it.
* NEWS: Mention it.
This commit is contained in:
Alexandre Duret-Lutz 2013-03-05 23:23:45 +01:00
parent c17f3b8656
commit c6406995fb
6 changed files with 139 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/ltltest/Makefile.am
View file

@ -92,6 +92,7 @@ TESTS = \
kind.test \
lbt.test \
lenient.test \
isop.test \
syntimpl.test \
reduc.test \
reducpsl.test \

55
src/ltltest/isop.test Executable file
View file

@ -0,0 +1,55 @@
#!/bin/sh
# -*- coding: utf-8 -*-
# Copyright (C) 2013 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 >input<<EOF
(a -> b) & (b -> d)
(a -> b) & Xc & (b -> d)
GF((a | b) & (b | d))
{((a -> b) & (b -> d))*;a*}<>->((a | b) & (!b | !a))
EOF
# Make sure --boolean-to-isop works as expected...
run 0 ../../bin/ltlfilt --boolean-to-isop input > output
cat> expected<<EOF
(!a & !b) | (b & d)
(b | !a) & (d | !b) & Xc
GF(b | (a & d))
{{{{!a && !b} | {b && d}}}[*];a[*]}<>-> ((a & !b) | (b & !a))
EOF
cat output
diff output expected
# Make sure it would not give the same output without the option...
run 0 ../../bin/ltlfilt input > output
cat> expected<<EOF
(a -> b) & (b -> d)
(a -> b) & Xc & (b -> d)
GF((a | b) & (b | d))
{{{{a -> b} && {b -> d}}}[*];a[*]}<>-> ((a | b) & (!b | !a))
EOF
cat output
diff output expected