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

Degeneralization keeps track of levels.

Browse source 
* NEWS: Document this.
* spot/twa/twagraph.cc: `copy_state_names_from` handles this new info.
* spot/twaalgos/degen.hh, spot/twaalgos/degen.cc: Implement it.
* tests/python/origstate.py, tests/python/simstate.py: Update tests to
  reflect the change.
This commit is contained in:
Maximilien Colange 2017-05-31 11:11:31 +02:00
parent 7b5ab54530
commit f7d14ab526
6 changed files with 48 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

21
spot/twa/twagraph.cc
View file

@ -607,6 +607,19 @@ namespace spot
}
os->resize(used_states);
}
if (auto dl = get_named_prop<std::vector<unsigned>>("degen-levels"))
{
unsigned size = dl->size();
for (unsigned s = 0; s < size; ++s)
{
unsigned dst = newst[s];
if (dst == s || dst == -1U)
continue;
assert(dst < s);
(*dl)[dst] = (*dl)[s];
}
dl->resize(used_states);
}
init_number_ = newst[init_number_];
g_.defrag_states(std::move(newst), used_states);
}
@ -637,8 +650,11 @@ namespace spot
return;
auto orig = get_named_prop<std::vector<unsigned>>("original-states");
auto lvl = get_named_prop<std::vector<unsigned>>("degen-levels");
auto sims = get_named_prop<std::vector<unsigned>>("simulated-states");
assert(!lvl || orig);
if (orig && sims)
throw std::runtime_error("copy_state_names_from(): original-states and "
"simulated-states are both set");
@ -646,6 +662,9 @@ namespace spot
if (orig && orig->size() != num_states())
throw std::runtime_error("copy_state_names_from(): unexpected size "
"for original-states");
if (lvl && lvl->size() != num_states())
throw std::runtime_error("copy_state_names_from(): unexpected size "
"for degen-levels");
if (sims && sims->size() != other->num_states())
throw std::runtime_error("copy_state_names_from(): unexpected size "
@ -677,6 +696,8 @@ namespace spot
throw std::runtime_error("copy_state_names_from(): state does not"
" exist in source automaton");
newname = other->format_state(other_s);
if (lvl)
newname += '#' + std::to_string((*lvl)[s]);
}
names->emplace_back(newname);
}