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

use scc_info instead of scc_map in a couple of easy places

Browse source 
* src/bin/dstar2tgba.cc, src/bin/ltlcross.cc, src/tgbaalgos/stats.cc,
src/tgbaalgos/simulation.cc: Use scc_info instead of scc_map.
* src/tgbaalgos/stats.hh, src/bin/common_output.hh: Change parameters
types to be tgba_digraph_ptr instead tgba_ptr, so that scc_info can be
used.
This commit is contained in:
Alexandre Duret-Lutz 2014-08-20 10:03:21 +02:00
parent 14570f62d0
commit 5c9a5403fe
6 changed files with 21 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/bin/common_output.hh
View file

@ -73,7 +73,7 @@ public:
}
std::ostream&
print(const spot::const_tgba_ptr& aut,
print(const spot::const_tgba_digraph_ptr& aut,
const spot::ltl::formula* f = 0,
double run_time = -1.)
{

10
src/bin/dstar2tgba.cc
View file

@ -40,7 +40,7 @@
#include "tgba/bddprint.hh"
#include "misc/optionmap.hh"
#include "dstarparse/public.hh"
#include "tgbaalgos/scc.hh"
#include "tgbaalgos/sccinfo.hh"
const char argp_program_doc[] ="\
Convert Rabin and Streett automata into Büchi automata.\n\n\
@ -225,7 +225,7 @@ namespace
/// to be output.
std::ostream&
print(const spot::const_dstar_aut_ptr& daut,
const spot::const_tgba_ptr& aut,
const spot::const_tgba_digraph_ptr& aut,
const char* filename, double run_time)
{
filename_ = filename;
@ -252,11 +252,7 @@ namespace
daut_acc_ = daut->accpair_count;
if (has('C'))
{
spot::scc_map m(daut->aut);
m.build_map();
daut_scc_ = m.scc_count();
}
daut_scc_ = spot::scc_info(daut->aut).scc_count();
return this->spot::stat_printer::print(aut, 0, run_time);
}

5
src/bin/ltlcross.cc
View file

@ -48,6 +48,7 @@
#include "tgba/tgbaproduct.hh"
#include "tgbaalgos/gtec/gtec.hh"
#include "tgbaalgos/randomgraph.hh"
#include "tgbaalgos/sccinfo.hh"
#include "tgbaalgos/scc.hh"
#include "tgbaalgos/dotty.hh"
#include "tgbaalgos/isweakscc.hh"
@ -983,9 +984,7 @@ namespace
st->in_transitions = s.sub_transitions;
st->in_acc = aut->accpair_count;
spot::scc_map m(aut->aut);
m.build_map();
st->in_scc = m.scc_count();
st->in_scc = spot::scc_info(aut->aut).scc_count();
}
// convert it into TGBA for further processing
res = dstar_to_tgba(aut);