Commit e0bd0ad4 authored by Alexandre Duret-Lutz's avatar Alexandre Duret-Lutz

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.
parent c2ae99e7
......@@ -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)
......
......@@ -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,
......
......@@ -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,
......
......@@ -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;
......
......@@ -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);
......@@ -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.)
{
......
......@@ -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;
......
......@@ -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);
......
......@@ -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
......
......@@ -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)
......
......@@ -49,7 +49,7 @@ namespace spot
// This function is defined in nra2nba.cc, and used only here.
SPOT_LOCAL
tgba_digraph_ptr nra_to_nba(const const_dstar_aut_ptr& nra,
twa_graph_ptr nra_to_nba(const const_dstar_aut_ptr& nra,
const const_tgba_ptr& aut);
namespace
......@@ -217,7 +217,7 @@ namespace spot
const std::vector<bool>& realizable):
tgba_reachable_iterator_depth_first(a->aut),
in_(a),
out_(make_tgba_digraph(a->aut->get_dict())),
out_(make_twa_graph(a->aut->get_dict())),
final_(final),
num_states_(a->aut->num_states()),
sm_(sm),
......@@ -231,7 +231,7 @@ namespace spot
}
tgba_digraph_ptr
twa_graph_ptr
result()
{
return out_;
......@@ -291,7 +291,7 @@ namespace spot
protected:
const const_dstar_aut_ptr& in_;
tgba_digraph_ptr out_;
twa_graph_ptr out_;
const state_set& final_;
size_t num_states_;
acc_cond::mark_t acc_;
......@@ -302,7 +302,7 @@ namespace spot
}
tgba_digraph_ptr dra_to_ba(const const_dstar_aut_ptr& dra, bool* dba)
twa_graph_ptr dra_to_ba(const const_dstar_aut_ptr& dra, bool* dba)
{
assert(dra->type == Rabin);
......
......@@ -21,7 +21,7 @@
namespace spot
{
tgba_digraph_ptr
twa_graph_ptr
dstar_to_tgba(const const_dstar_aut_ptr& daut)
{
switch (daut->type)
......
......@@ -330,7 +330,7 @@ namespace spot
}
result_ r;
r.d = std::make_shared<spot::dstar_aut>();
r.d->aut = make_tgba_digraph(dict);
r.d->aut = make_twa_graph(dict);
r.d->accsets = 0;
r.env = &env;
dstaryy::parser parser(error_list, r);
......
......@@ -40,7 +40,7 @@ namespace spot
// makes its possible to mask AUT, as needed in dra_to_ba().
nra_to_nba_worker(const const_dstar_aut_ptr& a, const_tgba_ptr aut):
tgba_reachable_iterator_depth_first(aut),
out_(make_tgba_digraph(aut->get_dict())),
out_(make_twa_graph(aut->get_dict())),
d_(a),
num_states_(a->aut->num_states())
{
......@@ -55,7 +55,7 @@ namespace spot
i->destroy();
}
tgba_digraph_ptr
twa_graph_ptr
result()
{
return out_;
......@@ -105,7 +105,7 @@ namespace spot
}
protected:
tgba_digraph_ptr out_;
twa_graph_ptr out_;
const_dstar_aut_ptr d_;
size_t num_states_;
};
......@@ -115,7 +115,7 @@ namespace spot
// In dra_to_dba() we call this function with a second argument
// that is a masked version of nra->aut.
SPOT_LOCAL
tgba_digraph_ptr nra_to_nba(const const_dstar_aut_ptr& nra,
twa_graph_ptr nra_to_nba(const const_dstar_aut_ptr& nra,
const const_tgba_ptr& aut)
{
assert(nra->type == Rabin);
......@@ -124,7 +124,7 @@ namespace spot
return scc_filter_states(w.result());
}
tgba_digraph_ptr nra_to_nba(const const_dstar_aut_ptr& nra)
twa_graph_ptr nra_to_nba(const const_dstar_aut_ptr& nra)
{
return nra_to_nba(nra, nra->aut);
}
......
......@@ -98,11 +98,11 @@ namespace spot
}
tgba_digraph_ptr nsa_to_tgba(const const_dstar_aut_ptr& nsa)
twa_graph_ptr nsa_to_tgba(const const_dstar_aut_ptr& nsa)
{
assert(nsa->type == Streett);
auto a = nsa->aut;
auto res = make_tgba_digraph(a->get_dict());
auto res = make_twa_graph(a->get_dict());
res->copy_ap_of(a);
// Create accpair_count acceptance sets for the output.
......
......@@ -46,7 +46,7 @@ namespace spot
{
// Transition structure of the automaton.
// This is encoded as a TGBA without acceptance condition.
tgba_digraph_ptr aut;
twa_graph_ptr aut;
/// Type of the acceptance.
dstar_type type;
/// Number of acceptance pairs.
......@@ -68,7 +68,7 @@ namespace spot
typedef std::shared_ptr<dstar_aut> dstar_aut_ptr;
typedef std::shared_ptr<const dstar_aut> const_dstar_aut_ptr;
/// \brief Build a spot::tgba_digraph from ltl2dstar's output.
/// \brief Build a spot::twa_graph from ltl2dstar's output.
/// \param filename The name of the file to parse.
/// \param error_list A list that will be filled with
/// parse errors that occured during parsing.
......@@ -106,14 +106,14 @@ namespace spot
/// \brief Convert a non-deterministic Rabin automaton into a
/// non-deterministic Büchi automaton.
SPOT_API tgba_digraph_ptr
SPOT_API twa_graph_ptr
nra_to_nba(const const_dstar_aut_ptr& nra);
/// \brief Convert a non-deterministic Rabin automaton into a
/// non-deterministic Büchi automaton.
///
/// This version simply ignores all states in \a ignore.
SPOT_API tgba_digraph_ptr
SPOT_API twa_graph_ptr
nra_to_nba(const const_dstar_aut_ptr& nra, const state_set* ignore);
/// \brief Convert a deterministic Rabin automaton into a
......@@ -132,18 +132,18 @@ namespace spot
/// If the optional \a dba_output argument is non-null, the
/// pointed Boolean will be updated to indicate whether the
/// returned Büchi automaton is deterministic.
SPOT_API tgba_digraph_ptr
SPOT_API twa_graph_ptr
dra_to_ba(const const_dstar_aut_ptr& dra, bool* dba_output = 0);
/// \brief Convert a non-deterministic Streett automaton into a
/// non-deterministic tgba.
SPOT_API tgba_digraph_ptr
SPOT_API twa_graph_ptr
nsa_to_tgba(const const_dstar_aut_ptr& nra);
/// \brief Convert a Rabin or Streett automaton into a TGBA.
///
/// This function calls dra_to_ba() or nsa_to_tgba().
SPOT_API tgba_digraph_ptr
SPOT_API twa_graph_ptr
dstar_to_tgba(const const_dstar_aut_ptr& dstar);
/// @}
......
......@@ -29,7 +29,7 @@ void f1()
auto& e = spot::ltl::default_environment::instance();
auto tg = make_tgba_digraph(d);
auto tg = make_twa_graph(d);
auto* f1 = e.require("p1");
auto* f2 = e.require("p2");
......
......@@ -49,7 +49,7 @@
typedef std::map<std::string, bdd> formula_cache;
typedef std::pair<int, std::string*> pair;
typedef typename spot::tgba_digraph::namer<std::string>::type named_tgba_t;
typedef typename spot::twa_graph::namer<std::string>::type named_tgba_t;
// Note: because this parser is meant to be used on a stream of
// automata, it tries hard to recover from errors, so that we get a
......@@ -1682,7 +1682,7 @@ namespace spot
restart:
result_ r;
r.h = std::make_shared<spot::hoa_aut>();
r.h->aut = make_tgba_digraph(dict);
r.h->aut = make_twa_graph(dict);
r.env = &env;
hoayy::parser parser(error_list, r, last_loc);
static bool env_debug = !!getenv("SPOT_DEBUG_PARSER");
......@@ -1717,7 +1717,7 @@ namespace spot
return r.h;
};
tgba_digraph_ptr
twa_graph_ptr
hoa_stream_parser::parse_strict(const bdd_dict_ptr& dict,
ltl::environment& env,
bool debug)
......
......@@ -49,7 +49,7 @@ namespace spot
{
// Transition structure of the automaton.
// This is encoded as a TGBA without acceptance condition.
tgba_digraph_ptr aut;
twa_graph_ptr aut;
bool aborted = false;
spot::location loc;
};
......@@ -75,13 +75,13 @@ namespace spot
ltl::default_environment::instance(),
bool debug = false);
// Raises a parse_error on any syntax error
tgba_digraph_ptr parse_strict(const bdd_dict_ptr& dict,
twa_graph_ptr parse_strict(const bdd_dict_ptr& dict,
ltl::environment& env =
ltl::default_environment::instance(),
bool debug = false);
};
/// \brief Build a spot::tgba_digraph from a HOA file or a neverclaim.
/// \brief Build a spot::twa_graph from a HOA file or a neverclaim.
/// \param filename The name of the file to parse.
/// \param error_list A list that will be filled with
/// parse errors that occured during parsing.
......
......@@ -36,7 +36,7 @@ namespace spot
{
struct record_
{
const_tgba_digraph_ptr translation;
const_twa_graph_ptr translation;
typedef std::map<const record_*, bool> incomp_map;
incomp_map incompatible;
};
......
......@@ -161,7 +161,7 @@ namespace spot
return ltl::multop::instance(ltl::multop::And, f->clone(), c);
}
tgba_digraph_ptr exclusive_ap::constrain(const_tgba_digraph_ptr aut,
twa_graph_ptr exclusive_ap::constrain(const_twa_graph_ptr aut,
bool simplify_guards) const
{
// Compute the support of the automaton.
......@@ -194,7 +194,7 @@ namespace spot
restrict &= group[j] | group[k];
}
tgba_digraph_ptr res = make_tgba_digraph(aut->get_dict());
twa_graph_ptr res = make_twa_graph(aut->get_dict());
res->copy_ap_of(aut);
res->prop_copy(aut, { true, true, true, true });
res->copy_acceptance_of(aut);
......
......@@ -42,7 +42,7 @@ namespace spot
}
const ltl::formula* constrain(const ltl::formula* f) const;
tgba_digraph_ptr constrain(const_tgba_digraph_ptr aut,
twa_graph_ptr constrain(const_twa_graph_ptr aut,
bool simplify_guards = false) const;
};
}
......@@ -30,9 +30,9 @@ namespace spot
{
protected:
bdd_dict_ptr dict_;
tgba_digraph_ptr aut_;
twa_graph_ptr aut_;
acc_mapper_common(const tgba_digraph_ptr& aut)
acc_mapper_common(const twa_graph_ptr& aut)
: dict_(aut->get_dict()), aut_(aut)
{
}
......@@ -43,7 +43,7 @@ namespace spot
std::unordered_map<std::string, unsigned> map_;
public:
acc_mapper_string(const tgba_digraph_ptr& aut)
acc_mapper_string(const twa_graph_ptr& aut)
: acc_mapper_common(aut)
{
}
......@@ -73,7 +73,7 @@ namespace spot
class acc_mapper_consecutive_int: public acc_mapper_common
{
public:
acc_mapper_consecutive_int(const tgba_digraph_ptr& aut, unsigned count)
acc_mapper_consecutive_int(const twa_graph_ptr& aut, unsigned count)
: acc_mapper_common(aut)
{
std::vector<unsigned> vmap(count);
......@@ -97,7 +97,7 @@ namespace spot
std::map<unsigned, acc_cond::mark_t> map_;
public:
acc_mapper_int(const tgba_digraph_ptr& aut, unsigned count)
acc_mapper_int(const twa_graph_ptr& aut, unsigned count)
: acc_mapper_consecutive_int(aut, count), used_(0)
{
}
......
......@@ -76,7 +76,7 @@ namespace spot
// automaton
static void
build_result(const const_ta_ptr& a, std::list<hash_set*>& sets,
tgba_digraph_ptr result_tgba, const ta_explicit_ptr& result)
twa_graph_ptr result_tgba, const ta_explicit_ptr& result)
{
// For each set, create a state in the tgbaulting automaton.
// For a state s, state_num[s] is the number of the state in the minimal
......@@ -508,7 +508,7 @@ namespace spot
minimize_ta(const const_ta_ptr& ta_)
{
auto tgba = make_tgba_digraph(ta_->get_dict());
auto tgba = make_twa_graph(ta_->get_dict());
auto res = make_ta_explicit(tgba, ta_->acc().num_sets(), 0);
partition_t partition = build_partition(ta_);
......@@ -528,7 +528,7 @@ namespace spot
minimize_tgta(const const_tgta_explicit_ptr& tgta_)
{
auto tgba = make_tgba_digraph(tgta_->get_dict());
auto tgba = make_twa_graph(tgta_->get_dict());
auto res = make_tgta_explicit(tgba, tgta_->acc().num_sets(), 0);
auto ta = tgta_->get_ta();
......
......@@ -27,9 +27,9 @@ namespace spot
typedef std::shared_ptr<twa> tgba_ptr;
typedef std::shared_ptr<const twa> const_tgba_ptr;
class tgba_digraph;
typedef std::shared_ptr<const tgba_digraph> const_tgba_digraph_ptr;
typedef std::shared_ptr<tgba_digraph> tgba_digraph_ptr;
class twa_graph;
typedef std::shared_ptr<const twa_graph> const_twa_graph_ptr;
typedef std::shared_ptr<twa_graph> twa_graph_ptr;
class tgba_product;
typedef std::shared_ptr<const tgba_product> const_tgba_product_ptr;
......
......@@ -82,9 +82,9 @@ namespace spot
auto a = shared_from_this();
if (a->acc().uses_fin_acceptance())
{
auto aa = std::dynamic_pointer_cast<const tgba_digraph>(a);
auto aa = std::dynamic_pointer_cast<const twa_graph>(a);
if (!aa)
aa = make_tgba_digraph(a, prop_set::all());
aa = make_twa_graph(a, prop_set::all());
a = remove_fin(aa);
}
return !couvreur99(a)->check();
......
......@@ -23,7 +23,7 @@
namespace spot
{
void tgba_digraph::merge_transitions()
void twa_graph::merge_transitions()
{
g_.remove_dead_transitions_();
......@@ -130,7 +130,7 @@ namespace spot
g_.chain_transitions_();
}
void tgba_digraph::purge_unreachable_states()
void twa_graph::purge_unreachable_states()
{
unsigned num_states = g_.num_states();
if (SPOT_UNLIKELY(num_states == 0))
......@@ -173,7 +173,7 @@ namespace spot
g_.defrag_states(std::move(todo), current);
}
void tgba_digraph::purge_dead_states()
void twa_graph::purge_dead_states()
{
unsigned num_states = g_.num_states();
if (num_states == 0)
......
......@@ -105,7 +105,7 @@ namespace spot
template<class Graph>
class SPOT_API tgba_digraph_succ_iterator final:
class SPOT_API twa_graph_succ_iterator final:
public tgba_succ_iterator
{
private:
......@@ -116,7 +116,7 @@ namespace spot