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

c++11: introduce tgba::succ(s) to replace tgba::succ_iter(s).

Browse source 
| tgba_succ_iterator* i = aut->succ_iter(s);
| for (i->begin(); !i->done(); i->next())
|   {
|      // ...
|   }
| delete i;

becomes

| for (auto i: aut->succ(s))
|   {
|      // ...
|   }

hiding the begin()/done()/next() interface, taking care of the delete,
and allowing more optimization to come.

* src/tgba/succiter.hh, src/tgba/tgba.hh: Implement the above
new interface.
* iface/gspn/ssp.cc, src/dstarparse/nsa2tgba.cc,
src/saba/sabacomplementtgba.cc, src/tgba/tgbakvcomplement.cc,
src/tgba/tgbamask.cc, src/tgba/tgbasafracomplement.cc,
src/tgba/tgbatba.cc, src/tgbaalgos/compsusp.cc, src/tgbaalgos/cutscc.cc,
src/tgbaalgos/degen.cc, src/tgbaalgos/emptiness.cc,
src/tgbaalgos/isdet.cc, src/tgbaalgos/ltl2tgba_fm.cc,
src/tgbaalgos/minimize.cc, src/tgbaalgos/powerset.cc,
src/tgbaalgos/safety.cc, src/tgbaalgos/simulation.cc,
src/tgbaalgos/tau03.cc, src/tgbatest/explicit2.cc: Update for
loops.
This commit is contained in:
Alexandre Duret-Lutz 2014-01-25 19:48:28 +01:00
parent f59773e3c7
commit 487cd01d9f
21 changed files with 418 additions and 522 deletions
Download patch file Download diff file Expand all files Collapse all files

43
src/tgbaalgos/ltl2tgba_fm.cc
View file

@ -1,6 +1,6 @@
// -*- coding: utf-8 -*-
// Copyright (C) 2008, 2009, 2010, 2011, 2012, 2013 Laboratoire de Recherche et
// Développement de l'Epita (LRDE).
// Copyright (C) 2008, 2009, 2010, 2011, 2012, 2013, 2014 Laboratoire
// de Recherche et Développement de l'Epita (LRDE).
// Copyright (C) 2003, 2004, 2005, 2006 Laboratoire
// d'Informatique de Paris 6 (LIP6), département Systèmes Répartis
// Coopératifs (SRC), Université Pierre et Marie Curie.
@ -152,8 +152,8 @@ namespace spot
~translate_dict()
{
fv_map::iterator i;
for (i = next_map.begin(); i != next_map.end(); ++i)
i->first->destroy();
for (auto& i: next_map)
i.first->destroy();
dict->unregister_all_my_variables(this);
flagged_formula_to_bdd_map::iterator j = ltl_bdd_.begin();
@ -306,10 +306,10 @@ namespace spot
{
fv_map::const_iterator fi;
os << "Next Variables:" << std::endl;
for (fi = next_map.begin(); fi != next_map.end(); ++fi)
for (auto& fi: next_map)
{
os << " " << fi->second << ": Next[";
to_string(fi->first, os) << "]" << std::endl;
os << " " << fi.second << ": Next[";
to_string(fi.first, os) << "]" << std::endl;
}
os << "Shared Dict:" << std::endl;
dict->dump(os);
@ -1005,9 +1005,8 @@ namespace spot
ratexp_to_dfa::~ratexp_to_dfa()
{
std::vector<tgba_explicit_formula*>::const_iterator it;
for (it = automata_.begin(); it != automata_.end(); ++it)
delete *it;
for (auto i: automata_)
delete i;
}
tgba_explicit_formula*
@ -1087,13 +1086,12 @@ namespace spot
// SCC are numbered in topological order
for (unsigned n = 0; n < scc_count; ++n)
{
bool coacc = false;
const std::list<const state*>& st = sm->states_of(n);
// The SCC is coaccessible if any of its states
// is final (i.e., it accepts [*0])...
std::list<const state*>::const_iterator it;
for (it = st.begin(); it != st.end(); ++it)
if (a->get_label(*it)->accepts_eword())
bool coacc = false;
const std::list<const state*>& st = sm->states_of(n);
for (auto l: st)
if (a->get_label(l)->accepts_eword())
{
coacc = true;
break;
@ -1101,10 +1099,8 @@ namespace spot
if (!coacc)
{
// ... or if any of its successors is coaccessible.
const scc_map::succ_type& succ = sm->succ(n);
for (scc_map::succ_type::const_iterator i = succ.begin();
i != succ.end(); ++i)
if (coaccessible[i->first])
for (auto& i: sm->succ(n))
if (coaccessible[i.first])
{
coacc = true;
break;
@ -1113,13 +1109,13 @@ namespace spot
if (!coacc)
{
// Mark all formulas of this SCC as useless.
for (it = st.begin(); it != st.end(); ++it)
f2a_[a->get_label(*it)] = 0;
for (auto f: st)
f2a_[a->get_label(f)] = nullptr;
}
else
{
for (it = st.begin(); it != st.end(); ++it)
f2a_[a->get_label(*it)] = a;
for (auto f: st)
f2a_[a->get_label(f)] = a;
}
coaccessible[n] = coacc;
}
@ -1136,6 +1132,7 @@ namespace spot
}
}
// FIXME: use the new tgba::succ() interface
tgba_succ_iterator*
ratexp_to_dfa::succ(const formula* f)
{