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:
Thibaud Michaud
Alexandre Duret-Lutz
parent
beafcf4e3d
commit
37bcb5d959
23 changed files with 1159 additions and 42 deletions
|
|
@ -19,4 +19,4 @@
|
|||
## You should have received a copy of the GNU General Public License
|
||||
## along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
SUBDIRS = emptchk ltl2tgba ltlcounter ltlclasses wdba spin13 dtgbasat
|
||||
SUBDIRS = emptchk ltl2tgba ltlcounter ltlclasses wdba spin13 dtgbasat stutter
|
||||
|
|
|
|||
31
bench/stutter/Makefile.am
Normal file
31
bench/stutter/Makefile.am
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
## -*- coding: utf-8 -*-
|
||||
## Copyright (C) 2014 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 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/>.
|
||||
|
||||
SUBDIRS = .
|
||||
|
||||
AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src $(BUDDY_CPPFLAGS) \
|
||||
-I$(top_builddir)/lib -I$(top_srcdir)/lib
|
||||
AM_CXXFLAGS = $(WARNING_CXXFLAGS)
|
||||
LDADD = $(top_builddir)/src/bin/libcommon.a ../../lib/libgnu.la ../../src/libspot.la
|
||||
|
||||
bin_PROGRAMS = stutter_invariance_randomgraph \
|
||||
stutter_invariance_formulas
|
||||
|
||||
stutter_invariance_randomgraph_SOURCES = stutter_invariance_randomgraph.cc
|
||||
stutter_invariance_formulas_SOURCES = stutter_invariance_formulas.cc
|
||||
128
bench/stutter/stutter_invariance_formulas.cc
Normal file
128
bench/stutter/stutter_invariance_formulas.cc
Normal file
|
|
@ -0,0 +1,128 @@
|
|||
// -*- coding: utf-8 -*-
|
||||
// Copyright (C) 2014 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 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/>.
|
||||
|
||||
#include "bin/common_sys.hh"
|
||||
#include "bin/common_setup.hh"
|
||||
#include "bin/common_finput.hh"
|
||||
#include "bin/common_output.hh"
|
||||
#include "tgbaalgos/translate.hh"
|
||||
#include "tgbaalgos/stutter_invariance.hh"
|
||||
#include "ltlast/allnodes.hh"
|
||||
#include "ltlvisit/apcollect.hh"
|
||||
#include "ltlvisit/length.hh"
|
||||
#include "misc/timer.hh"
|
||||
#include <argp.h>
|
||||
#include "error.h"
|
||||
|
||||
#include "tgbaalgos/closure.hh"
|
||||
#include "tgbaalgos/stutterize.hh"
|
||||
#include "tgbaalgos/dotty.hh"
|
||||
#include "tgba/tgbaproduct.hh"
|
||||
|
||||
static unsigned n = 10;
|
||||
|
||||
const char argp_program_doc[] ="";
|
||||
|
||||
const struct argp_child children[] =
|
||||
{
|
||||
{ &finput_argp, 0, 0, 1 },
|
||||
{ &output_argp, 0, 0, -20 },
|
||||
{ &misc_argp, 0, 0, -1 },
|
||||
{ 0, 0, 0, 0 }
|
||||
};
|
||||
|
||||
namespace
|
||||
{
|
||||
class stut_processor: public job_processor
|
||||
{
|
||||
public:
|
||||
spot::translator& trans;
|
||||
std::string formula;
|
||||
|
||||
stut_processor(spot::translator& trans) : trans(trans)
|
||||
{
|
||||
}
|
||||
|
||||
int
|
||||
process_string(const std::string& input,
|
||||
const char* filename, int linenum)
|
||||
{
|
||||
formula = input;
|
||||
return job_processor::process_string(input, filename, linenum);
|
||||
}
|
||||
|
||||
int
|
||||
process_formula(const spot::ltl::formula* f,
|
||||
const char*, int)
|
||||
{
|
||||
const spot::ltl::formula* nf =
|
||||
spot::ltl::unop::instance(spot::ltl::unop::Not,
|
||||
f->clone());
|
||||
spot::const_tgba_digraph_ptr a = trans.run(f);
|
||||
spot::const_tgba_digraph_ptr na = trans.run(nf);
|
||||
spot::ltl::atomic_prop_set* ap = spot::ltl::atomic_prop_collect(f);
|
||||
bdd apdict = spot::ltl::atomic_prop_collect_as_bdd(f, a);
|
||||
bool res;
|
||||
bool prev = true;
|
||||
for (char algo = '1'; algo <= '8'; ++algo)
|
||||
{
|
||||
// set SPOT_STUTTER_CHECK environment variable
|
||||
char algostr[2] = { 0 };
|
||||
algostr[0] = algo;
|
||||
setenv("SPOT_STUTTER_CHECK", algostr, true);
|
||||
|
||||
spot::stopwatch sw;
|
||||
sw.start();
|
||||
for (unsigned i = 0; i < n; ++i)
|
||||
res = spot::is_stutter_invariant(a, na, apdict);
|
||||
const double time = sw.stop();
|
||||
|
||||
std::cout << formula << ", " << algo << ", " << ap->size() << ", "
|
||||
<< a->num_states() << ", " << res << ", " << time << std::endl;
|
||||
|
||||
if (algo > '1')
|
||||
assert(res == prev);
|
||||
prev = res;
|
||||
}
|
||||
f->destroy();
|
||||
nf->destroy();
|
||||
delete(ap);
|
||||
return 0;
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
int
|
||||
main(int argc, char** argv)
|
||||
{
|
||||
setup(argv);
|
||||
|
||||
const argp ap = { 0, 0, "[FILENAME[/COL]...]",
|
||||
argp_program_doc, children, 0, 0 };
|
||||
|
||||
if (int err = argp_parse(&ap, argc, argv, ARGP_NO_HELP, 0, 0))
|
||||
exit(err);
|
||||
|
||||
spot::translator trans;
|
||||
stut_processor processor(trans);
|
||||
if (processor.run())
|
||||
return 2;
|
||||
|
||||
return 0;
|
||||
}
|
||||
100
bench/stutter/stutter_invariance_randomgraph.cc
Normal file
100
bench/stutter/stutter_invariance_randomgraph.cc
Normal file
|
|
@ -0,0 +1,100 @@
|
|||
// -*- coding: utf-8 -*-
|
||||
// Copyright (C) 2014 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 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/>.
|
||||
|
||||
#include "misc/timer.hh"
|
||||
#include "ltlast/atomic_prop.hh"
|
||||
#include "tgbaalgos/dtgbacomp.hh"
|
||||
#include "tgbaalgos/stutter_invariance.hh"
|
||||
#include "tgbaalgos/randomgraph.hh"
|
||||
#include "tgbaalgos/dotty.hh"
|
||||
#include "tgbaalgos/product.hh"
|
||||
#include "tgbaalgos/stutterize.hh"
|
||||
#include "tgbaalgos/closure.hh"
|
||||
#include "tgba/tgbagraph.hh"
|
||||
#include "tgba/bdddict.hh"
|
||||
#include <cstdio>
|
||||
#include <cstring>
|
||||
#include <vector>
|
||||
|
||||
int
|
||||
main()
|
||||
{
|
||||
spot::bdd_dict_ptr dict = spot::make_bdd_dict();
|
||||
spot::tgba_digraph_ptr a;
|
||||
spot::tgba_digraph_ptr na;
|
||||
unsigned n = 10;
|
||||
for (unsigned states_n = 1; states_n <= 50; ++states_n)
|
||||
for (float d = 0; d <= 1; d += 0.1)
|
||||
{
|
||||
for (unsigned props_n = 1; props_n <= 4; ++props_n)
|
||||
{
|
||||
// random ap set
|
||||
auto ap = new spot::ltl::atomic_prop_set();
|
||||
spot::ltl::default_environment& e =
|
||||
spot::ltl::default_environment::instance();
|
||||
for (unsigned i = 1; i < props_n; ++i)
|
||||
{
|
||||
std::ostringstream p;
|
||||
p << 'p' << i;
|
||||
ap->insert(static_cast<const spot::ltl::atomic_prop*>
|
||||
(e.require(p.str())));
|
||||
}
|
||||
|
||||
// ap set as bdd
|
||||
bdd apdict = bddtrue;
|
||||
for (auto& i: *ap)
|
||||
apdict &= bdd_ithvar(dict->register_proposition(i, a));
|
||||
|
||||
// generate n random automata
|
||||
typedef std::pair<spot::tgba_digraph_ptr, spot::tgba_digraph_ptr>
|
||||
aut_pair_t;
|
||||
std::vector<aut_pair_t> vec;
|
||||
for (unsigned i = 0; i < n; ++i)
|
||||
{
|
||||
a = spot::random_graph(states_n, d, ap, dict, 2, 0.1, 0.5,
|
||||
true);
|
||||
na = spot::dtgba_complement(a);
|
||||
vec.push_back(aut_pair_t(a, na));
|
||||
}
|
||||
|
||||
for (char algo = '1'; algo <= '8'; ++algo)
|
||||
{
|
||||
// set SPOT_STUTTER_CHECK environment variable
|
||||
char algostr[2] = { 0 };
|
||||
algostr[0] = algo;
|
||||
setenv("SPOT_STUTTER_CHECK", algostr, true);
|
||||
|
||||
spot::stopwatch sw;
|
||||
sw.start();
|
||||
bool res;
|
||||
for (auto& a: vec)
|
||||
res = spot::is_stutter_invariant(a.first, a.second, apdict);
|
||||
const double time = sw.stop();
|
||||
|
||||
std::cout << algo << ", " << props_n << ", " << states_n
|
||||
<< ", " << res << ", " << time << std::endl;
|
||||
}
|
||||
spot::ltl::destroy_atomic_prop_set(*ap);
|
||||
delete(ap);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
return 0;
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue