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

scc_info: keep track of common acceptance sets

Browse source 
* spot/twaalgos/sccinfo.hh, spot/twaalgos/sccinfo.cc: Do it.
* tests/core/sccdot.test: Add a test case.
* NEWS: Mention it.
This commit is contained in:
Alexandre Duret-Lutz 2017-05-31 12:16:04 +02:00
parent 78add1d44b
commit 617a7187b3
4 changed files with 62 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

25
spot/twaalgos/sccinfo.hh
View file

@ -195,6 +195,7 @@ namespace spot
protected:
scc_succs succ_;
acc_cond::mark_t acc_;
acc_cond::mark_t common_;
std::vector<unsigned> states_; // States of the component
bool trivial_:1;
bool accepting_:1; // Necessarily accepting
@ -207,8 +208,10 @@ namespace spot
{
}
scc_info_node(acc_cond::mark_t acc, bool trivial):
acc_(acc), trivial_(trivial), accepting_(false),
scc_info_node(acc_cond::mark_t acc,
acc_cond::mark_t common, bool trivial):
acc_(acc), common_(common),
trivial_(trivial), accepting_(false),
rejecting_(false), useful_(false)
{
}
@ -246,6 +249,11 @@ namespace spot
return acc_;
}
acc_cond::mark_t common_marks() const
{
return common_;
}
const std::vector<unsigned>& states() const
{
return states_;
@ -477,7 +485,18 @@ namespace spot
std::set<acc_cond::mark_t> used_acc_of(unsigned scc) const;
acc_cond::mark_t acc_sets_of(unsigned scc) const;
/// sets that contain at least one transition of the SCC
acc_cond::mark_t acc_sets_of(unsigned scc) const
{
// FIXME: Why do we have two name for this method?
return acc(scc);
}
/// sets that contain the entire SCC
acc_cond::mark_t common_sets_of(unsigned scc) const
{
return node(scc).common_marks();
}
std::vector<bool> weak_sccs() const;