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

twa_succ_iterator: rename accessors

Browse source 
* src/twa/twa.hh, src/ta/ta.hh (current_state,
current_acceptance_conditions, current_condition): Rename as...
(dst, acc, cond): ... these.
* iface/ltsmin/ltsmin.cc, 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/kripke/kripkeprint.cc,
src/ta/taexplicit.cc, src/ta/taexplicit.hh, src/ta/taproduct.cc,
src/ta/taproduct.hh, src/ta/tgtaproduct.cc, src/ta/tgtaproduct.hh,
src/taalgos/dot.cc, src/taalgos/emptinessta.cc,
src/taalgos/minimize.cc, src/taalgos/reachiter.cc,
src/taalgos/tgba2ta.cc, src/twa/taatgba.cc, src/twa/taatgba.hh,
src/twa/twagraph.hh, src/twa/twaproduct.cc,
src/twa/twasafracomplement.cc, src/twaalgos/bfssteps.cc,
src/twaalgos/bfssteps.hh, src/twaalgos/compsusp.cc,
src/twaalgos/copy.cc, src/twaalgos/emptiness.cc,
src/twaalgos/gtec/gtec.cc, src/twaalgos/gv04.cc,
src/twaalgos/lbtt.cc, src/twaalgos/ltl2tgba_fm.cc,
src/twaalgos/magic.cc, src/twaalgos/minimize.cc,
src/twaalgos/ndfs_result.hxx, src/twaalgos/reachiter.cc,
src/twaalgos/se05.cc, src/twaalgos/stats.cc,
src/twaalgos/stutter.cc, src/twaalgos/tau03.cc,
src/twaalgos/tau03opt.cc, wrap/python/tests/interdep.py: Adjust.
* NEWS: Mention the renamings.
This commit is contained in:
Alexandre Duret-Lutz 2015-10-28 21:16:21 +01:00
parent 1b5b9e4a65
commit f6af2a84cb
46 changed files with 203 additions and 197 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/twa/taatgba.cc
View file

@ -287,21 +287,21 @@ namespace spot
}
spot::set_state*
taa_succ_iterator::current_state() const
taa_succ_iterator::dst() const
{
assert(!done());
return new spot::set_state(new taa_tgba::state_set(*(*i_)->dst), true);
}
bdd
taa_succ_iterator::current_condition() const
taa_succ_iterator::cond() const
{
assert(!done());
return (*i_)->condition;
}
acc_cond::mark_t
taa_succ_iterator::current_acceptance_conditions() const
taa_succ_iterator::acc() const
{
assert(!done());
return acc_.comp((*i_)->acceptance_conditions);

6
src/twa/taatgba.hh
View file

@ -109,9 +109,9 @@ namespace spot
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;
virtual set_state* dst() const;
virtual bdd cond() const;
virtual acc_cond::mark_t acc() const;
private:
/// Those typedefs are used to generate all possible successors in

8
src/twa/twa.hh
View file

@ -385,14 +385,14 @@ namespace spot
///
/// The returned state should be destroyed (see state::destroy)
/// by the caller after it is no longer used.
virtual state* current_state() const = 0;
virtual state* dst() const = 0;
/// \brief Get the condition on the transition leading to this successor.
///
/// This is a boolean function of atomic propositions.
virtual bdd current_condition() const = 0;
virtual bdd cond() const = 0;
/// \brief Get the acceptance conditions on the transition leading
/// to this successor.
virtual acc_cond::mark_t current_acceptance_conditions() const = 0;
virtual acc_cond::mark_t acc() const = 0;
//@}
};
@ -545,7 +545,7 @@ namespace spot
/// \brief Build an iterable over the successors of \a s.
///
/// This is meant to be used as
/// <code>for (auto i: aut->succ(s)) { /* i->current_state() */ }</code>.
/// <code>for (auto i: aut->succ(s)) { /* i->dst() */ }</code>.
succ_iterable
succ(const state* s) const
{

6
src/twa/twagraph.hh
View file

@ -143,20 +143,20 @@ namespace spot
return !p_;
}
virtual twa_graph_state* current_state() const
virtual twa_graph_state* dst() const
{
assert(!done());
return const_cast<twa_graph_state*>
(&g_->state_data(g_->edge_storage(p_).dst));
}
virtual bdd current_condition() const
virtual bdd cond() const
{
assert(!done());
return g_->edge_data(p_).cond;
}
virtual acc_cond::mark_t current_acceptance_conditions() const
virtual acc_cond::mark_t acc() const
{
assert(!done());
return g_->edge_data(p_).acc;

28
src/twa/twaproduct.cc
View file

@ -130,10 +130,10 @@ namespace spot
return !right_ || right_->done();
}
state_product* current_state() const
state_product* dst() const
{
return new(pool_->allocate()) state_product(left_->current_state(),
right_->current_state(),
return new(pool_->allocate()) state_product(left_->dst(),
right_->dst(),
pool_);
}
@ -175,8 +175,8 @@ namespace spot
assert(!done());
do
{
bdd l = left_->current_condition();
bdd r = right_->current_condition();
bdd l = left_->cond();
bdd r = right_->cond();
bdd current_cond = l & r;
if (current_cond != bddfalse)
@ -196,18 +196,18 @@ namespace spot
return false;
}
bdd current_condition() const
bdd cond() const
{
return current_cond_;
}
acc_cond::mark_t current_acceptance_conditions() const
acc_cond::mark_t acc() const
{
return
prod_->acc().join(prod_->left_acc(),
left_->current_acceptance_conditions(),
left_->acc(),
prod_->right_acc(),
right_->current_acceptance_conditions());
right_->acc());
}
protected:
@ -236,11 +236,11 @@ namespace spot
{
// All the transitions of left_ iterator have the
// same label, because it is a Kripke structure.
bdd l = left_->current_condition();
bdd l = left_->cond();
assert(!right_->done());
do
{
bdd r = right_->current_condition();
bdd r = right_->cond();
bdd current_cond = l & r;
if (current_cond != bddfalse)
@ -263,14 +263,14 @@ namespace spot
return false;
}
bdd current_condition() const
bdd cond() const
{
return current_cond_;
}
acc_cond::mark_t current_acceptance_conditions() const
acc_cond::mark_t acc() const
{
return right_->current_acceptance_conditions();
return right_->acc();
}
protected:

16
src/twa/twasafracomplement.cc
View file

@ -661,9 +661,9 @@ namespace spot
safra_tree::tr_cache_t transitions;
for (auto iterator: sba_aut->succ(n))
{
bdd condition = iterator->current_condition();
bdd condition = iterator->cond();
typedef std::pair<bdd, const state*> bdd_state;
transitions.insert(bdd_state(condition, iterator->current_state()));
transitions.insert(bdd_state(condition, iterator->dst()));
set_atomic_list(atomic_list, condition);
}
cache[n] = transitions;
@ -958,9 +958,9 @@ namespace spot
virtual bool first();
virtual bool next();
virtual bool done() const;
virtual state_complement* current_state() const;
virtual bdd current_condition() const;
virtual acc_cond::mark_t current_acceptance_conditions() const;
virtual state_complement* dst() const;
virtual bdd cond() const;
virtual acc_cond::mark_t acc() const;
private:
succ_list_t list_;
acc_cond::mark_t the_acceptance_cond_;
@ -988,21 +988,21 @@ namespace spot
}
state_complement*
twa_safra_complement_succ_iterator::current_state() const
twa_safra_complement_succ_iterator::dst() const
{
assert(!done());
return new state_complement(*(it_->second));
}
bdd
twa_safra_complement_succ_iterator::current_condition() const
twa_safra_complement_succ_iterator::cond() const
{
assert(!done());
return it_->first;
}
acc_cond::mark_t
twa_safra_complement_succ_iterator::current_acceptance_conditions() const
twa_safra_complement_succ_iterator::acc() const
{
assert(!done());
return the_acceptance_cond_;