* src/tgbaalgos/ltl2tgba_fm.hh, src/tgbaalgos/ltl2tgba_fm.cc: Add

the reduce_ltl argument.
* src/tgbatest/ltl2tgba.cc: Add options -fr1, -fr2, -fr3, and -fr4.
* src/tgbatest/spotlbtt.test, bench/ltl2tgba/algorithms: Test -fr4.
* bench/ltl2tgba/parseout.pl: Suppress Perl warnings on disabled
algorithms.
This commit is contained in:
Alexandre Duret-Lutz 2005-05-04 13:47:38 +00:00
parent 7ef117e3dc
commit 9063c5abb4
7 changed files with 127 additions and 201 deletions

View file

@ -63,6 +63,14 @@ Algorithm
Enabled = yes
}
Algorithm
{
Name = "FM, degen, +symb_merge, +exprop, +INpre, +post, +flapprox"
Path = "$LBTT_TRANSLATE"
Parameters = "--spot '$LTL2TGBA -fr4 -R1q -R1t -R3 -L -t -x -D -F'"
Enabled = yes
}
Algorithm
{
Name = "FM, degen, +symb_merge, +exprop, +pre, +post, +flapprox, +post_branch"
@ -71,6 +79,14 @@ Algorithm
Enabled = yes
}
Algorithm
{
Name = "FM, degen, +symb_merge, +exprop, +INpre, +post, +flapprox, +post_branch"
Path = "$LBTT_TRANSLATE"
Parameters = "--spot '$LTL2TGBA -fr4 -R1q -R1t -R3 -L -t -x -D -p -F'"
Enabled = yes
}
Algorithm
{
Name = "FM, degen, +symb_merge, +exprop, +post_branch, LTLopt"
@ -208,6 +224,14 @@ Algorithm
Enabled = yes
}
Algorithm
{
Name = "FM, gen, +symb_merge, +exprop, +INpre, +post, +flapprox"
Path = "$LBTT_TRANSLATE"
Parameters = "--spot '$LTL2TGBA -fr4 -R1q -R1t -R3 -L -t -x -F'"
Enabled = yes
}
Algorithm
{
Name = "FM, gen, +symb_merge, +exprop, +pre, +post, +flapprox, +post_branch"
@ -216,6 +240,13 @@ Algorithm
Enabled = yes
}
Algorithm
{
Name = "FM, gen, +symb_merge, +exprop, +INpre, +post, +flapprox, +post_branch"
Path = "$LBTT_TRANSLATE"
Parameters = "--spot '$LTL2TGBA -fr4 -R1q -R1t -R3 -L -t -x -p -F'"
Enabled = yes
}
Algorithm
{

View file

@ -52,7 +52,7 @@ while (<>)
if (/Pos\. formulae \|\s*([^|]*?)\s*\|\s*([^|]*?)\s*\|$/)
{
$acc = $1;
$time = $2;
$time = $2 || 0;
}
next unless /Pos\. formulae \|\s*(.*?)\s*\|\s*(.*?)\s*\|\s*(.*?)\s*\|/;
if ($line % 2)