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

dotty: get rid of the decorated version

Browse source 
* src/tgbaalgos/dottydec.cc, src/tgbaalgos/dottydec.hh,
src/tgbaalgos/rundotdec.cc, src/tgbaalgos/rundotdec.hh: Delete.
* src/tgbaalgos/Makefile.am, wrap/python/spot.i: Adjust.
* src/tgbaalgos/dotty.cc, src/tgbaalgos/dotty.hh: Remove the
decorated version, and the related arguments.
* src/bin/common_aoutput.cc, src/bin/dstar2tgba.cc,
src/tgbatest/ltl2tgba.cc, src/tgbatest/complementation.cc,
src/tgbatest/emptchk.cc: Adjust calls.
* wrap/python/ajax/spot.in: Draw the accepting run as an
automaton instead of painting it.
* wrap/python/ajax/ltl2tgba.html: Update help text.
This commit is contained in:
Alexandre Duret-Lutz 2015-01-24 11:54:39 +01:00
parent 947ab17b12
commit 49701ca3bc
15 changed files with 26 additions and 583 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/tgbatest/complementation.cc
View file

@ -251,7 +251,7 @@ int main(int argc, char* argv[])
return_value = 1;
if (auto run = res->accepting_run())
{
spot::dotty_reachable(std::cout, ec->automaton(), false);
spot::dotty_reachable(std::cout, ec->automaton());
spot::print_tgba_run(std::cout, ec->automaton(), run);
}
}

4
src/tgbatest/emptchk.cc
View file

@ -1,5 +1,5 @@
// -*- coding: utf-8 -*-
// Copyright (C) 2014 Laboratoire de Recherche et Développement de
// Copyright (C) 2014, 2015 Laboratoire de Recherche et Développement de
// l'Epita (LRDE).
//
// This file is part of Spot, a model checking library.
@ -163,7 +163,7 @@ main(int argc, char** argv)
if (auto run = res->accepting_run())
{
auto ar = spot::tgba_run_to_tgba(a, run);
spot::dotty_reachable(std::cout, ar, false);
spot::dotty_reachable(std::cout, ar);
}
std::cout << '\n';
if (runs == 0)

28
src/tgbatest/ltl2tgba.cc
View file

@ -48,7 +48,6 @@
#include "taalgos/minimize.hh"
#include "tgbaalgos/neverclaim.hh"
#include "tgbaalgos/replayrun.hh"
#include "tgbaalgos/rundotdec.hh"
#include "tgbaalgos/sccfilter.hh"
#include "tgbaalgos/safety.hh"
#include "tgbaalgos/gtec/gtec.hh"
@ -248,8 +247,6 @@ syntax(char* prog)
<< std::endl
<< " -CR compute and replay an accepting run (implies -C)"
<< std::endl
<< " -g graph the accepting run on the automaton (requires -e)"
<< std::endl
<< " -G graph the accepting run seen as an automaton "
<< " (requires -e)" << std::endl
<< " -m try to reduce accepting runs, in a second pass"
@ -364,7 +361,6 @@ checked_main(int argc, char** argv)
bool display_reduced_form = false;
bool post_branching = false;
bool fair_loop_approx = false;
bool graph_run_opt = false;
bool graph_run_tgba_opt = false;
bool opt_reduce = false;
bool opt_minimize = false;
@ -531,11 +527,6 @@ checked_main(int argc, char** argv)
{
file_opt = true;
}
else if (!strcmp(argv[formula_index], "-g"))
{
accepting_run = true;
graph_run_opt = true;
}
else if (!strcmp(argv[formula_index], "-G"))
{
accepting_run = true;
@ -927,10 +918,10 @@ checked_main(int argc, char** argv)
}
}
if ((graph_run_opt || graph_run_tgba_opt)
if ((graph_run_tgba_opt)
&& (!echeck_inst || !expect_counter_example))
{
std::cerr << argv[0] << ": error: -g and -G require -e." << std::endl;
std::cerr << argv[0] << ": error: -G requires -e." << std::endl;
exit(1);
}
@ -1531,7 +1522,7 @@ checked_main(int argc, char** argv)
switch (output)
{
case 0:
spot::dotty_reachable(std::cout, a, assume_sba);
spot::dotty_reachable(std::cout, a);
break;
case 5:
a->get_dict()->dump(std::cout);
@ -1702,7 +1693,7 @@ checked_main(int argc, char** argv)
}
else
{
if (!graph_run_opt && !graph_run_tgba_opt)
if (!graph_run_tgba_opt)
ec->print_stats(std::cout);
if (expect_counter_example != !!res &&
(!expect_counter_example || ec->safe()))
@ -1753,17 +1744,10 @@ checked_main(int argc, char** argv)
else
{
tm.start("printing accepting run");
if (graph_run_opt)
{
spot::tgba_run_dotty_decorator deco(run);
spot::dotty_reachable(std::cout, a,
assume_sba, nullptr,
&deco);
}
else if (graph_run_tgba_opt)
if (graph_run_tgba_opt)
{
auto ar = spot::tgba_run_to_tgba(a, run);
spot::dotty_reachable(std::cout, ar, false);
spot::dotty_reachable(std::cout, ar);
}
else
{