translate_aa: Factorize sere translation choice
* spot/twaalgos/translate_aa.cc: Here.
This commit is contained in:
parent
e53bd32631
commit
514ef110f2
1 changed files with 16 additions and 32 deletions
|
|
@ -34,6 +34,20 @@ namespace spot
|
|||
{
|
||||
namespace
|
||||
{
|
||||
twa_graph_ptr sere_aa_translate(formula f, const bdd_dict_ptr& dict)
|
||||
{
|
||||
// old bdd method
|
||||
if (sere_aa_translation_options() == 0)
|
||||
return sere_to_tgba(f, dict, true);
|
||||
|
||||
// derivation
|
||||
if (sere_aa_translation_options() == 1)
|
||||
return derive_finite_automaton_with_first(f, dict);
|
||||
|
||||
// linear form
|
||||
return expand_finite_automaton(f, dict, exp_opts::expand_opt::None);
|
||||
}
|
||||
|
||||
struct ltl_to_aa_builder
|
||||
{
|
||||
ltl_to_aa_builder(twa_graph_ptr aut, unsigned accepting_sink)
|
||||
|
|
@ -289,22 +303,7 @@ namespace spot
|
|||
{
|
||||
unsigned rhs_init = recurse(f[1]);
|
||||
const auto& dict = aut_->get_dict();
|
||||
twa_graph_ptr sere_aut;
|
||||
if (sere_aa_translation_options() == 0)
|
||||
{
|
||||
// old bdd method
|
||||
sere_aut = sere_to_tgba(f[0], dict, true);
|
||||
}
|
||||
else if (sere_aa_translation_options() == 1)
|
||||
{
|
||||
// derivation
|
||||
sere_aut = derive_finite_automaton_with_first(f[0], dict);
|
||||
}
|
||||
else
|
||||
{
|
||||
// linear form
|
||||
sere_aut = expand_finite_automaton(f[0], dict, exp_opts::expand_opt::None);
|
||||
}
|
||||
twa_graph_ptr sere_aut = sere_aa_translate(f[0], dict);
|
||||
|
||||
// TODO: this should be a std::vector<bool> !
|
||||
std::vector<unsigned> acc_states;
|
||||
|
|
@ -345,22 +344,7 @@ namespace spot
|
|||
{
|
||||
unsigned rhs_init = recurse(f[1]);
|
||||
const auto& dict = aut_->get_dict();
|
||||
twa_graph_ptr sere_aut;
|
||||
if (sere_aa_translation_options() == 0)
|
||||
{
|
||||
// old bdd method
|
||||
sere_aut = sere_to_tgba(f[0], dict, true);
|
||||
}
|
||||
else if (sere_aa_translation_options() == 1)
|
||||
{
|
||||
// derivation
|
||||
sere_aut = derive_finite_automaton_with_first(f[0], dict);
|
||||
}
|
||||
else
|
||||
{
|
||||
// linear form
|
||||
sere_aut = expand_finite_automaton(f[0], dict, exp_opts::expand_opt::None);
|
||||
}
|
||||
twa_graph_ptr sere_aut = sere_aa_translate(f[0], dict);
|
||||
|
||||
// DFA recognizes the empty language, so {0} []-> rhs is always true
|
||||
unsigned ns = sere_aut->num_states();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue