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

expansions: remove multiple old implementations

Browse source
This commit is contained in:
Antoine Martin 2023-03-16 07:39:34 +01:00
parent 564e3af5dd
commit aeba9ff674
2 changed files with 167 additions and 1289 deletions
Download patch file Download diff file Expand all files Collapse all files

1419
spot/tl/expansions.cc
View file

File diff suppressed because it is too large Load diff

37
spot/tl/expansions.hh
View file

@ -30,22 +30,11 @@
namespace spot namespace spot
{ {
using expansion_t = std::map<bdd, formula, bdd_less_than>; using expansion_t = std::multimap<bdd, formula, bdd_less_than>;
struct exp_opts struct exp_opts
{ {
enum expand_opt { enum expand_opt {
None = 0,
Deterministic = 1,
Basic = 2,
MergeSuffix = 4,
Bdd = 8,
};
};
struct exp_opts_new
{
enum expand_opt_new {
None = 0, None = 0,
UniqueSuffix = 1, UniqueSuffix = 1,
UniquePrefix = 2, UniquePrefix = 2,
@ -55,33 +44,15 @@ namespace spot
}; };
}; };
SPOT_API std::multimap<bdd, formula, bdd_less_than>
expansion_new(formula f, const bdd_dict_ptr& d, void *owner, exp_opts_new::expand_opt_new opts);
SPOT_API twa_graph_ptr
expand_new_automaton(formula f, bdd_dict_ptr d, exp_opts_new::expand_opt_new opts);
SPOT_API twa_graph_ptr
expand_new_finite_automaton(formula f, bdd_dict_ptr d, exp_opts_new::expand_opt_new opts);
SPOT_API twa_graph_ptr
expand_simple_automaton(formula f, bdd_dict_ptr d);
SPOT_API twa_graph_ptr
expand_simple_finite_automaton(formula f, bdd_dict_ptr d);
SPOT_API std::multimap<bdd, formula, bdd_less_than>
expansion_simple(formula f, const bdd_dict_ptr& d, void *owner);
SPOT_API expansion_t SPOT_API expansion_t
expansion(formula f, const bdd_dict_ptr& d, void *owner, exp_opts::expand_opt opts); expansion(formula f, const bdd_dict_ptr& d, void *owner, exp_opts::expand_opt opts);
SPOT_API formula
expansion_to_formula(expansion_t e, bdd_dict_ptr& d);
SPOT_API twa_graph_ptr SPOT_API twa_graph_ptr
expand_automaton(formula f, bdd_dict_ptr d, exp_opts::expand_opt opts); expand_automaton(formula f, bdd_dict_ptr d, exp_opts::expand_opt opts);
SPOT_API twa_graph_ptr SPOT_API twa_graph_ptr
expand_finite_automaton(formula f, bdd_dict_ptr d, exp_opts::expand_opt opts); expand_finite_automaton(formula f, bdd_dict_ptr d, exp_opts::expand_opt opts);
SPOT_API formula
expansion_to_formula(expansion_t e, bdd_dict_ptr& d);
} }