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

10
wrap/python/ajax/spot.in
View file

@ -288,16 +288,16 @@ However you may download the <a href="''' + cgi.escape(autprefix)
def render_automaton(automaton, dont_run_dot):
dotsrc = spot.ostringstream()
if isinstance(automaton, spot.ta): # TA/GTA
spot.dotty_reachable(dotsrc, automaton)
spot.print_dot(dotsrc, automaton)
elif hasattr(automaton, 'get_ta'): # TGTA
spot.dotty_reachable(dotsrc, automaton.get_ta())
spot.print_dot(dotsrc, automaton.get_ta())
else: # TGBA
spot.dotty_reachable(dotsrc, automaton, "N")
spot.print_dot(dotsrc, automaton, "N")
render_dot_maybe(dotsrc.str(), dont_run_dot)
def render_formula(f):
dotsrc = spot.ostringstream()
spot.dotty(dotsrc, f)
spot.print_dot_psl(dotsrc, f)
render_dot_maybe(dotsrc.str(), False)
def print_stats(automaton, detinfo = False, ta = False):
@ -722,7 +722,7 @@ else:
if output_type == 'a':
if buchi_type == 'i':
s = spot.ostringstream()
spot.never_claim_reachable(s, degen, f)
spot.print_never_claim(s, degen, f)
unbufprint('<div class="neverclaim">%s</div>' % cgi.escape(s.str()))
del s
else: # 't' or 's'

10
wrap/python/spot.py
View file

@ -71,7 +71,7 @@ def _ostream_to_svg(ostr):
def _render_automaton_as_svg(a, opt=None):
ostr = ostringstream()
dotty_reachable(ostr, a, opt)
print_dot(ostr, a, opt)
return _ostream_to_svg(ostr)
twa._repr_svg_ = _render_automaton_as_svg
@ -83,7 +83,7 @@ def _render_formula_as_svg(a):
# installed.
from IPython.display import SVG
ostr = ostringstream()
dotty(ostr, a)
print_dot_psl(ostr, a)
return SVG(_ostream_to_svg(ostr))
def _return_automaton_as_svg(a, opt=None):
@ -128,15 +128,15 @@ def _twa_to_str(a, format='hoa', opt=None):
return ostr.str()
if format == 'dot':
ostr = ostringstream()
dotty_reachable(ostr, a, opt)
print_dot(ostr, a, opt)
return ostr.str()
if format == 'spin':
ostr = ostringstream()
never_claim_reachable(ostr, a, opt)
print_never_claim(ostr, a, opt)
return ostr.str()
if format == 'lbtt':
ostr = ostringstream()
lbtt_reachable(ostr, a, bool(opt))
print_lbtt(ostr, a, bool(opt))
return ostr.str()
raise ValueError("unknown string format: " + format)

12
wrap/python/spot_impl.i
View file

@ -97,7 +97,7 @@ namespace std {
#include "twa/bdddict.hh"
#include "ltlvisit/apcollect.hh"
#include "ltlvisit/dotty.hh"
#include "ltlvisit/dot.hh"
#include "ltlvisit/dump.hh"
#include "ltlvisit/lunabbrev.hh"
#include "ltlvisit/nenoform.hh"
@ -117,7 +117,7 @@ namespace std {
#include "twa/twaproduct.hh"
#include "twaalgos/cleanacc.hh"
#include "twaalgos/dotty.hh"
#include "twaalgos/dot.hh"
#include "twaalgos/degen.hh"
#include "twaalgos/dupexp.hh"
#include "twaalgos/emptiness.hh"
@ -149,7 +149,7 @@ namespace std {
#include "ta/taexplicit.hh"
#include "ta/tgtaexplicit.hh"
#include "taalgos/tgba2ta.hh"
#include "taalgos/dotty.hh"
#include "taalgos/dot.hh"
#include "taalgos/stats.hh"
#include "taalgos/minimize.hh"
@ -239,7 +239,7 @@ using namespace spot;
%include "twa/twa.hh"
%include "ltlvisit/apcollect.hh"
%include "ltlvisit/dotty.hh"
%include "ltlvisit/dot.hh"
%include "ltlvisit/dump.hh"
%include "ltlvisit/lunabbrev.hh"
%include "ltlvisit/nenoform.hh"
@ -261,7 +261,7 @@ using namespace spot;
%include "twaalgos/cleanacc.hh"
%include "twaalgos/degen.hh"
%include "twaalgos/dotty.hh"
%include "twaalgos/dot.hh"
%include "twaalgos/dupexp.hh"
%include "twaalgos/emptiness.hh"
%include "twaalgos/gtec/gtec.hh"
@ -292,7 +292,7 @@ using namespace spot;
%include "ta/taexplicit.hh"
%include "ta/tgtaexplicit.hh"
%include "taalgos/tgba2ta.hh"
%include "taalgos/dotty.hh"
%include "taalgos/dot.hh"
%include "taalgos/stats.hh"
%include "taalgos/minimize.hh"

4
wrap/python/tests/ltl2tgba.py
View file

@ -111,11 +111,11 @@ if f:
a = degeneralized = spot.degeneralize(a)
if output == 0:
spot.dotty_reachable(cout, a)
spot.print_dot(cout, a)
elif output == 5:
a.get_dict().dump(cout)
elif output == 6:
spot.lbtt_reachable(cout, a)
spot.print_lbtt(cout, a)
else:
assert "unknown output option"

2
wrap/python/tests/parsetgba.py
View file

@ -37,7 +37,7 @@ a = spot.hoa_parse(filename, p, spot.make_bdd_dict())
assert not p
spot.dotty_reachable(spot.get_cout(), a.aut)
spot.print_dot(spot.get_cout(), a.aut)
del p
del a