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

Wrap are_isomorphic inside a class and optimize when deterministic

Browse source 
* src/bin/autfilt.cc: Use isomorphism_checker.
* src/tgbaalgos/are_isomorphic.cc, src/tgbaalgos/are_isomorphic.hh: Wrap
are_isomorphic inside a class to keep the canonic version of the first
automaton between two calls, and use a more efficient algorithm in case
both automata are deterministic.
* src/tgbatest/isomorph.test: Add tests for deterministic automata.
This commit is contained in:
Thibaud Michaud 2014-12-15 14:44:05 +01:00
parent 1995602df5
commit 176878554e
4 changed files with 156 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/bin/autfilt.cc
View file

@ -210,6 +210,7 @@ static int opt_seed = 0;
static auto dict = spot::make_bdd_dict();
static spot::tgba_digraph_ptr opt_product = nullptr;
static bool opt_merge = false;
static std::unique_ptr<spot::isomorphism_checker> isomorphism_checker = nullptr;
static spot::tgba_digraph_ptr opt_are_isomorphic = nullptr;
static bool opt_is_complete = false;
static bool opt_is_deterministic = false;
@ -574,10 +575,7 @@ namespace
if (opt_is_deterministic)
matched &= is_deterministic(aut);
if (opt_are_isomorphic)
{
spot::tgba_digraph_ptr tmp = make_tgba_digraph(aut);
matched &= (*spot::canonicalize(tmp) == *opt_are_isomorphic);
}
matched &= isomorphism_checker->is_isomorphic(aut);
if (opt_is_empty)
matched &= aut->is_empty();
@ -708,7 +706,8 @@ main(int argc, char** argv)
{
if (opt_merge)
opt_are_isomorphic->merge_transitions();
spot::canonicalize(opt_are_isomorphic);
isomorphism_checker = std::unique_ptr<spot::isomorphism_checker>(
new spot::isomorphism_checker(opt_are_isomorphic));
}