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

* src/tgbaalgos/dottydec.cc, src/tgbaalgos/dottydec.hh,

Browse source 
src/tgbaalgos/rundotdec.cc, src/tgbaalgos/rundotdec.hh: New files.
* src/tgbaalgos/Makefile.am (tgbaalgos_HEADERS,
libtgbaalgos_la_SOURCES): Add them.
* src/tgbaalgos/dotty.hh (dotty_reachable): Take a dotty_decorator
as third parameter.
* src/tgbaalgos/dotty.cc (dotty_bfs::process_state,
dotty_bfs::process_link): Use the decorator.
* src/tgbatest/ltl2tgba.cc: Graph the accepting run if the -g option
is given.
* src/tgbatest/emptchk.test: Exercize -g.
This commit is contained in:
Alexandre Duret-Lutz 2004-11-03 15:17:06 +00:00
parent a90b0648f8
commit 7688431451
10 changed files with 434 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/tgbatest/ltl2tgba.cc
View file

@ -43,6 +43,7 @@
#include "tgbaalgos/neverclaim.hh"
#include "tgbaalgos/reductgba_sim.hh"
#include "tgbaalgos/replayrun.hh"
#include "tgbaalgos/rundotdec.hh"
void
syntax(char* prog)
@ -65,6 +66,7 @@ syntax(char* prog)
<< " -f use Couvreur's FM algorithm for translation"
<< std::endl
<< " -F read the formula from the file" << std::endl
<< " -g graph the accepting run on the automaton (requires -e)"
<< " -L fair-loop approximation (implies -f)" << std::endl
<< " -N display the never clain for Spin "
<< "(implies -D)" << std::endl
@ -147,6 +149,7 @@ main(int argc, char** argv)
bool display_parity_game = false;
bool post_branching = false;
bool fair_loop_approx = false;
bool graph_run_opt = false;
spot::ltl::environment& env(spot::ltl::default_environment::instance());
spot::ltl::atomic_prop_set* unobservables = 0;
@ -199,6 +202,10 @@ main(int argc, char** argv)
{
file_opt = true;
}
else if (!strcmp(argv[formula_index], "-g"))
{
graph_run_opt = true;
}
else if (!strcmp(argv[formula_index], "-L"))
{
fair_loop_approx = true;
@ -347,6 +354,12 @@ main(int argc, char** argv)
}
}
if (graph_run_opt && (echeck_algo == "" || !expect_counter_example))
{
std::cerr << argv[0] << ": error: -g requires -e." << std::endl;
exit(1);
}
std::string input;
if (file_opt)
@ -561,7 +574,8 @@ main(int argc, char** argv)
do
{
spot::emptiness_check_result* res = ec->check();
ec->print_stats(std::cout);
if (!graph_run_opt)
ec->print_stats(std::cout);
if (expect_counter_example != !!res)
exit_code = 1;
@ -580,9 +594,17 @@ main(int argc, char** argv)
}
else
{
spot::print_tgba_run(std::cout, ec_a, run);
if (!spot::replay_tgba_run(std::cout, ec_a, run))
exit_code = 1;
if (graph_run_opt)
{
spot::tgba_run_dotty_decorator deco(run);
spot::dotty_reachable(std::cout, ec_a, &deco);
}
else
{
spot::print_tgba_run(std::cout, ec_a, run);
if (!spot::replay_tgba_run(std::cout, ec_a, run))
exit_code = 1;
}
delete run;
}
}