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

adjust names for automata printers

Browse source 
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.
This commit is contained in:
Alexandre Duret-Lutz 2015-06-05 21:35:22 +02:00
parent 8fb7b279f7
commit 738f939ff8
40 changed files with 115 additions and 114 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/twaalgos/Makefile.am
View file

@ -37,7 +37,7 @@ twaalgos_HEADERS = \
cycles.hh \
dtgbacomp.hh \
degen.hh \
dotty.hh \
dot.hh \
dtbasat.hh \
dtgbasat.hh \
dupexp.hh \
@ -95,7 +95,7 @@ libtwaalgos_la_SOURCES = \
cycles.cc \
dtgbacomp.cc \
degen.cc \
dotty.cc \
dot.cc \
dtbasat.cc \
dtgbasat.cc \
dupexp.cc \

4
src/twaalgos/dotty.cc → src/twaalgos/dot.cc
View file

@ -23,7 +23,7 @@
#include <ostream>
#include <stdexcept>
#include "twa/twagraph.hh"
#include "dotty.hh"
#include "dot.hh"
#include "twa/bddprint.hh"
#include "reachiter.hh"
#include "misc/escape.hh"
@ -528,7 +528,7 @@ namespace spot
} // anonymous namespace
std::ostream&
dotty_reachable(std::ostream& os, const const_twa_ptr& g,
print_dot(std::ostream& os, const const_twa_ptr& g,
const char* options)
{
dotty_output d(os, options);

2
src/twaalgos/dotty.hh → src/twaalgos/dot.hh
View file

@ -41,7 +41,7 @@ namespace spot
/// automaton, 'n' shows the name, 'c' uses circle-shaped states,
/// 'a' shows the acceptance.
SPOT_API std::ostream&
dotty_reachable(std::ostream& os,
print_dot(std::ostream& os,
const const_twa_ptr& g,
const char* options = nullptr);
}

4
src/twaalgos/dtbasat.cc
View file

@ -29,7 +29,7 @@
#include "stats.hh"
#include "misc/satsolver.hh"
#include "misc/timer.hh"
#include "dotty.hh"
#include "dot.hh"
// If you set the SPOT_TMPKEEP environment variable the temporary
// file used to communicate with the sat solver will be left in
@ -800,7 +800,7 @@ namespace spot
}
static bool show = getenv("SPOT_SATSHOW");
if (show && res)
dotty_reachable(std::cout, res);
print_dot(std::cout, res);
trace << "dtba_sat_synthetize(...) = " << res << '\n';
return res;

4
src/twaalgos/dtgbasat.cc
View file

@ -33,7 +33,7 @@
#include "misc/timer.hh"
#include "isweakscc.hh"
#include "isdet.hh"
#include "dotty.hh"
#include "dot.hh"
#include "complete.hh"
#include "misc/optionmap.hh"
#include "dtbasat.hh"
@ -1147,7 +1147,7 @@ namespace spot
}
static bool show = getenv("SPOT_SATSHOW");
if (show && res)
dotty_reachable(std::cout, res);
print_dot(std::cout, res);
trace << "dtgba_sat_synthetize(...) = " << res << '\n';
return res;

2
src/twaalgos/dupexp.cc
View file

@ -26,7 +26,7 @@
#include <string>
#include <map>
#include "reachiter.hh"
#include "dotty.hh"
#include "dot.hh"
namespace spot
{

2
src/twaalgos/lbtt.cc
View file

@ -133,7 +133,7 @@ namespace spot
}
std::ostream&
lbtt_reachable(std::ostream& os, const const_twa_ptr& g, bool sba)
print_lbtt(std::ostream& os, const const_twa_ptr& g, bool sba)
{
if (!g->acc().is_generalized_buchi())
throw std::runtime_error

2
src/twaalgos/lbtt.hh
View file

@ -35,5 +35,5 @@ namespace spot
/// \param sba Assume \a g is an SBA and use LBTT's state-based
/// acceptance format (similar to LBT's format).
SPOT_API std::ostream&
lbtt_reachable(std::ostream& os, const const_twa_ptr& g, bool sba = false);
print_lbtt(std::ostream& os, const const_twa_ptr& g, bool sba = false);
}

4
src/twaalgos/ltl2tgba_fm.cc
View file

@ -38,7 +38,7 @@
#include "ltl2tgba_fm.hh"
#include "twa/bddprint.hh"
#include "twaalgos/sccinfo.hh"
//#include "twaalgos/dotty.hh"
//#include "twaalgos/dot.hh"
namespace spot
{
@ -1170,7 +1170,7 @@ namespace spot
// short-lived. (Maybe it would even work without this line.)
dict_.dict->register_propositions(dict_.var_set, a);
//dotty_reachable(std::cerr, a);
//print_dot(std::cerr, a);
// The following code trims the automaton in a crude way by
// eliminating SCCs that are not coaccessible. It does not

2
src/twaalgos/neverclaim.cc
View file

@ -202,7 +202,7 @@ namespace spot
} // anonymous namespace
std::ostream&
never_claim_reachable(std::ostream& os, const const_twa_ptr& g,
print_never_claim(std::ostream& os, const const_twa_ptr& g,
const char* options)
{
if (!(g->acc().is_buchi() || g->acc().is_true()))

2
src/twaalgos/neverclaim.hh
View file

@ -39,7 +39,7 @@ namespace spot
/// these requirements, call degeneralize() first.
/// \param opt a string of option: 'c' to comment each state
SPOT_API std::ostream&
never_claim_reachable(std::ostream& os,
print_never_claim(std::ostream& os,
const const_twa_ptr& g,
const char* opt = nullptr);
}