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

Cleanup the minimize.hh interface.

Browse source 
* src/tgbaalgos/minimize.hh, src/tgbaalgos/minimize.cc
(minimize): Split into ...
(minimize_wdba, minimize_monitor): ... these two functions.
* src/tgbatest/ltl2tgba.cc (main): Adjust the call to
minimize_monitor.
* wrap/python/cgi-bin/ltl2tgba.in: Adjust the calls to
minimize_monitor and minimize_obligation.
* wrap/python/spot.i: Declare minimize_monitor, minimize_wdba,
minimize_obligations.
* src/tgba/tgbaexplicit.hh (tgba_explicit_string)
(tgba_explicit_formula, tgba_explicit_number): Add fake
declarations so that SWIG can see they inherits from tgba.
This commit is contained in:
Alexandre Duret-Lutz 2011-01-05 22:35:38 +01:00
parent 92126a6cf9
commit 8c972ad3ce
7 changed files with 182 additions and 136 deletions
Download patch file Download diff file Expand all files Collapse all files

101
src/tgbaalgos/minimize.cc
View file

@ -506,7 +506,20 @@ namespace spot
}
tgba_explicit_number* minimize(const tgba* a, bool monitor)
tgba_explicit_number* minimize_monitor(const tgba* a)
{
hash_set* final = new hash_set;
tgba_explicit_number* det_a;
{
power_map pm;
det_a = tgba_powerset(a, pm);
}
// final is empty: there is no acceptance condition
return minimize_dfa(det_a, final);
}
tgba_explicit_number* minimize_wdba(const tgba* a)
{
hash_set* final = new hash_set;
tgba_explicit_number* det_a;
@ -515,57 +528,54 @@ namespace spot
power_map pm;
det_a = tgba_powerset(a, pm);
if (!monitor)
// For each SCC of the deterministic automaton, determine if
// it is accepting or not.
scc_map sm(det_a);
sm.build_map();
unsigned scc_count = sm.scc_count();
std::vector<bool> accepting(scc_count);
// SCC are numbered in topological order
for (unsigned n = 0; n < scc_count; ++n)
{
// For each SCC of the deterministic automaton, determine if
// it is accepting or not.
scc_map sm(det_a);
sm.build_map();
unsigned scc_count = sm.scc_count();
std::vector<bool> accepting(scc_count);
// SCC are numbered in topological order
for (unsigned n = 0; n < scc_count; ++n)
bool acc = true;
if (sm.trivial(n))
{
bool acc = true;
// Trivial SCCs are accepting if all their
// successors are accepting.
if (sm.trivial(n))
// This corresponds to the algorithm in Fig. 1 of
// "Efficient minimization of deterministic weak
// omega-automata" written by Christof Löding and
// published in Information Processing Letters 79
// (2001) pp 105--109. Except we do not keep track
// of the actual color associated to each SCC.
const scc_map::succ_type& succ = sm.succ(n);
for (scc_map::succ_type::const_iterator i = succ.begin();
i != succ.end(); ++i)
{
// Trivial SCCs are accepting if all their
// successors are accepting.
// This corresponds to the algorithm in Fig. 1 of
// "Efficient minimization of deterministic weak
// omega-automata" written by Christof Löding and
// published in Information Processing Letters 79
// (2001) pp 105--109. Except we do not keep track
// of the actual color associated to each SCC.
const scc_map::succ_type& succ = sm.succ(n);
for (scc_map::succ_type::const_iterator i = succ.begin();
i != succ.end(); ++i)
if (!accepting[i->first])
{
if (!accepting[i->first])
{
acc = false;
break;
}
acc = false;
break;
}
}
else
{
// Regular SCCs are accepting if any of their loop
// corresponds to an accepting
acc = wdba_scc_is_accepting(det_a, n, a, sm, pm);
}
}
else
{
// Regular SCCs are accepting if any of their loop
// corresponds to an accepting
acc = wdba_scc_is_accepting(det_a, n, a, sm, pm);
}
accepting[n] = acc;
if (acc)
{
std::list<const state*> l = sm.states_of(n);
std::list<const state*>::const_iterator il;
for (il = l.begin(); il != l.end(); ++il)
final->insert((*il)->clone());
}
accepting[n] = acc;
if (acc)
{
std::list<const state*> l = sm.states_of(n);
std::list<const state*>::const_iterator il;
for (il = l.begin(); il != l.end(); ++il)
final->insert((*il)->clone());
}
}
}
@ -577,8 +587,7 @@ namespace spot
minimize_obligation(const tgba* aut_f,
const ltl::formula* f, const tgba* aut_neg_f)
{
// WDBA minimization
tgba_explicit_number* min_aut_f = minimize(aut_f);
tgba_explicit_number* min_aut_f = minimize_wdba(aut_f);
// If aut_f is a safety automaton, the WDBA minimization must be
// correct.