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

* src/tgbaalgos/replayrun.cc (replay_tgba_run): Note duplicate states.

Browse source
This commit is contained in:
Alexandre Duret-Lutz 2004-10-29 12:19:18 +00:00
parent cf45539312
commit 720a31c128
2 changed files with 33 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog
View file

@ -1,5 +1,7 @@
2004-10-29 Alexandre Duret-Lutz <adl@src.lip6.fr> 2004-10-29 Alexandre Duret-Lutz <adl@src.lip6.fr>
* src/tgbaalgos/replayrun.cc (replay_tgba_run): Note duplicate states.
* src/tgbaalgos/replayrun.cc (replay_tgba_run): Verify the run is * src/tgbaalgos/replayrun.cc (replay_tgba_run): Verify the run is
accepting. accepting.

33
src/tgbaalgos/replayrun.cc
View file

@ -23,6 +23,7 @@
#include "tgba/tgba.hh" #include "tgba/tgba.hh"
#include "emptiness.hh" #include "emptiness.hh"
#include "tgba/bddprint.hh" #include "tgba/bddprint.hh"
#include <sstream>
namespace spot namespace spot
{ {
@ -36,6 +37,9 @@ namespace spot
bdd all_acc = bddfalse; bdd all_acc = bddfalse;
bdd expected_all_acc = a->all_acceptance_conditions(); bdd expected_all_acc = a->all_acceptance_conditions();
bool all_acc_seen = false; bool all_acc_seen = false;
typedef Sgi::hash_map<const state*, std::set<int>,
state_ptr_hash, state_ptr_equal> state_map;
state_map seen;
if (run->prefix.empty()) if (run->prefix.empty())
{ {
@ -62,7 +66,23 @@ namespace spot
for (; i != l->end(); ++serial) for (; i != l->end(); ++serial)
{ {
os << "state " << serial << " in " << in << ": " state_map::iterator o = seen.find(s);
std::ostringstream msg;
if (o != seen.end())
{
std::set<int>::const_iterator d;
for (d = o->second.begin(); d != o->second.end(); ++d)
msg << " == " << *d;
o->second.insert(serial);
delete s;
s = o->first;
}
else
{
seen[s].insert(serial);
}
os << "state " << serial << " in " << in << msg.str() << ": "
<< a->format_state(s) << std::endl; << a->format_state(s) << std::endl;
// expected outgoing transition // expected outgoing transition
@ -89,7 +109,6 @@ namespace spot
// browse the actual outgoing transitions // browse the actual outgoing transitions
tgba_succ_iterator* j = a->succ_iter(s); tgba_succ_iterator* j = a->succ_iter(s);
delete s;
for (j->first(); !j->done(); j->next()) for (j->first(); !j->done(); j->next())
{ {
if (j->current_condition() != label if (j->current_condition() != label
@ -163,6 +182,16 @@ namespace spot
<< std::endl; << std::endl;
return false; return false;
} }
state_map::const_iterator o = seen.begin();
while (o != seen.end())
{
// Advance the iterator before deleting the "key" pointer.
const state* ptr = o->first;
++o;
delete ptr;
}
return true; return true;
} }
} }