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

translate: add support for -x tls-impl=N

Browse source 
This is long overdue, and we probably want to use tls-impl=1 in
ltlsynt.

* spot/twaalgos/translate.cc, spot/twaalgos/translate.hh:
Add support for tls-impl=N.
* tests/core/ltl2tgba.test: Test it.
* bin/spot-x.cc, NEWS: Document it.
This commit is contained in:
Alexandre Duret-Lutz 2017-10-11 22:19:43 +02:00
parent 9b18729721
commit 689aa7fdc0
5 changed files with 52 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

31
spot/twaalgos/translate.cc
View file

@ -30,7 +30,7 @@ namespace spot
void translator::setup_opt(const option_map* opt)
{
comp_susp_ = early_susp_ = skel_wdba_ = skel_simul_ = 0;
relabel_bool_ = -1;
relabel_bool_ = tls_impl_ = -1;
if (!opt)
return;
@ -43,6 +43,7 @@ namespace spot
skel_wdba_ = opt->get("skel-wdba", -1);
skel_simul_ = opt->get("skel-simul", 1);
}
tls_impl_ = opt->get("tls-impl", -1);
}
void translator::build_simplifier(const bdd_dict_ptr& dict)
@ -61,6 +62,34 @@ namespace spot
options.reduce_basics = true;
options.event_univ = true;
}
// User-supplied fine-tuning?
if (tls_impl_ >= 0)
switch (tls_impl_)
{
case 0:
options.synt_impl = false;
options.containment_checks = false;
options.containment_checks_stronger = false;
break;
case 1:
options.synt_impl = true;
options.containment_checks = false;
options.containment_checks_stronger = false;
break;
case 2:
options.synt_impl = true;
options.containment_checks = true;
options.containment_checks_stronger = false;
break;
case 3:
options.synt_impl = true;
options.containment_checks = true;
options.containment_checks_stronger = true;
break;
default:
throw std::runtime_error
("tls-impl should take a value between 0 and 3");
}
simpl_owned_ = simpl_ = new tl_simplifier(options, dict);
}

5
spot/twaalgos/translate.hh
View file

@ -74,15 +74,15 @@ namespace spot
translator(const bdd_dict_ptr& dict, const option_map* opt = nullptr)
: postprocessor(opt)
{
build_simplifier(dict);
setup_opt(opt);
build_simplifier(dict);
}
translator(const option_map* opt = nullptr)
: postprocessor(opt)
{
build_simplifier(make_bdd_dict());
setup_opt(opt);
build_simplifier(make_bdd_dict());
}
~translator()
@ -147,6 +147,7 @@ namespace spot
int skel_wdba_;
int skel_simul_;
int relabel_bool_;
int tls_impl_;
};
/// @}
}