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

twacube_to_twa: allows use of existing BDD_dict

Browse source 
* spot/twacube_algos/convert.cc,
spot/twacube_algos/convert.hh: Here.
* tests/core/twacube.cc: Test it.
This commit is contained in:
Etienne Renault 2020-05-22 13:13:05 +02:00
parent b1b59d0eae
commit ff48c81198
3 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
spot/twacube_algos/convert.cc
View file

@ -134,14 +134,15 @@ namespace spot
} }
spot::twa_graph_ptr spot::twa_graph_ptr
twacube_to_twa(spot::twacube_ptr twacube) twacube_to_twa(spot::twacube_ptr twacube, spot::bdd_dict_ptr d)
{ {
// Grab necessary variables // Grab necessary variables
auto& theg = twacube->get_graph(); auto& theg = twacube->get_graph();
spot::cubeset cs = twacube->get_cubeset(); spot::cubeset cs = twacube->get_cubeset();
// Build the resulting graph // Build the resulting graph
auto d = spot::make_bdd_dict(); if (d == nullptr)
d = spot::make_bdd_dict();
auto res = make_twa_graph(d); auto res = make_twa_graph(d);
// Fix the acceptance of the resulting automaton // Fix the acceptance of the resulting automaton

7
spot/twacube_algos/convert.hh
View file

@ -50,9 +50,12 @@ namespace spot
SPOT_API twacube_ptr SPOT_API twacube_ptr
twa_to_twacube(spot::const_twa_graph_ptr aut); twa_to_twacube(spot::const_twa_graph_ptr aut);
/// \brief Convert a twacube into a twa /// \brief Convert a twacube into a twa.
/// When \d is specified, the BDD_dict in parameter is used rather than
/// creating a new one.
SPOT_API spot::twa_graph_ptr SPOT_API spot::twa_graph_ptr
twacube_to_twa(spot::twacube_ptr twacube); twacube_to_twa(spot::twacube_ptr twacube,
spot::bdd_dict_ptr d = nullptr);
/// \brief Check wether a twacube and a twa are equivalent /// \brief Check wether a twacube and a twa are equivalent
SPOT_API bool are_equivalent(const spot::twacube_ptr twacube, SPOT_API bool are_equivalent(const spot::twacube_ptr twacube,

4
tests/core/twacube.cc
View file

@ -44,8 +44,10 @@ static void checkit(std::string f_str)
auto propcube = spot::twa_to_twacube(prop); auto propcube = spot::twa_to_twacube(prop);
assert(spot::are_equivalent(propcube, prop)); assert(spot::are_equivalent(propcube, prop));
auto propcubeback = spot::twacube_to_twa(propcube); auto propcubeback = spot::twacube_to_twa(propcube, dict);
assert(spot::are_equivalent(propcube, propcubeback)); assert(spot::are_equivalent(propcube, propcubeback));
assert(spot::are_equivalent(prop, propcubeback));
} }
int main() int main()