Commit 738f939f authored by Alexandre Duret-Lutz's avatar Alexandre Duret-Lutz
Browse files

adjust names for automata printers

The following renamings are made:

  never_claim_reachable -> print_never_claim
  hoa_reachable   -> print_hoa
  lbtt_reachable  -> print_lbtt
  dotty_reachable -> print_dot
  ltl::dotty      -> print_dot_psl

Fixes #89.

* src/ltlvisit/dotty.cc, src/ltlvisit/dotty.hh, src/taalgos/dotty.cc,
src/taalgos/dotty.hh src/twaalgos/dotty.cc, src/twaalgos/dotty.hh:
Rename...
* src/ltlvisit/dot.cc, src/ltlvisit/dot.hh src/taalgos/dot.cc,
src/taalgos/dot.hh src/twaalgos/dot.cc, src/twaalgos/dot.hh:
... those.
* bench/stutter/stutter_invariance_randomgraph.cc,
iface/ltsmin/modelcheck.cc, src/bin/common_aoutput.cc,
src/bin/dstar2tgba.cc, src/bin/ltl2tgta.cc, src/dstarparse/dra2ba.cc,
src/ltlvisit/Makefile.am, src/taalgos/Makefile.am,
src/tests/checkpsl.cc, src/tests/checkta.cc,
src/tests/complementation.cc, src/tests/emptchk.cc,
src/tests/ltl2tgba.cc, src/tests/ltlprod.cc, src/tests/randtgba.cc,
src/tests/readltl.cc, src/tests/taatgba.cc, src/tests/twagraph.cc,
src/twa/twa.hh, src/twa/twasafracomplement.cc,
src/twaalgos/Makefile.am, src/twaalgos/dtbasat.cc,
src/twaalgos/dtgbasat.cc, src/twaalgos/dupexp.cc,
src/twaalgos/lbtt.cc, src/twaalgos/lbtt.hh,
src/twaalgos/ltl2tgba_fm.cc, src/twaalgos/neverclaim.cc,
src/twaalgos/neverclaim.hh, wrap/python/ajax/spot.in,
wrap/python/spot.py, wrap/python/spot_impl.i,
wrap/python/tests/ltl2tgba.py, wrap/python/tests/parsetgba.py: Adjust.
parent 8fb7b279
......@@ -21,7 +21,7 @@
#include "ltlvisit/apcollect.hh"
#include "twaalgos/dtgbacomp.hh"
#include "twaalgos/randomgraph.hh"
#include "twaalgos/dotty.hh"
#include "twaalgos/dot.hh"
#include "twaalgos/product.hh"
#include "twaalgos/stutter.hh"
#include "twaalgos/stats.hh"
......
......@@ -18,7 +18,7 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "ltsmin.hh"
#include "twaalgos/dotty.hh"
#include "twaalgos/dot.hh"
#include "ltlenv/defaultenv.hh"
#include "ltlast/allnodes.hh"
#include "ltlparse/public.hh"
......@@ -230,9 +230,9 @@ checked_main(int argc, char **argv)
if (output == DotModel)
{
tm.start("dotty output");
spot::dotty_reachable(std::cout, model);
tm.stop("dotty output");
tm.start("dot output");
spot::print_dot(std::cout, model);
tm.stop("dot output");
goto safe_exit;
}
if (output == Kripke)
......@@ -246,9 +246,9 @@ checked_main(int argc, char **argv)
if (output == DotFormula)
{
tm.start("dotty output");
spot::dotty_reachable(std::cout, prop);
tm.stop("dotty output");
tm.start("dot output");
spot::print_dot(std::cout, prop);
tm.stop("dot output");
goto safe_exit;
}
......@@ -256,9 +256,9 @@ checked_main(int argc, char **argv)
if (output == DotProduct)
{
tm.start("dotty output");
spot::dotty_reachable(std::cout, product);
tm.stop("dotty output");
tm.start("dot output");
spot::print_dot(std::cout, product);
tm.stop("dot output");
goto safe_exit;
}
......
......@@ -27,7 +27,7 @@
#include "twa/bddprint.hh"
#include "twaalgos/dotty.hh"
#include "twaalgos/dot.hh"
#include "twaalgos/lbtt.hh"
#include "twaalgos/hoa.hh"
#include "twaalgos/neverclaim.hh"
......@@ -319,19 +319,19 @@ automaton_printer::print(const spot::twa_graph_ptr& aut,
// Do not output anything.
break;
case Dot:
spot::dotty_reachable(*out, aut, opt_dot);
spot::print_dot(*out, aut, opt_dot);
break;
case Lbtt:
spot::lbtt_reachable(*out, aut, type == spot::postprocessor::BA);
spot::print_lbtt(*out, aut, type == spot::postprocessor::BA);
break;
case Lbtt_t:
spot::lbtt_reachable(*out, aut, false);
spot::print_lbtt(*out, aut, false);
break;
case Hoa:
spot::hoa_reachable(*out, aut, hoa_opt) << '\n';
break;
case Spin:
spot::never_claim_reachable(*out, aut, opt_never);
spot::print_never_claim(*out, aut, opt_never);
break;
case Stats:
statistics.set_output(*out);
......
......@@ -32,7 +32,7 @@
#include "common_post.hh"
#include "common_file.hh"
#include "twaalgos/dotty.hh"
#include "twaalgos/dot.hh"
#include "twaalgos/lbtt.hh"
#include "twaalgos/hoa.hh"
#include "twaalgos/neverclaim.hh"
......@@ -388,19 +388,19 @@ namespace
switch (format)
{
case Dot:
spot::dotty_reachable(*out, aut, opt_dot);
spot::print_dot(*out, aut, opt_dot);
break;
case Lbtt:
spot::lbtt_reachable(*out, aut, type == spot::postprocessor::BA);
spot::print_lbtt(*out, aut, type == spot::postprocessor::BA);
break;
case Lbtt_t:
spot::lbtt_reachable(*out, aut, false);
spot::print_lbtt(*out, aut, false);
break;
case Hoa:
spot::hoa_reachable(*out, aut, hoa_opt) << '\n';
break;
case Spin:
spot::never_claim_reachable(*out, aut, opt_never);
spot::print_never_claim(*out, aut, opt_never);
break;
case Stats:
statistics.set_output(*out);
......
......@@ -35,13 +35,13 @@
#include "ltlparse/public.hh"
#include "ltlvisit/print.hh"
#include "ltlvisit/simplify.hh"
#include "twaalgos/dotty.hh"
#include "twaalgos/dot.hh"
#include "twaalgos/ltl2tgba_fm.hh"
#include "twaalgos/translate.hh"
#include "twa/bddprint.hh"
#include "taalgos/tgba2ta.hh"
#include "taalgos/dotty.hh"
#include "taalgos/dot.hh"
#include "taalgos/minimize.hh"
#include "misc/optionmap.hh"
......@@ -198,14 +198,14 @@ namespace
opt_with_artificial_livelock);
if (level != spot::postprocessor::Low)
testing_automaton = spot::minimize_ta(testing_automaton);
spot::dotty_reachable(std::cout, testing_automaton);
spot::print_dot(std::cout, testing_automaton);
}
else
{
auto tgta = tgba_to_tgta(aut, ap_set);
if (level != spot::postprocessor::Low)
tgta = spot::minimize_tgta(tgta);
spot::dotty_reachable(std::cout, tgta->get_ta());
spot::print_dot(std::cout, tgta->get_ta());
}
f->destroy();
flush_cout();
......
......@@ -23,7 +23,7 @@
#include "twaalgos/reachiter.hh"
#include "twaalgos/gtec/gtec.hh"
#include "twaalgos/sccfilter.hh"
#include "twaalgos/dotty.hh"
#include "twaalgos/dot.hh"
namespace spot
{
......
......@@ -29,7 +29,7 @@ ltlvisit_HEADERS = \
apcollect.hh \
contain.hh \
clone.hh \
dotty.hh \
dot.hh \
dump.hh \
exclusive.hh \
length.hh \
......@@ -52,7 +52,7 @@ libltlvisit_la_SOURCES = \
apcollect.cc \
contain.cc \
clone.cc \
dotty.cc \
dot.cc \
dump.cc \
exclusive.cc \
length.cc \
......
// -*- coding: utf-8 -*-
// Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014 Laboratoire de
// Recherche et Développement de l'Epita (LRDE).
// Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014, 2015 Laboratoire
// de Recherche et Développement de l'Epita (LRDE).
// Copyright (C) 2003, 2004 Laboratoire d'Informatique de Paris 6
// (LIP6), département Systèmes Répartis Coopératifs (SRC), Université
// Pierre et Marie Curie.
......@@ -21,7 +21,7 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "misc/hash.hh"
#include "dotty.hh"
#include "dot.hh"
#include "ltlast/visitor.hh"
#include "ltlast/allnodes.hh"
#include <ostream>
......@@ -114,9 +114,9 @@ namespace spot
void finish()
{
os_ << " subgraph atoms {" << std::endl
<< " rank=sink;" << std::endl
<< sinks_->str() << " }" << std::endl;
os_ << (" subgraph atoms {\n"
" rank=sink;\n")
<< sinks_->str() << " }\n";
delete sinks_;
}
......@@ -154,7 +154,7 @@ namespace spot
os_ << " [taillabel=\"L\"]";
else if (childnum == -2)
os_ << " [taillabel=\"R\"]";
os_ << ';' << std::endl;
os_ << ";\n";
}
father_ = node;
......@@ -177,11 +177,11 @@ namespace spot
}
std::ostream&
dotty(std::ostream& os, const formula* f)
print_dot_psl(std::ostream& os, const formula* f)
{
dotty_visitor::map m;
dotty_visitor v(os, m);
os << "digraph G {" << std::endl;
os << "digraph G {\n";
f->accept(v);
v.finish();
os << '}' << std::endl;
......
// -*- coding: utf-8 -*-
// Copyright (C) 2013 Laboratoire de Recherche et Développement
// Copyright (C) 2013, 2015 Laboratoire de Recherche et Développement
// de l'Epita (LRDE).
// Copyright (C) 2003, 2004 Laboratoire d'Informatique de Paris 6 (LIP6),
// département Systèmes Répartis Coopératifs (SRC), Université Pierre
......@@ -37,6 +37,6 @@ namespace spot
/// \c dot is part of the GraphViz package
/// http://www.research.att.com/sw/tools/graphviz/
SPOT_API
std::ostream& dotty(std::ostream& os, const formula* f);
std::ostream& print_dot_psl(std::ostream& os, const formula* f);
}
}
## -*- coding: utf-8 -*-
## Copyright (C) 2010, 2012, 2013 Laboratoire de Recherche et
## Copyright (C) 2010, 2012, 2013, 2015 Laboratoire de Recherche et
## Développement de l'Epita (LRDE).
##
## This file is part of Spot, a model checking library.
......@@ -25,7 +25,7 @@ taalgosdir = $(pkgincludedir)/taalgos
taalgos_HEADERS = \
tgba2ta.hh \
dotty.hh \
dot.hh \
reachiter.hh \
stats.hh \
statessetbuilder.hh \
......@@ -35,7 +35,7 @@ taalgos_HEADERS = \
noinst_LTLIBRARIES = libtaalgos.la
libtaalgos_la_SOURCES = \
tgba2ta.cc \
dotty.cc \
dot.cc \
reachiter.cc \
stats.cc \
statessetbuilder.cc \
......
......@@ -18,7 +18,7 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <ostream>
#include "dotty.hh"
#include "dot.hh"
#include "twa/bddprint.hh"
#include "reachiter.hh"
#include "misc/escape.hh"
......@@ -234,7 +234,7 @@ namespace spot
}
std::ostream&
dotty_reachable(std::ostream& os, const const_ta_ptr& a, const char* opt)
print_dot(std::ostream& os, const const_ta_ptr& a, const char* opt)
{
dotty_bfs d(os, a, opt);
d.run();
......
......@@ -25,6 +25,6 @@
namespace spot
{
SPOT_API std::ostream&
dotty_reachable(std::ostream& os, const const_ta_ptr& a,
print_dot(std::ostream& os, const const_ta_ptr& a,
const char* opt = nullptr);
}
......@@ -28,7 +28,7 @@
#include "twaalgos/ltl2taa.hh"
#include "twaalgos/sccfilter.hh"
#include "twaalgos/product.hh"
#include "twaalgos/dotty.hh"
#include "twaalgos/dot.hh"
void
syntax(char* prog)
......
......@@ -31,7 +31,7 @@
#include "twaalgos/stats.hh"
#include "taalgos/minimize.hh"
#include "taalgos/tgba2ta.hh"
#include "taalgos/dotty.hh"
#include "taalgos/dot.hh"
#include "taalgos/stats.hh"
void
......
......@@ -19,7 +19,7 @@
#include <iomanip>
#include <iostream>
#include "twaalgos/dotty.hh"
#include "twaalgos/dot.hh"
#include "twaalgos/hoa.hh"
#include "hoaparse/public.hh"
#include "twa/twaproduct.hh"
......@@ -136,7 +136,7 @@ int main(int argc, char* argv[])
if (save_hoa)
spot::hoa_reachable(std::cout, complement, nullptr);
else
spot::dotty_reachable(std::cout, complement);
spot::print_dot(std::cout, complement);
}
if (print_safra)
......@@ -158,7 +158,7 @@ int main(int argc, char* argv[])
spot::twa_ptr complement = 0;
complement = spot::make_safra_complement(a);
spot::dotty_reachable(std::cout, complement);
spot::print_dot(std::cout, complement);
f1->destroy();
}
else if (stats)
......@@ -253,7 +253,7 @@ int main(int argc, char* argv[])
return_value = 1;
if (auto run = res->accepting_run())
{
spot::dotty_reachable(std::cout, ec->automaton());
spot::print_dot(std::cout, ec->automaton());
spot::print_tgba_run(std::cout, ec->automaton(), run);
}
}
......
......@@ -30,7 +30,7 @@
#include "twaalgos/degen.hh"
#include "twa/twaproduct.hh"
#include "twaalgos/gtec/gtec.hh"
#include "twaalgos/dotty.hh"
#include "twaalgos/dot.hh"
#include "twaalgos/emptiness.hh"
void
......@@ -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);
spot::print_dot(std::cout, ar);
}
std::cout << '\n';
if (runs == 0)
......
......@@ -33,7 +33,7 @@
#include "twaalgos/ltl2tgba_fm.hh"
#include "twaalgos/ltl2taa.hh"
#include "twa/bddprint.hh"
#include "twaalgos/dotty.hh"
#include "twaalgos/dot.hh"
#include "twaalgos/lbtt.hh"
#include "twaalgos/hoa.hh"
#include "twaalgos/degen.hh"
......@@ -69,7 +69,7 @@
#include "twaalgos/stutter.hh"
#include "taalgos/tgba2ta.hh"
#include "taalgos/dotty.hh"
#include "taalgos/dot.hh"
#include "taalgos/stats.hh"
std::string
......@@ -1368,7 +1368,7 @@ checked_main(int argc, char** argv)
switch (output)
{
case 0:
spot::dotty_reachable(std::cout, testing_automaton);
spot::print_dot(std::cout, testing_automaton);
break;
case 12:
stats_reachable(testing_automaton).dump(std::cout);
......@@ -1402,7 +1402,7 @@ checked_main(int argc, char** argv)
switch (output)
{
case 0:
spot::dotty_reachable(std::cout, std::dynamic_pointer_cast
spot::print_dot(std::cout, std::dynamic_pointer_cast
<spot::tgta_explicit>(a)->get_ta());
break;
case 12:
......@@ -1478,19 +1478,19 @@ checked_main(int argc, char** argv)
switch (output)
{
case 0:
spot::dotty_reachable(std::cout, a);
spot::print_dot(std::cout, a);
break;
case 5:
a->get_dict()->dump(std::cout);
break;
case 6:
spot::lbtt_reachable(std::cout, a);
spot::print_lbtt(std::cout, a);
break;
case 8:
{
assert(degeneralize_opt == DegenSBA);
if (assume_sba)
spot::never_claim_reachable(std::cout, a, opt_never);
spot::print_never_claim(std::cout, a, opt_never);
else
{
// It is possible that we have applied other
......@@ -1498,7 +1498,7 @@ checked_main(int argc, char** argv)
// degeneralization. Let's degeneralize again!
auto s = spot::degeneralize(ensure_digraph(a), degen_reset,
degen_order, degen_cache);
spot::never_claim_reachable(std::cout, s, opt_never);
spot::print_never_claim(std::cout, s, opt_never);
}
break;
}
......@@ -1700,7 +1700,7 @@ checked_main(int argc, char** argv)
if (graph_run_tgba_opt)
{
auto ar = spot::tgba_run_to_tgba(a, run);
spot::dotty_reachable(std::cout, ar);
spot::print_dot(std::cout, ar);
}
else
{
......
......@@ -27,7 +27,7 @@
#include "ltlparse/public.hh"
#include "twaalgos/product.hh"
#include "twaalgos/ltl2tgba_fm.hh"
#include "twaalgos/dotty.hh"
#include "twaalgos/dot.hh"
void
syntax(char* prog)
......@@ -65,7 +65,7 @@ main(int argc, char** argv)
auto a2 = spot::ltl_to_tgba_fm(f2, dict);
f1->destroy();
f2->destroy();
spot::dotty_reachable(std::cout, product(a1, a2));
spot::print_dot(std::cout, product(a1, a2));
}
}
assert(spot::ltl::atomic_prop::instance_count() == 0);
......
......@@ -40,7 +40,7 @@
#include "twaalgos/hoa.hh"
#include "twaalgos/stats.hh"
#include "ltlenv/defaultenv.hh"
#include "twaalgos/dotty.hh"
#include "twaalgos/dot.hh"
#include "misc/random.hh"
#include "misc/optionmap.hh"
#include "twaalgos/degen.hh"
......@@ -919,7 +919,7 @@ main(int argc, char** argv)
if (opt_dot)
{
dotty_reachable(std::cout, a);
print_dot(std::cout, a);
}
if (!opt_ec)
{
......
......@@ -26,7 +26,7 @@
#include <cstring>
#include "ltlparse/public.hh"
#include "ltlvisit/dump.hh"
#include "ltlvisit/dotty.hh"
#include "ltlvisit/dot.hh"
#include "ltlast/allnodes.hh"
void
......@@ -87,7 +87,7 @@ main(int argc, char** argv)
dump_instances("before");
#ifdef DOTTY
spot::ltl::dotty(std::cout, f);
spot::ltl::print_dot_psl(std::cout, f);
#else
spot::ltl::dump(std::cout, f);
std::cout << std::endl;
......@@ -105,6 +105,7 @@ main(int argc, char** argv)
assert(spot::ltl::atomic_prop::instance_count() == 0);
assert(spot::ltl::unop::instance_count() == 0);
assert(spot::ltl::binop::instance_count() == 0);
assert(spot::ltl::bunop::instance_count() == 0);
assert(spot::ltl::multop::instance_count() == 0);
return exit_code;
}
Markdown is supported
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