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

Rewrite the check of WDBA state acceptance in minimize().

Browse source 
* src/tgbaalgos/powerset.hh (power_map): New structure, allowing
the caller to retrieve the set of original states corresponding to
the set in the deterministic automaton.
(power_set): Adjust prototype to take a power_map instead of the
acc_list.
* src/tgbaalgos/powerset.cc (power_set): Strip all code using
acc_list, and update power_set.
* src/tgbaalgos/minimize.cc (minimize): Rewrite, using an
algorithm similar to the one in the Dax paper to check whether
state of the minimized automaton should be accepting.
This commit is contained in:
Alexandre Duret-Lutz 2011-01-04 19:13:44 +01:00
parent 37a8d1dc92
commit 358d4bfdf2
4 changed files with 250 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

67
src/tgbaalgos/powerset.hh
View file

@ -1,4 +1,6 @@
// Copyright (C) 2004 Laboratoire d'Informatique de Paris 6 (LIP6),
// Copyright (C) 2011 Laboratoire de Recherche et Développement de
// l'Epita.
// Copyright (C) 2004 Laboratoire d'Informatique de Paris 6 (LIP6),
// département Systèmes Répartis Coopératifs (SRC), Université Pierre
// et Marie Curie.
//
@ -23,21 +25,72 @@
# define SPOT_TGBAALGOS_POWERSET_HH
# include <list>
# include <map>
# include "tgba/tgbaexplicit.hh"
namespace spot
{
struct power_map
{
typedef std::set<const state*, state_ptr_less_than> power_state;
typedef std::map<int, power_state> power_map_data;
typedef Sgi::hash_set<const state*, state_ptr_hash,
state_ptr_equal> state_set;
~power_map()
{
// Release all states.
state_set::const_iterator i = states.begin();
while (i != states.end())
{
// Advance the iterator before deleting the key.
const state* s = *i;
++i;
delete s;
}
}
const power_state&
states_of(int s) const
{
return map_.find(s)->second;
}
const state*
canonicalize(const state* s)
{
state_set::const_iterator i = states.find(s);
if (i != states.end())
{
delete s;
s = *i;
}
else
{
states.insert(s);
}
return s;
}
power_map_data map_;
state_set states;
};
/// \brief Build a deterministic automaton, ignoring acceptance conditions.
/// \ingroup tgba_misc
///
/// This create a deterministic automaton that recognize the
/// This create a deterministic automaton that recognizes the
/// same language as \a aut would if its acceptance conditions
/// were ignored. This is the classical powerset algorithm.
/// If acc_list is not 0. Whenever a power state is created from one
/// accepting state (a state belonging to an accepting SCC), then this power
/// state is added to acc_list.
tgba_explicit* tgba_powerset(const tgba* aut,
std::list<const state*>* acc_list = 0);
///
/// If \a pm is supplied it will be filled with the set of original states
/// associated to each state of the deterministic automaton.
//@{
tgba_explicit_number* tgba_powerset(const tgba* aut, power_map& pm);
tgba_explicit_number* tgba_powerset(const tgba* aut);
//@}
}
#endif // SPOT_TGBAALGOS_POWERSET_HH