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

Improvement of TA Product/Minimisation and of WFair generation

Browse source 
* src/ta/taproduct.hh, src/ta/taproduct.cc: improvement of TA Product
* src/ltltest/randltl.cc: improvement of WFair Formulas generation
* src/taalgos/minimize.cc: improvement of TA minimization
This commit is contained in:
Ala-Eddine Ben-Salem 2011-04-12 14:22:49 +02:00 • committed by Alexandre Duret-Lutz
parent 2aad5b10d2
commit 310973f88c
4 changed files with 82 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/ltltest/randltl.cc
View file

@ -97,7 +97,7 @@ to_int(const char* s)
// GF(p_1) & GF(p_2) & ... & GF(p_n)
formula* GF_n(spot::ltl::atomic_prop_set* ap, int n)
formula* GF_n(spot::ltl::atomic_prop_set* ap)
{
formula* result = 0;
@ -358,10 +358,6 @@ main(int argc, char** argv)
while (max_tries_r--)
{
f = rf->generate(opt_f);
if (opt_wFair)
{
f = GF_n(atomic_prop_collect(f, 0), f->hash());
}
if (opt_r)
{
const spot::ltl::formula* g = simp.simplify(f);
@ -386,6 +382,14 @@ main(int argc, char** argv)
continue;
}
}
if (opt_wFair)
{
spot::ltl::formula* g = GF_n(atomic_prop_collect(f, 0));
f = spot::ltl::unop::instance(unop::Not,
spot::ltl::binop::instance(binop::Implies, g, f));
}
break;
}
if (max_tries_r < 0)