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

9
spot/twaalgos/sccinfo.cc
View file

@ -318,7 +318,7 @@ namespace spot
}
std::set<acc_cond::mark_t> scc_info::used_acc_of(unsigned scc) const
std::set<acc_cond::mark_t> scc_info::marks_of(unsigned scc) const
{
std::set<acc_cond::mark_t> res;
for (auto& t: inner_edges_of(scc))
@ -326,7 +326,7 @@ namespace spot
return res;
}
std::vector<std::set<acc_cond::mark_t>> scc_info::used_acc() const
std::vector<std::set<acc_cond::mark_t>> scc_info::marks() const
{
unsigned n = aut_->num_states();
std::vector<std::set<acc_cond::mark_t>> result(scc_count());
@ -351,7 +351,7 @@ namespace spot
{
unsigned n = scc_count();
std::vector<bool> result(scc_count());
auto acc = used_acc();
auto acc = marks();
for (unsigned s = 0; s < n; ++s)
result[s] = is_rejecting_scc(s) || acc[s].size() == 1;
return result;
@ -413,7 +413,8 @@ namespace spot
q.pop();
out << " " << state << " [shape=box,"
<< (aut->acc().accepting(m->acc(state)) ? "style=bold," : "")
<< (aut->acc().accepting(m->acc_sets_of(state)) ?
"style=bold," : "")
<< "label=\"" << state;
{
size_t n = m->states_of(state).size();