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

revamp the formula hierarchy (montro-patch)

Browse source 
Flatten the formula ltl::formula hiearchy into a single ltl::vnode that
has an enumerator to distinguish the types of node, and a common
interface to access children, update reference counts, etc.  The
ltl::formula class is now a thin wrapper around an ltl::vnode pointer to
keep track of reference counts automatically.  Visitor are not used
anymore; we now have map() and traversor() methods that are more
concise.

This basically fixes #43, but should be followed by some fine tuning
that should now be localized to the formula.hh and formula.cc files.

Some statistics about this patch.  I started working on it on Sep 9, had
a first compiling version two weeks later on Sep 22, and it then took 5
days to fixes the ~70 distincts bugs that were introduced during the
conversion.  About 13200 lines were modified, and one third of those
were removed.

* src/ltlast/formula.cc, src/ltlast/formula.hh: Complete rewrite,
including what was in separate nearby files.
* src/ltlast/allnodes.hh, src/ltlast/atomic_prop.cc,
src/ltlast/atomic_prop.hh, src/ltlast/binop.cc, src/ltlast/binop.hh,
src/ltlast/bunop.cc, src/ltlast/bunop.hh, src/ltlast/constant.cc,
src/ltlast/constant.hh, src/ltlast/multop.cc, src/ltlast/multop.hh,
src/ltlast/unop.cc, src/ltlast/unop.hh, src/ltlvisit/dump.cc,
src/ltlvisit/dump.hh, src/ltlast/predecl.hh: Delete these files.  Their
feature have been merged in formula.hh and formula.cc.
* src/ltlast/visitor.hh, src/ltlvisit/clone.cc, src/ltlvisit/clone.hh,
src/ltlvisit/dump.hh, src/ltlvisit/postfix.cc, src/ltlvisit/postfix.hh:
Delete these files, as we do not use visitors anymore.
* bench/stutter/stutter_invariance_formulas.cc,
bench/stutter/stutter_invariance_randomgraph.cc, doc/org/tut01.org,
doc/org/tut02.org, doc/org/tut10.org, doc/org/tut22.org,
iface/ltsmin/ltsmin.cc, iface/ltsmin/ltsmin.hh,
iface/ltsmin/modelcheck.cc, src/bin/autfilt.cc,
src/bin/common_aoutput.cc, src/bin/common_aoutput.hh,
src/bin/common_finput.cc, src/bin/common_finput.hh,
src/bin/common_output.cc, src/bin/common_output.hh,
src/bin/common_trans.cc, src/bin/common_trans.hh, src/bin/dstar2tgba.cc,
src/bin/genltl.cc, src/bin/ltl2tgba.cc, src/bin/ltl2tgta.cc,
src/bin/ltlcross.cc, src/bin/ltldo.cc, src/bin/ltlfilt.cc,
src/bin/ltlgrind.cc, src/bin/randaut.cc, src/bin/randltl.cc,
src/kripke/kripkeexplicit.cc, src/kripke/kripkeexplicit.hh,
src/kripkeparse/kripkeparse.yy, src/ltlast/Makefile.am,
src/ltlenv/declenv.cc, src/ltlenv/declenv.hh, src/ltlenv/defaultenv.cc,
src/ltlenv/defaultenv.hh, src/ltlenv/environment.hh,
src/ltlparse/ltlparse.yy, src/ltlparse/public.hh,
src/ltlvisit/Makefile.am, src/ltlvisit/apcollect.cc,
src/ltlvisit/apcollect.hh, src/ltlvisit/contain.cc,
src/ltlvisit/contain.hh, src/ltlvisit/dot.cc, src/ltlvisit/dot.hh,
src/ltlvisit/exclusive.cc, src/ltlvisit/exclusive.hh,
src/ltlvisit/length.cc, src/ltlvisit/length.hh, src/ltlvisit/mark.cc,
src/ltlvisit/mark.hh, src/ltlvisit/mutation.cc,
src/ltlvisit/mutation.hh, src/ltlvisit/nenoform.cc,
src/ltlvisit/nenoform.hh, src/ltlvisit/print.cc, src/ltlvisit/print.hh,
src/ltlvisit/randomltl.cc, src/ltlvisit/randomltl.hh,
src/ltlvisit/relabel.cc, src/ltlvisit/relabel.hh,
src/ltlvisit/remove_x.cc, src/ltlvisit/remove_x.hh,
src/ltlvisit/simpfg.cc, src/ltlvisit/simpfg.hh,
src/ltlvisit/simplify.cc, src/ltlvisit/simplify.hh, src/ltlvisit/snf.cc,
src/ltlvisit/snf.hh, src/ltlvisit/unabbrev.cc, src/ltlvisit/unabbrev.hh,
src/parseaut/parseaut.yy, src/ta/taexplicit.cc, src/ta/tgtaexplicit.cc,
src/taalgos/minimize.cc, src/taalgos/tgba2ta.cc, src/tests/bare.test,
src/tests/checkpsl.cc, src/tests/checkta.cc,
src/tests/complementation.cc, src/tests/consterm.cc,
src/tests/emptchk.cc, src/tests/equalsf.cc, src/tests/ikwiad.cc,
src/tests/isop.test, src/tests/kind.cc, src/tests/length.cc,
src/tests/ltldo.test, src/tests/ltlfilt.test, src/tests/ltlgrind.test,
src/tests/ltlprod.cc, src/tests/ltlrel.cc,
src/tests/parse_print_test.cc, src/tests/parseaut.test,
src/tests/parseerr.test, src/tests/randtgba.cc, src/tests/readltl.cc,
src/tests/reduc.cc, src/tests/syntimpl.cc, src/tests/taatgba.cc,
src/tests/tostring.cc, src/tests/twagraph.cc, src/tests/utf8.test,
src/twa/acc.cc, src/twa/bdddict.cc, src/twa/bdddict.hh,
src/twa/bddprint.cc, src/twa/formula2bdd.cc, src/twa/formula2bdd.hh,
src/twa/taatgba.cc, src/twa/taatgba.hh, src/twa/twa.cc, src/twa/twa.hh
src/twa/twagraph.cc, src/twa/twagraph.hh, src/twa/twasafracomplement.cc,
src/twaalgos/compsusp.cc, src/twaalgos/compsusp.hh,
src/twaalgos/dtgbasat.cc, src/twaalgos/hoa.cc, src/twaalgos/lbtt.cc,
src/twaalgos/ltl2taa.cc, src/twaalgos/ltl2taa.hh,
src/twaalgos/ltl2tgba_fm.cc, src/twaalgos/ltl2tgba_fm.hh,
src/twaalgos/minimize.cc, src/twaalgos/minimize.hh,
src/twaalgos/neverclaim.cc, src/twaalgos/postproc.cc,
src/twaalgos/postproc.hh, src/twaalgos/powerset.cc,
src/twaalgos/powerset.hh, src/twaalgos/randomgraph.cc,
src/twaalgos/remprop.cc, src/twaalgos/remprop.hh, src/twaalgos/stats.cc,
src/twaalgos/stats.hh, src/twaalgos/stutter.cc, src/twaalgos/stutter.hh,
src/twaalgos/translate.cc, src/twaalgos/translate.hh,
wrap/python/ajax/spotcgi.in, wrap/python/spot.py,
wrap/python/spot_impl.i, wrap/python/Makefile.am,
wrap/python/tests/automata-io.ipynb, wrap/python/tests/formulas.ipynb,
wrap/python/tests/ltl2tgba.py, wrap/python/tests/ltlparse.py,
wrap/python/tests/ltlsimple.py, wrap/python/tests/randltl.ipynb: Adjust
to use the new interface.
* src/sanity/style.test: Accept more C++11 patterns.
* NEWS: Mention the change.
This commit is contained in:
Alexandre Duret-Lutz 2015-09-24 19:44:00 +02:00
parent 1628b188fe
commit b77f7e24c3
177 changed files with 8295 additions and 13332 deletions
Download patch file Download diff file Expand all files Collapse all files

176
src/twaalgos/compsusp.cc
View file

@ -25,9 +25,7 @@
#include "minimize.hh"
#include "simulation.hh"
#include "safety.hh"
#include "ltlast/allnodes.hh"
#include "ltlvisit/print.hh"
#include "ltlvisit/clone.hh"
#include <queue>
#include <sstream>
#include "ltlenv/environment.hh"
@ -36,163 +34,111 @@ namespace spot
{
namespace
{
typedef std::map<const ltl::formula*, bdd> formula_bdd_map;
// An environment to store atomic proposition associated to
// suspended variable. (We don't use the default environment to
// avoid conflicts with user-defined atomic propositions that
// would share the same name.)
class suspended_environment: public ltl::environment
{
public:
const ltl::formula*
require(const std::string& s)
{
return ltl::atomic_prop::instance(s, *this);
}
const std::string&
name() const
{
static std::string name("suspended environment");
return name;
}
};
static suspended_environment suspenv;
typedef std::map<ltl::formula, bdd> formula_bdd_map;
typedef std::vector<ltl::formula> vec;
// Rewrite the suspendable subformulae "s" of an LTL formula in
// the form Gg where "g" is an atomic proposition representing
// "s". At the same time, populate maps that associate "s" to "g"
// and vice-versa.
class ltl_suspender_visitor: public ltl::clone_visitor
class ltl_suspender_visitor final
{
public:
typedef std::map<const ltl::formula*, const ltl::formula*> fmap_t;
typedef std::map<ltl::formula, ltl::formula> fmap_t;
ltl_suspender_visitor(fmap_t& g2s, fmap_t& a2o, bool oblig)
: g2s_(g2s), a2o_(a2o), oblig_(oblig)
{
}
void
visit(const ltl::multop* mo)
ltl::formula
visit(ltl::formula f)
{
ltl::multop::type op = mo->op();
switch (op)
switch (ltl::op op = f.kind())
{
case ltl::multop::Or:
case ltl::multop::And:
case ltl::op::Or:
case ltl::op::And:
{
ltl::multop::vec* res = new ltl::multop::vec;
ltl::multop::vec* oblig = oblig_ ? new ltl::multop::vec : 0;
ltl::multop::vec* susp = new ltl::multop::vec;
unsigned mos = mo->size();
vec res;
vec oblig;
vec susp;
unsigned mos = f.size();
for (unsigned i = 0; i < mos; ++i)
{
const ltl::formula* c = mo->nth(i);
if (c->is_boolean())
res->push_back(c->clone());
else if (oblig_ && c->is_syntactic_obligation())
oblig->push_back(c->clone());
else if (c->is_eventual() && c->is_universal())
susp->push_back(c->clone());
ltl::formula c = f.nth(i);
if (c.is_boolean())
res.push_back(c);
else if (oblig_ && c.is_syntactic_obligation())
oblig.push_back(c);
else if (c.is_eventual() && c.is_universal())
susp.push_back(c);
else
res->push_back(recurse(c));
res.push_back(recurse(c));
}
if (!oblig_ || oblig->empty())
if (!oblig.empty())
{
delete oblig;
res.push_back(recurse(ltl::formula::multop(op, oblig)));
}
else
if (!susp.empty())
{
const ltl::formula* o = ltl::multop::instance(op, oblig);
res->push_back(recurse(o));
o->destroy();
}
if (susp->empty())
{
delete susp;
}
else
{
const ltl::formula* o = ltl::multop::instance(op, susp);
ltl::formula o = ltl::formula::multop(op, susp);
// Rewrite 'o' as 'G"o"'
const ltl::formula* g = recurse(o);
o->destroy();
if (op == ltl::multop::And)
ltl::formula g = recurse(o);
if (op == ltl::op::And)
{
res->push_back(g);
res.push_back(g);
}
else
{
// res || susp -> (res && G![susp]) || G[susp])
const ltl::formula* r = ltl::multop::instance(op, res);
const ltl::unop* u =
down_cast<const ltl::unop*>(g);
const ltl::formula* gn =
ltl::unop::instance
(ltl::unop::G, ltl::unop::instance
(ltl::unop::Not, u->child()->clone()));
result_ = ltl::multop::instance
(ltl::multop::Or, ltl::multop::instance
(ltl::multop::And, r, gn),
g);
return;
auto r = ltl::formula::multop(op, res);
auto gn = ltl::formula::G(ltl::formula::Not(g.nth(0)));
return ltl::formula::Or({ltl::formula::And({r, gn}), g});
}
}
result_ = ltl::multop::instance(op, res);
return ltl::formula::multop(op, res);
}
break;
case ltl::multop::OrRat:
case ltl::multop::AndRat:
case ltl::multop::AndNLM:
case ltl::multop::Concat:
case ltl::multop::Fusion:
this->ltl::clone_visitor::visit(mo);
break;
default:
return f.map([this](ltl::formula f)
{
return this->recurse(f);
});
}
}
const ltl::formula*
recurse(const ltl::formula* f)
ltl::formula
recurse(ltl::formula f)
{
const ltl::formula* res;
if (f->is_boolean())
return f->clone();
if (oblig_ && f->is_syntactic_obligation())
ltl::formula res;
if (f.is_boolean())
return f;
if (oblig_ && f.is_syntactic_obligation())
{
fmap_t::const_iterator i = assoc_.find(f);
if (i != assoc_.end())
return i->second->clone();
return i->second;
std::ostringstream s;
s << "〈";
print_psl(s, f) << "〉";
res = suspenv.require(s.str());
// We have to clone f, because it is not always a sub-tree
// of the original formula. (Think n-ary operators.)
a2o_[res] = f->clone();
print_psl(s << "〈", f) << "〉";
res = ltl::formula::ap(s.str());
a2o_[res] = f;
assoc_[f] = res;
return res;
}
if (f->is_eventual() && f->is_universal())
if (f.is_eventual() && f.is_universal())
{
fmap_t::const_iterator i = assoc_.find(f);
if (i != assoc_.end())
return ltl::unop::instance(ltl::unop::G, i->second->clone());
return ltl::formula::G(i->second);
std::ostringstream s;
s << '[';
print_psl(s, f) << ']';
res = suspenv.require(s.str());
// We have to clone f, because it is not always a sub-tree
// of the original formula. (Think n-ary operators.)
g2s_[res] = f->clone();
print_psl(s << '[', f) << "]$";
res = ltl::formula::ap(s.str());
g2s_[res] = f;
assoc_[f] = res;
return ltl::unop::instance(ltl::unop::G, res);
return ltl::formula::G(res);
}
f->accept(*this);
return result_;
return visit(f);
}
private:
@ -210,7 +156,7 @@ namespace spot
static
twa_graph_ptr
susp_prod(const const_twa_ptr& left, const ltl::formula* f, bdd v)
susp_prod(const const_twa_ptr& left, ltl::formula f, bdd v)
{
bdd_dict_ptr dict = left->get_dict();
auto right =
@ -320,7 +266,7 @@ namespace spot
twa_graph_ptr
compsusp(const ltl::formula* f, const bdd_dict_ptr& dict,
compsusp(ltl::formula f, const bdd_dict_ptr& dict,
bool no_wdba, bool no_simulation,
bool early_susp, bool no_susp_product, bool wdba_smaller,
bool oblig)
@ -328,7 +274,7 @@ namespace spot
ltl_suspender_visitor::fmap_t g2s;
ltl_suspender_visitor::fmap_t a2o;
ltl_suspender_visitor v(g2s, a2o, oblig);
const ltl::formula* g = v.recurse(f);
ltl::formula g = v.recurse(f);
// Translate the patched formula, and remove useless SCCs.
twa_graph_ptr res =
@ -392,14 +338,6 @@ namespace spot
if ((allaccap & i->second) == allaccap)
res = susp_prod(res, i->first, i->second);
g->destroy();
for (ltl_suspender_visitor::fmap_t::iterator i = g2s.begin();
i != g2s.end(); ++i)
i->second->destroy();
for (ltl_suspender_visitor::fmap_t::iterator i = a2o.begin();
i != a2o.end(); ++i)
i->second->destroy();
return res;
}
}