alarsyo/spot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

rename src/ as spot/ and use include <spot/...>

Browse source 
* NEWS: Mention the change.
* src/: Rename as ...
* spot/: ... this, adjust all headers to include <spot/...> instead of
"...", and adjust all Makefile.am to search headers from the top-level
directory.
* HACKING: Add conventions about #include.
* spot/sanity/style.test: Add a few more grep to catch cases
that do not follow these conventions.
* .gitignore, Makefile.am, README, bench/stutter/Makefile.am,
bench/stutter/stutter_invariance_formulas.cc,
bench/stutter/stutter_invariance_randomgraph.cc, configure.ac,
debian/rules, doc/Doxyfile.in, doc/Makefile.am,
doc/org/.dir-locals.el.in, doc/org/g++wrap.in, doc/org/init.el.in,
doc/org/tut01.org, doc/org/tut02.org, doc/org/tut03.org,
doc/org/tut10.org, doc/org/tut20.org, doc/org/tut21.org,
doc/org/tut22.org, doc/org/tut30.org, iface/ltsmin/Makefile.am,
iface/ltsmin/kripke.test, iface/ltsmin/ltsmin.cc,
iface/ltsmin/ltsmin.hh, iface/ltsmin/modelcheck.cc,
wrap/python/Makefile.am, wrap/python/ajax/spotcgi.in,
wrap/python/spot_impl.i, wrap/python/tests/ltl2tgba.py,
wrap/python/tests/randgen.py, wrap/python/tests/run.in: Adjust.
This commit is contained in:
Alexandre Duret-Lutz 2015-12-04 19:42:23 +01:00
parent 1fddfe60ec
commit f120dd3206
529 changed files with 1308 additions and 1262 deletions
Download patch file Download diff file Expand all files Collapse all files

108
spot/twaalgos/word.cc Normal file
View file

@ -0,0 +1,108 @@
// -*- coding: utf-8 -*-
// Copyright (C) 2013, 2014, 2015 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 <spot/twaalgos/word.hh>
#include <spot/twa/bddprint.hh>
#include <spot/twa/bdddict.hh>
namespace spot
{
twa_word::twa_word(const twa_run_ptr run)
: dict_(run->aut->get_dict())
{
for (auto& i: run->prefix)
prefix.push_back(i.label);
for (auto& i: run->cycle)
cycle.push_back(i.label);
dict_->register_all_variables_of(run->aut, this);
}
void
twa_word::simplify()
{
// If all the formulas on the cycle are compatible, reduce the
// cycle to a simple conjunction.
//
// For instance
// !a|!b; b; a&b; cycle{a; b; a&b}
// can be reduced to
// !a|!b; b; a&b; cycle{a&b}
{
bdd all = bddtrue;
for (auto& i: cycle)
all &= i;
if (all != bddfalse)
{
cycle.clear();
cycle.push_back(all);
}
}
// If the last formula of the prefix is compatible with the
// last formula of the cycle, we can shift the cycle and
// reduce the prefix.
//
// For instance
// !a|!b; b; a&b; cycle{a&b}
// can be reduced to
// !a|!b; cycle{a&b}
while (!prefix.empty())
{
bdd a = prefix.back() & cycle.back();
if (a == bddfalse)
break;
prefix.pop_back();
cycle.pop_back();
cycle.push_front(a);
}
// Get rid of any disjunction.
//
// For instance
// !a|!b; cycle{a&b}
// can be reduced to
// !a&!b; cycle{a&b}
for (auto& i: prefix)
i = bdd_satone(i);
for (auto& i: cycle)
i = bdd_satone(i);
}
std::ostream&
operator<<(std::ostream& os, const twa_word& w)
{
auto d = w.get_dict();
if (!w.prefix.empty())
for (auto& i: w.prefix)
{
bdd_print_formula(os, d, i);
os << "; ";
}
assert(!w.cycle.empty());
bool notfirst = false;
os << "cycle{";
for (auto& i: w.cycle)
{
if (notfirst)
os << "; ";
notfirst = true;
bdd_print_formula(os, d, i);
}
os << '}';
return os;
}
}