Do not comment states in the never claim by default. It takes too

much time when the formula is large, and it is useless when the
purpose is model-checking with Spin.

* src/tgbaalgos/neverclaim.hh (never_claim_reachable): Add the
comments option.
* src/tgbaalgos/neverclaim.cc (never_claim_bfs,
never_claim_reachable): Honor the comment option.
* src/tgba/tests/ltl2tgba.cc (-N): Do not comment states.
(-NN) New option to output a commented never claim.
This commit is contained in:
Alexandre Duret-Lutz 2009-11-10 17:45:41 +01:00
parent 1d8b115b83
commit 8c6a2b33d9
4 changed files with 42 additions and 13 deletions

View file

@ -106,8 +106,10 @@ syntax(char* prog)
<< " -lS label acceptance conditions on states" << std::endl
<< " -m try to reduce accepting runs, in a second pass"
<< std::endl
<< " -N display the never clain for Spin "
<< "(implies -D)" << std::endl
<< " -N display the never clain for Spin (implies -D)"
<< std::endl
<< " -NN display the never clain for Spin, with commented states"
<< " (implies -D)" << std::endl
<< " -p branching postponement (implies -f)" << std::endl
<< " -Pfile multiply the formula with the automaton from `file'."
<< std::endl
@ -200,6 +202,7 @@ main(int argc, char** argv)
bool opt_reduce = false;
bool containment = false;
bool show_fc = false;
bool spin_comments = false;
spot::ltl::environment& env(spot::ltl::default_environment::instance());
spot::ltl::atomic_prop_set* unobservables = 0;
spot::tgba_explicit_string* system = 0;
@ -377,6 +380,12 @@ main(int argc, char** argv)
degeneralize_opt = DegenSBA;
output = 8;
}
else if (!strcmp(argv[formula_index], "-NN"))
{
degeneralize_opt = DegenSBA;
output = 8;
spin_comments = true;
}
else if (!strcmp(argv[formula_index], "-p"))
{
post_branching = true;
@ -794,7 +803,7 @@ main(int argc, char** argv)
assert(degeneralize_opt == DegenSBA);
const spot::tgba_sba_proxy* s =
static_cast<const spot::tgba_sba_proxy*>(degeneralized);
spot::never_claim_reachable(std::cout, s, f);
spot::never_claim_reachable(std::cout, s, f, spin_comments);
break;
}
case 9: