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

Speed up computation of non_final states for minimize_wdba.

Browse source 
* src/tgbaalgos/minimize.cc (minimize_dfa): Take final and
non_final sets.
(minimize_wdba): Fill in non_final at the same time as final.
(minimize_monitor): Call state_set() to fill non_final.
(init_sets): Simplify and rename as ...
(state_set): ... this.
This commit is contained in:
Alexandre Duret-Lutz 2011-01-06 12:16:55 +01:00
parent 474e69565b
commit 6cb5df0bd7
2 changed files with 37 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -1,3 +1,14 @@
2011-01-06 Alexandre Duret-Lutz <adl@lrde.epita.fr>
Speed up computation of non_final states for minimize_wdba.
* src/tgbaalgos/minimize.cc (minimize_dfa): Take final and
non_final sets.
(minimize_wdba): Fill in non_final at the same time as final.
(minimize_monitor): Call state_set() to fill non_final.
(init_sets): Simplify and rename as ...
(state_set): ... this.
2011-01-06 Alexandre Duret-Lutz <adl@lrde.epita.fr> 2011-01-06 Alexandre Duret-Lutz <adl@lrde.epita.fr>
Introduce a class to complement a WDBA on-the-fly. Introduce a class to complement a WDBA on-the-fly.

65
src/tgbaalgos/minimize.cc
View file

@ -80,51 +80,35 @@ namespace spot
} }
} }
// Given an automaton a, find all states that are not in "final" and add // Find all states of an automaton.
// them to the set "non_final". void state_set(const tgba* a, hash_set* seen)
void init_sets(const tgba_explicit* a,
hash_set& final,
hash_set& non_final)
{ {
hash_set seen;
std::queue<const state*> tovisit; std::queue<const state*> tovisit;
// Perform breadth-first traversal. // Perform breadth-first traversal.
const state* init = a->get_init_state(); const state* init = a->get_init_state();
tovisit.push(init); tovisit.push(init);
seen.insert(init); seen->insert(init);
while (!tovisit.empty()) while (!tovisit.empty())
{ {
const state* src = tovisit.front(); const state* src = tovisit.front();
tovisit.pop(); tovisit.pop();
// Is the state final ?
if (final.find(src) == final.end())
// No, add it to the set non_final
non_final.insert(src->clone());
tgba_succ_iterator* sit = a->succ_iter(src); tgba_succ_iterator* sit = a->succ_iter(src);
for (sit->first(); !sit->done(); sit->next()) for (sit->first(); !sit->done(); sit->next())
{ {
const state* dst = sit->current_state(); const state* dst = sit->current_state();
// Is it a new state ? // Is it a new state ?
if (seen.find(dst) == seen.end()) if (seen->find(dst) == seen->end())
{ {
// Register the successor for later processing. // Register the successor for later processing.
tovisit.push(dst); tovisit.push(dst);
seen.insert(dst); seen->insert(dst);
} }
else else
delete dst; delete dst;
} }
delete sit; delete sit;
} }
while (!seen.empty())
{
hash_set::iterator i = seen.begin();
const state* s = *i;
seen.erase(i);
delete s;
}
} }
// From the base automaton and the list of sets, build the minimal // From the base automaton and the list of sets, build the minimal
@ -307,7 +291,7 @@ namespace spot
} }
tgba_explicit_number* minimize_dfa(const tgba_explicit_number* det_a, tgba_explicit_number* minimize_dfa(const tgba_explicit_number* det_a,
hash_set* final) hash_set* final, hash_set* non_final)
{ {
typedef std::list<hash_set*> partition_t; typedef std::list<hash_set*> partition_t;
partition_t cur_run; partition_t cur_run;
@ -318,9 +302,6 @@ namespace spot
hash_map state_set_map; hash_map state_set_map;
hash_set* non_final = new hash_set;
init_sets(det_a, *final, *non_final);
// Size of det_a // Size of det_a
unsigned size = final->size() + non_final->size(); unsigned size = final->size() + non_final->size();
// Use bdd variables to number sets. set_num is the first variable // Use bdd variables to number sets. set_num is the first variable
@ -510,19 +491,26 @@ namespace spot
tgba_explicit_number* minimize_monitor(const tgba* a) tgba_explicit_number* minimize_monitor(const tgba* a)
{ {
hash_set* final = new hash_set; hash_set* final = new hash_set;
hash_set* non_final = new hash_set;
tgba_explicit_number* det_a; tgba_explicit_number* det_a;
{ {
power_map pm; power_map pm;
det_a = tgba_powerset(a, pm); det_a = tgba_powerset(a, pm);
} }
// non_final contain all states.
// final is empty: there is no acceptance condition // final is empty: there is no acceptance condition
return minimize_dfa(det_a, final); state_set(a, non_final);
return minimize_dfa(det_a, final, non_final);
} }
tgba_explicit_number* minimize_wdba(const tgba* a) tgba_explicit_number* minimize_wdba(const tgba* a)
{ {
hash_set* final = new hash_set; hash_set* final = new hash_set;
hash_set* non_final = new hash_set;
tgba_explicit_number* det_a; tgba_explicit_number* det_a;
{ {
@ -571,17 +559,16 @@ namespace spot
} }
accepting[n] = acc; accepting[n] = acc;
if (acc)
{ hash_set* dest_set = acc ? final : non_final;
std::list<const state*> l = sm.states_of(n); const std::list<const state*>& l = sm.states_of(n);
std::list<const state*>::const_iterator il; std::list<const state*>::const_iterator il;
for (il = l.begin(); il != l.end(); ++il) for (il = l.begin(); il != l.end(); ++il)
final->insert((*il)->clone()); dest_set->insert((*il)->clone());
}
} }
} }
return minimize_dfa(det_a, final); return minimize_dfa(det_a, final, non_final);
} }
const tgba* const tgba*