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

tgba_digraph: add a copy constructor, and obsolete dupexp

Browse source 
* src/tgba/tgbagraph.hh, src/tgba/tgbagraph.cc: Add a copy constructor,
and some method to purge unreachable states.
* src/graph/graph.hh (defrag_states): Erase transition of removed
states.
* src/tgbaalgos/complete.cc, src/tgbaalgos/compsusp.cc,
src/tgbaalgos/dtgbacomp.cc, src/tgbaalgos/simulation.cc,
src/tgbatest/checkpsl.cc, src/tgbatest/emptchk.cc,
src/tgbatest/ltl2tgba.cc: Adjust to use make_tgba_digraph() instead
of tgba_dupexp_dfs() or tgba_dupexp_bfs().
* src/tgbaalgos/dupexp.cc, src/tgbaalgos/dupexp.hh: Use
make_tgba_digraph() when possible.
* src/tgbatest/det.test, src/tgbatest/sim.test: Adjust expected results.
This commit is contained in:
Alexandre Duret-Lutz 2014-10-28 18:47:19 +01:00
parent 971788fdbe
commit 923785f76a
14 changed files with 128 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/tgba/tgbagraph.hh
View file

@ -25,6 +25,7 @@
#include "graph/ngraph.hh"
#include "tgba/bdddict.hh"
#include "tgba/tgba.hh"
#include "tgbaalgos/dupexp.hh"
#include "misc/bddop.hh"
#include <sstream>
@ -170,6 +171,14 @@ namespace spot
{
}
explicit tgba_digraph(const const_tgba_digraph_ptr& other)
: tgba(other->get_dict()),
g_(other->g_), init_number_(other->init_number_)
{
copy_acceptance_conditions_of(other);
copy_ap_of(other);
}
virtual ~tgba_digraph()
{
get_dict()->unregister_all_my_variables(this);
@ -228,7 +237,7 @@ namespace spot
set_init_state(state_number(s));
}
virtual graph_t::state get_init_state_number() const
graph_t::state get_init_state_number() const
{
if (num_states() == 0)
const_cast<graph_t&>(g_).new_state();
@ -391,6 +400,9 @@ namespace spot
/// Remove all states without successors.
void purge_dead_states();
/// Remove all unreachable states.
void purge_unreachable_states();
bool state_is_accepting(unsigned s) const
{
assert(has_state_based_acc());
@ -412,6 +424,21 @@ namespace spot
{
return std::make_shared<tgba_digraph>(dict);
}
inline tgba_digraph_ptr make_tgba_digraph(const const_tgba_digraph_ptr& aut)
{
return std::make_shared<tgba_digraph>(aut);
}
inline tgba_digraph_ptr make_tgba_digraph(const const_tgba_ptr& aut)
{
auto p = std::dynamic_pointer_cast<const tgba_digraph>(aut);
if (p)
return std::make_shared<tgba_digraph>(p);
else
return tgba_dupexp_dfs(aut);
}
}
#endif // SPOT_TGBA_TGBAGRAPH_HH