twa_run: swallow reduce_run, replay_twa_run, twa_run_to_tgba

These now become twa_run::reduce, twa_run::replay, and
twa_run::as_twa.

* src/twaalgos/reducerun.cc, src/twaalgos/reducerun.hh,
src/twaalgos/replayrun.cc, src/twaalgos/replayrun.hh: Delete.
* src/twaalgos/Makefile.am: Adjust.
* src/twaalgos/emptiness.cc, src/twaalgos/emptiness.hh: Move
the above functions here, as method of twa_run.
* src/bin/common_aoutput.hh, src/bin/ltlcross.cc,
src/tests/emptchk.cc, src/tests/ikwiad.cc, src/tests/randtgba.cc,
wrap/python/ajax/spotcgi.in, iface/ltsmin/modelcheck.cc: Adjust.
* NEWS: List the renamings.
This commit is contained in:
Alexandre Duret-Lutz 2015-10-25 12:51:51 +01:00
parent 63917def2d
commit 99c967f021
15 changed files with 508 additions and 664 deletions

View file

@ -38,13 +38,11 @@
#include "twaalgos/hoa.hh"
#include "twaalgos/degen.hh"
#include "twa/twaproduct.hh"
#include "twaalgos/reducerun.hh"
#include "parseaut/public.hh"
#include "twaalgos/copy.hh"
#include "twaalgos/minimize.hh"
#include "taalgos/minimize.hh"
#include "twaalgos/neverclaim.hh"
#include "twaalgos/replayrun.hh"
#include "twaalgos/sccfilter.hh"
#include "twaalgos/safety.hh"
#include "twaalgos/gtec/gtec.hh"
@ -1580,13 +1578,13 @@ checked_main(int argc, char** argv)
if (opt_reduce)
{
tm.start("reducing accepting run");
run = spot::reduce_run(run);
run = run->reduce();
tm.stop("reducing accepting run");
}
if (accepting_run_replay)
{
tm.start("replaying acc. run");
if (!spot::replay_twa_run(std::cout, run, true))
if (!run->replay(std::cout, true))
exit_code = 1;
tm.stop("replaying acc. run");
}
@ -1594,14 +1592,9 @@ checked_main(int argc, char** argv)
{
tm.start("printing accepting run");
if (graph_run_tgba_opt)
{
auto ar = spot::twa_run_to_tgba(a, run);
spot::print_dot(std::cout, ar);
}
spot::print_dot(std::cout, run->as_twa());
else
{
std::cout << run;
}
std::cout << run;
tm.stop("printing accepting run");
}
}