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

* src/tgbaalgos/ndfs_result.hh (construct_prefix): Do not call

Browse source 
erase() after splice(), splice() already removes the elements.
This commit is contained in:
Alexandre Duret-Lutz 2005-01-03 12:11:28 +00:00
parent 000c041a95
commit 13183893dd
2 changed files with 284 additions and 284 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,5 +1,8 @@
2005-01-03 Alexandre Duret-Lutz <adl@src.lip6.fr> 2005-01-03 Alexandre Duret-Lutz <adl@src.lip6.fr>
* src/tgbaalgos/ndfs_result.hh (construct_prefix): Do not call
erase() after splice(), splice() already removes the elements.
* src/evtgba/evtgbaiter.hh, src/ltlast/formula.hh, * src/evtgba/evtgbaiter.hh, src/ltlast/formula.hh,
src/ltlast/refformula.hh, src/ltlenv/defaultenv.hh, src/ltlast/refformula.hh, src/ltlenv/defaultenv.hh,
src/misc/bareword.hh, src/tgba/succiter.hh, src/misc/bareword.hh, src/tgba/succiter.hh,
@ -46,7 +49,7 @@
2004-12-16 Alexandre Duret-Lutz <adl@src.lip6.fr> 2004-12-16 Alexandre Duret-Lutz <adl@src.lip6.fr>
* src/tgbaalgos/reducerun.cc (reduce_run): Do not call erase() after * src/tgbaalgos/reducerun.cc (reduce_run): Do not call erase() after
splice(), splice() already remove the elements. splice(), splice() already removes the elements.
* src/tgbaalgos/gtec/ce.cc (couvreur99_check_result::accepting_run): * src/tgbaalgos/gtec/ce.cc (couvreur99_check_result::accepting_run):
Likewise. Likewise.

23
src/tgbaalgos/ndfs_result.hh
View file

@ -1,4 +1,4 @@
// Copyright (C) 2004 Laboratoire d'Informatique de Paris 6 (LIP6), // Copyright (C) 2004, 2005 Laboratoire d'Informatique de Paris 6 (LIP6),
// département Systèmes Répartis Coopératifs (SRC), Université Pierre // département Systèmes Répartis Coopératifs (SRC), Université Pierre
// et Marie Curie. // et Marie Curie.
// //
@ -61,7 +61,7 @@ namespace spot
typedef std::list<stack_item> stack_type; typedef std::list<stack_item> stack_type;
template < typename ndfs_search, typename heap > template <typename ndfs_search, typename heap>
class ndfs_result : public emptiness_check_result class ndfs_result : public emptiness_check_result
{ {
public: public:
@ -161,7 +161,7 @@ namespace spot
{ {
bool b = dfs(start, acc_trans, covered_acc); bool b = dfs(start, acc_trans, covered_acc);
assert(b); assert(b);
(void)b; (void) b;
} }
delete start; delete start;
@ -177,8 +177,7 @@ namespace spot
construct_prefix(run); construct_prefix(run);
for (typename accepting_transitions_list::const_iterator i = for (typename accepting_transitions_list::const_iterator i =
acc_trans.begin(); acc_trans.begin(); i != acc_trans.end(); ++i)
i != acc_trans.end(); ++i)
{ {
delete i->source; delete i->source;
delete i->dest; delete i->dest;
@ -369,8 +368,9 @@ namespace spot
const state* filter(const state* s) const state* filter(const state* s)
{ {
if (!h.has_been_visited(s) || seen.find(s) != seen.end() || if (!h.has_been_visited(s)
dead.find(s) != dead.end()) || seen.find(s) != seen.end()
|| dead.find(s) != dead.end())
{ {
delete s; delete s;
return 0; return 0;
@ -379,8 +379,8 @@ namespace spot
return s; return s;
} }
void finalize( void finalize(const std::map<const state*, tgba_run::step,
const std::map<const state*, tgba_run::step, state_ptr_less_than>&, state_ptr_less_than>&,
const tgba_run::step&, const state*, tgba_run::steps&) const tgba_run::step&, const state*, tgba_run::steps&)
{ {
} }
@ -500,7 +500,7 @@ namespace spot
typename accepting_transitions_list::const_iterator i = typename accepting_transitions_list::const_iterator i =
acc_trans.begin(); acc_trans.begin();
ndfsr_trace << "targets are the source states: "; ndfsr_trace << "targets are the source states: ";
for (++i; i!=acc_trans.end(); ++i) for (++i; i != acc_trans.end(); ++i)
{ {
if (i->source->compare(begin) == 0 && if (i->source->compare(begin) == 0 &&
i->source->compare(i->dest) == 0) i->source->compare(i->dest) == 0)
@ -576,7 +576,6 @@ namespace spot
m_source_trans target; m_source_trans target;
transition tmp; transition tmp;
// Register all states from the cycle as target of the BFS. // Register all states from the cycle as target of the BFS.
for (tgba_run::steps::const_iterator i = run->cycle.begin(); for (tgba_run::steps::const_iterator i = run->cycle.begin();
i != run->cycle.end(); ++i) i != run->cycle.end(); ++i)
@ -617,9 +616,7 @@ namespace spot
// Now shift the cycle so it starts on cycle_entry_point. // Now shift the cycle so it starts on cycle_entry_point.
run->cycle.splice(run->cycle.end(), run->cycle, run->cycle.splice(run->cycle.end(), run->cycle,
run->cycle.begin(), cycle_ep_it); run->cycle.begin(), cycle_ep_it);
run->cycle.erase(run->cycle.begin(), cycle_ep_it);
} }
}; };
} }