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

2
src/tests/checkpsl.cc
View file

@ -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)

2
src/tests/checkta.cc
View file

@ -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

8
src/tests/complementation.cc
View file

@ -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);
}
}

4
src/tests/emptchk.cc
View file

@ -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)

18
src/tests/ltl2tgba.cc
View file

@ -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
{

4
src/tests/ltlprod.cc
View file

@ -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);

4
src/tests/randtgba.cc
View file

@ -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)
{

5
src/tests/readltl.cc
View file

@ -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;
}

4
src/tests/taatgba.cc
View file

@ -22,7 +22,7 @@
#include "misc/hash.hh"
#include "ltlenv/defaultenv.hh"
#include "ltlast/allnodes.hh"
#include "twaalgos/dotty.hh"
#include "twaalgos/dot.hh"
#include "twa/taatgba.hh"
int
@ -46,7 +46,7 @@ main()
a->add_condition(t3, e.require("c"));
a->set_init_state("state 1");
spot::dotty_reachable(std::cout, a);
spot::print_dot(std::cout, a);
}
assert(spot::ltl::atomic_prop::instance_count() == 0);

14
src/tests/twagraph.cc
View file

@ -20,7 +20,7 @@
#include <iostream>
#include "twa/twagraph.hh"
#include "twaalgos/dotty.hh"
#include "twaalgos/dot.hh"
#include "ltlenv/defaultenv.hh"
void f1()
@ -50,7 +50,7 @@ void f1()
tg->new_transition(s3, s2, p1 >> p2, 0U);
tg->new_transition(s3, s3, bddtrue, tg->acc().marks({0, 1}));
spot::dotty_reachable(std::cout, tg);
spot::print_dot(std::cout, tg);
{
auto i = tg->get_graph().out_iteraser(s3);
@ -58,14 +58,14 @@ void f1()
i.erase();
i.erase();
assert(!i);
spot::dotty_reachable(std::cout, tg);
spot::print_dot(std::cout, tg);
}
{
auto i = tg->get_graph().out_iteraser(s3);
i.erase();
assert(!i);
spot::dotty_reachable(std::cout, tg);
spot::print_dot(std::cout, tg);
}
auto all = tg->acc().marks({0, 1});
@ -76,9 +76,9 @@ void f1()
std::cerr << tg->num_transitions() << '\n';
assert(tg->num_transitions() == 7);
spot::dotty_reachable(std::cout, tg);
spot::print_dot(std::cout, tg);
tg->merge_transitions();
spot::dotty_reachable(std::cout, tg);
spot::print_dot(std::cout, tg);
std::cerr << tg->num_transitions() << '\n';
assert(tg->num_transitions() == 5);
@ -86,7 +86,7 @@ void f1()
// Add enough states so that the state vector is reallocated.
for (unsigned i = 0; i < 100; ++i)
tg->new_state();
spot::dotty_reachable(std::cout, tg);
spot::print_dot(std::cout, tg);
}
int main()