546559b8c3
Trivial simplifications rules (such as "FFa=Fa" or "x&1=x") are performed any time a formule is instanciated. * src/ltlast/constant.hh, src/ltlast/constant.cc (true_instance, true_instance_): Declare the true_instance_ as a static member, and move true_instance() into the .hh so it gets inlined. Have true_instance_ as a class variable will ensure that it is the first formula instantiated. Binop simplifications rely on this to order arguments. (false_instance, false_instance_): Likewise. (empty_word_instance, empty_word_instance_): New method and static member. * src/ltlast/formula.hh (formula::formula): If max_count_ ever loops, skip the first three values so that constants always have smaller hash codes. * src/ltlast/binop.hh, src/ltlast/binop.cc (instance): Add simplifications and document them. * src/ltlast/multop.hh (multop::Concat): New operator. * src/ltlast/multop.cc (op_name): Handle Concat. (instance): Inline Concat arguments without reordering. Handle absorbent and neutral elements for all operators. * src/ltlast/unop.hh (unop::Star): New operator. * src/ltlast/unop.cc (op_name): Handle Star. (instance): Handle Star, and add trivial simplifications for other unary operators. * src/ltlparse/ltlparse.yy (OP_CONCAT, OP_STAR, CONST_EMPTYWORD): Declare these new operators and add rules for them. * src/ltlparse/ltlscan.ll (OP_CONCAT, OP_STAR, CONST_EMPTYWORD): Output these new operators. * src/ltltest/equals.test: New tests. * src/ltltest/parse.test: Remove redundant test. * src/ltltest/tunabbrev.test, src/tgbatest/emptchk.test: Adjust tests. * src/ltlvisit/basicreduce.cc, src/ltlvisit/contain.cc, src/ltlvisit/nenoform.cc, src/ltlvisit/reduce.cc, src/ltlvisit/syntimpl.cc, src/ltlvisit/tostring.cc, src/ltlvisit/tunabbrev.cc: Complete visitors to handle new operators. * src/ltltest/nenoform.test: More tests. * src/ltlvisit/lunabbrev.cc (unabbreviate_logic_visitor::visit): Clone formulae before instance() function actually have a chance to destroy them. * src/tgba/formula2bdd.cc, src/tgbaalgos/eltl2tgba_lacim.cc, src/tgbaalgos/ltl2taa.cc, src/tgbaalgos/ltl2tgba_fm.cc, src/tgbaalgos/ltl2tgba_lacim.cc: Adjust switches to assert on new operators.
101 lines
3.4 KiB
Bash
Executable file
101 lines
3.4 KiB
Bash
Executable file
#!/bin/sh
|
|
# Copyright (C) 2008, 2009, 2010 Laboratoire de Recherche et
|
|
# Développement de l'Epita (LRDE).
|
|
# Copyright (C) 2003, 2004, 2005 Laboratoire d'Informatique de
|
|
# Paris 6 (LIP6), département Systèmes Répartis Coopératifs (SRC),
|
|
# Université Pierre et Marie Curie.
|
|
#
|
|
# 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 2 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 Spot; see the file COPYING. If not, write to the Free
|
|
# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
|
|
# 02111-1307, USA.
|
|
|
|
|
|
. ./defs
|
|
|
|
set -e
|
|
|
|
expect_ce_do()
|
|
{
|
|
run 0 ../ltl2tgba "$@"
|
|
run 0 ../ltl2tgba -g "$@"
|
|
}
|
|
|
|
expect_ce()
|
|
{
|
|
expect_ce_do -CR -e -l "$1"
|
|
expect_ce_do -CR -e -l -D "$1"
|
|
expect_ce_do -CR -e -f "$1"
|
|
expect_ce_do -CR -e -f -D "$1"
|
|
expect_ce_do -CR -e'Cou99(shy)' -l "$1"
|
|
expect_ce_do -CR -e'Cou99(shy)' -l -D "$1"
|
|
expect_ce_do -CR -e'Cou99(shy)' -f "$1"
|
|
expect_ce_do -CR -e'Cou99(shy)' -f -D "$1"
|
|
expect_ce_do -CR -eCVWY90 -l "$1"
|
|
expect_ce_do -CR -eCVWY90 -f "$1"
|
|
run 0 ../ltl2tgba -CR -e'CVWY90(bsh=10M)' -l "$1"
|
|
run 0 ../ltl2tgba -CR -e'CVWY90(bsh=10M)' -f "$1"
|
|
run 0 ../ltl2tgba -CR -eSE05 -l "$1"
|
|
run 0 ../ltl2tgba -CR -eSE05 -f "$1"
|
|
run 0 ../ltl2tgba -CR -e'SE05(bsh=10M)' -l "$1"
|
|
run 0 ../ltl2tgba -CR -e'SE05(bsh=10M)' -f "$1"
|
|
run 0 ../ltl2tgba -CR -eTau03_opt -f "$1"
|
|
run 0 ../ltl2tgba -CR -eGV04 -f "$1"
|
|
# Expect multiple accepting runs
|
|
test `../ltl2tgba -C -e'CVWY90(repeated)' -l "$1" |
|
|
grep Prefix: | wc -l` -ge $2
|
|
test `../ltl2tgba -C -e'SE05(repeated)' -l "$1" |
|
|
grep Prefix: | wc -l` -ge $2
|
|
}
|
|
|
|
expect_no()
|
|
{
|
|
run 0 ../ltl2tgba -CR -E -l "$1"
|
|
run 0 ../ltl2tgba -CR -E -l -D "$1"
|
|
run 0 ../ltl2tgba -CR -E -f "$1"
|
|
run 0 ../ltl2tgba -CR -E -f -D "$1"
|
|
run 0 ../ltl2tgba -CR -E'Cou99(shy)' -l "$1"
|
|
run 0 ../ltl2tgba -CR -E'Cou99(shy)' -l -D "$1"
|
|
run 0 ../ltl2tgba -CR -E'Cou99(shy)' -f "$1"
|
|
run 0 ../ltl2tgba -CR -E'Cou99(shy)' -f -D "$1"
|
|
run 0 ../ltl2tgba -CR -ECVWY90 -l "$1"
|
|
run 0 ../ltl2tgba -CR -ECVWY90 -f "$1"
|
|
run 0 ../ltl2tgba -CR -E'CVWY90(bsh=10M)' -l "$1"
|
|
run 0 ../ltl2tgba -CR -E'CVWY90(bsh=10M)' -f "$1"
|
|
run 0 ../ltl2tgba -CR -ESE05 -l "$1"
|
|
run 0 ../ltl2tgba -CR -ESE05 -f "$1"
|
|
run 0 ../ltl2tgba -CR -E'SE05(bsh=10M)' -l "$1"
|
|
run 0 ../ltl2tgba -CR -E'SE05(bsh=10M)' -f "$1"
|
|
run 0 ../ltl2tgba -CR -ETau03_opt -f "$1"
|
|
run 0 ../ltl2tgba -CR -EGV04 -f "$1"
|
|
test `../ltl2tgba -C -e'CVWY90(repeated)' -l "!($1)" |
|
|
grep Prefix: | wc -l` -ge $2
|
|
test `../ltl2tgba -C -e'SE05(repeated)' -l "!($1)" |
|
|
grep Prefix: | wc -l` -ge $2
|
|
}
|
|
|
|
expect_ce 'a' 1
|
|
expect_ce 'a U b' 1
|
|
expect_ce 'X a' 1
|
|
expect_ce 'a & b & c' 1
|
|
expect_ce 'a | b | (c U (d & (g U (h ^ i))))' 2
|
|
expect_ce 'Xa & (b U !a) & (b U !a)' 1
|
|
expect_ce 'Fa & Xb & GFc & Gd' 1
|
|
expect_ce 'Fa & Xa & GFc & Gc' 2
|
|
expect_ce 'Fc & X(a | Xb) & GF(a | Xb) & Gc' 1
|
|
expect_ce '!((FF a) <=> (F x))' 3
|
|
expect_no '!((FF a) <=> (F a))' 3
|
|
expect_no 'Xa && (!a U b) && !b && X!b' 4
|
|
expect_no '(a U !b) && Gb' 3
|