Instead of "delete iter;" we now do "aut->release_iter(iter);" to give the iterator back to the automaton. The TGBA classes now reuse a previously returned tgba_succ_iterator to answer a succ_iter() call, therefore avoiding (1) memory allocation, as well as (2) vtable and other constant member initialization. * src/tgba/tgba.hh, src/tgba/tgba.cc (release_iter, iter_cache_): Implement a release_iter() that stores the released iterator in iter_cache_. * src/tgba/succiter.hh (internal::succ_iterable): Move... * src/tgba/tgba.hh (tgba::succ_iterable): ... here. And use release_iter(). * iface/dve2/dve2.cc, src/kripke/kripke.cc, src/kripke/kripke.hh, src/tgba/succiterconcrete.cc, src/tgba/succiterconcrete.hh, src/tgba/taatgba.hh, src/tgba/tgbabddconcrete.cc, src/tgba/tgbaexplicit.hh, src/tgba/tgbamask.cc, src/tgba/tgbaproduct.cc, src/tgba/tgbaproxy.cc, src/tgba/tgbascc.cc, src/tgba/tgbatba.cc, src/tgba/tgbaunion.cc, src/tgba/tgbaunion.hh, src/tgba/wdbacomp.cc, src/tgbaalgos/bfssteps.cc, src/tgbaalgos/compsusp.cc, src/tgbaalgos/cycles.cc, src/tgbaalgos/dtbasat.cc, src/tgbaalgos/dtgbasat.cc, src/tgbaalgos/gtec/gtec.cc, src/tgbaalgos/gv04.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/reachiter.cc, src/tgbaalgos/replayrun.cc, src/tgbaalgos/safety.cc, src/tgbaalgos/scc.cc, src/tgbaalgos/se05.cc, src/tgbaalgos/simulation.cc, src/tgbaalgos/tau03.cc, src/tgbaalgos/tau03opt.cc: Use release_iter() instead of deleting iterators, and used recycle iter_cache_ in implementations of tgba::succ_iter().
299 lines
6.3 KiB
C++
299 lines
6.3 KiB
C++
// -*- coding: utf-8 -*-
|
|
// Copyright (C) 2011, 2012, 2013, 2014 Laboratoire de Recherche et
|
|
// Développement de l'Epita.
|
|
//
|
|
// 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 "wdbacomp.hh"
|
|
#include "ltlast/constant.hh"
|
|
|
|
namespace spot
|
|
{
|
|
namespace
|
|
{
|
|
class state_wdba_comp_proxy : public state
|
|
{
|
|
public:
|
|
state_wdba_comp_proxy(state* s) : s_(s)
|
|
{
|
|
}
|
|
|
|
/// Copy constructor
|
|
state_wdba_comp_proxy(const state_wdba_comp_proxy& o)
|
|
: state(),
|
|
s_(o.real_state())
|
|
{
|
|
if (s_)
|
|
s_ = s_->clone();
|
|
}
|
|
|
|
virtual
|
|
~state_wdba_comp_proxy()
|
|
{
|
|
if (s_)
|
|
s_->destroy();
|
|
}
|
|
|
|
state*
|
|
real_state() const
|
|
{
|
|
return s_;
|
|
}
|
|
|
|
virtual int
|
|
compare(const state* other) const
|
|
{
|
|
const state_wdba_comp_proxy* o =
|
|
down_cast<const state_wdba_comp_proxy*>(other);
|
|
assert(o);
|
|
const state* oo = o->real_state();
|
|
if (s_ == 0)
|
|
return oo ? 1 : 0;
|
|
if (oo == 0)
|
|
return -1;
|
|
|
|
return s_->compare(oo);
|
|
}
|
|
|
|
virtual size_t
|
|
hash() const
|
|
{
|
|
if (s_)
|
|
return s_->hash();
|
|
return 0;
|
|
}
|
|
|
|
virtual
|
|
state_wdba_comp_proxy* clone() const
|
|
{
|
|
return new state_wdba_comp_proxy(*this);
|
|
}
|
|
|
|
private:
|
|
state* s_; // 0 if sink-state.
|
|
};
|
|
|
|
class tgba_wdba_comp_proxy_succ_iterator: public tgba_succ_iterator
|
|
{
|
|
public:
|
|
tgba_wdba_comp_proxy_succ_iterator(tgba_succ_iterator* it,
|
|
bdd the_acceptance_cond)
|
|
: it_(it), the_acceptance_cond_(the_acceptance_cond), left_(bddtrue)
|
|
{
|
|
}
|
|
|
|
void recycle(const tgba* a, tgba_succ_iterator* it)
|
|
{
|
|
a->release_iter(it_);
|
|
it_ = it;
|
|
}
|
|
|
|
virtual
|
|
~tgba_wdba_comp_proxy_succ_iterator()
|
|
{
|
|
delete it_;
|
|
}
|
|
|
|
// iteration
|
|
|
|
void
|
|
first()
|
|
{
|
|
if (it_)
|
|
it_->first();
|
|
left_ = bddtrue;
|
|
}
|
|
|
|
void
|
|
next()
|
|
{
|
|
left_ -= current_condition();
|
|
if (it_)
|
|
it_->next();
|
|
}
|
|
|
|
bool
|
|
done() const
|
|
{
|
|
return left_ == bddfalse;
|
|
}
|
|
|
|
// inspection
|
|
|
|
state_wdba_comp_proxy*
|
|
current_state() const
|
|
{
|
|
if (!it_ || it_->done())
|
|
return new state_wdba_comp_proxy(0);
|
|
return new state_wdba_comp_proxy(it_->current_state());
|
|
}
|
|
|
|
bdd
|
|
current_condition() const
|
|
{
|
|
if (!it_ || it_->done())
|
|
return left_;
|
|
return it_->current_condition();
|
|
}
|
|
|
|
bdd
|
|
current_acceptance_conditions() const
|
|
{
|
|
if (!it_ || it_->done())
|
|
// The sink state is accepting in the negated automaton.
|
|
return the_acceptance_cond_;
|
|
|
|
if (it_->current_acceptance_conditions() == bddfalse)
|
|
return the_acceptance_cond_;
|
|
else
|
|
return bddfalse;
|
|
}
|
|
|
|
protected:
|
|
tgba_succ_iterator* it_;
|
|
const bdd the_acceptance_cond_;
|
|
bdd left_;
|
|
};
|
|
|
|
class tgba_wdba_comp_proxy: public tgba
|
|
{
|
|
public:
|
|
tgba_wdba_comp_proxy(const tgba* a)
|
|
: a_(a), the_acceptance_cond_(a->all_acceptance_conditions())
|
|
{
|
|
if (the_acceptance_cond_ == bddfalse)
|
|
{
|
|
int v = get_dict()
|
|
->register_acceptance_variable(ltl::constant::true_instance(),
|
|
this);
|
|
the_acceptance_cond_ = bdd_ithvar(v);
|
|
}
|
|
}
|
|
|
|
virtual ~tgba_wdba_comp_proxy()
|
|
{
|
|
get_dict()->unregister_all_my_variables(this);
|
|
}
|
|
|
|
virtual state* get_init_state() const
|
|
{
|
|
return new state_wdba_comp_proxy(a_->get_init_state());
|
|
}
|
|
|
|
virtual tgba_succ_iterator*
|
|
succ_iter(const state* local_state,
|
|
const state* global_state = 0,
|
|
const tgba* global_automaton = 0) const
|
|
{
|
|
const state_wdba_comp_proxy* s =
|
|
down_cast<const state_wdba_comp_proxy*>(local_state);
|
|
assert(s);
|
|
|
|
const state* o = s->real_state();
|
|
tgba_succ_iterator* it = nullptr;
|
|
if (o)
|
|
it = a_->succ_iter(s->real_state(), global_state, global_automaton);
|
|
if (iter_cache_)
|
|
{
|
|
tgba_wdba_comp_proxy_succ_iterator* res =
|
|
down_cast<tgba_wdba_comp_proxy_succ_iterator*>(iter_cache_);
|
|
res->recycle(a_, it);
|
|
iter_cache_ = nullptr;
|
|
return res;
|
|
}
|
|
return new tgba_wdba_comp_proxy_succ_iterator(it,
|
|
the_acceptance_cond_);
|
|
}
|
|
|
|
virtual bdd_dict*
|
|
get_dict() const
|
|
{
|
|
return a_->get_dict();
|
|
}
|
|
|
|
virtual std::string
|
|
format_state(const state* ostate) const
|
|
{
|
|
const state_wdba_comp_proxy* s =
|
|
down_cast<const state_wdba_comp_proxy*>(ostate);
|
|
assert(s);
|
|
const state* rs = s->real_state();
|
|
if (rs)
|
|
return a_->format_state(s->real_state());
|
|
else
|
|
return "(*)"; // sink state
|
|
}
|
|
|
|
virtual state*
|
|
project_state(const state* s, const tgba* t) const
|
|
{
|
|
const state_wdba_comp_proxy* s2 =
|
|
down_cast<const state_wdba_comp_proxy*>(s);
|
|
assert(s2);
|
|
if (t == this)
|
|
return s2->clone();
|
|
return a_->project_state(s2->real_state(), t);
|
|
}
|
|
|
|
virtual bdd
|
|
all_acceptance_conditions() const
|
|
{
|
|
return the_acceptance_cond_;
|
|
}
|
|
|
|
virtual bdd
|
|
neg_acceptance_conditions() const
|
|
{
|
|
return !the_acceptance_cond_;
|
|
}
|
|
|
|
protected:
|
|
virtual bdd
|
|
compute_support_conditions(const state*) const
|
|
{
|
|
// The automaton is complete, so we always support all variables.
|
|
return bddtrue;
|
|
}
|
|
|
|
virtual bdd compute_support_variables(const state* ostate) const
|
|
{
|
|
const state_wdba_comp_proxy* s =
|
|
down_cast<const state_wdba_comp_proxy*>(ostate);
|
|
assert(s);
|
|
const state* rs = s->real_state();
|
|
if (rs)
|
|
return a_->support_variables(rs);
|
|
else
|
|
return bddtrue;
|
|
}
|
|
|
|
const tgba* a_;
|
|
private:
|
|
bdd the_acceptance_cond_;
|
|
|
|
// Disallow copy.
|
|
tgba_wdba_comp_proxy(const tgba_wdba_comp_proxy&) SPOT_DELETED;
|
|
tgba_wdba_comp_proxy& operator=(const tgba_wdba_comp_proxy&) SPOT_DELETED;
|
|
};
|
|
|
|
}
|
|
|
|
tgba*
|
|
wdba_complement(const tgba* aut)
|
|
{
|
|
return new tgba_wdba_comp_proxy(aut);
|
|
}
|
|
}
|