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

random: Get rid of uniform_distribution (non-portable).

Browse source 
* src/misc/random.cc, src/misc/random.hh,
src/tgbaalgos/randomgraph.cc, src/tgbatest/randaut.test,
src/tgbatest/randomize.test, src/tgbatest/readsave.test,
src/ltlvisit/simplify.cc, src/tgbaalgos/randomize.cc,
src/graph/graph.hh, src/tgbatest/randpsl.test: here.
This commit is contained in:
Etienne Renault 2015-02-11 11:19:25 +01:00
parent 5610d10ac3
commit 734bceff8e
10 changed files with 237 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

46
src/ltlvisit/simplify.cc
View file

@ -533,26 +533,36 @@ namespace spot
const formula* f1,
const formula* f2)
{
// Rewrite a<=>b as (a&b)|(!a&!b)
if (equiv)
return
multop::instance(multop::Or,
multop::instance(multop::And,
recurse_(f1, false),
recurse_(f2, false)),
multop::instance(multop::And,
recurse_(f1, true),
recurse_(f2, true)));
{
// Rewrite a<=>b as (a&b)|(!a&!b)
auto recurse_f1_true = recurse_(f1, true);
auto recurse_f1_false = recurse_(f1, false);
auto recurse_f2_true = recurse_(f2, true);
auto recurse_f2_false = recurse_(f2, false);
auto left = multop::instance(multop::And,
recurse_f1_false,
recurse_f2_false);
auto right = multop::instance(multop::And,
recurse_f1_true,
recurse_f2_true);
return multop::instance(multop::Or, left, right);
}
else
// Rewrite a^b as (a&!b)|(!a&b)
return
multop::instance(multop::Or,
multop::instance(multop::And,
recurse_(f1, false),
recurse_(f2, true)),
multop::instance(multop::And,
recurse_(f1, true),
recurse_(f2, false)));
{
// Rewrite a^b as (a&!b)|(!a&b)
auto recurse_f1_true = recurse_(f1, true);
auto recurse_f1_false = recurse_(f1, false);
auto recurse_f2_true = recurse_(f2, true);
auto recurse_f2_false = recurse_(f2, false);
auto left = multop::instance(multop::And,
recurse_f1_false,
recurse_f2_true);
auto right = multop::instance(multop::And,
recurse_f1_true,
recurse_f2_false);
return multop::instance(multop::Or, left, right);
}
}
void