Commit a15aac28 authored by Pierre PARUTTO's avatar Pierre PARUTTO Committed by Alexandre Duret-Lutz
Browse files

Revamp tgbaexplicit.hh

* src/tgba/tgbaexplicit.hh, src/tgba/tgbaexplicit.cc: Factor most of
the code in an explicit_graph<State, Type> that inherits from type.
The tgba_explicit type<State> now inherits from
explicit_graph<State,tgba>.
* src/ltlvisit/contain.cc, src/neverparse/neverclaimparse.yy
src/tgba/tgbareduc.cc, src/tgba/tgbareduc.hh, src/tgbaalgos/cutscc.cc,
src/tgbaalgos/dupexp.cc, src/tgbaalgos/dupexp.hh,
src/tgbaalgos/emptiness.cc, src/tgbaalgos/ltl2tgba_fm.cc,
src/tgbaalgos/ltl2tgba_fm.hh, src/tgbaalgos/minimize.cc,
src/tgbaalgos/powerset.cc, src/tgbaalgos/randomgraph.cc,
src/tgbaalgos/sccfilter.cc, src/tgbaparse/tgbaparse.yy,
src/tgbatest/complementation.cc, src/tgbatest/explicit.cc,
src/tgbatest/explprod.cc, src/tgbatest/ltl2tgba.cc,
src/tgbatest/mixprod.cc, src/tgbatest/powerset.cc,
src/tgbatest/tgbaread.cc, src/tgbatest/tripprod.cc:
Replace tgba_explicit* by the actual type used.
* src/tgbatest/explicit2.cc: New file.
* src/tgbatest/Makefile.am: Add it.
parent 9e2b932f
......@@ -132,9 +132,11 @@ namespace spot
if (i != translated_.end())
return &i->second;
const tgba_explicit* e = ltl_to_tgba_fm(f, dict_, exprop_, symb_merge_,
branching_postponement_,
fair_loop_approx_);
const tgba_explicit_formula* e =
ltl_to_tgba_fm(f, dict_, exprop_, symb_merge_,
branching_postponement_,
fair_loop_approx_);
record_& r = translated_[f->clone()];
r.translation = e;
return &r;
......
......@@ -120,7 +120,7 @@ ident_list:
state:
ident_list "skip"
{
spot::tgba_explicit::transition* t = result->create_transition(*$1, *$1);
spot::state_explicit_string::transition* t = result->create_transition(*$1, *$1);
bool acc = !strncmp("accept", $1->c_str(), 6);
if (acc)
result->add_acceptance_condition(t,
......@@ -135,7 +135,7 @@ state:
bool acc = !strncmp("accept", $1->c_str(), 6);
for (it = $3->begin(); it != $3->end(); ++it)
{
spot::tgba_explicit::transition* t =
spot::state_explicit_string::transition* t =
result->create_transition(*$1,*it->second);
result->add_condition(t, it->first);
......
// Copyright (C) 2009, 2010, 2011 Laboratoire de Recherche et Dveloppement
// Copyright (C) 2012 Laboratoire de Recherche et Développement
// de l'Epita (LRDE).
// Copyright (C) 2003, 2004 Laboratoire d'Informatique de Paris 6 (LIP6),
// dpartement Systmes Rpartis Coopratifs (SRC), Universit Pierre
// et Marie Curie.
//
// This file is part of Spot, a model checking library.
//
......@@ -21,348 +18,13 @@
// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
#include <sstream>
#include "ltlast/atomic_prop.hh"
#include "ltlast/constant.hh"
#include "tgbaexplicit.hh"
#include "tgba/formula2bdd.hh"
#include "misc/bddop.hh"
#include <cassert>
#include "ltlvisit/tostring.hh"
#include "ltlast/constant.hh"
namespace spot
{
////////////////////////////////////////
// tgba_explicit_succ_iterator
tgba_explicit_succ_iterator::tgba_explicit_succ_iterator
(const state_explicit::transitions_t* s, bdd all_acc)
: s_(s), all_acceptance_conditions_(all_acc)
{
}
void
tgba_explicit_succ_iterator::first()
{
i_ = s_->begin();
}
void
tgba_explicit_succ_iterator::next()
{
++i_;
}
bool
tgba_explicit_succ_iterator::done() const
{
return i_ == s_->end();
}
state_explicit*
tgba_explicit_succ_iterator::current_state() const
{
assert(!done());
return const_cast<state_explicit*>(i_->dest);
}
bdd
tgba_explicit_succ_iterator::current_condition() const
{
assert(!done());
return i_->condition;
}
bdd
tgba_explicit_succ_iterator::current_acceptance_conditions() const
{
assert(!done());
return i_->acceptance_conditions & all_acceptance_conditions_;
}
////////////////////////////////////////
// state_explicit
int
state_explicit::compare(const spot::state* other) const
{
const state_explicit* o = down_cast<const state_explicit*>(other);
assert(o);
// Do not simply return "o - this", it might not fit in an int.
if (o < this)
return -1;
if (o > this)
return 1;
return 0;
}
size_t
state_explicit::hash() const
{
return
reinterpret_cast<const char*>(this) - static_cast<const char*>(0);
}
////////////////////////////////////////
// tgba_explicit
tgba_explicit::tgba_explicit(bdd_dict* dict)
: dict_(dict), init_(0), all_acceptance_conditions_(bddfalse),
neg_acceptance_conditions_(bddtrue),
all_acceptance_conditions_computed_(false)
{
}
tgba_explicit::~tgba_explicit()
{
dict_->unregister_all_my_variables(this);
}
tgba_explicit::transition*
tgba_explicit::create_transition(state* source, const state* dest)
{
transition t;
t.dest = dest;
t.condition = bddtrue;
t.acceptance_conditions = bddfalse;
state_explicit::transitions_t::iterator i =
source->successors.insert(source->successors.end(), t);
return &*i;
}
void
tgba_explicit::add_condition(transition* t, const ltl::formula* f)
{
t->condition &= formula_to_bdd(f, dict_, this);
f->destroy();
}
void
tgba_explicit::add_conditions(transition* t, bdd f)
{
dict_->register_propositions(f, this);
t->condition &= f;
}
void
tgba_explicit::copy_acceptance_conditions_of(const tgba *a)
{
assert(neg_acceptance_conditions_ == bddtrue);
assert(all_acceptance_conditions_computed_ == false);
bdd f = a->neg_acceptance_conditions();
dict_->register_acceptance_variables(f, this);
neg_acceptance_conditions_ = f;
}
void
tgba_explicit::set_acceptance_conditions(bdd acc)
{
assert(neg_acceptance_conditions_ == bddtrue);
assert(all_acceptance_conditions_computed_ == false);
dict_->register_acceptance_variables(bdd_support(acc), this);
neg_acceptance_conditions_ = compute_neg_acceptance_conditions(acc);
all_acceptance_conditions_computed_ = true;
all_acceptance_conditions_ = acc;
}
bool
tgba_explicit::has_acceptance_condition(const ltl::formula* f) const
{
return dict_->is_registered_acceptance_variable(f, this);
}
bdd
tgba_explicit::get_acceptance_condition(const ltl::formula* f)
{
bdd_dict::fv_map::iterator i = dict_->acc_map.find(f);
assert(has_acceptance_condition(f));
/* If this second assert fails and the first doesn't,
things are badly broken. This has already happened. */
assert(i != dict_->acc_map.end());
f->destroy();
bdd v = bdd_ithvar(i->second);
v &= bdd_exist(neg_acceptance_conditions_, v);
return v;
}
void
tgba_explicit::add_acceptance_condition(transition* t, const ltl::formula* f)
{
bdd c = get_acceptance_condition(f);
t->acceptance_conditions |= c;
}
void
tgba_explicit::add_acceptance_conditions(transition* t, bdd f)
{
bdd sup = bdd_support(f);
dict_->register_acceptance_variables(sup, this);
while (sup != bddtrue)
{
neg_acceptance_conditions_ &= bdd_nithvar(bdd_var(sup));
sup = bdd_high(sup);
}
t->acceptance_conditions |= f;
}
state*
tgba_explicit::get_init_state() const
{
// Fix empty automata by adding a lone initial state.
if (!init_)
const_cast<tgba_explicit*>(this)->add_default_init();
return init_;
}
tgba_succ_iterator*
tgba_explicit::succ_iter(const spot::state* state,
const spot::state* global_state,
const tgba* global_automaton) const
{
const state_explicit* s = down_cast<const state_explicit*>(state);
assert(s);
(void) global_state;
(void) global_automaton;
return new tgba_explicit_succ_iterator(&s->successors,
all_acceptance_conditions());
}
bdd
tgba_explicit::compute_support_conditions(const spot::state* in) const
{
const state_explicit* s = down_cast<const state_explicit*>(in);
assert(s);
const state_explicit::transitions_t& st = s->successors;
bdd res = bddfalse;
state_explicit::transitions_t::const_iterator i;
for (i = st.begin(); i != st.end(); ++i)
res |= i->condition;
return res;
}
bdd
tgba_explicit::compute_support_variables(const spot::state* in) const
{
const state_explicit* s = down_cast<const state_explicit*>(in);
assert(s);
const state_explicit::transitions_t& st = s->successors;
bdd res = bddtrue;
state_explicit::transitions_t::const_iterator i;
for (i = st.begin(); i != st.end(); ++i)
res &= bdd_support(i->condition);
return res;
}
bdd_dict*
tgba_explicit::get_dict() const
{
return dict_;
}
bdd
tgba_explicit::all_acceptance_conditions() const
{
if (!all_acceptance_conditions_computed_)
{
all_acceptance_conditions_ =
compute_all_acceptance_conditions(neg_acceptance_conditions_);
all_acceptance_conditions_computed_ = true;
}
return all_acceptance_conditions_;
}
bdd
tgba_explicit::neg_acceptance_conditions() const
{
return neg_acceptance_conditions_;
}
tgba_explicit_string::~tgba_explicit_string()
{
ns_map::iterator i;
for (i = name_state_map_.begin(); i != name_state_map_.end(); ++i)
{
// Do not erase the same state twice. (Because of possible aliases.)
if (state_name_map_.erase(i->second))
{
delete i->second;
}
}
}
tgba_explicit::state*
tgba_explicit_string::add_default_init()
{
return add_state("empty");
}
std::string
tgba_explicit_string::format_state(const spot::state* s) const
{
const state_explicit* se = down_cast<const state_explicit*>(s);
assert(se);
sn_map::const_iterator i = state_name_map_.find(se);
assert(i != state_name_map_.end());
return i->second;
}
tgba_explicit_formula::~tgba_explicit_formula()
{
ns_map::iterator i = name_state_map_.begin();
while (i != name_state_map_.end())
{
// Advance the iterator before deleting the formula.
const ltl::formula* s = i->first;
delete i->second;
++i;
s->destroy();
}
}
tgba_explicit::state* tgba_explicit_formula::add_default_init()
{
return add_state(ltl::constant::true_instance());
}
std::string
tgba_explicit_formula::format_state(const spot::state* s) const
{
const state_explicit* se = down_cast<const state_explicit*>(s);
assert(se);
sn_map::const_iterator i = state_name_map_.find(se);
assert(i != state_name_map_.end());
return ltl::to_string(i->second);
}
tgba_explicit_number::~tgba_explicit_number()
{
ns_map::iterator i = name_state_map_.begin();
while (i != name_state_map_.end())
{
delete i->second;
++i;
}
}
tgba_explicit::state* tgba_explicit_number::add_default_init()
{
return add_state(0);
}
std::string
tgba_explicit_number::format_state(const spot::state* s) const
{
const state_explicit* se = down_cast<const state_explicit*>(s);
assert(se);
sn_map::const_iterator i = state_name_map_.find(se);
assert(i != state_name_map_.end());
std::stringstream ss;
ss << i->second;
return ss.str();
}
const std::string state_explicit_string::default_val("empty");
const int state_explicit_number::default_val(0);
const ltl::formula*
state_explicit_formula::default_val(ltl::constant::true_instance());
}
// Copyright (C) 2009, 2010, 2011 Laboratoire de Recherche et Développement
// de l'Epita (LRDE).
// Copyright (C) 2003, 2004, 2006 Laboratoire d'Informatique de
// Paris 6 (LIP6), département Systèmes Répartis Coopératifs (SRC),
// Université Pierre et Marie Curie.
// -*- encoding: utf-8 -*-
// Copyright (C) 2009, 2010, 2011, 2012 Laboratoire de Recherche et
// Développement de l'Epita.
// Copyright (C) 2003, 2004, 2006 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.
//
......@@ -24,21 +25,48 @@
#ifndef SPOT_TGBA_TGBAEXPLICIT_HH
# define SPOT_TGBA_TGBAEXPLICIT_HH
#include "misc/hash.hh"
#include <sstream>
#include <list>
#include "tgba.hh"
#include "tgba/formula2bdd.hh"
#include "misc/hash.hh"
#include "misc/bddop.hh"
#include "ltlast/formula.hh"
#include <cassert>
#include "ltlvisit/tostring.hh"
namespace spot
{
// Forward declarations. See below.
class state_explicit;
class tgba_explicit_succ_iterator;
class tgba_explicit;
///misc
template<typename T>
struct destroy_key
{
void destroy(T t)
{
(void) t;
}
};
template<>
struct destroy_key<const ltl::formula*>
{
void destroy(const ltl::formula* t)
{
t->destroy();
}
};
/// States used by spot::tgba_explicit.
class tba: public tgba
{
public:
/// A State in a TBA (Transition based Buchi Automaton) is accepting
/// iff all outgoing transitions are accepting.
virtual bool is_accepting(const spot::state* s) = 0;
};
/// States used by spot::explicit_graph implementation
/// \ingroup tgba_representation
template<typename Label, typename label_hash>
class state_explicit: public spot::state
{
public:
......@@ -46,360 +74,636 @@ namespace spot
{
}
virtual int compare(const spot::state* other) const;
virtual size_t hash() const;
virtual state_explicit* clone() const
state_explicit(const Label& l):
label_(l)
{
return const_cast<state_explicit*>(this);
}
bool empty() const
virtual ~state_explicit()
{
return successors.empty();
}
virtual
void destroy() const
{
}
/// Explicit transitions.
typedef Label Label_t;
typedef label_hash label_hash_t;
struct transition
{
bdd condition;
bdd acceptance_conditions;
const state_explicit* dest;
const state_explicit<Label, label_hash>* dest;
};
typedef std::list<transition> transitions_t;
transitions_t successors;
private:
state_explicit(const state_explicit& other);
state_explicit& operator=(const state_explicit& other);
virtual ~state_explicit()
const Label& label() const
{
return label_;
}
friend class tgba_explicit_string;
friend class tgba_explicit_formula;
friend class tgba_explicit_number;
};
/// Explicit representation of a spot::tgba.
/// \ingroup tgba_representation
class tgba_explicit: public tgba
{
public:
typedef state_explicit state;
typedef state_explicit::transition transition;
bool empty() const
{
return successors.empty();
}
tgba_explicit(bdd_dict* dict);
virtual int compare(const state* other) const
{
const state_explicit<Label, label_hash>* s =
down_cast<const state_explicit<Label, label_hash>*>(other);
assert (s);
// Do not simply return "o - this", it might not fit in an int.
if (s < this)
return -1;
if (s > this)
return 1;
return 0;
}
/// Add a default initial state.
virtual state* add_default_init() = 0;
virtual size_t hash() const
{
return
reinterpret_cast<const char*>(this) - static_cast<const char*>(0);
}
transition*
create_transition(state* source, const state* dest);
virtual state_explicit<Label, label_hash>*
clone() const
{
return const_cast<state_explicit<Label, label_hash>*>(this);
}
void add_condition(transition* t, const ltl::formula* f);
/// This assumes that all variables in \a f are known from dict.
void add_conditions(transition* t, bdd f);
protected:
Label label_;
};
/// \brief Copy the acceptance conditions of a tgba.
///
/// If used, this function should be called before creating any
/// transition.
void copy_acceptance_conditions_of(const tgba *a);
///states labeled by an int
/// \ingroup tgba_representation
class state_explicit_number:
public state_explicit<int, identity_hash<int> >
{
public:
state_explicit_number()
: state_explicit<int, identity_hash<int> >()
{
}
/// The the acceptance conditions.
void set_acceptance_conditions(bdd acc);
state_explicit_number(int label)
: state_explicit<int, identity_hash<int> >(label)
{
}
bool has_acceptance_condition(const ltl::formula* f) const;
void add_acceptance_condition(transition* t, const ltl::formula* f);
/// This assumes that all acceptance conditions in \a f are known from dict.
void add_acceptance_conditions(transition* t, bdd f);
virtual void destroy()
{
}
// tgba interface
virtual ~tgba_explicit();
virtual spot::state* get_init_state() const;
virtual tgba_succ_iterator*
succ_iter(const spot::state* local_state,
const spot::state* global_state = 0,
const tgba* global_automaton = 0) const;
virtual bdd_dict* get_dict() const;
static const int default_val;
static std::string to_string(int l)
{
std::stringstream ss;
ss << l;
return ss.str();
}