Maintain basic LTL properties using a bitfield inside formula objects.
This bitfield is easily updated as the formulae are constructed. Doing so avoids many AST recursions to compute these properties individually. This patch removes the eventual_universal_visitor, as well as the kind_of() function. * src/ltlast/formula.hh (is_boolean, is_sugar_free_boolean, is_in_nenoform, is_X_free, is_sugar_free_ltl, is_ltl_formula, is_eltl_formula, is_psl_formula, is_eventual, is_universal, is_marked): New methods to query formula properties in constant time. (get_props, ltl_prop): A method and structure for implementation as a field bit in an unsigned, for fast computation. (print_formula_props): New function. * src/ltlast/formula.cc (print_formula_props): Implement it. * src/ltlast/atomic_prop.cc, src/ltlast/binop.cc, src/ltlast/bunop.cc, src/ltlast/constant.cc, src/ltlast/multop.cc, src/ltlast/unop.cc, src/ltlast/automatop.cc: Compute the properties as instances are constructed. * src/ltlparse/ltlparse.yy: Update to use is_boolean() instead of kind_of(). * src/ltltest/kind.cc: Update to use print_formula_props(). * src/ltltest/kind.test: Adjust to test eventual and universal properties. * src/ltlvisit/kind.cc, src/ltlvisit/kind.hh: Delete these files. * src/ltlvisit/Makefile.am: Remove kind.hh and kind.cc. * src/ltlvisit/reduce.cc (recurse_eu, eventual_universal_visitor): Remove, no longer needed. (reduce_visitor, is_eventual, is_universal): Adjust to use formula::is_eventual(), and formula::is_universal(). * src/ltlvisit/reduce.hh (is_eventual, is_universal): Declare as deprecated.
This commit is contained in:
Alexandre Duret-Lutz
parent
1671aa5da1
commit
546260e7a0
17 changed files with 408 additions and 488 deletions
|
|
@ -35,7 +35,6 @@ ltlvisit_HEADERS = \
|
|||
destroy.hh \
|
||||
dotty.hh \
|
||||
dump.hh \
|
||||
kind.hh \
|
||||
length.hh \
|
||||
lunabbrev.hh \
|
||||
mark.hh \
|
||||
|
|
@ -58,7 +57,6 @@ libltlvisit_la_SOURCES = \
|
|||
destroy.cc \
|
||||
dotty.cc \
|
||||
dump.cc \
|
||||
kind.cc \
|
||||
length.cc \
|
||||
lunabbrev.cc \
|
||||
mark.cc \
|
||||
|
|
|
|||
|
|
@ -1,229 +0,0 @@
|
|||
// Copyright (C) 2010 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 2 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 Spot; see the file COPYING. If not, write to the Free
|
||||
// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
|
||||
// 02111-1307, USA.
|
||||
|
||||
#include "kind.hh"
|
||||
#include "ltlast/allnodes.hh"
|
||||
#include "ltlast/visitor.hh"
|
||||
#include <iostream>
|
||||
|
||||
namespace spot
|
||||
{
|
||||
namespace ltl
|
||||
{
|
||||
namespace
|
||||
{
|
||||
|
||||
class kind_visitor : public visitor
|
||||
{
|
||||
unsigned result_;
|
||||
public:
|
||||
kind_visitor()
|
||||
: result_(All_Kind)
|
||||
{
|
||||
}
|
||||
~kind_visitor()
|
||||
{
|
||||
}
|
||||
|
||||
unsigned
|
||||
result()
|
||||
{
|
||||
return result_;
|
||||
}
|
||||
|
||||
void
|
||||
visit(atomic_prop*)
|
||||
{
|
||||
}
|
||||
|
||||
void
|
||||
visit(constant* c)
|
||||
{
|
||||
if (c == constant::empty_word_instance())
|
||||
result_ &= ~(Boolean_Kind | LTL_Kind | ELTL_Kind);
|
||||
}
|
||||
|
||||
void
|
||||
visit(bunop* bo)
|
||||
{
|
||||
result_ = recurse(bo->child());
|
||||
result_ &= ~(Boolean_Kind | LTL_Kind | ELTL_Kind);
|
||||
}
|
||||
|
||||
void
|
||||
visit(unop* uo)
|
||||
{
|
||||
result_ = recurse(uo->child());
|
||||
|
||||
switch (uo->op())
|
||||
{
|
||||
case unop::NegClosure:
|
||||
case unop::Closure:
|
||||
result_ &= ~(Boolean_Kind | LTL_Kind | ELTL_Kind);
|
||||
return;
|
||||
case unop::Finish:
|
||||
result_ &= ~(Boolean_Kind | LTL_Kind | PSL_Kind);
|
||||
return;
|
||||
case unop::Not:
|
||||
if (!dynamic_cast<atomic_prop*>(uo->child()))
|
||||
result_ &= ~NeNoForm_Kind;
|
||||
return;
|
||||
case unop::X:
|
||||
result_ &= ~(Boolean_Kind | No_X_Kind | ELTL_Kind);
|
||||
return;
|
||||
case unop::F:
|
||||
case unop::G:
|
||||
result_ &= ~(Boolean_Kind | SugarFree_LTL_Kind | ELTL_Kind);
|
||||
return;
|
||||
}
|
||||
/* Unreachable code. */
|
||||
assert(0);
|
||||
}
|
||||
|
||||
void
|
||||
visit(automatop* ao)
|
||||
{
|
||||
unsigned aos = ao->size();
|
||||
for (unsigned i = 0; i < aos && !result_; ++i)
|
||||
result_ &= recurse(ao->nth(i));
|
||||
|
||||
result_ &= ~(Boolean_Kind | LTL_Kind | PSL_Kind);
|
||||
}
|
||||
|
||||
void
|
||||
visit(multop* mo)
|
||||
{
|
||||
unsigned mos = mo->size();
|
||||
for (unsigned i = 0; i < mos && !result_; ++i)
|
||||
result_ &= recurse(mo->nth(i));
|
||||
|
||||
switch (mo->op())
|
||||
{
|
||||
case multop::Or:
|
||||
case multop::And:
|
||||
return;
|
||||
case multop::AndNLM:
|
||||
// The non-matching-length-And (&) can only appear
|
||||
// in the rational parts of PSL formula. We
|
||||
// don't remove the Boolean_Kind flags, because
|
||||
// applied to atomic propositions a&b has the same
|
||||
// effect as a&&b.
|
||||
result_ &= ~(LTL_Kind | ELTL_Kind);
|
||||
return;
|
||||
case multop::Concat:
|
||||
case multop::Fusion:
|
||||
result_ &= ~(Boolean_Kind | LTL_Kind | ELTL_Kind);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
visit(binop* bo)
|
||||
{
|
||||
result_ = recurse(bo->first()) & recurse(bo->second());
|
||||
|
||||
switch (bo->op())
|
||||
{
|
||||
case binop::EConcatMarked:
|
||||
case binop::UConcat:
|
||||
case binop::EConcat:
|
||||
result_ &= ~(Boolean_Kind | LTL_Kind | ELTL_Kind);
|
||||
return;
|
||||
case binop::Xor:
|
||||
case binop::Implies:
|
||||
case binop::Equiv:
|
||||
result_ &= ~(NeNoForm_Kind | SugarFree_Boolean_Kind);
|
||||
return;
|
||||
case binop::U:
|
||||
case binop::W:
|
||||
case binop::M:
|
||||
case binop::R:
|
||||
result_ &= ~(Boolean_Kind | ELTL_Kind);
|
||||
return;
|
||||
}
|
||||
/* Unreachable code. */
|
||||
assert(0);
|
||||
}
|
||||
|
||||
unsigned
|
||||
recurse(const formula* f)
|
||||
{
|
||||
return kind_of(f);
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
unsigned
|
||||
kind_of(const formula* f)
|
||||
{
|
||||
kind_visitor v;
|
||||
const_cast<formula*>(f)->accept(v);
|
||||
return v.result();
|
||||
}
|
||||
|
||||
|
||||
|
||||
std::ostream&
|
||||
print_kind(std::ostream& o, unsigned k, bool abbreviated)
|
||||
{
|
||||
struct data { char abbrev; const char* name; };
|
||||
static const data kind_name[] =
|
||||
{
|
||||
{'B', "Boolean formula"}, // 1
|
||||
{'&', "no sugar Boolean operator"}, // 2
|
||||
{'!', "in negative normal form"}, // 4
|
||||
{'x', "no X LTL operator"}, // 8
|
||||
{'f', "no sugar LTL operator"}, // 16
|
||||
{'L', "LTL formula"}, // 32
|
||||
{'E', "ELTL formula"}, // 64
|
||||
{'P', "PSL formula"}, // 128
|
||||
};
|
||||
const char* comma = "";
|
||||
unsigned size = (sizeof kind_name)/(sizeof *kind_name);
|
||||
for (unsigned i = 0; i < size; ++i)
|
||||
{
|
||||
if ((k & 1))
|
||||
{
|
||||
if (abbreviated)
|
||||
{
|
||||
o << kind_name[i].abbrev;
|
||||
}
|
||||
else
|
||||
{
|
||||
o << comma << kind_name[i].name;
|
||||
comma = ", ";
|
||||
}
|
||||
}
|
||||
k >>= 1;
|
||||
}
|
||||
return o;
|
||||
}
|
||||
|
||||
|
||||
std::ostream&
|
||||
print_kind(std::ostream& o, const formula* f, bool abbreviated)
|
||||
{
|
||||
print_kind(o, kind_of(f), abbreviated);
|
||||
return o;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
|
@ -1,69 +0,0 @@
|
|||
// Copyright (C) 2010 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 2 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 Spot; see the file COPYING. If not, write to the Free
|
||||
// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
|
||||
// 02111-1307, USA.
|
||||
|
||||
#ifndef SPOT_LTLVISIT_KIND_HH
|
||||
# define SPOT_LTLVISIT_KIND_HH
|
||||
|
||||
#include "ltlast/predecl.hh"
|
||||
#include <iosfwd>
|
||||
|
||||
namespace spot
|
||||
{
|
||||
namespace ltl
|
||||
{
|
||||
/// Different kinds or proporties of formulae.
|
||||
// If you change this list, you have to adjust
|
||||
// the kind_name array in print_kind() (kind.cc)
|
||||
enum kind
|
||||
{
|
||||
Boolean_Kind = 1,
|
||||
SugarFree_Boolean_Kind = 2,
|
||||
NeNoForm_Kind = 4,
|
||||
No_X_Kind = 8,
|
||||
SugarFree_LTL_Kind = 16,
|
||||
LTL_Kind = 32,
|
||||
ELTL_Kind = 64,
|
||||
PSL_Kind = 128,
|
||||
All_Kind = -1U,
|
||||
};
|
||||
|
||||
|
||||
/// \brief Compute properties of a formula.
|
||||
/// \ingroup ltl_visitor
|
||||
///
|
||||
/// Return a sum of ltl::kind values depending on the operators
|
||||
/// used by a formula.
|
||||
///
|
||||
/// \param f The formula to analyze.
|
||||
unsigned kind_of(const formula* f);
|
||||
|
||||
/// \brief Print a ltl::kind (computed by kind_of()).
|
||||
/// \ingroup ltl_visitor
|
||||
std::ostream& print_kind(std::ostream& o, unsigned k,
|
||||
bool abbreviated = false);
|
||||
|
||||
/// \brief Print the properties of a formula.
|
||||
/// \ingroup ltl_visitor
|
||||
std::ostream& print_kind(std::ostream& o, const formula* f,
|
||||
bool abbreviated = false);
|
||||
}
|
||||
}
|
||||
|
||||
#endif // SPOT_LTLVISIT_KIND_HH
|
||||
|
|
@ -38,168 +38,6 @@ namespace spot
|
|||
{
|
||||
namespace
|
||||
{
|
||||
typedef union
|
||||
{
|
||||
unsigned v;
|
||||
struct is_struct
|
||||
{
|
||||
bool eventual:1;
|
||||
bool universal:1;
|
||||
} is;
|
||||
} eu_info;
|
||||
|
||||
static unsigned recurse_eu(const formula* f);
|
||||
|
||||
class eventual_universal_visitor: public const_visitor
|
||||
{
|
||||
public:
|
||||
|
||||
eventual_universal_visitor()
|
||||
{
|
||||
}
|
||||
|
||||
virtual
|
||||
~eventual_universal_visitor()
|
||||
{
|
||||
}
|
||||
|
||||
bool
|
||||
is_eventual() const
|
||||
{
|
||||
return ret_.is.eventual;
|
||||
}
|
||||
|
||||
bool
|
||||
is_universal() const
|
||||
{
|
||||
return ret_.is.universal;
|
||||
}
|
||||
|
||||
unsigned
|
||||
eu() const
|
||||
{
|
||||
return ret_.v;
|
||||
}
|
||||
|
||||
void
|
||||
visit(const atomic_prop*)
|
||||
{
|
||||
ret_.v = 0;
|
||||
}
|
||||
|
||||
void
|
||||
visit(const constant*)
|
||||
{
|
||||
ret_.v = 0;
|
||||
}
|
||||
|
||||
void
|
||||
visit(const bunop*)
|
||||
{
|
||||
ret_.v = 0;
|
||||
}
|
||||
|
||||
void
|
||||
visit(const unop* uo)
|
||||
{
|
||||
const formula* f1 = uo->child();
|
||||
if (uo->op() == unop::F)
|
||||
{
|
||||
ret_.v = recurse_eu(f1);
|
||||
ret_.is.eventual = true;
|
||||
return;
|
||||
}
|
||||
if (uo->op() == unop::G)
|
||||
{
|
||||
ret_.v = recurse_eu(f1);
|
||||
ret_.is.universal = true;
|
||||
return;
|
||||
}
|
||||
ret_.v = 0;
|
||||
return;
|
||||
}
|
||||
|
||||
void
|
||||
visit(const binop* bo)
|
||||
{
|
||||
const formula* f1 = bo->first();
|
||||
const formula* f2 = bo->second();
|
||||
|
||||
// Beware: (f U g) is purely eventual if both operands
|
||||
// are purely eventual, unlike in the proceedings of
|
||||
// Concur'00. (The revision of the paper available at
|
||||
// http://www.bell-labs.com/project/TMP/ is fixed.) See
|
||||
// also http://arxiv.org/abs/1011.4214 for a discussion
|
||||
// about this problem. (Which we fixed in 2005 thanks
|
||||
// to LBTT.)
|
||||
|
||||
// This means that we can use the following case to handle
|
||||
// all cases of (f U g), (f R g), (f W g), (f M g) for
|
||||
// universality and eventuality.
|
||||
ret_.v = recurse_eu(f1) & recurse_eu(f2);
|
||||
|
||||
// we are left with the case where U, R, W, or M are actually
|
||||
// used to represent F or G.
|
||||
switch (bo->op())
|
||||
{
|
||||
case binop::Xor:
|
||||
case binop::Equiv:
|
||||
case binop::Implies:
|
||||
return;
|
||||
case binop::U:
|
||||
if (f1 == constant::true_instance())
|
||||
ret_.is.eventual = true;
|
||||
return;
|
||||
case binop::W:
|
||||
if (f2 == constant::true_instance())
|
||||
ret_.is.eventual = true;
|
||||
return;
|
||||
case binop::R:
|
||||
if (f1 == constant::false_instance())
|
||||
ret_.is.universal = true;
|
||||
return;
|
||||
case binop::M:
|
||||
if (f2 == constant::false_instance())
|
||||
ret_.is.universal = true;
|
||||
return;
|
||||
case binop::UConcat:
|
||||
case binop::EConcat:
|
||||
case binop::EConcatMarked:
|
||||
return;
|
||||
}
|
||||
/* Unreachable code. */
|
||||
assert(0);
|
||||
}
|
||||
|
||||
void
|
||||
visit(const automatop*)
|
||||
{
|
||||
assert(0);
|
||||
}
|
||||
|
||||
void
|
||||
visit(const multop* mo)
|
||||
{
|
||||
unsigned mos = mo->size();
|
||||
assert(mos != 0);
|
||||
ret_.v = recurse_eu(mo->nth(0));
|
||||
for (unsigned i = 1; i < mos && ret_.v != 0; ++i)
|
||||
ret_.v &= recurse_eu(mo->nth(i));
|
||||
}
|
||||
|
||||
private:
|
||||
eu_info ret_;
|
||||
};
|
||||
|
||||
static unsigned
|
||||
recurse_eu(const formula* f)
|
||||
{
|
||||
eventual_universal_visitor v;
|
||||
const_cast<formula*>(f)->accept(v);
|
||||
return v.eu();
|
||||
}
|
||||
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////
|
||||
|
||||
class reduce_visitor: public visitor
|
||||
|
|
@ -251,14 +89,14 @@ namespace spot
|
|||
case unop::F:
|
||||
/* If f is a pure eventuality formula then F(f)=f. */
|
||||
if (!(opt_ & Reduce_Eventuality_And_Universality)
|
||||
|| !is_eventual(result_))
|
||||
|| !result_->is_eventual())
|
||||
result_ = unop::instance(unop::F, result_);
|
||||
return;
|
||||
|
||||
case unop::G:
|
||||
/* If f is a pure universality formula then G(f)=f. */
|
||||
if (!(opt_ & Reduce_Eventuality_And_Universality)
|
||||
|| !is_universal(result_))
|
||||
|| !result_->is_universal())
|
||||
result_ = unop::instance(unop::G, result_);
|
||||
return;
|
||||
|
||||
|
|
@ -280,14 +118,13 @@ namespace spot
|
|||
binop::type op = bo->op();
|
||||
|
||||
formula* f2 = recurse(bo->second());
|
||||
eu_info f2i = { recurse_eu(f2) };
|
||||
|
||||
if (opt_ & Reduce_Eventuality_And_Universality)
|
||||
{
|
||||
/* If b is a pure eventuality formula then a U b = b.
|
||||
If b is a pure universality formula a R b = b. */
|
||||
if ((f2i.is.eventual && (op == binop::U))
|
||||
|| (f2i.is.universal && (op == binop::R)))
|
||||
if ((f2->is_eventual() && (op == binop::U))
|
||||
|| (f2->is_universal() && (op == binop::R)))
|
||||
{
|
||||
result_ = f2;
|
||||
return;
|
||||
|
|
@ -295,17 +132,16 @@ namespace spot
|
|||
}
|
||||
|
||||
formula* f1 = recurse(bo->first());
|
||||
eu_info f1i = { recurse_eu(f1) };
|
||||
if (opt_ & Reduce_Eventuality_And_Universality)
|
||||
{
|
||||
/* If a is a pure eventuality formula then a M b = a & b.
|
||||
If a is a pure universality formula a W b = a|b. */
|
||||
if (f1i.is.eventual && (op == binop::M))
|
||||
if (f1->is_eventual() && (op == binop::M))
|
||||
{
|
||||
result_ = multop::instance(multop::And, f1, f2);
|
||||
return;
|
||||
}
|
||||
if (f1i.is.universal && (op == binop::W))
|
||||
if (f1->is_universal() && (op == binop::W))
|
||||
{
|
||||
result_ = multop::instance(multop::Or, f1, f2);
|
||||
return;
|
||||
|
|
@ -639,17 +475,13 @@ namespace spot
|
|||
bool
|
||||
is_eventual(const formula* f)
|
||||
{
|
||||
eventual_universal_visitor v;
|
||||
const_cast<formula*>(f)->accept(v);
|
||||
return v.is_eventual();
|
||||
return f->is_eventual();
|
||||
}
|
||||
|
||||
bool
|
||||
is_universal(const formula* f)
|
||||
{
|
||||
eventual_universal_visitor v;
|
||||
const_cast<formula*>(f)->accept(v);
|
||||
return v.is_universal();
|
||||
return f->is_universal();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
// Copyright (C) 2004, 2006 Laboratoire d'Informatique de Paris 6 (LIP6),
|
||||
// Copyright (C) 2004, 2006, 2010 Laboratoire d'Informatique de Paris 6 (LIP6),
|
||||
// département Systèmes Répartis Coopératifs (SRC), Université Pierre
|
||||
// et Marie Curie.
|
||||
//
|
||||
|
|
@ -82,7 +82,13 @@ namespace spot
|
|||
///
|
||||
/// A word that satisfies a pure eventuality can be prefixed by
|
||||
/// anything and still satisfies the formula.
|
||||
///
|
||||
/// \deprecated Use f->is_eventual() instead.
|
||||
#if __GNUC__
|
||||
bool is_eventual(const formula* f) __attribute__ ((deprecated));
|
||||
#else
|
||||
bool is_eventual(const formula* f);
|
||||
#endif
|
||||
|
||||
/// \brief Check whether a formula is purely universal.
|
||||
/// \ingroup ltl_misc
|
||||
|
|
@ -105,7 +111,13 @@ namespace spot
|
|||
///
|
||||
/// Any (non-empty) suffix of a word that satisfies if purely
|
||||
/// universal formula also satisfies the formula.
|
||||
///
|
||||
/// \deprecated Use f->is_universal() instead.
|
||||
#if __GNUC__
|
||||
bool is_universal(const formula* f) __attribute__ ((deprecated));
|
||||
#else
|
||||
bool is_universal(const formula* f);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue