use scc_info instead of scc_map in a couple of easy places

* 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

View file

@ -1,5 +1,6 @@
// Copyright (C) 2008, 2011, 2012, 2013 Laboratoire de Recherche et Développement
// de l'Epita (LRDE).
// -*- coding utf-8 -*-
// Copyright (C) 2008, 2011, 2012, 2013, 2014 Laboratoire de Recherche
// et Développement de l'Epita (LRDE).
// Copyright (C) 2004 Laboratoire d'Informatique de Paris 6 (LIP6),
// département Systèmes Répartis Coopératifs (SRC), Université Pierre
// et Marie Curie.
@ -25,7 +26,7 @@
#include "reachiter.hh"
#include "ltlvisit/tostring.hh"
#include "tgbaalgos/isdet.hh"
#include "tgbaalgos/scc.hh"
#include "tgbaalgos/sccinfo.hh"
namespace spot
{
@ -157,7 +158,7 @@ namespace spot
}
std::ostream&
stat_printer::print(const const_tgba_ptr& aut,
stat_printer::print(const const_tgba_digraph_ptr& aut,
const ltl::formula* f,
double run_time)
{
@ -182,11 +183,7 @@ namespace spot
acc_ = aut->number_of_acceptance_conditions();
if (has('c') || has('S'))
{
scc_map m(aut);
m.build_map();
scc_ = m.scc_count();
}
scc_ = scc_info(aut).scc_count();
if (has('n'))
{