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

Add an is_unambiguous() function, use it in ltlcross and autfilt

Browse source 
* src/twaalgos/isunamb.hh, src/twaalgos/isunamb.cc: New files.
* src/twaalgos/Makefile.am: Add them.
* src/tests/unambig.test: New file.
* src/tests/Makefile.am: Add it.
* src/bin/ltlcross.cc: Record whether each produced automaton is
ambiguous.
* src/bin/autfilt.cc: Add a --is-unambiguous option.
* NEWS: Mention it.
This commit is contained in:
Alexandre Duret-Lutz 2013-03-21 11:53:42 +01:00
parent 9f3a7a49de
commit 98de84f3de
8 changed files with 192 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/bin/autfilt.cc
View file

@ -39,6 +39,7 @@
#include "twaalgos/product.hh"
#include "twaalgos/isdet.hh"
#include "twaalgos/stutter.hh"
#include "twaalgos/isunamb.hh"
#include "misc/optionmap.hh"
#include "misc/timer.hh"
#include "misc/random.hh"
@ -80,6 +81,7 @@ enum {
OPT_IS_COMPLETE,
OPT_IS_DETERMINISTIC,
OPT_IS_EMPTY,
OPT_IS_UNAMBIGUOUS,
OPT_KEEP_STATES,
OPT_MASK_ACC,
OPT_MERGE,
@ -179,6 +181,8 @@ static const argp_option options[] =
"keep deterministic automata", 0 },
{ "is-empty", OPT_IS_EMPTY, 0, 0,
"keep automata with an empty language", 0 },
{ "is-unambiguous", OPT_IS_UNAMBIGUOUS, 0, 0,
"keep only unambiguous automata", 0 },
{ "intersect", OPT_INTERSECT, "FILENAME", 0,
"keep automata whose languages have an non-empty intersection with"
" the automaton from FILENAME", 0 },
@ -234,6 +238,7 @@ static struct opt_t
static bool opt_merge = false;
static bool opt_is_complete = false;
static bool opt_is_deterministic = false;
static bool opt_is_unambiguous = false;
static bool opt_invert = false;
static range opt_states = { 0, std::numeric_limits<int>::max() };
static range opt_edges = { 0, std::numeric_limits<int>::max() };
@ -344,6 +349,9 @@ parse_opt(int key, char* arg, struct argp_state*)
case OPT_IS_EMPTY:
opt_is_empty = true;
break;
case OPT_IS_UNAMBIGUOUS:
opt_is_unambiguous = true;
break;
case OPT_MERGE:
opt_merge = true;
break;
@ -522,6 +530,10 @@ namespace
matched &= is_complete(aut);
if (opt_is_deterministic)
matched &= is_deterministic(aut);
if (opt_is_deterministic)
matched &= is_deterministic(aut);
else if (opt_is_unambiguous)
matched &= is_unambiguous(aut);
if (opt->are_isomorphic)
matched &= opt->isomorphism_checker->is_isomorphic(aut);
if (opt_is_empty)

11
src/bin/ltlcross.cc
View file

@ -59,6 +59,7 @@
#include "misc/formater.hh"
#include "twaalgos/stats.hh"
#include "twaalgos/isdet.hh"
#include "twaalgos/isunamb.hh"
#include "misc/escape.hh"
#include "misc/hash.hh"
#include "misc/random.hh"
@ -293,6 +294,7 @@ struct statistics
std::vector<double> product_states;
std::vector<double> product_transitions;
std::vector<double> product_scc;
bool ambiguous;
static void
fields(std::ostream& os, bool show_exit, bool show_sr)
@ -316,7 +318,8 @@ struct statistics
"\"nondet_aut\","
"\"terminal_aut\","
"\"weak_aut\","
"\"strong_aut\"");
"\"strong_aut\","
"\"ambiguous_aut\"");
size_t m = products_avg ? 1U : products;
for (size_t i = 0; i < m; ++i)
os << ",\"product_states\",\"product_transitions\",\"product_scc\"";
@ -353,7 +356,8 @@ struct statistics
<< nondeterministic << ','
<< terminal_aut << ','
<< weak_aut << ','
<< strong_aut;
<< strong_aut << ','
<< ambiguous;
if (!products_avg)
{
for (size_t i = 0; i < products; ++i)
@ -381,7 +385,7 @@ struct statistics
{
size_t m = products_avg ? 1U : products;
m *= 3;
m += 13 + show_sr * 6;
m += 14 + show_sr * 6;
os << na;
for (size_t i = 0; i < m; ++i)
os << ',' << na;
@ -688,6 +692,7 @@ namespace
st->weak_aut = true;
else
st->terminal_aut = true;
st->ambiguous = !spot::is_unambiguous(res);
}
}
output.cleanup();