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

simulation: do not depend on bdd numbers for ordering classes

Browse source 
Fixes #262 again.  Reported by Maximilien Colange.

* spot/twaalgos/simulation.cc: Use state numbers to order classes, not
their signatures.  The problem was that even if two simulation of the
same automaton assign the same signature, the BDD identifier used for
that signature might be different, and therefore the ordering obtained
by using BDDs as keys in a map can be different.  A side-effect of
this change is that the order of states in automata produced by
simulation-based reduction may change; many tests had to be updated.
* tests/core/ltl2tgba.test: Add a new test case based on Maximilien's
report.
* tests/core/complement.test, tests/core/det.test,
tests/core/parseaut.test, tests/core/prodor.test, tests/core/scc.test,
tests/python/atva16-fig2a.ipynb, tests/python/automata.ipynb,
tests/python/decompose.ipynb, tests/python/decompose_scc.py,
tests/python/highlighting.ipynb, tests/python/piperead.ipynb,
tests/python/sccinfo.py, tests/python/simstate.py,
tests/python/testingaut.ipynb, tests/python/word.ipynb: Update
test case for new order of states.
This commit is contained in:
Alexandre Duret-Lutz 2017-06-02 11:23:42 +02:00
parent 101c2533f1
commit 9ab4b840fd
17 changed files with 1464 additions and 1402 deletions
Download patch file Download diff file Expand all files Collapse all files

54
spot/twaalgos/simulation.cc
View file

@ -275,7 +275,7 @@ namespace spot
// We run through the map bdd/list<state>, and we update
// the previous_class_ with the new data.
for (auto& p: bdd_lstate_)
for (auto& p: sorted_classes_)
{
// If the signature of a state is bddfalse (no
// edges) the class of this state is bddfalse
@ -283,11 +283,11 @@ namespace spot
// simplifications in the signature by removing a
// edge which has as a destination a state with
// no outgoing edge.
if (p.first == bddfalse)
for (auto s: p.second)
if (p->first == bddfalse)
for (unsigned s: p->second)
previous_class_[s] = bddfalse;
else
for (auto s: p.second)
for (unsigned s: p->second)
previous_class_[s] = *it_bdd;
++it_bdd;
}
@ -302,10 +302,10 @@ namespace spot
{
update_previous_class();
nb_partition_before = bdd_lstate_.size();
bdd_lstate_.clear();
nb_po_before = po_size_;
po_size_ = 0;
update_sig();
// print_partition();
go_to_next_it();
}
@ -347,8 +347,18 @@ namespace spot
void update_sig()
{
bdd_lstate_.clear();
sorted_classes_.clear();
for (unsigned s = 0; s < size_a_; ++s)
bdd_lstate_[compute_sig(s)].emplace_back(s);
{
bdd sig = compute_sig(s);
auto p = bdd_lstate_.emplace(std::piecewise_construct,
std::make_tuple(sig),
std::make_tuple());
p.first->second.emplace_back(s);
if (p.second)
sorted_classes_.emplace_back(p.first);
}
}
@ -390,7 +400,7 @@ namespace spot
std::list<bdd>::iterator it_bdd = used_var_.begin();
for (auto& p: bdd_lstate_)
for (auto& p: sorted_classes_)
{
// If the signature of a state is bddfalse (no edges) the
// class of this state is bddfalse instead of an anonymous
@ -398,9 +408,9 @@ namespace spot
// removing an edge which has as a destination a state
// with no outgoing edge.
bdd acc = bddfalse;
if (p.first != bddfalse)
if (p->first != bddfalse)
acc = *it_bdd;
now_to_next.emplace_back(p.first, acc);
now_to_next.emplace_back(p->first, acc);
++it_bdd;
}
@ -450,16 +460,16 @@ namespace spot
if (implications)
implications->resize(bdd_lstate_.size());
// Create one state per partition.
for (auto& p: bdd_lstate_)
// Create one state per class.
for (auto& p: sorted_classes_)
{
bdd cl = previous_class_[p.second.front()];
bdd cl = previous_class_[p->second.front()];
// A state may be referred to either by
// its class, or by all the implied classes.
auto s = gb->new_state(cl.id());
gb->alias_state(s, relation_[cl].id());
// update state_mapping
for (auto& st : p.second)
for (auto& st : p->second)
(*state_mapping)[st] = s;
if (implications)
(*implications)[s] = relation_[cl];
@ -479,14 +489,14 @@ namespace spot
auto all_inf = all_inf_;
// For each class, we will create
// all the edges between the states.
for (auto& p: bdd_lstate_)
for (auto& p: sorted_classes_)
{
// All states in p.second have the same class, so just
// pick the class of the first one first one.
bdd src = previous_class_[p.second.front()];
bdd src = previous_class_[p->second.front()];
// Get the signature to derive successors.
bdd sig = compute_sig(p.second.front());
bdd sig = compute_sig(p->second.front());
if (Cosimulation)
sig = bdd_compose(sig, bddfalse, bdd_var(bdd_initial));
@ -621,12 +631,12 @@ namespace spot
// where is the new class name.
void print_partition()
{
for (auto& p: bdd_lstate_)
for (auto& p: sorted_classes_)
{
std::cerr << "partition: "
<< bdd_format_isop(a_->get_dict(), p.first)
<< bdd_format_isop(a_->get_dict(), p->first)
<< std::endl;
for (auto s: p.second)
for (auto s: p->second)
std::cerr << " - "
<< a_->format_state(a_->state_from_number(s))
<< '\n';
@ -654,9 +664,13 @@ namespace spot
// Represent the class of each state at the previous iteration.
vector_state_bdd previous_class_;
// The list of state for each class at the current_iteration.
// The list of states for each class at the current_iteration.
// Computed in `update_sig'.
map_bdd_lstate bdd_lstate_;
// The above map, sorted by states number instead of BDD
// identifier to avoid non-determinism while iterating over all
// states.
std::vector<map_bdd_lstate::const_iterator> sorted_classes_;
// The queue of free bdd. They will be used as the identifier
// for the class.