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

randaut: add a --colored option

Browse source 
Fixes #83.

* src/bin/randaut.cc: Add option.
* src/twaalgos/randomgraph.cc, src/twaalgos/randomgraph.hh: Honor it.
* src/tests/randaut.test: Add tests.
* doc/org/randaut.org: Document it.
This commit is contained in:
Alexandre Duret-Lutz 2015-06-01 21:56:39 +02:00
parent 97665a584e
commit 715805fad3
5 changed files with 148 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/twaalgos/randomgraph.cc
View file

@ -36,7 +36,7 @@ namespace spot
namespace
{
unsigned
static unsigned
random_deterministic_labels_rec(std::vector<bdd>& labels, int *props,
int props_n, bdd current, unsigned n)
{
@ -69,7 +69,7 @@ namespace spot
}
}
std::vector<bdd>
static std::vector<bdd>
random_deterministic_labels(int *props, int props_n, unsigned n)
{
std::vector<bdd> bddvec;
@ -77,16 +77,23 @@ namespace spot
return bddvec;
}
acc_cond::mark_t
random_acc_cond(twa_graph_ptr aut, unsigned n_accs, float a)
static acc_cond::mark_t
random_acc(unsigned n_accs, float a)
{
acc_cond::mark_t m = 0U;
for (unsigned i = 0U; i < n_accs; ++i)
if (drand() < a)
m |= aut->acc().mark(i);
m.set(i);
return m;
}
static acc_cond::mark_t
random_acc1(unsigned n_accs)
{
auto u = static_cast<unsigned>(mrand(static_cast<int>(n_accs)));
return acc_cond::mark_t({u});
}
bdd
random_labels(int* props, int props_n, float t)
{
@ -118,7 +125,7 @@ namespace spot
random_graph(int n, float d,
const ltl::atomic_prop_set* ap, const bdd_dict_ptr& dict,
unsigned n_accs, float a, float t,
bool deterministic, bool state_acc)
bool deterministic, bool state_acc, bool colored)
{
assert(n > 0);
auto res = make_twa_graph(dict);
@ -188,12 +195,12 @@ namespace spot
unsigned dst;
acc_cond::mark_t m = 0U;
if (state_acc)
m = random_acc_cond(res, n_accs, a);
m = colored ? random_acc1(n_accs) : random_acc(n_accs, a);
for (auto& l: labels)
{
if (!state_acc)
m = random_acc_cond(res, n_accs, a);
m = colored ? random_acc1(n_accs) : random_acc(n_accs, a);
// No connection to unreachable successors so far. This
// is our last chance, so force it now.

5
src/twaalgos/randomgraph.hh
View file

@ -51,6 +51,8 @@ namespace spot
/// is true.
/// \param deterministic build a complete and deterministic automaton
/// \param state_acc build an automaton with state-based acceptance
/// \param colored build an automaton in which each transition (or state)
/// belongs to a single acceptance set.
///
/// This algorithms is adapted from the one in Fig 6.2 page 48 of
/** \verbatim
@ -81,7 +83,8 @@ namespace spot
random_graph(int n, float d,
const ltl::atomic_prop_set* ap, const bdd_dict_ptr& dict,
unsigned n_accs = 0, float a = 0.1, float t = 0.5,
bool deterministic = false, bool state_acc = false);
bool deterministic = false, bool state_acc = false,
bool colored = false);
/// Build a random acceptance where each acceptance sets is used once.
SPOT_API acc_cond::acc_code random_acceptance(unsigned n_accs);