0fc0ea3166
* src/ltlast/binop.cc, src/ltlast/binop.cc: Add support for these new operators. * src/ltlparse/ltlparse.yy, src/ltlparse/ltlscan.ll: Parse them. * src/ltltest/reduccmp.test: Add new tests for W and M. * src/ltlvisit/basicreduce.cc, src/ltlvisit/contain.cc, src/ltlvisit/lunabbrev.cc, src/ltlvisit/nenoform.cc, src/ltlvisit/randomltl.cc, src/ltlvisit/randomltl.hh, src/ltlvisit/reduce.cc, src/ltlvisite/simpfg.cc, src/ltlvisit/simpfg.hh, src/ltlvisit/syntimpl.cc, src/ltlvisit/tostring.cc, src/tgba/formula2bdd.cc, src/tgbaalgos/eltl2tgba_lacim.cc, src/tgbaalgos/ltl2taa.cc, src/tgbaalgos/ltl2tgba_fm.cc, src/tgbaalgos/ltl2tgba_lacim.cc: Add support for W and M. * src/tgbatest/ltl2neverclaim.test: Test never claim output using LBTT, this is more thorough. Also we cannot use -N any more in the spotlbtt.test. * src/tgbatests/ltl2tgba.cc: Define M and W for ELTL. * src/tgbatest/ltl2neverclaim.test: Test W and M, and use -DS instead of -N, because lbtt-translate does not want to translate these operators for tools that masquerade as Spin.
348 lines
7.7 KiB
Bash
Executable file
348 lines
7.7 KiB
Bash
Executable file
#!/bin/sh
|
|
# Copyright (C) 2009, 2010 Laboratoire de Recherche et Développement
|
|
# de l'Epita (LRDE).
|
|
# Copyright (C) 2003, 2004, 2005, 2006, 2007 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.
|
|
|
|
|
|
echo 'This test can take as long as 15 minutes on a 2GHz Pentium 4.'
|
|
|
|
. ./defs
|
|
|
|
set -e
|
|
|
|
cat > config <<EOF
|
|
Algorithm
|
|
{
|
|
Name = "Spot (Couvreur -- LaCIM)"
|
|
Path = "${LBTT_TRANSLATE}"
|
|
Parameters = "--spot '../ltl2tgba -l -F -t'"
|
|
Enabled = yes
|
|
}
|
|
|
|
Algorithm
|
|
{
|
|
Name = "Spot (Couvreur -- LaCIM), reduction of formula"
|
|
Path = "${LBTT_TRANSLATE}"
|
|
Parameters = "--spot '../ltl2tgba -l -F -t -r4'"
|
|
Enabled = yes
|
|
}
|
|
|
|
Algorithm
|
|
{
|
|
Name = "Spot (Couvreur -- LaCIM), degeneralized"
|
|
Path = "${LBTT_TRANSLATE}"
|
|
Parameters = "--spot '../ltl2tgba -l -F -t -D'"
|
|
Enabled = no
|
|
}
|
|
|
|
Algorithm
|
|
{
|
|
Name = "Spot (Couvreur -- LaCIM), fake"
|
|
Path = "${LBTT_TRANSLATE}"
|
|
Parameters = "--spot '../ltl2tgba -F -T'"
|
|
Enabled = no
|
|
}
|
|
|
|
Algorithm
|
|
{
|
|
Name = "Spot (Couvreur -- LaCIM), eltl"
|
|
Path = "${LBTT_TRANSLATE}"
|
|
Parameters = "--spot '../ltl2tgba -F -lo -t'"
|
|
Enabled = yes
|
|
}
|
|
|
|
Algorithm
|
|
{
|
|
Name = "Spot (Couvreur -- LaCIM), eltl + delete_unaccepting_scc"
|
|
Path = "${LBTT_TRANSLATE}"
|
|
Parameters = "--spot '../ltl2tgba -F -lo -t -R3b'"
|
|
Enabled = yes
|
|
}
|
|
|
|
Algorithm
|
|
{
|
|
Name = "Spot (Couvreur -- LaCIM), eltl + post reduction with scc"
|
|
Path = "${LBTT_TRANSLATE}"
|
|
Parameters = "--spot '../ltl2tgba -F -lo -t -R3'"
|
|
Enabled = no
|
|
}
|
|
|
|
Algorithm
|
|
{
|
|
Name = "Spot (Couvreur -- FM)"
|
|
Path = "${LBTT_TRANSLATE}"
|
|
Parameters = "--spot '../ltl2tgba -F -f -t'"
|
|
Enabled = yes
|
|
}
|
|
|
|
Algorithm
|
|
{
|
|
Name = "Spot (Couvreur -- FM), basic reduction of formula"
|
|
Path = "${LBTT_TRANSLATE}"
|
|
Parameters = "--spot '../ltl2tgba -r1 -F -f -t'"
|
|
Enabled = no
|
|
}
|
|
|
|
Algorithm
|
|
{
|
|
Name = "Spot (Couvreur -- FM), reduction of formula using class of formula"
|
|
Path = "${LBTT_TRANSLATE}"
|
|
Parameters = "--spot '../ltl2tgba -r2 -F -f -t'"
|
|
Enabled = no
|
|
}
|
|
|
|
Algorithm
|
|
{
|
|
Name = "Spot (Couvreur -- FM), reduction of formula using implies relation"
|
|
Path = "${LBTT_TRANSLATE}"
|
|
Parameters = "--spot '../ltl2tgba -r3 -F -f -t'"
|
|
Enabled = no
|
|
}
|
|
|
|
Algorithm
|
|
{
|
|
Name = "Spot (Couvreur -- FM), reduction of formula (pre reduction)"
|
|
Path = "${LBTT_TRANSLATE}"
|
|
Parameters = "--spot '../ltl2tgba -r4 -F -f -t'"
|
|
Enabled = yes
|
|
}
|
|
|
|
Algorithm
|
|
{
|
|
Name = "Spot (Couvreur -- FM), reduction7 of formula (pre reduction)"
|
|
Path = "${LBTT_TRANSLATE}"
|
|
Parameters = "--spot '../ltl2tgba -r7 -F -f -t'"
|
|
Enabled = yes
|
|
}
|
|
|
|
Algorithm
|
|
{
|
|
Name = "Spot (Couvreur -- FM), reduction of formula in FM"
|
|
Path = "${LBTT_TRANSLATE}"
|
|
Parameters = "--spot '../ltl2tgba -fr4 -F -f -t'"
|
|
Enabled = no
|
|
}
|
|
|
|
Algorithm
|
|
{
|
|
Name = "Spot (Couvreur -- FM) reduction7 of formula in FM"
|
|
Path = "${LBTT_TRANSLATE}"
|
|
Parameters = "--spot '../ltl2tgba -fr7 -F -f -t'"
|
|
Enabled = no
|
|
}
|
|
|
|
Algorithm
|
|
{
|
|
Name = "Spot (Couvreur -- FM), post reduction with direct simulation"
|
|
Path = "${LBTT_TRANSLATE}"
|
|
Parameters = "--spot '../ltl2tgba -R1q -R1t -F -f -t'"
|
|
Enabled = yes
|
|
}
|
|
|
|
Algorithm
|
|
{
|
|
Name = "Spot (Couvreur -- FM), post reduction with delayed simulation"
|
|
Path = "${LBTT_TRANSLATE}"
|
|
Parameters = "--spot '../ltl2tgba -R2q -R2t -F -f -t'"
|
|
Enabled = yes
|
|
}
|
|
|
|
Algorithm
|
|
{
|
|
Name = "Spot (Couvreur -- FM), post reduction with scc"
|
|
Path = "${LBTT_TRANSLATE}"
|
|
Parameters = "--spot '../ltl2tgba -R3 -F -f -t'"
|
|
Enabled = yes
|
|
}
|
|
|
|
Algorithm
|
|
{
|
|
Name = "Spot (Couvreur -- FM), pre + post reduction"
|
|
Path = "${LBTT_TRANSLATE}"
|
|
Parameters = "--spot '../ltl2tgba -r4 -R1q -R1t -R3 -F -f -t'"
|
|
Enabled = yes
|
|
}
|
|
|
|
Algorithm
|
|
{
|
|
Name = "Spot (Couvreur -- FM), pre + allpost reduction"
|
|
Path = "${LBTT_TRANSLATE}"
|
|
Parameters = "--spot '../ltl2tgba -r4 -R1q -R1t -R2q -R2t -R3 -F -f -t'"
|
|
Enabled = no
|
|
}
|
|
|
|
Algorithm
|
|
{
|
|
Name = "Spot (Couvreur -- FM), without symb_merge"
|
|
Path = "${LBTT_TRANSLATE}"
|
|
Parameters = "--spot '../ltl2tgba -F -f -y -t'"
|
|
Enabled = yes
|
|
}
|
|
|
|
Algorithm
|
|
{
|
|
Name = "Spot (Couvreur -- FM), degeneralized"
|
|
Path = "${LBTT_TRANSLATE}"
|
|
Parameters = "--spot '../ltl2tgba -F -f -t -D'"
|
|
Enabled = yes
|
|
}
|
|
|
|
Algorithm
|
|
{
|
|
Name = "Spot (Couvreur -- FM), degeneralized on states"
|
|
Path = "${LBTT_TRANSLATE}"
|
|
Parameters = "--spot '../ltl2tgba -F -f -t -DS'"
|
|
Enabled = yes
|
|
}
|
|
|
|
Algorithm
|
|
{
|
|
Name = "Spot (Couvreur -- FM exprop)"
|
|
Path = "${LBTT_TRANSLATE}"
|
|
Parameters = "--spot '../ltl2tgba -F -f -x -t'"
|
|
Enabled = yes
|
|
}
|
|
|
|
Algorithm
|
|
{
|
|
Name = "Spot (Couvreur -- FM exprop), without symb_merge"
|
|
Path = "${LBTT_TRANSLATE}"
|
|
Parameters = "--spot '../ltl2tgba -F -f -x -y -t'"
|
|
Enabled = yes
|
|
}
|
|
|
|
Algorithm
|
|
{
|
|
Name = "Spot (Couvreur -- FM exprop), degeneralized"
|
|
Path = "${LBTT_TRANSLATE}"
|
|
Parameters = "--spot '../ltl2tgba -F -f -x -t -D'"
|
|
Enabled = yes
|
|
}
|
|
|
|
Algorithm
|
|
{
|
|
Name = "Spot (Couvreur -- FM post_branch + exprop)"
|
|
Path = "${LBTT_TRANSLATE}"
|
|
Parameters = "--spot '../ltl2tgba -F -f -x -p -t'"
|
|
Enabled = yes
|
|
}
|
|
|
|
Algorithm
|
|
{
|
|
Name = "Spot (Couvreur -- FM post_branch + exprop + flapprox)"
|
|
Path = "${LBTT_TRANSLATE}"
|
|
Parameters = "--spot '../ltl2tgba -F -f -x -p -L -t'"
|
|
Enabled = yes
|
|
}
|
|
|
|
Algorithm
|
|
{
|
|
Name = "Spot (Couvreur -- FM post_branch + exprop), degeneralized"
|
|
Path = "${LBTT_TRANSLATE}"
|
|
Parameters = "--spot '../ltl2tgba -F -f -p -x -t -D'"
|
|
Enabled = yes
|
|
}
|
|
|
|
Algorithm
|
|
{
|
|
Name = "Spot (Couvreur -- FM post_branch + exprop + flapprox), degeneralized"
|
|
Path = "${LBTT_TRANSLATE}"
|
|
Parameters = "--spot '../ltl2tgba -F -f -p -x -t -L -D'"
|
|
Enabled = yes
|
|
}
|
|
|
|
Algorithm
|
|
{
|
|
Name = "Spot (Couvreur -- FM), pre + post reduction, degeneralized on states"
|
|
Path = "${LBTT_TRANSLATE}"
|
|
Parameters = "--spot '../ltl2tgba -F -f -DS -R3 -r7 -t'"
|
|
Enabled = yes
|
|
}
|
|
|
|
Algorithm
|
|
{
|
|
Name = "Spot (Tauriainen -- TAA)"
|
|
Path = "${LBTT_TRANSLATE}"
|
|
Parameters = "--spot '../ltl2tgba -F -taa -t'"
|
|
Enabled = yes
|
|
}
|
|
|
|
Algorithm
|
|
{
|
|
Name = "Spot (Tauriainen -- TAA) refined rules"
|
|
Path = "${LBTT_TRANSLATE}"
|
|
Parameters = "--spot '../ltl2tgba -F -taa -t -c'"
|
|
Enabled = yes
|
|
}
|
|
|
|
Algorithm
|
|
{
|
|
Name = "Spot (Tauriainen -- TAA), refined rules + post reduction with scc"
|
|
Path = "${LBTT_TRANSLATE}"
|
|
Parameters = "--spot '../ltl2tgba -F -taa -t -c -R3'"
|
|
Enabled = yes
|
|
}
|
|
|
|
Algorithm
|
|
{
|
|
Name = "Spot (Tauriainen -- TAA) refined rules + pre + post reduction"
|
|
Path = "${LBTT_TRANSLATE}"
|
|
Parameters = "--spot '../ltl2tgba -F -taa -t -c -r7 -R3'"
|
|
Enabled = no
|
|
}
|
|
|
|
GlobalOptions
|
|
{
|
|
Rounds = 100
|
|
Interactive = Never
|
|
# Verbosity = 5
|
|
# ComparisonCheck = no
|
|
# ConsistencyCheck = no
|
|
# IntersectionCheck = no
|
|
}
|
|
|
|
FormulaOptions
|
|
{
|
|
Size = 1...13
|
|
Propositions = 6
|
|
|
|
AbbreviatedOperators = Yes
|
|
GenerateMode = Normal
|
|
OutputMode = Normal
|
|
PropositionPriority = 50
|
|
|
|
TruePriority = 1
|
|
FalsePriority = 1
|
|
|
|
AndPriority = 10
|
|
OrPriority = 10
|
|
XorPriority = 0
|
|
# EquivalencePriority = 0
|
|
|
|
BeforePriority = 0
|
|
|
|
DefaultOperatorPriority = 5
|
|
}
|
|
EOF
|
|
|
|
${LBTT}
|
|
rm config
|