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
170
src/tgbaalgos/stutterize.cc
Normal file
170
src/tgbaalgos/stutterize.cc
Normal file
|
|
@ -0,0 +1,170 @@
|
|||
// -*- coding: utf-8 -*-
|
||||
// Copyright (C) 2014 Laboratoire de Recherche
|
||||
// et Développement de l'Epita (LRDE).
|
||||
// Copyright (C) 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/>.
|
||||
|
||||
#include "stutterize.hh"
|
||||
#include "tgba/tgba.hh"
|
||||
#include "dupexp.hh"
|
||||
#include "misc/hash.hh"
|
||||
#include "misc/hashfunc.hh"
|
||||
#include "ltlvisit/apcollect.hh"
|
||||
#include <deque>
|
||||
#include <unordered_map>
|
||||
#include <unordered_set>
|
||||
#include <vector>
|
||||
|
||||
namespace spot
|
||||
{
|
||||
namespace
|
||||
{
|
||||
typedef std::pair<unsigned, bdd> stutter_state;
|
||||
|
||||
struct stutter_state_hash
|
||||
{
|
||||
size_t
|
||||
operator()(const stutter_state& s) const
|
||||
{
|
||||
return wang32_hash(s.first) ^ wang32_hash(s.second.id());
|
||||
}
|
||||
};
|
||||
|
||||
// Associate the stutter state to its number.
|
||||
typedef std::unordered_map<stutter_state, unsigned,
|
||||
stutter_state_hash> ss2num_map;
|
||||
|
||||
// Queue of state to be processed.
|
||||
typedef std::deque<stutter_state> queue_t;
|
||||
}
|
||||
|
||||
tgba_digraph_ptr
|
||||
sl(const const_tgba_digraph_ptr& a, const ltl::formula* f)
|
||||
{
|
||||
bdd aps = atomic_prop_collect_as_bdd(f, a);
|
||||
return sl(a, aps);
|
||||
}
|
||||
|
||||
tgba_digraph_ptr
|
||||
sl2(const const_tgba_digraph_ptr& a, const ltl::formula* f)
|
||||
{
|
||||
bdd aps = atomic_prop_collect_as_bdd(f, a);
|
||||
return sl2(a, aps);
|
||||
}
|
||||
|
||||
tgba_digraph_ptr
|
||||
sl(const const_tgba_digraph_ptr& a, bdd atomic_propositions)
|
||||
{
|
||||
// The result automaton uses numbered states.
|
||||
tgba_digraph_ptr res = make_tgba_digraph(a->get_dict());
|
||||
// We use the same BDD variables as the input.
|
||||
res->copy_ap_of(a);
|
||||
res->copy_acceptance_conditions_of(a);
|
||||
// These maps make it possible to convert stutter_state to number
|
||||
// and vice-versa.
|
||||
ss2num_map ss2num;
|
||||
|
||||
queue_t todo;
|
||||
|
||||
unsigned s0 = a->get_init_state_number();
|
||||
stutter_state s(s0, bddfalse);
|
||||
ss2num[s] = 0;
|
||||
res->new_state();
|
||||
todo.push_back(s);
|
||||
|
||||
while (!todo.empty())
|
||||
{
|
||||
s = todo.front();
|
||||
todo.pop_front();
|
||||
unsigned src = ss2num[s];
|
||||
|
||||
bool self_loop_needed = true;
|
||||
|
||||
for (auto& t : a->out(s.first))
|
||||
{
|
||||
bdd all = t.cond;
|
||||
while (all != bddfalse)
|
||||
{
|
||||
bdd one = bdd_satoneset(all, atomic_propositions, bddtrue);
|
||||
all -= one;
|
||||
|
||||
stutter_state d(t.dst, one);
|
||||
|
||||
auto r = ss2num.emplace(d, ss2num.size());
|
||||
unsigned dest = r.first->second;
|
||||
|
||||
if (r.second)
|
||||
{
|
||||
todo.push_back(d);
|
||||
unsigned u = res->new_state();
|
||||
assert(u == dest);
|
||||
(void)u;
|
||||
}
|
||||
|
||||
// Create the transition.
|
||||
res->new_transition(src, dest, one, t.acc);
|
||||
|
||||
if (src == dest)
|
||||
self_loop_needed = false;
|
||||
}
|
||||
}
|
||||
|
||||
if (self_loop_needed && s.second != bddfalse)
|
||||
res->new_transition(src, src, s.second, 0U);
|
||||
}
|
||||
res->merge_transitions();
|
||||
return res;
|
||||
}
|
||||
|
||||
tgba_digraph_ptr
|
||||
sl2(const const_tgba_digraph_ptr& a, bdd atomic_propositions)
|
||||
{
|
||||
tgba_digraph_ptr res = tgba_dupexp_dfs(a);
|
||||
unsigned num_states = res->num_states();
|
||||
for (unsigned state = 0; state < num_states; ++state)
|
||||
{
|
||||
std::vector<unsigned> out;
|
||||
auto trans = res->out(state);
|
||||
|
||||
for (auto it = trans.begin(); it != trans.end(); ++it)
|
||||
out.push_back(it.trans());
|
||||
for (auto it: out)
|
||||
{
|
||||
if (res->trans_storage(it).dst != state)
|
||||
{
|
||||
bdd all = res->trans_storage(it).cond;
|
||||
while (all != bddfalse)
|
||||
{
|
||||
unsigned dst = res->trans_storage(it).dst;
|
||||
bdd one = bdd_satoneset(all, atomic_propositions, bddtrue);
|
||||
unsigned tmp = res->new_state();
|
||||
res->new_transition(state, tmp, one,
|
||||
res->trans_storage(it).acc);
|
||||
res->new_transition(tmp, tmp, one, 0U);
|
||||
res->new_transition(tmp, dst, one,
|
||||
res->trans_storage(it).acc);
|
||||
all -= one;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
res->merge_transitions();
|
||||
return res;
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue