Commit 4732d165 authored by Alexandre Duret-Lutz's avatar Alexandre Duret-Lutz
Browse files

* iface/gspn/ltlgspn.cc: Add option -P.

parent 92cc5f9b
2004-01-09 Alexandre Duret-Lutz <adl@src.lip6.fr>
* iface/gspn/ltlgspn.cc: Add option -P.
2004-01-08 Alexandre Duret-Lutz <adl@src.lip6.fr> 2004-01-08 Alexandre Duret-Lutz <adl@src.lip6.fr>
Run valgrind in test cases. Run valgrind in test cases.
......
// Copyright (C) 2003 Laboratoire d'Informatique de Paris 6 (LIP6), // Copyright (C) 2003, 2004 Laboratoire d'Informatique de Paris 6 (LIP6),
// dpartement Systmes Rpartis Coopratifs (SRC), Universit Pierre // dpartement Systmes Rpartis Coopratifs (SRC), Universit Pierre
// et Marie Curie. // et Marie Curie.
// //
...@@ -35,7 +35,7 @@ syntax(char* prog) ...@@ -35,7 +35,7 @@ syntax(char* prog)
std::cerr << "Usage: "<< prog std::cerr << "Usage: "<< prog
<< " [OPTIONS...] model formula props..." << std::endl << " [OPTIONS...] model formula props..." << std::endl
<< std::endl << std::endl
<< " -c compute a counter example" << std::endl << " -c compute an example" << std::endl
<< " (instead of just checking for emptiness)" << std::endl << " (instead of just checking for emptiness)" << std::endl
<< std::endl << std::endl
<< " -e use Couvreur's emptiness-check (default)" << std::endl << " -e use Couvreur's emptiness-check (default)" << std::endl
...@@ -43,8 +43,8 @@ syntax(char* prog) ...@@ -43,8 +43,8 @@ syntax(char* prog)
<< std::endl << std::endl
<< " -l use Couvreur's LaCIM algorithm for translation (default)" << " -l use Couvreur's LaCIM algorithm for translation (default)"
<< std::endl << std::endl
<< " -f use Couvreur's FM algorithm for translation" << " -f use Couvreur's FM algorithm for translation" << std::endl
<< std::endl; << " -P do not project example on model" << std::endl;
exit(2); exit(2);
} }
...@@ -56,6 +56,7 @@ main(int argc, char **argv) ...@@ -56,6 +56,7 @@ main(int argc, char **argv)
enum { Couvreur, Magic } check = Couvreur; enum { Couvreur, Magic } check = Couvreur;
enum { Lacim, Fm } trans = Lacim; enum { Lacim, Fm } trans = Lacim;
bool compute_counter_example = false; bool compute_counter_example = false;
bool proj = true;
spot::gspn_environment env; spot::gspn_environment env;
...@@ -81,6 +82,10 @@ main(int argc, char **argv) ...@@ -81,6 +82,10 @@ main(int argc, char **argv)
{ {
trans = Fm; trans = Fm;
} }
else if (!strcmp(argv[formula_index], "-P"))
{
proj = 0;
}
else else
{ {
syntax(argv[0]); syntax(argv[0]);
...@@ -135,7 +140,7 @@ main(int argc, char **argv) ...@@ -135,7 +140,7 @@ main(int argc, char **argv)
if (compute_counter_example) if (compute_counter_example)
{ {
ec.counter_example(); ec.counter_example();
ec.print_result(std::cout, model); ec.print_result(std::cout, proj ? model : 0);
} }
else else
{ {
...@@ -157,7 +162,7 @@ main(int argc, char **argv) ...@@ -157,7 +162,7 @@ main(int argc, char **argv)
if (ms.check()) if (ms.check())
{ {
if (compute_counter_example) if (compute_counter_example)
ms.print_result (std::cout, model); ms.print_result (std::cout, proj ? model : 0);
else else
std::cout << "non-empty" << std::endl; std::cout << "non-empty" << std::endl;
exit(1); exit(1);
......
Supports Markdown
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