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

Use a cache to speed up tgba_tba_proxy.

Browse source 
tgba_tba_proxy used to spend a lot of time (re)computing the
acceptance condition common to all outgoing transition of a state.

* src/tgba/tgbatba.hh (accmap_): New cache.
(common_acceptance_conditions_of_original_state): New method.
* src/tgba/tgbatba.cc (tgba_tba_proxy_succ_iterator::~sync)
Call common_acceptance_conditions_of_original_state() instead of
computing the result.
(~tgba_tba_proxy): Cleanup the cache.
(common_acceptance_conditions_of_original_state): Implement it.
This commit is contained in:
Alexandre Duret-Lutz 2010-12-09 19:37:01 +01:00
parent e713cb3b67
commit 3e7debe53e
3 changed files with 66 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/tgba/tgbatba.cc
View file

@ -117,7 +117,7 @@ namespace spot
iterator expected,
const list& cycle,
bdd the_acceptance_cond,
const tgba* aut)
const tgba_tba_proxy* aut)
: it_(it), expected_(expected), cycle_(cycle),
the_acceptance_cond_(the_acceptance_cond), aut_(aut)
{
@ -185,13 +185,8 @@ namespace spot
// conditions common to all outgoing transitions of the
// destination state, and pretend they are already present
// on this transition.
bdd common = aut_->all_acceptance_conditions();
state* dest = it_->current_state();
tgba_succ_iterator* dest_it = aut_->succ_iter(dest);
for (dest_it->first(); !dest_it->done(); dest_it->next())
common &= dest_it->current_acceptance_conditions();
acc |= common;
delete dest_it;
acc |= aut_->common_acceptance_conditions_of_original_state(dest);
delete dest;
// bddtrue is a special condition used for tgba_sba_proxy
@ -241,7 +236,7 @@ namespace spot
bool accepting_;
const list& cycle_;
const bdd the_acceptance_cond_;
const tgba* aut_;
const tgba_tba_proxy* aut_;
friend class ::spot::tgba_tba_proxy;
};
@ -283,6 +278,15 @@ namespace spot
tgba_tba_proxy::~tgba_tba_proxy()
{
get_dict()->unregister_all_my_variables(this);
accmap_t::const_iterator i = accmap_.begin();
while (i != accmap_.end())
{
// Advance the iterator before deleting the key.
const state* s = i->first;
++i;
delete s;
}
}
state*
@ -305,7 +309,27 @@ namespace spot
return new tgba_tba_proxy_succ_iterator(it, s->acceptance_iterator(),
acc_cycle_, the_acceptance_cond_,
a_);
this);
}
bdd
tgba_tba_proxy::common_acceptance_conditions_of_original_state(const state* s)
const
{
// Lookup cache
accmap_t::const_iterator i = accmap_.find(s);
if (i != accmap_.end())
return i->second;
bdd common = a_->all_acceptance_conditions();
tgba_succ_iterator* it = a_->succ_iter(s);
for (it->first(); !it->done() && common != bddfalse; it->next())
common &= it->current_acceptance_conditions();
delete it;
// Populate cache
accmap_[s->clone()] = common;
return common;
}
bdd_dict*