Commit b1800e38 authored by Denis Poitrenaud's avatar Denis Poitrenaud
Browse files

* src/tgbatest/dfs.test, src/tgbatest/emptchk.test,

src/tgbatest/emptchke.test, src/tgbatest/ltl2tgba.cc,
src/tgbatest/randtgba.cc, src/tgbatest/tba_samples_from_spin.test:
Adjust names of emptiness check algorithms.
parent 40ce79c7
2005-01-28 Denis Poitrenaud <Denis.Poitrenaud@lip6.fr>
* src/tgbatest/dfs.test, src/tgbatest/emptchk.test,
src/tgbatest/emptchke.test, src/tgbatest/ltl2tgba.cc,
src/tgbatest/randtgba.cc, src/tgbatest/tba_samples_from_spin.test:
Adjust names of emptiness check algorithms.
2005-01-27 Denis Poitrenaud <Denis.Poitrenaud@lip6.fr> 2005-01-27 Denis Poitrenaud <Denis.Poitrenaud@lip6.fr>
* src/tgbaalgos/gtec/gtec.cc: Adjust statistics count to match * src/tgbaalgos/gtec/gtec.cc: Adjust statistics count to match
......
...@@ -77,8 +77,8 @@ s9, s8,,; ...@@ -77,8 +77,8 @@ s9, s8,,;
s9, s9,,; s9, s9,,;
EOF EOF
run 0 ./ltl2tgba -emagic_search -X blue_counter run 0 ./ltl2tgba -eSE05 -X blue_counter
run 0 ./ltl2tgba -ese05_search -X blue_counter run 0 ./ltl2tgba -eTau03_opt -X blue_counter
# s1->s2->s3->(large composant from s4 to s9) # s1->s2->s3->(large composant from s4 to s9)
# ^ || # ^ ||
...@@ -129,8 +129,8 @@ s9, s8,,; ...@@ -129,8 +129,8 @@ s9, s8,,;
s9, s9,,; s9, s9,,;
EOF EOF
run 0 ./ltl2tgba -emagic_search -X blue_last run 0 ./ltl2tgba -eSE05 -X blue_last
run 0 ./ltl2tgba -ese05_search -X blue_last run 0 ./ltl2tgba -eTau03_opt -X blue_last
# _______ # _______
# | | # | |
...@@ -185,7 +185,7 @@ s9, s8,,; ...@@ -185,7 +185,7 @@ s9, s8,,;
s9, s9,,; s9, s9,,;
EOF EOF
run 0 ./ltl2tgba -emagic_search -X red run 0 ./ltl2tgba -eSE05 -X red
run 0 ./ltl2tgba -ese05_search -X red run 0 ./ltl2tgba -eTau03_opt -X red
rm -f red blue_counter blue_last rm -f red blue_counter blue_last
\ No newline at end of file
...@@ -37,23 +37,23 @@ expect_ce() ...@@ -37,23 +37,23 @@ expect_ce()
expect_ce_do -e -D "$1" expect_ce_do -e -D "$1"
expect_ce_do -e -f "$1" expect_ce_do -e -f "$1"
expect_ce_do -e -f -D "$1" expect_ce_do -e -f -D "$1"
expect_ce_do -ecouvreur99_shy "$1" expect_ce_do -eCou99_shy "$1"
expect_ce_do -ecouvreur99_shy -D "$1" expect_ce_do -eCou99_shy -D "$1"
expect_ce_do -ecouvreur99_shy -f "$1" expect_ce_do -eCou99_shy -f "$1"
expect_ce_do -ecouvreur99_shy -f -D "$1" expect_ce_do -eCou99_shy -f -D "$1"
expect_ce_do -emagic_search "$1" expect_ce_do -eCVWY90 "$1"
expect_ce_do -emagic_search -f "$1" expect_ce_do -eCVWY90 -f "$1"
run 0 ./ltl2tgba -ebsh_magic_search "$1" run 0 ./ltl2tgba -eCVWY90_bsh "$1"
run 0 ./ltl2tgba -ebsh_magic_search -f "$1" run 0 ./ltl2tgba -eCVWY90_bsh -f "$1"
run 0 ./ltl2tgba -ese05_search "$1" run 0 ./ltl2tgba -eSE05 "$1"
run 0 ./ltl2tgba -ese05_search -f "$1" run 0 ./ltl2tgba -eSE05 -f "$1"
run 0 ./ltl2tgba -ebsh_se05_search "$1" run 0 ./ltl2tgba -eSE05_bsh "$1"
run 0 ./ltl2tgba -ebsh_se05_search -f "$1" run 0 ./ltl2tgba -eSE05_bsh -f "$1"
run 0 ./ltl2tgba -etau03_opt_search -f "$1" run 0 ./ltl2tgba -eTau03_opt -f "$1"
run 0 ./ltl2tgba -egv04 -f "$1" run 0 ./ltl2tgba -eGV04 -f "$1"
# Expect multiple accepting runs # Expect multiple accepting runs
test `./ltl2tgba -emagic_search_repeated "$1" | grep Prefix: | wc -l` -ge $2 test `./ltl2tgba -eCVWY90_repeated "$1" | grep Prefix: | wc -l` -ge $2
test `./ltl2tgba -ese05_search_repeated "$1" | grep Prefix: | wc -l` -ge $2 test `./ltl2tgba -eSE05_repeated "$1" | grep Prefix: | wc -l` -ge $2
} }
expect_no() expect_no()
...@@ -62,23 +62,23 @@ expect_no() ...@@ -62,23 +62,23 @@ expect_no()
run 0 ./ltl2tgba -E -D "$1" run 0 ./ltl2tgba -E -D "$1"
run 0 ./ltl2tgba -E -f "$1" run 0 ./ltl2tgba -E -f "$1"
run 0 ./ltl2tgba -E -f -D "$1" run 0 ./ltl2tgba -E -f -D "$1"
run 0 ./ltl2tgba -Ecouvreur99_shy "$1" run 0 ./ltl2tgba -ECou99_shy "$1"
run 0 ./ltl2tgba -Ecouvreur99_shy -D "$1" run 0 ./ltl2tgba -ECou99_shy -D "$1"
run 0 ./ltl2tgba -Ecouvreur99_shy -f "$1" run 0 ./ltl2tgba -ECou99_shy -f "$1"
run 0 ./ltl2tgba -Ecouvreur99_shy -f -D "$1" run 0 ./ltl2tgba -ECou99_shy -f -D "$1"
run 0 ./ltl2tgba -Emagic_search "$1" run 0 ./ltl2tgba -ECVWY90 "$1"
run 0 ./ltl2tgba -Emagic_search -f "$1" run 0 ./ltl2tgba -ECVWY90 -f "$1"
run 0 ./ltl2tgba -Ebsh_magic_search "$1" run 0 ./ltl2tgba -ECVWY90_bsh "$1"
run 0 ./ltl2tgba -Ebsh_magic_search -f "$1" run 0 ./ltl2tgba -ECVWY90_bsh -f "$1"
run 0 ./ltl2tgba -Ese05_search "$1" run 0 ./ltl2tgba -ESE05 "$1"
run 0 ./ltl2tgba -Ese05_search -f "$1" run 0 ./ltl2tgba -ESE05 -f "$1"
run 0 ./ltl2tgba -Ebsh_se05_search "$1" run 0 ./ltl2tgba -ESE05_bsh "$1"
run 0 ./ltl2tgba -Ebsh_se05_search -f "$1" run 0 ./ltl2tgba -ESE05_bsh -f "$1"
run 0 ./ltl2tgba -Etau03_opt_search -f "$1" run 0 ./ltl2tgba -ETau03_opt -f "$1"
run 0 ./ltl2tgba -Egv04 -f "$1" run 0 ./ltl2tgba -EGV04 -f "$1"
test `./ltl2tgba -emagic_search_repeated "!($1)" | test `./ltl2tgba -eCVWY90_repeated "!($1)" |
grep Prefix: | wc -l` -ge $2 grep Prefix: | wc -l` -ge $2
test `./ltl2tgba -ese05_search_repeated "!($1)" | test `./ltl2tgba -eSE05_repeated "!($1)" |
grep Prefix: | wc -l` -ge $2 grep Prefix: | wc -l` -ge $2
} }
......
...@@ -29,9 +29,9 @@ expect_ce() ...@@ -29,9 +29,9 @@ expect_ce()
{ {
run 0 ./ltl2tgba -e -X "$1" run 0 ./ltl2tgba -e -X "$1"
run 0 ./ltl2tgba -e -D -X "$1" run 0 ./ltl2tgba -e -D -X "$1"
run 0 ./ltl2tgba -ecouvreur99_shy -X "$1" run 0 ./ltl2tgba -eCou99_shy -X "$1"
run 0 ./ltl2tgba -ecouvreur99_shy -D -X "$1" run 0 ./ltl2tgba -eCou99_shy -D -X "$1"
run 0 ./ltl2tgba -emagic_search -X "$1" run 0 ./ltl2tgba -eCVWY90 -X "$1"
} }
cat >input <<'EOF' cat >input <<'EOF'
......
...@@ -133,24 +133,24 @@ syntax(char* prog) ...@@ -133,24 +133,24 @@ syntax(char* prog)
<< "(implies -f)" << std::endl << "(implies -f)" << std::endl
<< std::endl << std::endl
<< "Where ALGO should be one of:" << std::endl << "Where ALGO should be one of:" << std::endl
<< " couvreur99 (the default)" << std::endl << " Cou99 (the default)" << std::endl
<< " couvreur99_shy-" << std::endl << " Cou99_shy-" << std::endl
<< " couvreur99_shy" << std::endl << " Cou99_shy" << std::endl
<< " magic_search" << std::endl << " CVWY90" << std::endl
<< " magic_search_repeated" << std::endl << " CVWY90_repeated" << std::endl
<< " bsh_magic_search[(heap size in Mo - 10Mo by default)]" << " CVWY90_bsh[(heap size in Mo - 10Mo by default)]"
<< std::endl << std::endl
<< " bsh_magic_search_repeated[(heap size in MB - 10MB" << " CVWY90_bsh_repeated[(heap size in MB - 10MB"
<< " by default)]" << std::endl << " by default)]" << std::endl
<< " gv04" << std::endl << " GV04" << std::endl
<< " se05_search" << std::endl << " SE05" << std::endl
<< " se05_search_repeated" << std::endl << " SE05_repeated" << std::endl
<< " bsh_se05_search[(heap size in MB - 10MB by default)]" << " SE05_bsh[(heap size in MB - 10MB by default)]"
<< std::endl << std::endl
<< " bsh_se05_search_repeated[(heap size in MB - 10MB" << " SE05_bsh_repeated[(heap size in MB - 10MB"
<< " by default)]" << std::endl << " by default)]" << std::endl
<< " tau03_search" << std::endl << " Tau03" << std::endl
<< " tau03_opt_search" << std::endl; << " Tau03_opt" << std::endl;
exit(2); exit(2);
} }
...@@ -241,7 +241,7 @@ main(int argc, char** argv) ...@@ -241,7 +241,7 @@ main(int argc, char** argv)
echeck_algo = argv[formula_index] + 2; echeck_algo = argv[formula_index] + 2;
} }
else else
echeck_algo = "couvreur99"; echeck_algo = "Cou99";
expect_counter_example = true; expect_counter_example = true;
output = -1; output = -1;
} }
...@@ -255,7 +255,7 @@ main(int argc, char** argv) ...@@ -255,7 +255,7 @@ main(int argc, char** argv)
echeck_algo = argv[formula_index] + 2; echeck_algo = argv[formula_index] + 2;
} }
else else
echeck_algo = "couvreur99"; echeck_algo = "Cou99";
expect_counter_example = false; expect_counter_example = false;
output = -1; output = -1;
} }
...@@ -412,77 +412,77 @@ main(int argc, char** argv) ...@@ -412,77 +412,77 @@ main(int argc, char** argv)
if (echeck_algo != "") if (echeck_algo != "")
{ {
if (echeck_algo == "couvreur99") if (echeck_algo == "Cou99")
{ {
echeck = Couvreur; echeck = Couvreur;
} }
else if (echeck_algo == "couvreur99_shy") else if (echeck_algo == "Cou99_shy")
{ {
echeck = Couvreur2; echeck = Couvreur2;
couv_group = true; couv_group = true;
} }
else if (echeck_algo == "couvreur99_shy-") else if (echeck_algo == "Cou99_shy-")
{ {
echeck = Couvreur2; echeck = Couvreur2;
couv_group = false; couv_group = false;
} }
else if (echeck_algo == "magic_search") else if (echeck_algo == "CVWY90")
{ {
echeck = MagicSearch; echeck = MagicSearch;
degeneralize_maybe = true; degeneralize_maybe = true;
} }
else if (echeck_algo == "magic_search_repeated") else if (echeck_algo == "CVWY90_repeated")
{ {
echeck = MagicSearch; echeck = MagicSearch;
degeneralize_maybe = true; degeneralize_maybe = true;
search_many = true; search_many = true;
} }
else if (echeck_algo == "bsh_magic_search") else if (echeck_algo == "CVWY90_bsh")
{ {
echeck = MagicSearch; echeck = MagicSearch;
degeneralize_maybe = true; degeneralize_maybe = true;
bit_state_hashing = true; bit_state_hashing = true;
} }
else if (echeck_algo == "bsh_magic_search_repeated") else if (echeck_algo == "CVWY90_bsh_repeated")
{ {
echeck = MagicSearch; echeck = MagicSearch;
degeneralize_maybe = true; degeneralize_maybe = true;
bit_state_hashing = true; bit_state_hashing = true;
search_many = true; search_many = true;
} }
else if (echeck_algo == "se05_search") else if (echeck_algo == "SE05")
{ {
echeck = Se05Search; echeck = Se05Search;
degeneralize_maybe = true; degeneralize_maybe = true;
} }
else if (echeck_algo == "se05_search_repeated") else if (echeck_algo == "SE05_repeated")
{ {
echeck = Se05Search; echeck = Se05Search;
degeneralize_maybe = true; degeneralize_maybe = true;
search_many = true; search_many = true;
} }
else if (echeck_algo == "bsh_se05_search") else if (echeck_algo == "SE05_bsh")
{ {
echeck = Se05Search; echeck = Se05Search;
degeneralize_maybe = true; degeneralize_maybe = true;
bit_state_hashing = true; bit_state_hashing = true;
} }
else if (echeck_algo == "bsh_se05_search_repeated") else if (echeck_algo == "SE05_bsh_repeated")
{ {
echeck = Se05Search; echeck = Se05Search;
degeneralize_maybe = true; degeneralize_maybe = true;
bit_state_hashing = true; bit_state_hashing = true;
search_many = true; search_many = true;
} }
else if (echeck_algo == "tau03_search") else if (echeck_algo == "Tau03")
{ {
echeck = Tau03Search; echeck = Tau03Search;
} }
else if (echeck_algo == "tau03_opt_search") else if (echeck_algo == "Tau03_opt")
{ {
echeck = Tau03OptSearch; echeck = Tau03OptSearch;
} }
else if (echeck_algo == "gv04") else if (echeck_algo == "GV04")
{ {
echeck = Gv04; echeck = Gv04;
degeneralize_maybe = true; degeneralize_maybe = true;
...@@ -753,7 +753,7 @@ main(int argc, char** argv) ...@@ -753,7 +753,7 @@ main(int argc, char** argv)
if (a->number_of_acceptance_conditions() == 0) if (a->number_of_acceptance_conditions() == 0)
{ {
if (!paper_opt) if (!paper_opt)
std::cout << "To apply tau03_search, the automaton must have at" std::cout << "To apply Tau03, the automaton must have at"
<< " least one accepting condition. Try with another" << " least one accepting condition. Try with another"
<< " algorithm." << std::endl; << " algorithm." << std::endl;
else else
......
...@@ -103,16 +103,16 @@ struct ec_algo ...@@ -103,16 +103,16 @@ struct ec_algo
ec_algo ec_algos[] = ec_algo ec_algos[] =
{ {
{ "couvreur99", couvreur99_cons, 0, -1U, true }, { "Cou99", couvreur99_cons, 0, -1U, true },
{ "couvreur99_shy-", couvreur99_shy_minus_cons, 0, -1U, true }, { "Cou99_shy-", couvreur99_shy_minus_cons, 0, -1U, true },
{ "couvreur99_shy", couvreur99_shy_cons, 0, -1U, true }, { "Cou99_shy", couvreur99_shy_cons, 0, -1U, true },
{ "explicit_magic_search", spot::explicit_magic_search, 0, 1, true }, { "CVWY90", spot::explicit_magic_search, 0, 1, true },
{ "bsh_magic_search", bsh_ms_cons, 0, 1, false }, { "CVWY90_bsh", bsh_ms_cons, 0, 1, false },
{ "explicit_se05", spot::explicit_se05_search, 0, 1, true }, { "GV04", spot::explicit_gv04_check, 0, 1, true },
{ "bsh_se05", bsh_se05_cons, 0, 1, false }, { "SE05", spot::explicit_se05_search, 0, 1, true },
{ "explicit_gv04", spot::explicit_gv04_check, 0, 1, true }, { "SE05_bsh", bsh_se05_cons, 0, 1, false },
{ "explicit_tau03", spot::explicit_tau03_search, 1, -1U, true }, { "Tau03", spot::explicit_tau03_search, 1, -1U, true },
{ "explicit_tau03_opt", spot::explicit_tau03_opt_search, 0, -1U, true }, { "Tau03_opt", spot::explicit_tau03_opt_search, 0, -1U, true },
}; };
spot::emptiness_check* spot::emptiness_check*
......
...@@ -27,25 +27,25 @@ set -e ...@@ -27,25 +27,25 @@ set -e
expect_ce() expect_ce()
{ {
./ltl2tgba -X -e "$1" ./ltl2tgba -X -e "$1"
./ltl2tgba -X -ecouvreur99_shy "$1" ./ltl2tgba -X -eCou99_shy "$1"
./ltl2tgba -X -emagic_search "$1" ./ltl2tgba -X -eCVWY90 "$1"
./ltl2tgba -X -ebsh_magic_search "$1" ./ltl2tgba -X -eCVWY90_bsh "$1"
./ltl2tgba -X -ese05_search "$1" ./ltl2tgba -X -eSE05 "$1"
./ltl2tgba -X -ebsh_se05_search "$1" ./ltl2tgba -X -eSE05_bsh "$1"
./ltl2tgba -X -etau03_search "$1" ./ltl2tgba -X -eTau03 "$1"
./ltl2tgba -X -etau03_opt_search "$1" ./ltl2tgba -X -eTau03_opt "$1"
} }
expect_no() expect_no()
{ {
./ltl2tgba -X -E "$1" ./ltl2tgba -X -E "$1"
./ltl2tgba -X -Ecouvreur99_shy "$1" ./ltl2tgba -X -ECou99_shy "$1"
./ltl2tgba -X -Emagic_search "$1" ./ltl2tgba -X -ECVWY90 "$1"
./ltl2tgba -X -Ebsh_magic_search "$1" ./ltl2tgba -X -ECVWY90_bsh "$1"
./ltl2tgba -X -Ese05_search "$1" ./ltl2tgba -X -ESE05 "$1"
./ltl2tgba -X -Ebsh_se05_search "$1" ./ltl2tgba -X -ESE05_bsh "$1"
./ltl2tgba -X -Etau03_search "$1" ./ltl2tgba -X -ETau03 "$1"
./ltl2tgba -X -Etau03_opt_search "$1" ./ltl2tgba -X -ETau03_opt "$1"
} }
dir=$srcdir/tba_samples_from_spin dir=$srcdir/tba_samples_from_spin
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment