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

Use clearer names for three methods of spot::scc_info

Browse source 
scc_info::used_acc() and spot::info::used_acc_of() have been renamed to
scc_info::marks() and scc_info::marks_of().
scc_info::acc() has been renamed to (the already existing and redundant)
scc_info::acc_sets_of().
Old names have been deprecated.

* spot/twaalgos/sccinfo.hh, spot/twaalgos/sccinfo.cc: implement it.
* spot/twaalgos/dtwasat.cc, spot/twaalgos/isweakscc.cc,
  spot/twaalgos/remfin.cc, spot/twaalgos/sccfilter.cc: update names.
* NEWS: documentate it.
This commit is contained in:
Maximilien Colange 2017-09-14 10:32:36 +02:00
parent 7eb50bc1f8
commit bd5c6920b1
7 changed files with 56 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

36
spot/twaalgos/sccinfo.hh
View file

@ -476,9 +476,10 @@ namespace spot
return node(scc).is_trivial();
}
SPOT_DEPRECATED("use acc_sets_of() instead")
acc_cond::mark_t acc(unsigned scc) const
{
return node(scc).acc_marks();
return acc_sets_of(scc);
}
bool is_accepting_scc(unsigned scc) const
@ -505,20 +506,33 @@ namespace spot
return reachable_state(st) && node(scc_of(st)).is_useful();
}
/// \brief Return the set of all used acceptance combinations, for
/// each accepting SCC.
std::vector<std::set<acc_cond::mark_t>> used_acc() const;
/// \brief Returns, for each accepting SCC, the set of all marks appearing
/// in it.
std::vector<std::set<acc_cond::mark_t>> marks() const;
std::set<acc_cond::mark_t> marks_of(unsigned scc) const;
std::set<acc_cond::mark_t> used_acc_of(unsigned scc) const;
/// sets that contain at least one transition of the SCC
acc_cond::mark_t acc_sets_of(unsigned scc) const
// Same as above, with old names.
SPOT_DEPRECATED("use marks() instead")
std::vector<std::set<acc_cond::mark_t>> used_acc() const
{
// FIXME: Why do we have two name for this method?
return acc(scc);
return marks();
}
SPOT_DEPRECATED("use marks_of() instead")
std::set<acc_cond::mark_t> used_acc_of(unsigned scc) const
{
return marks_of(scc);
}
/// sets that contain the entire SCC
/// \brief Returns, for a given SCC, the set of all colors appearing in it.
/// It is the set of colors that appear in some mark among those returned by
/// marks_of().
acc_cond::mark_t acc_sets_of(unsigned scc) const
{
return node(scc).acc_marks();
}
/// Returns, for a given SCC, the set of colors that appear on all of its
/// transitions.
acc_cond::mark_t common_sets_of(unsigned scc) const
{
return node(scc).common_marks();