* 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
parent
7ef117e3dc
commit
9063c5abb4
7 changed files with 127 additions and 201 deletions
|
|
@ -74,6 +74,10 @@ syntax(char* prog)
|
|||
<< std::endl
|
||||
<< " -f use Couvreur's FM algorithm for translation"
|
||||
<< std::endl
|
||||
<< " -fr1 use -r1 (see below) at each step of FM" << std::endl
|
||||
<< " -fr2 use -r2 (see below) at each step of FM" << std::endl
|
||||
<< " -fr3 use -r3 (see below) at each step of FM" << std::endl
|
||||
<< " -fr4 use -r4 (see below) at each step of FM" << std::endl
|
||||
<< " -F read the formula from the file" << std::endl
|
||||
<< " -g graph the accepting run on the automaton (requires -e)"
|
||||
<< std::endl
|
||||
|
|
@ -144,6 +148,7 @@ main(int argc, char** argv)
|
|||
bool paper_opt = false;
|
||||
enum { NoDegen, DegenTBA, DegenSBA } degeneralize_opt = NoDegen;
|
||||
bool fm_opt = false;
|
||||
int fm_red = spot::ltl::Reduce_None;
|
||||
bool fm_exprop_opt = false;
|
||||
bool fm_symb_merge_opt = true;
|
||||
bool file_opt = false;
|
||||
|
|
@ -246,6 +251,26 @@ main(int argc, char** argv)
|
|||
{
|
||||
fm_opt = true;
|
||||
}
|
||||
else if (!strcmp(argv[formula_index], "-fr1"))
|
||||
{
|
||||
fm_opt = true;
|
||||
fm_red |= spot::ltl::Reduce_Basics;
|
||||
}
|
||||
else if (!strcmp(argv[formula_index], "-fr2"))
|
||||
{
|
||||
fm_opt = true;
|
||||
fm_red |= spot::ltl::Reduce_Eventuality_And_Universality;
|
||||
}
|
||||
else if (!strcmp(argv[formula_index], "-fr3"))
|
||||
{
|
||||
fm_opt = true;
|
||||
fm_red |= spot::ltl::Reduce_Syntactic_Implications;
|
||||
}
|
||||
else if (!strcmp(argv[formula_index], "-fr4"))
|
||||
{
|
||||
fm_opt = true;
|
||||
fm_red |= spot::ltl::Reduce_All;
|
||||
}
|
||||
else if (!strcmp(argv[formula_index], "-F"))
|
||||
{
|
||||
file_opt = true;
|
||||
|
|
@ -472,7 +497,8 @@ main(int argc, char** argv)
|
|||
to_free = a = spot::ltl_to_tgba_fm(f, dict, fm_exprop_opt,
|
||||
fm_symb_merge_opt,
|
||||
post_branching,
|
||||
fair_loop_approx, unobservables);
|
||||
fair_loop_approx, unobservables,
|
||||
fm_red);
|
||||
else
|
||||
to_free = a = concrete = spot::ltl_to_tgba_lacim(f, dict);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
#!/bin/sh
|
||||
# Copyright (C) 2003, 2004 Laboratoire d'Informatique de Paris 6 (LIP6),
|
||||
# Copyright (C) 2003, 2004, 2005 Laboratoire d'Informatique de Paris 6 (LIP6),
|
||||
# département Systèmes Répartis Coopératifs (SRC), Université Pierre
|
||||
# et Marie Curie.
|
||||
#
|
||||
|
|
@ -100,6 +100,14 @@ Algorithm
|
|||
Enabled = yes
|
||||
}
|
||||
|
||||
Algorithm
|
||||
{
|
||||
Name = "Spot (Couvreur -- FM), reduction of formula in FM"
|
||||
Path = "${LBTT_TRANSLATE}"
|
||||
Parameters = "--spot './ltl2tgba -fr4 -F -f -t'"
|
||||
Enabled = yes
|
||||
}
|
||||
|
||||
Algorithm
|
||||
{
|
||||
Name = "Spot (Couvreur -- FM), post reduction with direct simulation"
|
||||
|
|
@ -156,38 +164,6 @@ Algorithm
|
|||
Enabled = yes
|
||||
}
|
||||
|
||||
Algorithm
|
||||
{
|
||||
Name = "Spot (Couvreur -- FM), fake"
|
||||
Path = "${LBTT_TRANSLATE}"
|
||||
Parameters = "--spot './ltl2tgba -F -f -T'"
|
||||
Enabled = no
|
||||
}
|
||||
|
||||
Algorithm
|
||||
{
|
||||
Name = "Spot (Couvreur -- FM), reduction of formula, fake"
|
||||
Path = "${LBTT_TRANSLATE}"
|
||||
Parameters = "--spot './ltl2tgba -r4 -F -f -T'"
|
||||
Enabled = no
|
||||
}
|
||||
|
||||
Algorithm
|
||||
{
|
||||
Name = "Spot (Couvreur -- FM), without symb_merge, fake"
|
||||
Path = "${LBTT_TRANSLATE}"
|
||||
Parameters = "--spot './ltl2tgba -F -f -y -T'"
|
||||
Enabled = no
|
||||
}
|
||||
|
||||
Algorithm
|
||||
{
|
||||
Name = "Spot (Couvreur -- FM), fake, LTL simplifications by ltl2ba"
|
||||
Path = "${LBTT_TRANSLATE}"
|
||||
Parameters = "--spot '${srcdir}/ltl2baw.pl --spot=\"-f -T\" -F'"
|
||||
Enabled = no
|
||||
}
|
||||
|
||||
Algorithm
|
||||
{
|
||||
Name = "Spot (Couvreur -- FM exprop)"
|
||||
|
|
@ -244,167 +220,6 @@ Algorithm
|
|||
Enabled = yes
|
||||
}
|
||||
|
||||
Algorithm
|
||||
{
|
||||
Name = "Spot (Couvreur -- FM exprop + post_branch), fake"
|
||||
Path = "${LBTT_TRANSLATE}"
|
||||
Parameters = "--spot './ltl2tgba -F -f -x -p -T'"
|
||||
Enabled = no
|
||||
}
|
||||
|
||||
Algorithm
|
||||
{
|
||||
Name = "Spot (Couvreur -- FM exprop + flapprox), fake"
|
||||
Path = "${LBTT_TRANSLATE}"
|
||||
Parameters = "--spot './ltl2tgba -F -f -x -L -T'"
|
||||
Enabled = no
|
||||
}
|
||||
|
||||
Algorithm
|
||||
{
|
||||
Name = "Spot (Couvreur -- FM exprop + post_branch + flapprox), fake"
|
||||
Path = "${LBTT_TRANSLATE}"
|
||||
Parameters = "--spot './ltl2tgba -F -f -x -p -L -T'"
|
||||
Enabled = no
|
||||
}
|
||||
|
||||
Algorithm
|
||||
{
|
||||
Name = "Spot (Couvreur -- FM exprop), fake"
|
||||
Path = "${LBTT_TRANSLATE}"
|
||||
Parameters = "--spot './ltl2tgba -F -f -x -T'"
|
||||
Enabled = no
|
||||
}
|
||||
|
||||
Algorithm
|
||||
{
|
||||
Name = "Spot (Couvreur -- FM exprop), without symb_merge, fake"
|
||||
Path = "${LBTT_TRANSLATE}"
|
||||
Parameters = "--spot './ltl2tgba -F -f -x -y -T'"
|
||||
Enabled = no
|
||||
}
|
||||
|
||||
Algorithm
|
||||
{
|
||||
Name = "Spot (Couvreur -- FM exprop), fake, LTL simplifications by ltl2ba"
|
||||
Path = "${LBTT_TRANSLATE}"
|
||||
Parameters = "--spot '${srcdir}/ltl2baw.pl --spot=\"-f -x -T\" -F'"
|
||||
Enabled = no
|
||||
}
|
||||
|
||||
Algorithm
|
||||
{
|
||||
Name = "Spin"
|
||||
Path = "${LBTT_TRANSLATE}"
|
||||
Parameters = "--spin spin"
|
||||
Enabled = no
|
||||
}
|
||||
|
||||
Algorithm
|
||||
{
|
||||
Name = "LBT"
|
||||
Path = "${LBTT_TRANSLATE}"
|
||||
Parameters = "--lbt lbt"
|
||||
Enabled = no
|
||||
}
|
||||
|
||||
Algorithm
|
||||
{
|
||||
Name = "LTL2BA"
|
||||
Path = "${LBTT_TRANSLATE}"
|
||||
Parameters = "--spin ltl2ba"
|
||||
Enabled = no
|
||||
}
|
||||
|
||||
Algorithm
|
||||
{
|
||||
Name = "LTL2BA, generalized fake"
|
||||
Path = "${LBTT_TRANSLATE}"
|
||||
Parameters = "--spot '${srcdir}/ltl2baw.pl -F'"
|
||||
Enabled = no
|
||||
}
|
||||
|
||||
Algorithm
|
||||
{
|
||||
Name = "LTL2BA without LTL and SCC simplifications"
|
||||
Path = "${LBTT_TRANSLATE}"
|
||||
Parameters = "--spin 'ltl2ba -l -c'"
|
||||
Enabled = no
|
||||
}
|
||||
|
||||
Algorithm
|
||||
{
|
||||
Name = "LTL2BA without LTL and SCC simplifications, generalized fake"
|
||||
Path = "${LBTT_TRANSLATE}"
|
||||
Parameters = "--spot '${srcdir}/ltl2baw.pl -l -c -F'"
|
||||
Enabled = no
|
||||
}
|
||||
|
||||
Algorithm
|
||||
{
|
||||
Name = "Wring (GPVW)"
|
||||
Path = "sh"
|
||||
Parameters = "-c 'cd ~/src/wring2lbtt && ./wring2lbtt --0'"
|
||||
Enabled = no
|
||||
}
|
||||
|
||||
Algorithm
|
||||
{
|
||||
Name = "Wring (GPVW+)"
|
||||
Path = "sh"
|
||||
Parameters = "-c 'cd ~/src/wring2lbtt && ./wring2lbtt --1'"
|
||||
Enabled = no
|
||||
}
|
||||
|
||||
Algorithm
|
||||
{
|
||||
Name = "Wring (LTL2AUT)"
|
||||
Path = "sh"
|
||||
Parameters = "-c 'cd ~/src/wring2lbtt && ./wring2lbtt --2'"
|
||||
Enabled = no
|
||||
}
|
||||
|
||||
Algorithm
|
||||
{
|
||||
Name = "Wring (Wring RewRule)"
|
||||
Path = "sh"
|
||||
Parameters = "-c 'cd ~/src/wring2lbtt && ./wring2lbtt --3'"
|
||||
Enabled = no
|
||||
}
|
||||
|
||||
Algorithm
|
||||
{
|
||||
Name = "Wring (Wring RewRule+BoolOpt)"
|
||||
Path = "sh"
|
||||
Parameters = "-c 'cd ~/src/wring2lbtt && ./wring2lbtt --4'"
|
||||
Enabled = no
|
||||
}
|
||||
|
||||
Algorithm
|
||||
{
|
||||
Name = "Wring (Wring RewRule+BoolOpt+AutSempl)"
|
||||
Path = "sh"
|
||||
Parameters = "-c 'cd ~/src/wring2lbtt && ./wring2lbtt --5'"
|
||||
Enabled = no
|
||||
}
|
||||
|
||||
Algorithm
|
||||
{
|
||||
Name = "Wring (Wring BoolOpt)"
|
||||
Path = "sh"
|
||||
Parameters = "-c 'cd ~/src/wring2lbtt && ./wring2lbtt --6'"
|
||||
Enabled = no
|
||||
}
|
||||
|
||||
Algorithm
|
||||
{
|
||||
Name = "Wring (Wring RewRule+BoolOpt), degeneralized"
|
||||
Path = "sh"
|
||||
Parameters = "-c 'cd ~/src/wring2lbtt && ./wring2lbtt -d --4'"
|
||||
Enabled = no
|
||||
}
|
||||
|
||||
|
||||
GlobalOptions
|
||||
{
|
||||
Rounds = 100
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue