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

16
src/tgbaalgos/dupexp.cc
View file

@ -21,10 +21,12 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "dupexp.hh"
#include "tgba/tgbagraph.hh"
#include <sstream>
#include <string>
#include <map>
#include "reachiter.hh"
#include "dotty.hh"
namespace spot
{
@ -119,6 +121,20 @@ namespace spot
tgba_digraph_ptr
tgba_dupexp_dfs(const const_tgba_ptr& aut, std::vector<const state*>& rel)
{
auto aa = std::dynamic_pointer_cast<const spot::tgba_digraph>(aut);
if (aa)
{
aa->get_init_state_number(); // Create an initial state if needed.
auto res = make_tgba_digraph(aa);
unsigned ns = aa->num_states();
rel.reserve(ns);
// The state numbers are common to both automata, but
// the state pointers are to the older one.
for (unsigned n = 0; n < ns; ++n)
rel.push_back(aa->state_from_number(n));
return res;
}
dupexp_iter_save<tgba_reachable_iterator_depth_first> di(aut, rel);
di.run();
return di.result();