Fix a longstanding bug reported by Kristin Y. Rozier..

* src/ltlast/formula.hh (formula_ptr_less_than::operator()):
Fix a typo where `l' was typed as `1'.
* src/tgbatest/ltlcounter/: New files from Kristin Y. Rozier.
* src/tgbatest/ltlcounter.test: New
* src/tgbatest/Makefile.am (TESTS): Add ltlcounter.test.
(EXTRA_DIST): Add files in ltlcounter/.
This commit is contained in:
Alexandre Duret-Lutz 2009-11-04 18:05:48 +01:00
parent 24b78fde34
commit 6fb7e9faff
10 changed files with 644 additions and 3 deletions

62
src/tgbatest/ltlcounter.test Executable file
View file

@ -0,0 +1,62 @@
#!/bin/sh
# Copyright (C) 2009 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 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
lcdir=$srcdir/../ltlcounter
lc=$lcdir/LTLcounter.pl
lcl=$lcdir/LTLcounterLinear.pl
lcc=$lcdir/LTLcounterCarry.pl
lccl=$lcdir/LTLcounterCarryLinear.pl
check_formula()
{
# First, check the satisfiability of the formula with Spot
run 0 ../ltl2tgba -e -x -f "$1" >/dev/null
# Also check the satisfiability of the degeneralized formula
run 0 ../ltl2tgba -e -D -x -f "$1" >/dev/null
run 0 ../ltl2tgba -e -DS -x -f "$1" >/dev/null
}
# Kristin Y. Rozier reported that the formulae with n=10 were badly
# translated. Each of these formulae should have exactly one
# accepting path, but in this case the emptiness returned an automata
# without cycle. It turned out the function used to compare LTL
# formulae was bugged when two LTL formulae had the same hash value,
# so the translation of the formula stopped midway, on a formula it
# thought it had already seen.
for i in 1 2 3 4 5 6 7 8 9 10 11 12
do
:;:;: "========== $i counters ==========" ;:;: # only visible with "set -x"
f=`"$lc" $i`
check_formula "$f"
f=`"$lcl" $i`
check_formula "$f"
f=`"$lcc" $i`
check_formula "$f"
f=`"$lccl" $i`
check_formula "$f"
done