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/ta/ta.hh
View file

@ -206,16 +206,16 @@ namespace spot
virtual bool done() const = 0;
virtual state*
current_state() const = 0;
dst() const = 0;
/// \brief Get the changeset on the transition leading to current successor.
///
/// This is a boolean function of atomic propositions.
virtual bdd
current_condition() const = 0;
cond() const = 0;
acc_cond::mark_t
current_acceptance_conditions() const = 0;
acc() const = 0;
};

10
src/ta/taexplicit.cc
View file

@ -72,28 +72,28 @@ namespace spot
}
state*
ta_explicit_succ_iterator::current_state() const
ta_explicit_succ_iterator::dst() const
{
trace
<< "***ta_explicit_succ_iterator::current_state() if(done()) =***"
<< "***ta_explicit_succ_iterator::dst() if(done()) =***"
<< done() << std::endl;
assert(!done());
trace
<< "***ta_explicit_succ_iterator::current_state() (*i_)->condition =***"
<< "***ta_explicit_succ_iterator::dst() (*i_)->condition =***"
<< (*i_)->condition << std::endl;
state_ta_explicit* s = (*i_)->dest;
return s;
}
bdd
ta_explicit_succ_iterator::current_condition() const
ta_explicit_succ_iterator::cond() const
{
assert(!done());
return (*i_)->condition;
}
acc_cond::mark_t
ta_explicit_succ_iterator::current_acceptance_conditions() const
ta_explicit_succ_iterator::acc() const
{
assert(!done());
return (*i_)->acceptance_conditions;

6
src/ta/taexplicit.hh
View file

@ -239,12 +239,12 @@ namespace spot
virtual bool done() const;
virtual state*
current_state() const;
dst() const;
virtual bdd
current_condition() const;
cond() const;
virtual acc_cond::mark_t
current_acceptance_conditions() const;
acc() const;
private:
state_ta_explicit::transitions* transitions_;

16
src/ta/taproduct.cc
View file

@ -130,7 +130,7 @@ namespace spot
return;
}
kripke_current_dest_state = kripke_succ_it_->current_state();
kripke_current_dest_state = kripke_succ_it_->dst();
bdd kripke_current_dest_condition = kripke_->state_condition(
kripke_current_dest_state);
is_stuttering_transition_ = (kripke_source_condition
@ -196,10 +196,10 @@ namespace spot
if (!ta_succ_it_->done())
{
current_state_ = new state_ta_product(ta_succ_it_->current_state(),
current_state_ = new state_ta_product(ta_succ_it_->dst(),
kripke_current_dest_state->clone());
current_acceptance_conditions_
= ta_succ_it_->current_acceptance_conditions();
= ta_succ_it_->acc();
return true;
}
@ -215,7 +215,7 @@ namespace spot
}
state_ta_product*
ta_succ_iterator_product::current_state() const
ta_succ_iterator_product::dst() const
{
return current_state_->clone();
}
@ -227,13 +227,13 @@ namespace spot
}
bdd
ta_succ_iterator_product::current_condition() const
ta_succ_iterator_product::cond() const
{
return current_condition_;
}
acc_cond::mark_t
ta_succ_iterator_product::current_acceptance_conditions() const
ta_succ_iterator_product::acc() const
{
return current_acceptance_conditions_;
}
@ -281,7 +281,7 @@ namespace spot
artificial_initial_state, kripke_init_state_condition);
for (ta_init_it_->first(); !ta_init_it_->done(); ta_init_it_->next())
{
ta_init_states_set.insert(ta_init_it_->current_state());
ta_init_states_set.insert(ta_init_it_->dst());
}
delete ta_init_it_;
@ -444,7 +444,7 @@ namespace spot
return;
}
kripke_current_dest_state = kripke_succ_it_->current_state();
kripke_current_dest_state = kripke_succ_it_->dst();
bdd kripke_current_dest_condition = kripke_->state_condition(
kripke_current_dest_state);

6
src/ta/taproduct.hh
View file

@ -88,12 +88,12 @@ namespace spot
// inspection
state_ta_product*
current_state() const;
dst() const;
bdd
current_condition() const;
cond() const;
acc_cond::mark_t
current_acceptance_conditions() const;
acc() const;
/// \brief Return true if the changeset of the current transition is empty
bool

14
src/ta/tgtaproduct.cc
View file

@ -162,7 +162,7 @@ namespace spot
return;
}
kripke_current_dest_state = kripke_succ_it_->current_state();
kripke_current_dest_state = kripke_succ_it_->dst();
bdd kripke_current_dest_condition = kripke_->state_condition(
kripke_current_dest_state);
@ -205,9 +205,9 @@ namespace spot
{
current_state_ = new (pool_->allocate()) state_product(
kripke_current_dest_state->clone(),
tgta_succ_it_->current_state(), pool_);
tgta_succ_it_->dst(), pool_);
current_acceptance_conditions_
= tgta_succ_it_->current_acceptance_conditions();
= tgta_succ_it_->acc();
return true;
}
@ -231,21 +231,21 @@ namespace spot
}
state_product*
tgta_succ_iterator_product::current_state() const
tgta_succ_iterator_product::dst() const
{
trace
<< "*** current_state() .... if(done()) = ***" << done() << std::endl;
<< "*** dst() .... if(done()) = ***" << done() << std::endl;
return current_state_->clone();
}
bdd
tgta_succ_iterator_product::current_condition() const
tgta_succ_iterator_product::cond() const
{
return current_condition_;
}
acc_cond::mark_t
tgta_succ_iterator_product::current_acceptance_conditions() const
tgta_succ_iterator_product::acc() const
{
return current_acceptance_conditions_;
}

6
src/ta/tgtaproduct.hh
View file

@ -67,12 +67,12 @@ namespace spot
// inspection
state_product*
current_state() const;
dst() const;
bdd
current_condition() const;
cond() const;
acc_cond::mark_t
current_acceptance_conditions() const;
acc() const;
private:
//@{