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

* src/tgbaalgos/gtec/gtec.cc: Add a third level hash, to split

Browse source 
each container into lists of states with identical formula states.
This commit is contained in:
Alexandre Duret-Lutz 2006-02-15 16:10:11 +00:00
parent afd4ea0eb4
commit 644b74f8c0
2 changed files with 85 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,5 +1,8 @@
2006-02-15 Alexandre Duret-Lutz <adl@src.lip6.fr> 2006-02-15 Alexandre Duret-Lutz <adl@src.lip6.fr>
* src/tgbaalgos/gtec/gtec.cc: Add a third level hash, to split
each container into lists of states with identical formula states.
* iface/gspn/ltlgspn.cc, src/tgbaalgos/gtec/gtec.cc, * iface/gspn/ltlgspn.cc, src/tgbaalgos/gtec/gtec.cc,
src/tgbaalgos/gtec/gtec.hh: New option (-e6) to disable src/tgbaalgos/gtec/gtec.hh: New option (-e6) to disable
inclusion check in the stack. inclusion check in the stack.

146
iface/gspn/ssp.cc
View file

@ -670,40 +670,45 @@ namespace spot
virtual numbered_state_heap::state_index virtual numbered_state_heap::state_index
find(const state* s) const find(const state* s) const
{ {
const void* cont = const state_gspn_ssp* s_ = dynamic_cast<const state_gspn_ssp*>(s);
container_(dynamic_cast<const state_gspn_ssp*>(s)->left()); const void* cont = container_(s_->left());
contained_map::const_iterator i = contained.find(cont); contained_map::const_iterator i = contained.find(cont);
if (i != contained.end()) if (i != contained.end())
{ {
const state_list& l = i->second; f_map::const_iterator k = i->second.find(s_->right());
if (k != i->second.end())
state_list::const_iterator j;
for (j = l.begin(); j != l.end(); ++j)
{ {
const state_gspn_ssp* old_state = const state_list& l = k->second;
dynamic_cast<const state_gspn_ssp*>(*j);
const state_gspn_ssp* new_state =
dynamic_cast<const state_gspn_ssp*>(s);
assert(old_state);
assert(new_state);
if ((old_state->right())->compare(new_state->right()) == 0) state_list::const_iterator j;
for (j = l.begin(); j != l.end(); ++j)
{ {
const state_gspn_ssp* old_state =
dynamic_cast<const state_gspn_ssp*>(*j);
const state_gspn_ssp* new_state =
dynamic_cast<const state_gspn_ssp*>(s);
assert(old_state);
assert(new_state);
if (old_state->left() == new_state->left()) if (old_state->left() == new_state->left())
break; break;
if (old_state->left() if (old_state->left()
&& new_state->left() && new_state->left()
&& spot_inclusion(new_state->left(), old_state->left())) && spot_inclusion(new_state->left(), old_state->left()))
break; break;
} }
} if (j != l.end())
if (j != l.end())
{
if (s != *j)
{ {
delete s; if (s != *j)
s = *j; {
delete s;
s = *j;
}
}
else
{
s = 0;
} }
} }
else else
@ -737,40 +742,45 @@ namespace spot
virtual numbered_state_heap::state_index_p virtual numbered_state_heap::state_index_p
find(const state* s) find(const state* s)
{ {
const void* cont = const state_gspn_ssp* s_ = dynamic_cast<const state_gspn_ssp*>(s);
container_(dynamic_cast<const state_gspn_ssp*>(s)->left()); const void* cont = container_(s_->left());
contained_map::const_iterator i = contained.find(cont); contained_map::const_iterator i = contained.find(cont);
if (i != contained.end()) if (i != contained.end())
{ {
const state_list& l = i->second; f_map::const_iterator k = i->second.find(s_->right());
if (k != i->second.end())
state_list::const_iterator j;
for (j = l.begin(); j != l.end(); ++j)
{ {
const state_gspn_ssp* old_state = const state_list& l = k->second;
dynamic_cast<const state_gspn_ssp*>(*j);
const state_gspn_ssp* new_state =
dynamic_cast<const state_gspn_ssp*>(s);
assert(old_state);
assert(new_state);
if ((old_state->right())->compare(new_state->right()) == 0) state_list::const_iterator j;
for (j = l.begin(); j != l.end(); ++j)
{ {
const state_gspn_ssp* old_state =
dynamic_cast<const state_gspn_ssp*>(*j);
const state_gspn_ssp* new_state =
dynamic_cast<const state_gspn_ssp*>(s);
assert(old_state);
assert(new_state);
if (old_state->left() == new_state->left()) if (old_state->left() == new_state->left())
break; break;
if (old_state->left() if (old_state->left()
&& new_state->left() && new_state->left()
&& spot_inclusion(new_state->left(), old_state->left())) && spot_inclusion(new_state->left(), old_state->left()))
break; break;
} }
} if (j != l.end())
if (j != l.end())
{
if (s != *j)
{ {
delete s; if (s != *j)
s = *j; {
delete s;
s = *j;
}
}
else
{
s = 0;
} }
} }
else else
@ -848,11 +858,12 @@ namespace spot
{ {
h[s] = index; h[s] = index;
State sg = dynamic_cast<const state_gspn_ssp*>(s)->left(); const state_gspn_ssp* s_ = dynamic_cast<const state_gspn_ssp*>(s);
State sg = s_->left();
if (sg) if (sg)
{ {
const void* cont = container_(sg); const void* cont = container_(sg);
contained[cont].push_front(s); contained[cont][s_->right()].push_front(s);
} }
} }
@ -870,7 +881,9 @@ namespace spot
hash_type h; ///< Map of visited states. hash_type h; ///< Map of visited states.
typedef std::list<const state*> state_list; typedef std::list<const state*> state_list;
typedef Sgi::hash_map<const void*, state_list, typedef Sgi::hash_map<const state*, state_list,
state_ptr_hash, state_ptr_equal> f_map;
typedef Sgi::hash_map<const void*, f_map,
ptr_hash<void> > contained_map; ptr_hash<void> > contained_map;
contained_map contained; contained_map contained;
@ -1025,29 +1038,31 @@ namespace spot
typedef numbered_state_heap_ssp_semi::hash_type hash_type; typedef numbered_state_heap_ssp_semi::hash_type hash_type;
hash_type& h = dynamic_cast<numbered_state_heap_ssp_semi*>(ecs_->h)->h; hash_type& h = dynamic_cast<numbered_state_heap_ssp_semi*>(ecs_->h)->h;
typedef numbered_state_heap_ssp_semi::contained_map contained_map; typedef numbered_state_heap_ssp_semi::contained_map contained_map;
typedef numbered_state_heap_ssp_semi::f_map f_map;
typedef numbered_state_heap_ssp_semi::state_list state_list; typedef numbered_state_heap_ssp_semi::state_list state_list;
const contained_map& contained = const contained_map& contained =
dynamic_cast<numbered_state_heap_ssp_semi*>(ecs_->h)->contained; dynamic_cast<numbered_state_heap_ssp_semi*>(ecs_->h)->contained;
const void* cont = const state_gspn_ssp* s_ = dynamic_cast<const state_gspn_ssp*>(s);
container_(dynamic_cast<const state_gspn_ssp*>(s)->left()); const void* cont = container_(s_->left());
contained_map::const_iterator i = contained.find(cont); contained_map::const_iterator i = contained.find(cont);
if (i != contained.end()) if (i != contained.end())
{ {
const state_list& l = i->second; f_map::const_iterator k = i->second.find(s_->right());
state_list::const_iterator j; if (k != i->second.end())
for (j = l.begin(); j != l.end(); ++j)
{ {
const state_gspn_ssp* old_state = const state_list& l = k->second;
dynamic_cast<const state_gspn_ssp*>(*j); state_list::const_iterator j;
const state_gspn_ssp* new_state =
dynamic_cast<const state_gspn_ssp*>(s);
assert(old_state);
assert(new_state);
if ((old_state->right())->compare(new_state->right()) == 0) for (j = l.begin(); j != l.end(); ++j)
{ {
const state_gspn_ssp* old_state =
dynamic_cast<const state_gspn_ssp*>(*j);
const state_gspn_ssp* new_state =
dynamic_cast<const state_gspn_ssp*>(s);
assert(old_state);
assert(new_state);
if (old_state->left() == new_state->left()) if (old_state->left() == new_state->left())
break; break;
@ -1096,21 +1111,24 @@ namespace spot
} }
} }
} }
} if (j != l.end())
if (j != l.end())
{
if (s != *j)
{ {
delete s; if (s != *j)
s = *j; {
delete s;
s = *j;
}
}
else
{
s = 0;
} }
} }
else else
{ {
s = 0; s = 0;
} }
} }
else else
{ {
s = 0; s = 0;