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

print_hoa: output all registered APs

Browse source 
Also introduce twa::unregister_ap() and twa_graph::remove_unused_ap()
so that the methods where this behavior is expected can be fixed.

And fix ltsmin::kripke() which did not register APs.

Part of #170.

* spot/twaalgos/hoa.cc: Use apvars() to print all registerd APs.
Throw an exception when printing automata using unregistered APs.
* spot/ltsmin/ltsmin.cc: Call register_ap().
* spot/twa/twa.cc, spot/twa/twa.hh, spot/twa/twagraph.cc,
spot/twa/twagraph.hh (twa::unregister_ap, twa_graph::remove_unused_ap):
New methods.
* spot/tl/exclusive.cc, spot/twaalgos/postproc.cc,
spot/twaalgos/remprop.cc, spot/twaalgos/relabel.cc: Use them.
* tests/core/maskacc.test, tests/core/maskkeep.test,
tests/core/strength.test: Adjust expected results.
* NEWS: Mention those changes.
This commit is contained in:
Alexandre Duret-Lutz 2016-04-30 23:54:31 +02:00
parent 9afa98a1dd
commit 1c2c914d7e
14 changed files with 124 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

11
spot/twa/twa.cc
View file

@ -92,6 +92,17 @@ namespace spot
return i->second.first;
}
void
twa::unregister_ap(int b)
{
auto d = get_dict();
assert(d->bdd_map[b].type == bdd_dict::var);
auto pos = std::find(aps_.begin(), aps_.end(), d->bdd_map[b].f);
assert(pos != aps_.end());
aps_.erase(pos);
d->unregister_variable(b, this);
bddaps_ = bdd_exist(bddaps_, bdd_ithvar(b));
}