Change the simulation option from -RSD to -RDS and document it.

* src/tgbatest/ltl2tgba.cc: Here.
* src/tgbatest/spotlbtt.test: Adjust.
This commit is contained in:
Alexandre Duret-Lutz 2012-04-27 17:26:59 +02:00
parent 7e5875845a
commit 324802c04f
2 changed files with 12 additions and 10 deletions

View file

@ -201,7 +201,9 @@ syntax(char* prog)
<< " " << " "
<< "(prefer -R3 over -R3f if you degeneralize with -D, -DS, or -N)" << "(prefer -R3 over -R3f if you degeneralize with -D, -DS, or -N)"
<< std::endl << std::endl
<< " -Rm attempt to minimize the automata" << std::endl << " -RDS minimize the automaton with direct simulation"
<< std::endl
<< " -Rm attempt to WDBA-minimize the automata" << std::endl
<< std::endl << std::endl
<< "Automaton conversion:" << std::endl << "Automaton conversion:" << std::endl
@ -614,7 +616,7 @@ main(int argc, char** argv)
|| !strcmp(argv[formula_index], "-R2t")) || !strcmp(argv[formula_index], "-R2t"))
{ {
// For backward compatibility, make all these options // For backward compatibility, make all these options
// equal to -RSD. // equal to -RDS.
reduction_dir_sim = true; reduction_dir_sim = true;
} }
else if (!strcmp(argv[formula_index], "-R3")) else if (!strcmp(argv[formula_index], "-R3"))
@ -634,14 +636,14 @@ main(int argc, char** argv)
{ {
display_reduce_form = true; display_reduce_form = true;
} }
else if (!strcmp(argv[formula_index], "-RDS"))
{
reduction_dir_sim = true;
}
else if (!strcmp(argv[formula_index], "-Rm")) else if (!strcmp(argv[formula_index], "-Rm"))
{ {
opt_minimize = true; opt_minimize = true;
} }
else if (!strcmp(argv[formula_index], "-RSD"))
{
reduction_dir_sim = true;
}
else if (!strcmp(argv[formula_index], "-M")) else if (!strcmp(argv[formula_index], "-M"))
{ {
opt_monitor = true; opt_monitor = true;

View file

@ -195,7 +195,7 @@ Algorithm
{ {
Name = "Spot (Couvreur -- FM), simulated" Name = "Spot (Couvreur -- FM), simulated"
Path = "${LBTT_TRANSLATE}" Path = "${LBTT_TRANSLATE}"
Parameters = "--spot '../ltl2tgba -F -f -t -RSD -r4 -R3'" Parameters = "--spot '../ltl2tgba -F -f -t -RDS -r4 -R3'"
Enabled = yes Enabled = yes
} }
@ -203,7 +203,7 @@ Algorithm
{ {
Name = "Spot (Couvreur -- LaCim), simulated" Name = "Spot (Couvreur -- LaCim), simulated"
Path = "${LBTT_TRANSLATE}" Path = "${LBTT_TRANSLATE}"
Parameters = "--spot '../ltl2tgba -F -f -l -t -RSD -r4 -R3'" Parameters = "--spot '../ltl2tgba -F -f -l -t -RDS -r4 -R3'"
Enabled = yes Enabled = yes
} }
@ -211,7 +211,7 @@ Algorithm
{ {
Name = "Spot (Couvreur -- TAA), simulated" Name = "Spot (Couvreur -- TAA), simulated"
Path = "${LBTT_TRANSLATE}" Path = "${LBTT_TRANSLATE}"
Parameters = "--spot '../ltl2tgba -F -f -l -taa -t -RSD -r4 -R3'" Parameters = "--spot '../ltl2tgba -F -f -l -taa -t -RDS -r4 -R3'"
Enabled = yes Enabled = yes
} }
@ -219,7 +219,7 @@ Algorithm
{ {
Name = "Spot (Couvreur -- FM), simulated and degeneralized on states." Name = "Spot (Couvreur -- FM), simulated and degeneralized on states."
Path = "${LBTT_TRANSLATE}" Path = "${LBTT_TRANSLATE}"
Parameters = "--spot '../ltl2tgba -F -f -t -RSD -DS'" Parameters = "--spot '../ltl2tgba -F -f -t -RDS -DS'"
Enabled = yes Enabled = yes
} }