This is a huge patch, that took over a month to complete. The bit sets are currently restricted to what 'unsigned can store', but it should be easy to extend it to 'uint64_t' should we need it. * NEWS: Update. * src/tgba/acc.hh: New file. * src/tgbatest/acc.cc, src/tgbatest/acc.test: Test it. * src/tgba/tgbakvcomplement.cc, src/tgba/tgbakvcomplement.hh, src/tgba/tgbasgba.cc, src/tgba/tgbasgba.hh: Delete. The KV complementation is too slow to be used in practice, and I somehow broke it during the conversion to bitsets. The tgba->sgba conversion was only used for the KV complementation, and should be better redone on tgba_digraph_ptr should it be needed again. * src/bin/ltlcross.cc, src/dstarparse/dra2ba.cc, src/dstarparse/nsa2tgba.cc, src/graphtest/tgbagraph.cc, src/graphtest/tgbagraph.test, src/kripke/fairkripke.cc, src/kripke/fairkripke.hh, src/kripke/kripke.cc, src/kripke/kripke.hh, src/kripke/kripkeexplicit.cc, src/kripke/kripkeexplicit.hh, src/misc/hash.hh, src/neverparse/neverclaimparse.yy, src/priv/accmap.hh, src/ta/ta.cc, src/ta/ta.hh, src/ta/taexplicit.cc, src/ta/taexplicit.hh, src/ta/taproduct.cc, src/ta/taproduct.hh, src/ta/tgta.cc, src/ta/tgta.hh, src/ta/tgtaexplicit.cc, src/ta/tgtaexplicit.hh, src/ta/tgtaproduct.cc, src/ta/tgtaproduct.hh, src/taalgos/dotty.cc, src/taalgos/emptinessta.cc, src/taalgos/minimize.cc, src/taalgos/tgba2ta.cc, src/tgba/Makefile.am, src/tgba/fwd.hh, src/tgba/taatgba.cc, src/tgba/taatgba.hh, src/tgba/tgba.cc, src/tgba/tgba.hh, src/tgba/tgbagraph.cc, src/tgba/tgbagraph.hh, src/tgba/tgbamask.cc, src/tgba/tgbamask.hh, src/tgba/tgbaproduct.cc, src/tgba/tgbaproduct.hh, src/tgba/tgbaproxy.cc, src/tgba/tgbaproxy.hh, src/tgba/tgbasafracomplement.cc, src/tgba/tgbasafracomplement.hh, src/tgbaalgos/bfssteps.cc, src/tgbaalgos/complete.cc, src/tgbaalgos/compsusp.cc, src/tgbaalgos/degen.cc, src/tgbaalgos/dotty.cc, src/tgbaalgos/dtbasat.cc, src/tgbaalgos/dtgbacomp.cc, src/tgbaalgos/dtgbasat.cc, src/tgbaalgos/dupexp.cc, src/tgbaalgos/emptiness.cc, src/tgbaalgos/emptiness.hh, src/tgbaalgos/gtec/ce.cc, src/tgbaalgos/gtec/gtec.cc, src/tgbaalgos/gtec/gtec.hh, src/tgbaalgos/gtec/sccstack.cc, src/tgbaalgos/gtec/sccstack.hh, src/tgbaalgos/gv04.cc, src/tgbaalgos/hoaf.cc, src/tgbaalgos/isweakscc.cc, src/tgbaalgos/lbtt.cc, src/tgbaalgos/ltl2tgba_fm.cc, src/tgbaalgos/magic.cc, src/tgbaalgos/ndfs_result.hxx, src/tgbaalgos/neverclaim.cc, src/tgbaalgos/postproc.cc, src/tgbaalgos/powerset.cc, src/tgbaalgos/randomgraph.cc, src/tgbaalgos/randomgraph.hh, src/tgbaalgos/reducerun.cc, src/tgbaalgos/replayrun.cc, src/tgbaalgos/safety.cc, src/tgbaalgos/save.cc, src/tgbaalgos/scc.cc, src/tgbaalgos/scc.hh, src/tgbaalgos/sccfilter.cc, src/tgbaalgos/sccinfo.cc, src/tgbaalgos/sccinfo.hh, src/tgbaalgos/se05.cc, src/tgbaalgos/simulation.cc, src/tgbaalgos/simulation.hh, src/tgbaalgos/stats.cc, src/tgbaalgos/stripacc.cc, src/tgbaalgos/tau03.cc, src/tgbaalgos/tau03opt.cc, src/tgbaalgos/weight.cc, src/tgbaalgos/weight.hh, src/tgbaparse/tgbaparse.yy, src/tgbatest/Makefile.am, src/tgbatest/complementation.cc, src/tgbatest/complementation.test, src/tgbatest/degenlskip.test, src/tgbatest/det.test, src/tgbatest/dstar.test, src/tgbatest/emptchk.cc, src/tgbatest/explpro2.test, src/tgbatest/explpro3.test, src/tgbatest/explpro4.test, src/tgbatest/explprod.test, src/tgbatest/ltl2tgba.cc, src/tgbatest/ltl2tgba.test, src/tgbatest/maskacc.cc, src/tgbatest/maskacc.test, src/tgbatest/neverclaimread.test, src/tgbatest/randtgba.cc, src/tgbatest/readsave.test, src/tgbatest/sim.test, src/tgbatest/sim2.test, src/tgbatest/spotlbtt.test, src/tgbatest/tgbaread.test, src/tgbatest/tripprod.test, iface/dve2/dve2.cc: Adjust or use to the new acceptance interface.
359 lines
10 KiB
C++
359 lines
10 KiB
C++
// -*- coding: utf-8 -*-
|
|
// Copyright (C) 2009, 2011, 2012, 2013, 2014 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/>.
|
|
|
|
#ifndef SPOT_TGBA_TAATGBA_HH
|
|
# define SPOT_TGBA_TAATGBA_HH
|
|
|
|
#include <set>
|
|
#include <iosfwd>
|
|
#include <vector>
|
|
#include "misc/hash.hh"
|
|
#include "ltlast/formula.hh"
|
|
#include "bdddict.hh"
|
|
#include "tgba.hh"
|
|
#include "ltlvisit/tostring.hh"
|
|
|
|
namespace spot
|
|
{
|
|
/// \brief A self-loop Transition-based Alternating Automaton (TAA)
|
|
/// which is seen as a TGBA (abstract class, see below).
|
|
class SPOT_API taa_tgba : public tgba
|
|
{
|
|
public:
|
|
taa_tgba(const bdd_dict_ptr& dict);
|
|
|
|
struct transition;
|
|
typedef std::list<transition*> state;
|
|
typedef std::set<state*> state_set;
|
|
|
|
/// Explicit transitions.
|
|
struct transition
|
|
{
|
|
bdd condition;
|
|
acc_cond::mark_t acceptance_conditions;
|
|
const state_set* dst;
|
|
};
|
|
|
|
void add_condition(transition* t, const ltl::formula* f);
|
|
|
|
/// TGBA interface.
|
|
virtual ~taa_tgba();
|
|
virtual spot::state* get_init_state() const;
|
|
virtual tgba_succ_iterator* succ_iter(const spot::state* state) const;
|
|
virtual std::string format_state(const spot::state* state) const = 0;
|
|
|
|
protected:
|
|
virtual bdd compute_support_conditions(const spot::state* state) const;
|
|
|
|
typedef std::vector<taa_tgba::state_set*> ss_vec;
|
|
|
|
taa_tgba::state_set* init_;
|
|
ss_vec state_set_vec_;
|
|
|
|
std::map<const ltl::formula*, acc_cond::mark_t,
|
|
ltl::formula_ptr_less_than> acc_map_;
|
|
|
|
private:
|
|
// Disallow copy.
|
|
taa_tgba(const taa_tgba& other) SPOT_DELETED;
|
|
taa_tgba& operator=(const taa_tgba& other) SPOT_DELETED;
|
|
};
|
|
|
|
/// Set of states deriving from spot::state.
|
|
class SPOT_API set_state : public spot::state
|
|
{
|
|
public:
|
|
set_state(const taa_tgba::state_set* s, bool delete_me = false)
|
|
: s_(s), delete_me_(delete_me)
|
|
{
|
|
}
|
|
|
|
virtual int compare(const spot::state*) const;
|
|
virtual size_t hash() const;
|
|
virtual set_state* clone() const;
|
|
|
|
virtual ~set_state()
|
|
{
|
|
if (delete_me_)
|
|
delete s_;
|
|
}
|
|
|
|
const taa_tgba::state_set* get_state() const;
|
|
private:
|
|
const taa_tgba::state_set* s_;
|
|
bool delete_me_;
|
|
};
|
|
|
|
class SPOT_API taa_succ_iterator : public tgba_succ_iterator
|
|
{
|
|
public:
|
|
taa_succ_iterator(const taa_tgba::state_set* s, const acc_cond& acc);
|
|
virtual ~taa_succ_iterator();
|
|
|
|
virtual bool first();
|
|
virtual bool next();
|
|
virtual bool done() const;
|
|
|
|
virtual set_state* current_state() const;
|
|
virtual bdd current_condition() const;
|
|
virtual acc_cond::mark_t current_acceptance_conditions() const;
|
|
|
|
private:
|
|
/// Those typedefs are used to generate all possible successors in
|
|
/// the constructor using a cartesian product.
|
|
typedef taa_tgba::state::const_iterator iterator;
|
|
typedef std::pair<iterator, iterator> iterator_pair;
|
|
typedef std::vector<iterator_pair> bounds_t;
|
|
typedef std::unordered_map<const spot::set_state*,
|
|
std::vector<taa_tgba::transition*>,
|
|
state_ptr_hash, state_ptr_equal> seen_map;
|
|
|
|
struct distance_sort :
|
|
public std::binary_function<const iterator_pair&,
|
|
const iterator_pair&, bool>
|
|
{
|
|
bool
|
|
operator()(const iterator_pair& lhs, const iterator_pair& rhs) const
|
|
{
|
|
return std::distance(lhs.first, lhs.second) <
|
|
std::distance(rhs.first, rhs.second);
|
|
}
|
|
};
|
|
|
|
std::vector<taa_tgba::transition*>::const_iterator i_;
|
|
std::vector<taa_tgba::transition*> succ_;
|
|
seen_map seen_;
|
|
const acc_cond& acc_;
|
|
};
|
|
|
|
/// A taa_tgba instance with states labeled by a given type.
|
|
/// Still an abstract class, see below.
|
|
template<typename label, typename label_hash>
|
|
class SPOT_API taa_tgba_labelled : public taa_tgba
|
|
{
|
|
public:
|
|
taa_tgba_labelled(const bdd_dict_ptr& dict) : taa_tgba(dict) {};
|
|
|
|
~taa_tgba_labelled()
|
|
{
|
|
auto i = acc_map_.begin();
|
|
while (i != acc_map_.end())
|
|
(i++)->first->destroy();
|
|
}
|
|
|
|
void set_init_state(const label& s)
|
|
{
|
|
std::vector<label> v(1);
|
|
v[0] = s;
|
|
set_init_state(v);
|
|
}
|
|
void set_init_state(const std::vector<label>& s)
|
|
{
|
|
init_ = add_state_set(s);
|
|
}
|
|
|
|
transition*
|
|
create_transition(const label& s,
|
|
const std::vector<label>& d)
|
|
{
|
|
state* src = add_state(s);
|
|
state_set* dst = add_state_set(d);
|
|
transition* t = new transition;
|
|
t->dst = dst;
|
|
t->condition = bddtrue;
|
|
t->acceptance_conditions = 0U;
|
|
src->push_back(t);
|
|
return t;
|
|
}
|
|
|
|
transition*
|
|
create_transition(const label& s, const label& d)
|
|
{
|
|
std::vector<std::string> vec;
|
|
vec.push_back(d);
|
|
return create_transition(s, vec);
|
|
}
|
|
|
|
void add_acceptance_condition(transition* t, const ltl::formula* f)
|
|
{
|
|
auto p = acc_map_.emplace(f, 0);
|
|
if (p.second)
|
|
p.first->second = acc_.marks({acc_.add_set()});
|
|
else
|
|
f->destroy();
|
|
t->acceptance_conditions |= p.first->second;
|
|
}
|
|
|
|
/// \brief Format the state as a string for printing.
|
|
///
|
|
/// If state is a spot::set_state of only one element, then the
|
|
/// string corresponding to state->get_state() is returned.
|
|
///
|
|
/// Otherwise a string composed of each string corresponding to
|
|
/// each state->get_state() in the spot::set_state is returned,
|
|
/// e.g. like {string_1,...,string_n}.
|
|
virtual std::string format_state(const spot::state* s) const
|
|
{
|
|
const spot::set_state* se = down_cast<const spot::set_state*>(s);
|
|
assert(se);
|
|
const state_set* ss = se->get_state();
|
|
return format_state_set(ss);
|
|
}
|
|
|
|
/// \brief Output a TAA in a stream.
|
|
void output(std::ostream& os) const
|
|
{
|
|
typename ns_map::const_iterator i;
|
|
for (i = name_state_map_.begin(); i != name_state_map_.end(); ++i)
|
|
{
|
|
taa_tgba::state::const_iterator i2;
|
|
os << "State: " << label_to_string(i->first) << std::endl;
|
|
for (i2 = i->second->begin(); i2 != i->second->end(); ++i2)
|
|
{
|
|
os << ' ' << format_state_set((*i2)->dst)
|
|
<< ", C:" << (*i2)->condition
|
|
<< ", A:" << (*i2)->acceptance_conditions << std::endl;
|
|
}
|
|
}
|
|
}
|
|
|
|
protected:
|
|
typedef label label_t;
|
|
|
|
typedef std::unordered_map<const label, taa_tgba::state*,
|
|
label_hash> ns_map;
|
|
typedef std::unordered_map<const taa_tgba::state*, label,
|
|
ptr_hash<taa_tgba::state> > sn_map;
|
|
|
|
ns_map name_state_map_;
|
|
sn_map state_name_map_;
|
|
|
|
/// \brief Return a label as a string.
|
|
virtual std::string label_to_string(const label_t& lbl) const = 0;
|
|
|
|
/// \brief Clone the label if necessary to assure it is owned by
|
|
/// this, avoiding memory issues when label is a pointer.
|
|
virtual label_t clone_if(const label_t& lbl) const = 0;
|
|
|
|
private:
|
|
/// \brief Return the taa_tgba::state for \a name, creating it
|
|
/// when it does not exist already.
|
|
taa_tgba::state* add_state(const label& name)
|
|
{
|
|
typename ns_map::iterator i = name_state_map_.find(name);
|
|
if (i == name_state_map_.end())
|
|
{
|
|
const label& name_ = clone_if(name);
|
|
taa_tgba::state* s = new taa_tgba::state;
|
|
name_state_map_[name_] = s;
|
|
state_name_map_[s] = name_;
|
|
return s;
|
|
}
|
|
return i->second;
|
|
}
|
|
|
|
/// \brief Return the taa::state_set for \a names.
|
|
taa_tgba::state_set* add_state_set(const std::vector<label>& names)
|
|
{
|
|
state_set* ss = new state_set;
|
|
for (unsigned i = 0; i < names.size(); ++i)
|
|
ss->insert(add_state(names[i]));
|
|
state_set_vec_.push_back(ss);
|
|
return ss;
|
|
}
|
|
|
|
std::string format_state_set(const taa_tgba::state_set* ss) const
|
|
{
|
|
state_set::const_iterator i1 = ss->begin();
|
|
typename sn_map::const_iterator i2;
|
|
if (ss->empty())
|
|
return std::string("{}");
|
|
if (ss->size() == 1)
|
|
{
|
|
i2 = state_name_map_.find(*i1);
|
|
assert(i2 != state_name_map_.end());
|
|
return "{" + label_to_string(i2->second) + "}";
|
|
}
|
|
else
|
|
{
|
|
std::string res("{");
|
|
while (i1 != ss->end())
|
|
{
|
|
i2 = state_name_map_.find(*i1++);
|
|
assert(i2 != state_name_map_.end());
|
|
res += label_to_string(i2->second);
|
|
res += ",";
|
|
}
|
|
res[res.size() - 1] = '}';
|
|
return res;
|
|
}
|
|
}
|
|
};
|
|
|
|
class SPOT_API taa_tgba_string :
|
|
#ifndef SWIG
|
|
public taa_tgba_labelled<std::string, string_hash>
|
|
#else
|
|
public taa_tgba
|
|
#endif
|
|
{
|
|
public:
|
|
taa_tgba_string(const bdd_dict_ptr& dict) :
|
|
taa_tgba_labelled<std::string, string_hash>(dict) {};
|
|
~taa_tgba_string();
|
|
protected:
|
|
virtual std::string label_to_string(const std::string& label) const;
|
|
virtual std::string clone_if(const std::string& label) const;
|
|
};
|
|
|
|
typedef std::shared_ptr<taa_tgba_string> taa_tgba_string_ptr;
|
|
typedef std::shared_ptr<const taa_tgba_string> const_taa_tgba_string_ptr;
|
|
|
|
inline taa_tgba_string_ptr make_taa_tgba_string(const bdd_dict_ptr& dict)
|
|
{
|
|
return std::make_shared<taa_tgba_string>(dict);
|
|
}
|
|
|
|
class SPOT_API taa_tgba_formula :
|
|
#ifndef SWIG
|
|
public taa_tgba_labelled<const ltl::formula*, ltl::formula_ptr_hash>
|
|
#else
|
|
public taa_tgba
|
|
#endif
|
|
{
|
|
public:
|
|
taa_tgba_formula(const bdd_dict_ptr& dict) :
|
|
taa_tgba_labelled<const ltl::formula*, ltl::formula_ptr_hash>(dict) {};
|
|
~taa_tgba_formula();
|
|
protected:
|
|
virtual std::string label_to_string(const label_t& label) const;
|
|
virtual const ltl::formula* clone_if(const label_t& label) const;
|
|
};
|
|
|
|
typedef std::shared_ptr<taa_tgba_formula> taa_tgba_formula_ptr;
|
|
typedef std::shared_ptr<const taa_tgba_formula> const_taa_tgba_formula_ptr;
|
|
|
|
inline taa_tgba_formula_ptr make_taa_tgba_formula(const bdd_dict_ptr& dict)
|
|
{
|
|
return std::make_shared<taa_tgba_formula>(dict);
|
|
}
|
|
|
|
}
|
|
|
|
#endif // SPOT_TGBA_TAATGBA_HH
|