This is a huge patch, that took over a month to complete. The bit sets are currently restricted to what 'unsigned can store', but it should be easy to extend it to 'uint64_t' should we need it. * NEWS: Update. * src/tgba/acc.hh: New file. * src/tgbatest/acc.cc, src/tgbatest/acc.test: Test it. * src/tgba/tgbakvcomplement.cc, src/tgba/tgbakvcomplement.hh, src/tgba/tgbasgba.cc, src/tgba/tgbasgba.hh: Delete. The KV complementation is too slow to be used in practice, and I somehow broke it during the conversion to bitsets. The tgba->sgba conversion was only used for the KV complementation, and should be better redone on tgba_digraph_ptr should it be needed again. * src/bin/ltlcross.cc, src/dstarparse/dra2ba.cc, src/dstarparse/nsa2tgba.cc, src/graphtest/tgbagraph.cc, src/graphtest/tgbagraph.test, src/kripke/fairkripke.cc, src/kripke/fairkripke.hh, src/kripke/kripke.cc, src/kripke/kripke.hh, src/kripke/kripkeexplicit.cc, src/kripke/kripkeexplicit.hh, src/misc/hash.hh, src/neverparse/neverclaimparse.yy, src/priv/accmap.hh, src/ta/ta.cc, src/ta/ta.hh, src/ta/taexplicit.cc, src/ta/taexplicit.hh, src/ta/taproduct.cc, src/ta/taproduct.hh, src/ta/tgta.cc, src/ta/tgta.hh, src/ta/tgtaexplicit.cc, src/ta/tgtaexplicit.hh, src/ta/tgtaproduct.cc, src/ta/tgtaproduct.hh, src/taalgos/dotty.cc, src/taalgos/emptinessta.cc, src/taalgos/minimize.cc, src/taalgos/tgba2ta.cc, src/tgba/Makefile.am, src/tgba/fwd.hh, src/tgba/taatgba.cc, src/tgba/taatgba.hh, src/tgba/tgba.cc, src/tgba/tgba.hh, src/tgba/tgbagraph.cc, src/tgba/tgbagraph.hh, src/tgba/tgbamask.cc, src/tgba/tgbamask.hh, src/tgba/tgbaproduct.cc, src/tgba/tgbaproduct.hh, src/tgba/tgbaproxy.cc, src/tgba/tgbaproxy.hh, src/tgba/tgbasafracomplement.cc, src/tgba/tgbasafracomplement.hh, src/tgbaalgos/bfssteps.cc, src/tgbaalgos/complete.cc, src/tgbaalgos/compsusp.cc, src/tgbaalgos/degen.cc, src/tgbaalgos/dotty.cc, src/tgbaalgos/dtbasat.cc, src/tgbaalgos/dtgbacomp.cc, src/tgbaalgos/dtgbasat.cc, src/tgbaalgos/dupexp.cc, src/tgbaalgos/emptiness.cc, src/tgbaalgos/emptiness.hh, src/tgbaalgos/gtec/ce.cc, src/tgbaalgos/gtec/gtec.cc, src/tgbaalgos/gtec/gtec.hh, src/tgbaalgos/gtec/sccstack.cc, src/tgbaalgos/gtec/sccstack.hh, src/tgbaalgos/gv04.cc, src/tgbaalgos/hoaf.cc, src/tgbaalgos/isweakscc.cc, src/tgbaalgos/lbtt.cc, src/tgbaalgos/ltl2tgba_fm.cc, src/tgbaalgos/magic.cc, src/tgbaalgos/ndfs_result.hxx, src/tgbaalgos/neverclaim.cc, src/tgbaalgos/postproc.cc, src/tgbaalgos/powerset.cc, src/tgbaalgos/randomgraph.cc, src/tgbaalgos/randomgraph.hh, src/tgbaalgos/reducerun.cc, src/tgbaalgos/replayrun.cc, src/tgbaalgos/safety.cc, src/tgbaalgos/save.cc, src/tgbaalgos/scc.cc, src/tgbaalgos/scc.hh, src/tgbaalgos/sccfilter.cc, src/tgbaalgos/sccinfo.cc, src/tgbaalgos/sccinfo.hh, src/tgbaalgos/se05.cc, src/tgbaalgos/simulation.cc, src/tgbaalgos/simulation.hh, src/tgbaalgos/stats.cc, src/tgbaalgos/stripacc.cc, src/tgbaalgos/tau03.cc, src/tgbaalgos/tau03opt.cc, src/tgbaalgos/weight.cc, src/tgbaalgos/weight.hh, src/tgbaparse/tgbaparse.yy, src/tgbatest/Makefile.am, src/tgbatest/complementation.cc, src/tgbatest/complementation.test, src/tgbatest/degenlskip.test, src/tgbatest/det.test, src/tgbatest/dstar.test, src/tgbatest/emptchk.cc, src/tgbatest/explpro2.test, src/tgbatest/explpro3.test, src/tgbatest/explpro4.test, src/tgbatest/explprod.test, src/tgbatest/ltl2tgba.cc, src/tgbatest/ltl2tgba.test, src/tgbatest/maskacc.cc, src/tgbatest/maskacc.test, src/tgbatest/neverclaimread.test, src/tgbatest/randtgba.cc, src/tgbatest/readsave.test, src/tgbatest/sim.test, src/tgbatest/sim2.test, src/tgbatest/spotlbtt.test, src/tgbatest/tgbaread.test, src/tgbatest/tripprod.test, iface/dve2/dve2.cc: Adjust or use to the new acceptance interface.
302 lines
6.5 KiB
Bash
Executable file
302 lines
6.5 KiB
Bash
Executable file
#!/bin/sh
|
|
# -*- coding: utf-8 -*-
|
|
# Copyright (C) 2009, 2010, 2011, 2012, 2014 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 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/>.
|
|
|
|
|
|
echo 'This test can take as long as 15 minutes on a 2GHz Pentium 4.'
|
|
|
|
. ./defs
|
|
need_lbtt
|
|
|
|
set -e
|
|
|
|
cat > config <<EOF
|
|
Algorithm
|
|
{
|
|
Name = "Spot (Couvreur -- LaCIM), fake"
|
|
Path = "${LBTT_TRANSLATE}"
|
|
Parameters = "--spot '../ltl2tgba -F -T'"
|
|
Enabled = no
|
|
}
|
|
|
|
Algorithm
|
|
{
|
|
Name = "Spot (Couvreur -- FM)"
|
|
Path = "${LBTT_TRANSLATE}"
|
|
Parameters = "--spot '../ltl2tgba -F -f -t'"
|
|
Enabled = yes
|
|
}
|
|
|
|
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) reduction7+ru of formula (pre reduction)"
|
|
Path = "${LBTT_TRANSLATE}"
|
|
Parameters = "--spot '../ltl2tgba -r7 -ru -F -f -t'"
|
|
Enabled = yes
|
|
}
|
|
|
|
Algorithm
|
|
{
|
|
Name = "Spot (Couvreur -- FM), reduction of formula in FM"
|
|
Path = "${LBTT_TRANSLATE}"
|
|
Parameters = "--spot '../ltl2tgba -fr -r4 -F -f -t'"
|
|
Enabled = no
|
|
}
|
|
|
|
Algorithm
|
|
{
|
|
Name = "Spot (Couvreur -- FM) reduction7 of formula in FM"
|
|
Path = "${LBTT_TRANSLATE}"
|
|
Parameters = "--spot '../ltl2tgba -fr -r7 -F -f -t'"
|
|
Enabled = no
|
|
}
|
|
|
|
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 +WDBA"
|
|
Path = "${LBTT_TRANSLATE}"
|
|
Parameters = "--spot '../ltl2tgba -r4 -R3 -Rm -F -f -t'"
|
|
Enabled = yes
|
|
}
|
|
|
|
Algorithm
|
|
{
|
|
Name = "Spot (Couvreur -- FM), +pre +WDBA(rejbig)"
|
|
Path = "${LBTT_TRANSLATE}"
|
|
Parameters = "--spot '../ltl2tgba -r4 -R3 -RM -F -f -t'"
|
|
Enabled = yes
|
|
}
|
|
|
|
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 -DT'"
|
|
Enabled = yes
|
|
}
|
|
|
|
Algorithm
|
|
{
|
|
Name = "Spot (Couvreur -- FM), simulated"
|
|
Path = "${LBTT_TRANSLATE}"
|
|
Parameters = "--spot '../ltl2tgba -F -f -t -RDS -r4 -R3'"
|
|
Enabled = yes
|
|
}
|
|
|
|
Algorithm
|
|
{
|
|
Name = "Spot (Couvreur -- FM), don't care simulation"
|
|
Path = "${LBTT_TRANSLATE}"
|
|
Parameters = "--spot '../ltl2tgba -F -f -t -RDCS -r4 -R3f'"
|
|
Enabled = no
|
|
}
|
|
|
|
Algorithm
|
|
{
|
|
Name = "Spot (Couvreur -- FM), don't care iterated simulation"
|
|
Path = "${LBTT_TRANSLATE}"
|
|
Parameters = "--spot '../ltl2tgba -F -f -t -RDCIS -r4 -R3f'"
|
|
Enabled = no
|
|
}
|
|
|
|
|
|
Algorithm
|
|
{
|
|
Name = "Spot (Couvreur -- FM), cosimulated"
|
|
Path = "${LBTT_TRANSLATE}"
|
|
Parameters = "--spot '../ltl2tgba -F -f -t -RRS -r4 -R3'"
|
|
Enabled = yes
|
|
}
|
|
|
|
Algorithm
|
|
{
|
|
Name = "Spot (Couvreur -- FM), iterated simulation"
|
|
Path = "${LBTT_TRANSLATE}"
|
|
Parameters = "--spot '../ltl2tgba -F -f -t -RIS -r4 -R3'"
|
|
Enabled = yes
|
|
}
|
|
|
|
Algorithm
|
|
{
|
|
Name = "Spot (Couvreur -- TAA), simulated"
|
|
Path = "${LBTT_TRANSLATE}"
|
|
Parameters = "--spot '../ltl2tgba -F -taa -t -RDS -r4 -R3'"
|
|
Enabled = yes
|
|
}
|
|
|
|
Algorithm
|
|
{
|
|
Name = "Spot (Couvreur -- FM), simulated and degeneralized on states."
|
|
Path = "${LBTT_TRANSLATE}"
|
|
Parameters = "--spot '../ltl2tgba -F -f -t -RDS -DS'"
|
|
Enabled = yes
|
|
}
|
|
|
|
Algorithm
|
|
{
|
|
Name = "Compositional Suspension"
|
|
Path = "${LBTT_TRANSLATE}"
|
|
Parameters = "--spot '../ltl2tgba -u -F -f -t'"
|
|
Enabled = yes
|
|
}
|
|
|
|
Algorithm
|
|
{
|
|
Name = "Compositional Suspension (-r4)"
|
|
Path = "${LBTT_TRANSLATE}"
|
|
Parameters = "--spot '../ltl2tgba -u -r4 -F -f -t'"
|
|
Enabled = yes
|
|
}
|
|
|
|
Algorithm
|
|
{
|
|
Name = "Compositional Suspension (-r4 -ru)"
|
|
Path = "${LBTT_TRANSLATE}"
|
|
Parameters = "--spot '../ltl2tgba -u -r4 -ru -F -f -t'"
|
|
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 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 -DT'"
|
|
Enabled = yes
|
|
}
|
|
|
|
Algorithm
|
|
{
|
|
Name = "Spot (Couvreur -- FM post_branch + exprop + flapprox), degeneralized"
|
|
Path = "${LBTT_TRANSLATE}"
|
|
Parameters = "--spot '../ltl2tgba -F -f -p -x -t -L -DT'"
|
|
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
|
|
}
|
|
|
|
|
|
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
|