rename tgba_digraph as twa_graph

Automatic mass renaming.

* src/bin/autfilt.cc, src/bin/common_aoutput.cc,
src/bin/common_aoutput.hh, src/bin/common_conv.cc,
src/bin/common_conv.hh, src/bin/common_output.hh, src/bin/dstar2tgba.cc,
src/bin/ltlcross.cc, src/bin/ltldo.cc, src/bin/randaut.cc,
src/dstarparse/dra2ba.cc, src/dstarparse/dstar2tgba.cc,
src/dstarparse/dstarparse.yy, src/dstarparse/nra2nba.cc,
src/dstarparse/nsa2tgba.cc, src/dstarparse/public.hh,
src/graphtest/tgbagraph.cc, src/hoaparse/hoaparse.yy,
src/hoaparse/public.hh, src/ltlvisit/contain.hh,
src/ltlvisit/exclusive.cc, src/ltlvisit/exclusive.hh,
src/priv/accmap.hh, src/taalgos/minimize.cc, src/tgba/fwd.hh,
src/tgba/tgba.cc, src/tgba/tgbagraph.cc, src/tgba/tgbagraph.hh,
src/tgba/tgbasafracomplement.cc, src/tgba/tgbasafracomplement.hh,
src/tgbaalgos/are_isomorphic.cc, src/tgbaalgos/are_isomorphic.hh,
src/tgbaalgos/canonicalize.cc, src/tgbaalgos/canonicalize.hh,
src/tgbaalgos/cleanacc.cc, src/tgbaalgos/cleanacc.hh,
src/tgbaalgos/complete.cc, src/tgbaalgos/complete.hh,
src/tgbaalgos/compsusp.cc, src/tgbaalgos/compsusp.hh,
src/tgbaalgos/cycles.hh, src/tgbaalgos/degen.cc, src/tgbaalgos/degen.hh,
src/tgbaalgos/dotty.cc, src/tgbaalgos/dtbasat.cc,
src/tgbaalgos/dtbasat.hh, src/tgbaalgos/dtgbacomp.cc,
src/tgbaalgos/dtgbacomp.hh, src/tgbaalgos/dtgbasat.cc,
src/tgbaalgos/dtgbasat.hh, src/tgbaalgos/dupexp.cc,
src/tgbaalgos/dupexp.hh, src/tgbaalgos/emptiness.cc,
src/tgbaalgos/emptiness.hh, src/tgbaalgos/hoa.cc,
src/tgbaalgos/isdet.cc, src/tgbaalgos/isdet.hh, src/tgbaalgos/lbtt.cc,
src/tgbaalgos/ltl2tgba_fm.cc, src/tgbaalgos/ltl2tgba_fm.hh,
src/tgbaalgos/mask.cc, src/tgbaalgos/mask.hh, src/tgbaalgos/minimize.cc,
src/tgbaalgos/minimize.hh, src/tgbaalgos/neverclaim.cc,
src/tgbaalgos/postproc.cc, src/tgbaalgos/postproc.hh,
src/tgbaalgos/powerset.cc, src/tgbaalgos/powerset.hh,
src/tgbaalgos/product.cc, src/tgbaalgos/product.hh,
src/tgbaalgos/randomgraph.cc, src/tgbaalgos/randomgraph.hh,
src/tgbaalgos/randomize.cc, src/tgbaalgos/randomize.hh,
src/tgbaalgos/relabel.cc, src/tgbaalgos/relabel.hh,
src/tgbaalgos/remfin.cc, src/tgbaalgos/remfin.hh,
src/tgbaalgos/remprop.cc, src/tgbaalgos/remprop.hh,
src/tgbaalgos/safety.cc, src/tgbaalgos/safety.hh,
src/tgbaalgos/sbacc.cc, src/tgbaalgos/sbacc.hh,
src/tgbaalgos/sccfilter.cc, src/tgbaalgos/sccfilter.hh,
src/tgbaalgos/sccinfo.cc, src/tgbaalgos/sccinfo.hh,
src/tgbaalgos/simulation.cc, src/tgbaalgos/simulation.hh,
src/tgbaalgos/stats.cc, src/tgbaalgos/stats.hh,
src/tgbaalgos/stripacc.cc, src/tgbaalgos/stripacc.hh,
src/tgbaalgos/stutter.cc, src/tgbaalgos/stutter.hh,
src/tgbaalgos/totgba.cc, src/tgbaalgos/totgba.hh,
src/tgbaalgos/translate.cc, src/tgbaalgos/translate.hh,
src/tgbatest/checkpsl.cc, src/tgbatest/complementation.cc,
src/tgbatest/emptchk.cc, src/tgbatest/ltl2tgba.cc,
src/tgbatest/randtgba.cc, wrap/python/spot_impl.i,
wrap/python/tests/automata-io.ipynb, wrap/python/tests/automata.ipynb,
wrap/python/tests/piperead.ipynb, wrap/python/tests/testingaut.ipynb:
Rename tgba_digraph as twa_graph.
This commit is contained in:
Alexandre Duret-Lutz 2015-04-21 19:13:55 +02:00
parent c2ae99e779
commit e0bd0ad4c0
111 changed files with 523 additions and 523 deletions

View file

@ -208,7 +208,7 @@ static const struct argp_child children[] =
{ 0, 0, 0, 0 }
};
typedef spot::tgba_digraph::graph_t::trans_storage_t tr_t;
typedef spot::twa_graph::graph_t::trans_storage_t tr_t;
typedef std::set<std::vector<tr_t>> unique_aut_t;
static long int match_count = 0;
static spot::option_map extra_options;
@ -223,9 +223,9 @@ static int opt_seed = 0;
static struct opt_t
{
spot::bdd_dict_ptr dict = spot::make_bdd_dict();
spot::tgba_digraph_ptr product = nullptr;
spot::tgba_digraph_ptr intersect = nullptr;
spot::tgba_digraph_ptr are_isomorphic = nullptr;
spot::twa_graph_ptr product = nullptr;
spot::twa_graph_ptr intersect = nullptr;
spot::twa_graph_ptr are_isomorphic = nullptr;
std::unique_ptr<spot::isomorphism_checker>
isomorphism_checker = nullptr;
std::unique_ptr<unique_aut_t> uniq = nullptr;
@ -488,7 +488,7 @@ namespace
// never modify the original automaton (e.g. with
// merge_transitions()) and the statistics about it make sense.
auto aut = ((automaton_format == Stats) || opt_name)
? spot::make_tgba_digraph(haut->aut, spot::twa::prop_set::all())
? spot::make_twa_graph(haut->aut, spot::twa::prop_set::all())
: haut->aut;
// Preprocessing.
@ -576,7 +576,7 @@ namespace
if (opt->uniq)
{
auto tmp =
spot::canonicalize(make_tgba_digraph(aut,
spot::canonicalize(make_twa_graph(aut,
spot::twa::prop_set::all()));
if (!opt->uniq->emplace(tmp->transition_vector().begin() + 1,
tmp->transition_vector().end()).second)

View file

@ -231,7 +231,7 @@ automaton_printer::automaton_printer(stat_style input)
}
void
automaton_printer::print(const spot::tgba_digraph_ptr& aut,
automaton_printer::print(const spot::twa_graph_ptr& aut,
const spot::ltl::formula* f,
// Input location for errors and statistics.
const char* filename,

View file

@ -107,7 +107,7 @@ public:
/// to be output.
std::ostream&
print(const spot::const_hoa_aut_ptr& haut,
const spot::const_tgba_digraph_ptr& aut,
const spot::const_twa_graph_ptr& aut,
const spot::ltl::formula* f,
const char* filename, int loc, double run_time)
{
@ -225,7 +225,7 @@ public:
automaton_printer(stat_style input = no_input);
void
print(const spot::tgba_digraph_ptr& aut,
print(const spot::twa_graph_ptr& aut,
const spot::ltl::formula* f = nullptr,
// Input location for errors and statistics.
const char* filename = nullptr,

View file

@ -70,7 +70,7 @@ to_probability(const char* s)
return res;
}
spot::tgba_digraph_ptr
spot::twa_graph_ptr
read_automaton(const char* filename, spot::bdd_dict_ptr& dict)
{
spot::hoa_parse_error_list pel;

View file

@ -31,5 +31,5 @@ float to_probability(const char* s);
// Parse the comma or space seperate string of numbers.
std::vector<long> to_longs(const char* s);
spot::tgba_digraph_ptr
spot::twa_graph_ptr
read_automaton(const char* filename, spot::bdd_dict_ptr& dict);

View file

@ -77,7 +77,7 @@ public:
using spot::formater::set_output;
std::ostream&
print(const spot::const_tgba_digraph_ptr& aut,
print(const spot::const_twa_graph_ptr& aut,
const spot::ltl::formula* f = 0,
double run_time = -1.)
{

View file

@ -268,7 +268,7 @@ namespace
/// to be output.
std::ostream&
print(const spot::const_dstar_aut_ptr& daut,
const spot::const_tgba_digraph_ptr& aut,
const spot::const_twa_graph_ptr& aut,
const char* filename, double run_time)
{
filename_ = filename;

View file

@ -484,7 +484,7 @@ namespace
has_sr = has('D');
}
spot::tgba_digraph_ptr
spot::twa_graph_ptr
translate(unsigned int translator_num, char l, statistics_formula* fstats,
bool& problem)
{
@ -505,7 +505,7 @@ namespace
const char* status_str = 0;
spot::tgba_digraph_ptr res = 0;
spot::twa_graph_ptr res = 0;
if (timed_out)
{
// This is not considered to be a global error.
@ -696,8 +696,8 @@ namespace
};
static bool
check_empty_prod(const spot::const_tgba_digraph_ptr& aut_i,
const spot::const_tgba_digraph_ptr& aut_j,
check_empty_prod(const spot::const_twa_graph_ptr& aut_i,
const spot::const_twa_graph_ptr& aut_j,
size_t i, size_t j, bool icomp, bool jcomp)
{
auto prod = spot::product(aut_i, aut_j);
@ -1022,12 +1022,12 @@ namespace
// These store the result of the translation of the positive and
// negative formulas.
size_t m = translators.size();
std::vector<spot::tgba_digraph_ptr> pos(m);
std::vector<spot::tgba_digraph_ptr> neg(m);
std::vector<spot::twa_graph_ptr> pos(m);
std::vector<spot::twa_graph_ptr> neg(m);
// These store the complement of the above results, when we can
// compute it easily.
std::vector<spot::tgba_digraph_ptr> comp_pos(m);
std::vector<spot::tgba_digraph_ptr> comp_neg(m);
std::vector<spot::twa_graph_ptr> comp_pos(m);
std::vector<spot::twa_graph_ptr> comp_neg(m);
unsigned n = vstats.size();
@ -1213,9 +1213,9 @@ namespace
<< " edges\n";
// Products of the state space with the positive automata.
std::vector<spot::const_tgba_digraph_ptr> pos_prod(m);
std::vector<spot::const_twa_graph_ptr> pos_prod(m);
// Products of the state space with the negative automata.
std::vector<spot::const_tgba_digraph_ptr> neg_prod(m);
std::vector<spot::const_twa_graph_ptr> neg_prod(m);
// Associated SCC maps.
std::vector<spot::scc_info*> pos_map(m);
std::vector<spot::scc_info*> neg_map(m);

View file

@ -126,7 +126,7 @@ namespace
{
}
spot::tgba_digraph_ptr
spot::twa_graph_ptr
translate(unsigned int translator_num, bool& problem, double& duration)
{
output.reset(translator_num);
@ -144,7 +144,7 @@ namespace
int es = exec_with_timeout(cmd.c_str());
duration = sw.stop();
spot::tgba_digraph_ptr res = nullptr;
spot::twa_graph_ptr res = nullptr;
if (timed_out)
{
problem = false; // A timeout is considered benign

View file

@ -124,7 +124,7 @@ ARGMATCH_VERIFY(acc_args, acc_types);
static acc_type opt_acc = acc_buchi;
typedef spot::tgba_digraph::graph_t::trans_storage_t tr_t;
typedef spot::twa_graph::graph_t::trans_storage_t tr_t;
typedef std::set<std::vector<tr_t>> unique_aut_t;
static spot::ltl::atomic_prop_set aprops;
static bool ap_count_given = false;
@ -307,7 +307,7 @@ main(int argc, char** argv)
if (opt_uniq)
{
auto tmp = spot::canonicalize
(make_tgba_digraph(aut, spot::twa::prop_set::all()));
(make_twa_graph(aut, spot::twa::prop_set::all()));
std::vector<tr_t> trans(tmp->transition_vector().begin() + 1,
tmp->transition_vector().end());
if (!opt_uniq->emplace(trans).second)