Adding tgba-based stutter-invariance checking
* src/tgbaalgos/closure.cc, src/tgbaalgos/closure.hh: Add closure function. * src/tgbaalgos/stutterize.cc, src/tgbaalgos/stutterize.hh: Add two implementations of "self-loopize" function. * src/tgbaalgos/Makefile.am: Add them. * src/tgba/tgbasl.cc, src/tgba/tgbasl.hh: On-the-fly implementation of self-loopize. * src/tgba/Makefile.am: Add it. * src/tgbatest/ltl2tgba.cc, src/tgbatest/stutter_invariant.test: Test closure and sl. * src/tgbatest/Makefile.am: Adjust. * src/bin/ltlfilt.cc: Modify stutter-invariant option to use automaton-based checking rather than syntactic-based checking. * src/ltlvisit/remove_x.cc, src/ltlvisit/remove_x.hh: Remove is_stutter_insensitive function. * src/tgbaalgos/stutter_invariance.cc, src/tgbaalgos/stutter_invariance.hh: Check if a formula is stutter-invariant using closure and sl. * wrap/python/spot.i: Add closure and sl bindings. * bench/stutter/stutter_invariance_formulas.cc: Generate benchmarks from given formulas. * bench/stutter/stutter_invariance_randomgraph.cc: Generate benchmarks from random automata. * bench/stutter/Makefile.am: Add them. * configure.ac: Add bench/stutter/Makefile. * bench/Makefile.am: Add stutter subdirectory. * README: Document bench/stutter directory.
This commit is contained in:
parent
beafcf4e3d
commit
37bcb5d959
23 changed files with 1159 additions and 42 deletions
|
|
@ -121,6 +121,7 @@ TESTS = \
|
|||
emptchk.test \
|
||||
emptchke.test \
|
||||
dfs.test \
|
||||
stutter_invariant.test \
|
||||
ltlcrossce.test \
|
||||
emptchkr.test \
|
||||
ltlcounter.test \
|
||||
|
|
|
|||
|
|
@ -69,6 +69,8 @@
|
|||
#include "tgbaalgos/complete.hh"
|
||||
#include "tgbaalgos/dtbasat.hh"
|
||||
#include "tgbaalgos/dtgbasat.hh"
|
||||
#include "tgbaalgos/closure.hh"
|
||||
#include "tgbaalgos/stutterize.hh"
|
||||
|
||||
#include "taalgos/tgba2ta.hh"
|
||||
#include "taalgos/dotty.hh"
|
||||
|
|
@ -376,6 +378,8 @@ checked_main(int argc, char** argv)
|
|||
bool reject_bigger = false;
|
||||
bool opt_monitor = false;
|
||||
bool containment = false;
|
||||
bool opt_closure = false;
|
||||
bool opt_stutterize = false;
|
||||
bool spin_comments = false;
|
||||
const char* hoaf_opt = 0;
|
||||
spot::ltl::environment& env(spot::ltl::default_environment::instance());
|
||||
|
|
@ -790,6 +794,14 @@ checked_main(int argc, char** argv)
|
|||
{
|
||||
dupexp = BFS;
|
||||
}
|
||||
else if (!strcmp(argv[formula_index], "-CL"))
|
||||
{
|
||||
opt_closure = true;
|
||||
}
|
||||
else if (!strcmp(argv[formula_index], "-ST"))
|
||||
{
|
||||
opt_stutterize = true;
|
||||
}
|
||||
else if (!strcmp(argv[formula_index], "-t"))
|
||||
{
|
||||
output = 6;
|
||||
|
|
@ -1395,6 +1407,16 @@ checked_main(int argc, char** argv)
|
|||
}
|
||||
}
|
||||
|
||||
if (opt_closure)
|
||||
{
|
||||
a = closure(ensure_digraph(a));
|
||||
}
|
||||
|
||||
if (opt_stutterize)
|
||||
{
|
||||
a = sl(ensure_digraph(a), f);
|
||||
}
|
||||
|
||||
if (opt_monitor)
|
||||
{
|
||||
tm.start("Monitor minimization");
|
||||
|
|
|
|||
47
src/tgbatest/stutter_invariant.test
Executable file
47
src/tgbatest/stutter_invariant.test
Executable file
|
|
@ -0,0 +1,47 @@
|
|||
#!/bin/sh
|
||||
# -*- coding: utf-8 -*-
|
||||
# Copyright (C) 2008, 2009, 2010, 2014 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 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/>.
|
||||
|
||||
|
||||
. ./defs
|
||||
|
||||
set -e
|
||||
|
||||
check_stutter()
|
||||
{
|
||||
FORMULAS=$1
|
||||
SPOT_STUTTER_CHECK=$2
|
||||
run 0 ../../bin/ltlfilt --stutter-invariant -F $FORMULAS >exp
|
||||
for i in `seq $3 $4`
|
||||
do
|
||||
SPOT_STUTTER_CHECK=$i
|
||||
run 0 ../../bin/ltlfilt --stutter-invariant -F $FORMULAS >out
|
||||
diff out exp
|
||||
done
|
||||
}
|
||||
|
||||
cat >ltl <<EOF
|
||||
Fp0 R Fp2
|
||||
G(p1 xor Xp2)
|
||||
EOF
|
||||
|
||||
check_stutter ltl 0 1 8
|
||||
Loading…
Add table
Add a link
Reference in a new issue