Merge eltl2tgba.cc into ltl2tgba.cc.

* src/tgbatest/eltl2tgba.cc: Remove.
* src/tgbatest/Makefile.am: Adjust.
* src/tgbatest/ltl2tgba.cc: New option: -xltl to translate an
extended LTL instead of an LTL, a feature previously offered by
eltl2tgba.cc. Also: -R3b to use delete_unaccepting_scc.
* src/tgbatest/spotlbtt.test: Adjust.
This commit is contained in:
Damien Lefortier 2010-01-05 19:28:17 +01:00
parent 1aa10e1395
commit 830e482836
6 changed files with 114 additions and 168 deletions

View file

@ -32,7 +32,7 @@ Algorithm
{
Name = "Spot (Couvreur -- LaCIM)"
Path = "${LBTT_TRANSLATE}"
Parameters = "--spot '../ltl2tgba -F -l -t'"
Parameters = "--spot '../ltl2tgba -l -F -t'"
Enabled = yes
}
@ -40,7 +40,7 @@ Algorithm
{
Name = "Spot (Couvreur -- LaCIM), reduction of formula"
Path = "${LBTT_TRANSLATE}"
Parameters = "--spot '../ltl2tgba -r4 -l -F -t'"
Parameters = "--spot '../ltl2tgba -l -F -t -r4'"
Enabled = yes
}
@ -49,7 +49,7 @@ Algorithm
Name = "Spot (Couvreur -- LaCIM), degeneralized"
Path = "${LBTT_TRANSLATE}"
Parameters = "--spot '../ltl2tgba -l -F -t -D'"
Enabled = yes
Enabled = no
}
Algorithm
@ -64,7 +64,7 @@ Algorithm
{
Name = "Spot (Couvreur -- LaCIM), eltl"
Path = "${LBTT_TRANSLATE}"
Parameters = "--spot '../eltl2tgba -LW'"
Parameters = "--spot '../ltl2tgba -F -l -t -xltl'"
Enabled = yes
}
@ -72,10 +72,18 @@ Algorithm
{
Name = "Spot (Couvreur -- LaCIM), eltl + delete_unaccepting_scc"
Path = "${LBTT_TRANSLATE}"
Parameters = "--spot '../eltl2tgba -L'"
Parameters = "--spot '../ltl2tgba -F -l -t -xltl -R3b'"
Enabled = yes
}
Algorithm
{
Name = "Spot (Couvreur -- LaCIM), eltl + post reduction with scc"
Path = "${LBTT_TRANSLATE}"
Parameters = "--spot '../ltl2tgba -F -l -t -xltl -R3'"
Enabled = no
}
Algorithm
{
Name = "Spot (Couvreur -- FM)"
@ -276,12 +284,20 @@ Algorithm
Enabled = yes
}
Algorithm
{
Name = "Spot (Tauriainen -- TAA), refined rules + post reduction with scc"
Path = "${LBTT_TRANSLATE}"
Parameters = "--spot '../ltl2tgba -F -taa -t -c -R3'"
Enabled = yes
}
Algorithm
{
Name = "Spot (Tauriainen -- TAA) refined rules + pre + post reduction"
Path = "${LBTT_TRANSLATE}"
Parameters = "--spot '../ltl2tgba -F -taa -t -c -r7 -R3'"
Enabled = yes
Enabled = no
}
GlobalOptions