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

51
src/tgbaalgos/powerset.cc
View file

@ -72,8 +72,8 @@ namespace spot
bdd all_vars = bddtrue;
power_state::const_iterator i;
for (i = src.begin(); i != src.end(); ++i)
all_vars &= aut->support_variables(*i);
for (auto s: src)
all_vars &= aut->support_variables(s);
// Compute all possible combinations of these variables.
bdd all_conds = bddtrue;
@ -84,17 +84,10 @@ namespace spot
// Construct the set of all states reachable via COND.
power_state dest;
for (i = src.begin(); i != src.end(); ++i)
{
tgba_succ_iterator *si = aut->succ_iter(*i);
for (si->first(); !si->done(); si->next())
if ((cond >> si->current_condition()) == bddtrue)
{
const state* s = pm.canonicalize(si->current_state());
dest.insert(s);
}
delete si;
}
for (auto s: src)
for (auto si: aut->succ(s))
if ((cond >> si->current_condition()) == bddtrue)
dest.insert(pm.canonicalize(si->current_state()));
if (dest.empty())
continue;
// Add that transition.
@ -177,10 +170,8 @@ namespace spot
// }
bdd acc = aut_->all_acceptance_conditions();
for (trans_set::iterator i = all_.begin(); i != all_.end(); ++i)
{
(*i)->acceptance_conditions = acc;
}
for (auto i: all_)
i->acceptance_conditions = acc;
return threshold_ != 0 && cycles_left_ == 0;
}
@ -213,17 +204,13 @@ namespace spot
// start of the loop in the determinized automaton.
const power_map::power_state& ps =
refmap_.states_of(a->get_label(begin->ts->first));
for (power_map::power_state::const_iterator it = ps.begin();
it != ps.end() && !accepting; ++it)
for (auto s: ps)
{
// Construct a product between
// LOOP_A, and ORIG_A starting in *IT.
tgba* p = new tgba_product_init(&loop_a, ref_,
loop_a_init, *it);
// LOOP_A, and ORIG_A starting in S.
tgba* p = new tgba_product_init(&loop_a, ref_, loop_a_init, s);
//spot::dotty_reachable(std::cout, p);
couvreur99_check* ec = down_cast<couvreur99_check*>(couvreur99(p));
assert(ec);
emptiness_check_result* res = ec->check();
@ -232,6 +219,8 @@ namespace spot
delete res;
delete ec;
delete p;
if (accepting)
break;
}
loop_a_init->destroy();
@ -242,8 +231,8 @@ namespace spot
print_set(std::ostream& o, const trans_set& s) const
{
o << "{ ";
for (trans_set::const_iterator i = s.begin(); i != s.end(); ++i)
o << *i << " ";
for (auto i: s)
o << i << " ";
o << "}";
return o;
}
@ -272,15 +261,11 @@ namespace spot
}
else
{
for (trans_set::const_iterator i = ts.begin(); i != ts.end(); ++i)
for (auto t: ts)
{
trans* t = *i;
reject_.insert(t);
for (set_set::iterator j = accept_.begin();
j != accept_.end(); ++j)
{
j->erase(t);
}
for (auto& j: accept_)
j.erase(t);
all_.erase(t);
}
}