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

Slight improvement of the determinization

Browse source 
* spot/twaalgos/determinize.cc: the acceptance condition
  of the determinized automaton should be simpler
* tests/core/safra.test, tests/python/simstate.py: update tests
This commit is contained in:
Maximilien Colange 2018-02-08 18:15:34 +01:00
parent e945beb607
commit 41d5e44914
3 changed files with 42 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

23
spot/twaalgos/determinize.cc
View file

@ -26,7 +26,6 @@
#include <set>
#include <map>
#include <spot/misc/bddlt.hh>
#include <spot/twaalgos/sccinfo.hh>
#include <spot/twaalgos/determinize.hh>
@ -34,7 +33,7 @@
#include <spot/twaalgos/sccfilter.hh>
#include <spot/twaalgos/simulation.hh>
#include <spot/twaalgos/isdet.hh>
#include <spot/twaalgos/parity.hh>
namespace spot
{
@ -448,15 +447,6 @@ namespace spot
return res;
}
// Used to remove all acceptance whose value is above or equal to max_acc
void remove_dead_acc(twa_graph_ptr& aut, unsigned max_acc)
{
assert(max_acc < 32);
unsigned mask = (1 << max_acc) - 1;
for (auto& t: aut->edges())
t.acc &= mask;
}
struct compare
{
bool
@ -961,20 +951,23 @@ namespace spot
if (s.color_ != -1U)
{
res->new_edge(src_num, dst_num, s.cond(), {s.color_});
// We only care about green acc which are odd
if (s.color_ % 2 == 1)
sets = std::max(s.color_ + 1, sets);
sets = std::max(s.color_ + 1, sets);
}
else
res->new_edge(src_num, dst_num, s.cond());
}
}
remove_dead_acc(res, sets);
// Green and red colors work in pairs, so the number of parity conditions is
// necessarily even.
if (sets % 2 == 1)
sets += 1;
// Acceptance is now min(odd) since we can emit Red on paths 0 with new opti
res->set_acceptance(sets, acc_cond::acc_code::parity(false, true, sets));
res->prop_universal(true);
res->prop_state_acc(false);
cleanup_parity_here(res);
if (pretty_print)
res->set_named_prop("state-names", print_debug(aut, seen));
return res;