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

emptiness: allow twa_run::as_twa to preserve names

Browse source 
* spot/twaalgos/emptiness.cc, spot/twaalgos/emptiness.hh: Here.
* tests/python/ltsmin-dve.ipynb: Add a test.
* NEWS: Mention the change.
This commit is contained in:
Alexandre Duret-Lutz 2017-01-20 16:33:30 +01:00
parent 3f5470898d
commit fb59cab09f
4 changed files with 276 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files

25
spot/twaalgos/emptiness.cc
View file

@ -1,6 +1,6 @@
// -*- coding: utf-8 -*-
// Copyright (C) 2009, 2011-2017 Laboratoire de Recherche et Développement de
// l'Epita (LRDE).
// Copyright (C) 2009, 2011-2017 Laboratoire de Recherche et
// Développement de l'Epita (LRDE).
// Copyright (C) 2004, 2005 Laboratoire d'Informatique de Paris 6 (LIP6),
// département Systèmes Répartis Coopératifs (SRC), Université Pierre
// et Marie Curie.
@ -752,13 +752,20 @@ namespace spot
}
twa_graph_ptr
twa_run::as_twa() const
twa_run::as_twa(bool preserve_names) const
{
auto d = aut->get_dict();
auto res = make_twa_graph(d);
res->copy_ap_of(aut);
res->copy_acceptance_of(aut);
std::vector<std::string>* names= nullptr;
if (preserve_names)
{
names = new std::vector<std::string>;
res->set_named_prop("state-names", names);
}
const state* s = aut->get_init_state();
unsigned src;
unsigned dst;
@ -777,6 +784,8 @@ namespace spot
assert(s->compare(i->s) == 0);
src = res->new_state();
seen.emplace(i->s, src);
if (names)
names->push_back(aut->format_state(s));
for (; i != l->end();)
{
@ -826,7 +835,15 @@ namespace spot
auto p = seen.emplace(next, 0);
if (p.second)
p.first->second = res->new_state();
{
unsigned ns = res->new_state();
p.first->second = ns;
if (names)
{
assert(ns = names->size());
names->push_back(aut->format_state(next));
}
}
dst = p.first->second;
res->new_edge(src, dst, label, acc);

9
spot/twaalgos/emptiness.hh
View file

@ -1,6 +1,6 @@
// -*- coding: utf-8 -*-
// Copyright (C) 2011, 2013, 2014, 2015, 2016 Laboratoire de Recherche et
// Developpement de l'Epita (LRDE).
// Copyright (C) 2011, 2013, 2014, 2015, 2016, 2017 Laboratoire de
// Recherche et Developpement de l'Epita (LRDE).
// Copyright (C) 2004, 2005 Laboratoire d'Informatique de Paris 6 (LIP6),
// département Systèmes Répartis Coopératifs (SRC), Université Pierre
// et Marie Curie.
@ -438,7 +438,10 @@ namespace spot
/// \brief Return a twa_graph_ptr corresponding to \a run
///
/// Identical states are merged.
twa_graph_ptr as_twa() const;
///
/// If \a preserve_names is set, the created states are named
/// using the format_state() result from the original state.
twa_graph_ptr as_twa(bool preserve_names = false) const;
/// \brief Display a twa_run.
///