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

* src/tgbaalgos/ltl2tgba_fm.hh (ltl_to_tgba_fm): Add the

Browse source 
symb_merge argument.
* src/tgbaalgos/ltl2tgba_fm.cc (ltl_to_tgba_fm): Likewise.
* src/tgbatest/ltl2tgba.cc (main): Rename -fx as -x, and add -y
to unset symb_merge.
* wrap/python/cgi/ltl2tgba.in: Remove the exprop version
of the FM translator, make exprop and symb_merge options.
This commit is contained in:
Alexandre Duret-Lutz 2004-02-16 16:07:47 +00:00
parent 5cb4048120
commit 4e793ef418
6 changed files with 83 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/tgbatest/ltl2tgba.cc
View file

@ -61,8 +61,6 @@ syntax(char* prog)
<< "counter-example " << std::endl
<< " -f use Couvreur's FM algorithm for translation"
<< std::endl
<< " -fx use Couvreur's FM algorithm, with exploded properties"
<< std::endl
<< " -F read the formula from the file" << std::endl
<< " -m magic-search (implies -D), expect a counter-example"
<< std::endl
@ -82,8 +80,12 @@ syntax(char* prog)
<< "acceptance conditions" << std::endl
<< " -v display the BDD variables used by the automaton"
<< std::endl
<< " -x try to produce a more deterministic automata "
<< "(implies -f)" << std::endl
<< " -X do not compute an automaton, read it from a file"
<< std::endl;
<< std::endl
<< " -y do not merge states with same symbolic representation "
<< "(implies -f)" << std::endl;
exit(2);
}
@ -96,6 +98,7 @@ main(int argc, char** argv)
bool degeneralize_opt = false;
bool fm_opt = false;
bool fm_exprop_opt = false;
bool fm_symb_merge_opt = true;
bool file_opt = false;
int output = 0;
int formula_index = 0;
@ -156,11 +159,6 @@ main(int argc, char** argv)
{
fm_opt = true;
}
else if (!strcmp(argv[formula_index], "-fx"))
{
fm_opt = true;
fm_exprop_opt = true;
}
else if (!strcmp(argv[formula_index], "-F"))
{
file_opt = true;
@ -215,10 +213,20 @@ main(int argc, char** argv)
{
output = 5;
}
else if (!strcmp(argv[formula_index], "-x"))
{
fm_opt = true;
fm_exprop_opt = true;
}
else if (!strcmp(argv[formula_index], "-X"))
{
from_file = true;
}
else if (!strcmp(argv[formula_index], "-y"))
{
fm_opt = true;
fm_symb_merge_opt = false;
}
else
{
break;
@ -282,7 +290,8 @@ main(int argc, char** argv)
else
{
if (fm_opt)
to_free = a = spot::ltl_to_tgba_fm(f, dict, fm_exprop_opt);
to_free = a = spot::ltl_to_tgba_fm(f, dict, fm_exprop_opt,
fm_symb_merge_opt);
else
to_free = a = concrete = spot::ltl_to_tgba_lacim(f, dict);
spot::ltl::destroy(f);

36
src/tgbatest/spotlbtt.test
View file

@ -56,6 +56,13 @@ Algorithm
Enabled = yes
}
Algorithm
{
Name = "Spot (Couvreur -- FM), without symb_merge"
Path = "${LBTT_TRANSLATE} --spot './ltl2tgba -F -f -y -t'"
Enabled = yes
}
Algorithm
{
Name = "Spot (Couvreur -- FM), degeneralized"
@ -70,6 +77,13 @@ Algorithm
Enabled = no
}
Algorithm
{
Name = "Spot (Couvreur -- FM), without symb_merge, fake"
Path = "${LBTT_TRANSLATE} --spot './ltl2tgba -F -f -y -T'"
Enabled = no
}
Algorithm
{
Name = "Spot (Couvreur -- FM), fake, LTL simplifications by ltl2ba"
@ -80,28 +94,42 @@ Algorithm
Algorithm
{
Name = "Spot (Couvreur -- FM exprop)"
Path = "${LBTT_TRANSLATE} --spot './ltl2tgba -F -fx -t'"
Path = "${LBTT_TRANSLATE} --spot './ltl2tgba -F -f -x -t'"
Enabled = yes
}
Algorithm
{
Name = "Spot (Couvreur -- FM exprop), without symb_merge"
Path = "${LBTT_TRANSLATE} --spot './ltl2tgba -F -f -x -y -t'"
Enabled = yes
}
Algorithm
{
Name = "Spot (Couvreur -- FM exprop), degeneralized"
Path = "${LBTT_TRANSLATE} --spot './ltl2tgba -F -fx -t -D'"
Path = "${LBTT_TRANSLATE} --spot './ltl2tgba -F -f -x -t -D'"
Enabled = yes
}
Algorithm
{
Name = "Spot (Couvreur -- FM exprop), fake"
Path = "${LBTT_TRANSLATE} --spot './ltl2tgba -F -fx -T'"
Path = "${LBTT_TRANSLATE} --spot './ltl2tgba -F -f -x -T'"
Enabled = no
}
Algorithm
{
Name = "Spot (Couvreur -- FM exprop), without symb_merge, fake"
Path = "${LBTT_TRANSLATE} --spot './ltl2tgba -F -f -x -y -T'"
Enabled = no
}
Algorithm
{
Name = "Spot (Couvreur -- FM exprop), fake, LTL simplifications by ltl2ba"
Path = "${LBTT_TRANSLATE} --spot '${srcdir}/ltl2baw.pl --spot=\"-fx -T\" -F'"
Path = "${LBTT_TRANSLATE} --spot '${srcdir}/ltl2baw.pl --spot=\"-f -x -T\" -F'"
Enabled = no
}