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

deprecate copy() in favor of make_twa_graph()

Browse source 
Fixes #258.

* spot/twaalgos/copy.cc: Delete, and move the code...
* spot/twa/twagraph.cc: ... in some anonymous namespace here.
* spot/twa/twagraph.hh: Adjust the make_twa_graph() overload.
* spot/twaalgos/copy.hh, NEWS: Mark copy() as deprecated and redirect
to make_twa_graph().
* doc/org/upgrade2.org, doc/org/tut51.org, python/spot/impl.i,
spot/twaalgos/dot.cc, spot/twaalgos/langmap.cc, tests/core/ikwiad.cc:
Adjust callers.
* spot/twaalgos/Makefile.am: Remove copy.cc.
This commit is contained in:
Alexandre Duret-Lutz 2017-07-25 11:18:03 +02:00
parent 1e9daa73f3
commit 8e685e00c9
12 changed files with 197 additions and 206 deletions
Download patch file Download diff file Expand all files Collapse all files

34
spot/twaalgos/langmap.cc
View file

@ -19,7 +19,6 @@
#include <numeric>
#include <spot/twa/twa.hh>
#include <spot/twaalgos/copy.hh>
#include <spot/twaalgos/dualize.hh>
#include <spot/twaalgos/isdet.hh>
#include <spot/twaalgos/langmap.hh>
@ -43,29 +42,26 @@ namespace spot
// Prepare all automatons needed.
for (unsigned i = 0; i < n_states; ++i)
{
twa_graph_ptr c = copy(aut, twa::prop_set::all());
c->set_init_state(i);
alt_init_st_auts[i] = c;
twa_graph_ptr cc =
remove_fin(dualize(copy(c, twa::prop_set::all())));
compl_alt_init_st_auts[i] = cc;
}
{
twa_graph_ptr c = make_twa_graph(aut, twa::prop_set::all());
c->set_init_state(i);
alt_init_st_auts[i] = c;
compl_alt_init_st_auts[i] = remove_fin(dualize(c));
}
for (unsigned i = 1; i < n_states; ++i)
for (unsigned j = 0; j < i; ++j)
{
if (res[j] != j)
continue;
if (!alt_init_st_auts[i]->intersects(compl_alt_init_st_auts[j])
&& (!compl_alt_init_st_auts[i]->intersects(alt_init_st_auts[j])))
{
res[i] = res[j];
break;
if (res[j] != j)
continue;
if (!alt_init_st_auts[i]->intersects(compl_alt_init_st_auts[j])
&& (!compl_alt_init_st_auts[i]->intersects(alt_init_st_auts[j])))
{
res[i] = res[j];
break;
}
}
}
return res;
}