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

support for semi-deterministic property

Browse source 
* spot/twa/twa.hh (prop_semi_deterministic): New methods.
* spot/parseaut/parseaut.yy, spot/twaalgos/hoa.cc: Add support for the
semi-deterministic property.
* doc/org/concepts.org, doc/org/hoa.org: Document it.
* spot/twaalgos/isdet.cc,
spot/twaalgos/isdet.hh (is_semi_deterministic): New function.
* bin/autfilt.cc: Add --is-semi-deterministic.
* bin/common_aoutput.cc: Add --check=semi-deterministic.
* tests/core/semidet.test: New file.
* tests/Makefile.am: Add it.
* tests/core/parseaut.test, tests/core/readsave.test: Adjust.
This commit is contained in:
Alexandre Duret-Lutz 2016-12-29 16:37:43 +01:00
parent db5d9780f1
commit 4b01387817
14 changed files with 265 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

20
bin/autfilt.cc
View file

@ -107,6 +107,7 @@ enum {
OPT_IS_DETERMINISTIC,
OPT_IS_EMPTY,
OPT_IS_INHERENTLY_WEAK,
OPT_IS_SEMI_DETERMINISTIC,
OPT_IS_STUTTER_INVARIANT,
OPT_IS_TERMINAL,
OPT_IS_UNAMBIGUOUS,
@ -169,6 +170,8 @@ static const argp_option options[] =
"keep complete automata", 0 },
{ "is-deterministic", OPT_IS_DETERMINISTIC, nullptr, 0,
"keep deterministic automata", 0 },
{ "is-semi-deterministic", OPT_IS_SEMI_DETERMINISTIC, nullptr, 0,
"keep semi-deterministic automata", 0 },
{ "is-empty", OPT_IS_EMPTY, nullptr, 0,
"keep automata with an empty language", 0 },
{ "is-stutter-invariant", OPT_IS_STUTTER_INVARIANT, nullptr, 0,
@ -415,6 +418,7 @@ static bool opt_merge = false;
static bool opt_is_alternating = false;
static bool opt_is_complete = false;
static bool opt_is_deterministic = false;
static bool opt_is_semi_deterministic = false;
static bool opt_is_unambiguous = false;
static bool opt_is_terminal = false;
static bool opt_is_weak = false;
@ -672,6 +676,9 @@ parse_opt(int key, char* arg, struct argp_state*)
case OPT_IS_VERY_WEAK:
opt_is_very_weak = true;
break;
case OPT_IS_SEMI_DETERMINISTIC:
opt_is_semi_deterministic = true;
break;
case OPT_IS_STUTTER_INVARIANT:
opt_is_stutter_invariant = true;
break;
@ -1072,9 +1079,16 @@ namespace
if (opt_nondet_states_set)
matched &= opt_nondet_states.contains(spot::count_nondet_states(aut));
if (opt_is_deterministic)
matched &= is_deterministic(aut);
else if (opt_is_unambiguous)
matched &= is_unambiguous(aut);
{
matched &= is_deterministic(aut);
}
else
{
if (opt_is_unambiguous)
matched &= is_unambiguous(aut);
if (opt_is_semi_deterministic)
matched &= is_semi_deterministic(aut);
}
if (opt_is_terminal)
matched &= is_terminal_automaton(aut);
else if (opt_is_very_weak)