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.
103 lines
2.3 KiB
Bash
Executable file
103 lines
2.3 KiB
Bash
Executable file
#!/bin/sh
|
|
# Copyright (C) 2010 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.
|
|
|
|
# Do some quick translations to make sure the neverclaim produced by
|
|
# spot actually look correct!
|
|
|
|
# This test is separate from spotlbtt.test, because lbtt-translate
|
|
# will refuse to passe M and W to a tool (spot) that masquerades as
|
|
# Spin.
|
|
|
|
. ./defs
|
|
|
|
set -e
|
|
|
|
cat > config <<EOF
|
|
Algorithm
|
|
{
|
|
Name = "Spot (Couvreur -- FM)"
|
|
Path = "${LBTT_TRANSLATE}"
|
|
Parameters = "--spot '../ltl2tgba -F -f -t'"
|
|
Enabled = yes
|
|
}
|
|
|
|
Algorithm
|
|
{
|
|
Name = "Spot (Couvreur -- FM), with reductions"
|
|
Path = "${LBTT_TRANSLATE}"
|
|
Parameters = "--spot '../ltl2tgba -r4 -R3f -F -f -t'"
|
|
Enabled = no
|
|
}
|
|
|
|
Algorithm
|
|
{
|
|
Name = "Spot (Couvreur -- FM), degeneralized via never claim"
|
|
Path = "${LBTT_TRANSLATE}"
|
|
Parameters = "--spin '../ltl2tgba -F -f -N'"
|
|
Enabled = yes
|
|
}
|
|
|
|
Algorithm
|
|
{
|
|
Name = "Spot (Couvreur -- FM), reductions, degeneralized via never claim"
|
|
Path = "${LBTT_TRANSLATE}"
|
|
Parameters = "--spin '../ltl2tgba -F -f -r4 -R3 -N'"
|
|
Enabled = yes
|
|
}
|
|
|
|
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
|
|
StrongReleasePriority = 0
|
|
WeakUntilPriority = 0
|
|
|
|
DefaultOperatorPriority = 5
|
|
}
|
|
EOF
|
|
|
|
${LBTT}
|
|
rm config
|