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

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[] = ...@@ -208,7 +208,7 @@ static const struct argp_child children[] =
{ 0, 0, 0, 0 } { 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; typedef std::set<std::vector<tr_t>> unique_aut_t;
static long int match_count = 0; static long int match_count = 0;
static spot::option_map extra_options; static spot::option_map extra_options;
...@@ -223,9 +223,9 @@ static int opt_seed = 0; ...@@ -223,9 +223,9 @@ static int opt_seed = 0;
static struct opt_t static struct opt_t
{ {
spot::bdd_dict_ptr dict = spot::make_bdd_dict(); spot::bdd_dict_ptr dict = spot::make_bdd_dict();
spot::tgba_digraph_ptr product = nullptr; spot::twa_graph_ptr product = nullptr;
spot::tgba_digraph_ptr intersect = nullptr; spot::twa_graph_ptr intersect = nullptr;
spot::tgba_digraph_ptr are_isomorphic = nullptr; spot::twa_graph_ptr are_isomorphic = nullptr;
std::unique_ptr<spot::isomorphism_checker> std::unique_ptr<spot::isomorphism_checker>
isomorphism_checker = nullptr; isomorphism_checker = nullptr;
std::unique_ptr<unique_aut_t> uniq = nullptr; std::unique_ptr<unique_aut_t> uniq = nullptr;
...@@ -488,7 +488,7 @@ namespace ...@@ -488,7 +488,7 @@ namespace
// never modify the original automaton (e.g. with // never modify the original automaton (e.g. with
// merge_transitions()) and the statistics about it make sense. // merge_transitions()) and the statistics about it make sense.
auto aut = ((automaton_format == Stats) || opt_name) 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; : haut->aut;
// Preprocessing. // Preprocessing.
...@@ -576,7 +576,7 @@ namespace ...@@ -576,7 +576,7 @@ namespace
if (opt->uniq) if (opt->uniq)
{ {
auto tmp = auto tmp =
spot::canonicalize(make_tgba_digraph(aut, spot::canonicalize(make_twa_graph(aut,
spot::twa::prop_set::all())); spot::twa::prop_set::all()));
if (!opt->uniq->emplace(tmp->transition_vector().begin() + 1, if (!opt->uniq->emplace(tmp->transition_vector().begin() + 1,
tmp->transition_vector().end()).second) tmp->transition_vector().end()).second)
......
...@@ -231,7 +231,7 @@ automaton_printer::automaton_printer(stat_style input) ...@@ -231,7 +231,7 @@ automaton_printer::automaton_printer(stat_style input)
} }
void void
automaton_printer::print(const spot::tgba_digraph_ptr& aut, automaton_printer::print(const spot::twa_graph_ptr& aut,
const spot::ltl::formula* f, const spot::ltl::formula* f,
// Input location for errors and statistics. // Input location for errors and statistics.
const char* filename, const char* filename,
......
...@@ -107,7 +107,7 @@ public: ...@@ -107,7 +107,7 @@ public:
/// to be output. /// to be output.
std::ostream& std::ostream&
print(const spot::const_hoa_aut_ptr& haut, 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 spot::ltl::formula* f,
const char* filename, int loc, double run_time) const char* filename, int loc, double run_time)
{ {
...@@ -225,7 +225,7 @@ public: ...@@ -225,7 +225,7 @@ public:
automaton_printer(stat_style input = no_input); automaton_printer(stat_style input = no_input);
void void
print(const spot::tgba_digraph_ptr& aut, print(const spot::twa_graph_ptr& aut,
const spot::ltl::formula* f = nullptr, const spot::ltl::formula* f = nullptr,
// Input location for errors and statistics. // Input location for errors and statistics.
const char* filename = nullptr, const char* filename = nullptr,
......
...@@ -70,7 +70,7 @@ to_probability(const char* s) ...@@ -70,7 +70,7 @@ to_probability(const char* s)
return res; return res;
} }
spot::tgba_digraph_ptr spot::twa_graph_ptr
read_automaton(const char* filename, spot::bdd_dict_ptr& dict) read_automaton(const char* filename, spot::bdd_dict_ptr& dict)
{ {
spot::hoa_parse_error_list pel; spot::hoa_parse_error_list pel;
......
...@@ -31,5 +31,5 @@ float to_probability(const char* s); ...@@ -31,5 +31,5 @@ float to_probability(const char* s);
// Parse the comma or space seperate string of numbers. // Parse the comma or space seperate string of numbers.
std::vector<long> to_longs(const char* s); 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); read_automaton(const char* filename, spot::bdd_dict_ptr& dict);
...@@ -77,7 +77,7 @@ public: ...@@ -77,7 +77,7 @@ public:
using spot::formater::set_output; using spot::formater::set_output;
std::ostream& std::ostream&
print(const spot::const_tgba_digraph_ptr& aut, print(const spot::const_twa_graph_ptr& aut,
const spot::ltl::formula* f = 0, const spot::ltl::formula* f = 0,
double run_time = -1.) double run_time = -1.)
{ {
......
...@@ -268,7 +268,7 @@ namespace ...@@ -268,7 +268,7 @@ namespace
/// to be output. /// to be output.
std::ostream& std::ostream&
print(const spot::const_dstar_aut_ptr& daut, 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) const char* filename, double run_time)
{ {
filename_ = filename; filename_ = filename;
......
...@@ -484,7 +484,7 @@ namespace ...@@ -484,7 +484,7 @@ namespace
has_sr = has('D'); has_sr = has('D');
} }
spot::tgba_digraph_ptr spot::twa_graph_ptr
translate(unsigned int translator_num, char l, statistics_formula* fstats, translate(unsigned int translator_num, char l, statistics_formula* fstats,
bool& problem) bool& problem)
{ {
...@@ -505,7 +505,7 @@ namespace ...@@ -505,7 +505,7 @@ namespace
const char* status_str = 0; const char* status_str = 0;
spot::tgba_digraph_ptr res = 0; spot::twa_graph_ptr res = 0;
if (timed_out) if (timed_out)
{ {
// This is not considered to be a global error. // This is not considered to be a global error.
...@@ -696,8 +696,8 @@ namespace ...@@ -696,8 +696,8 @@ namespace
}; };
static bool static bool
check_empty_prod(const spot::const_tgba_digraph_ptr& aut_i, check_empty_prod(const spot::const_twa_graph_ptr& aut_i,
const spot::const_tgba_digraph_ptr& aut_j, const spot::const_twa_graph_ptr& aut_j,
size_t i, size_t j, bool icomp, bool jcomp) size_t i, size_t j, bool icomp, bool jcomp)
{ {
auto prod = spot::product(aut_i, aut_j); auto prod = spot::product(aut_i, aut_j);
...@@ -1022,12 +1022,12 @@ namespace ...@@ -1022,12 +1022,12 @@ namespace
// These store the result of the translation of the positive and // These store the result of the translation of the positive and
// negative formulas. // negative formulas.
size_t m = translators.size(); size_t m = translators.size();
std::vector<spot::tgba_digraph_ptr> pos(m); std::vector<spot::twa_graph_ptr> pos(m);
std::vector<spot::tgba_digraph_ptr> neg(m); std::vector<spot::twa_graph_ptr> neg(m);
// These store the complement of the above results, when we can // These store the complement of the above results, when we can
// compute it easily. // compute it easily.
std::vector<spot::tgba_digraph_ptr> comp_pos(m); std::vector<spot::twa_graph_ptr> comp_pos(m);
std::vector<spot::tgba_digraph_ptr> comp_neg(m); std::vector<spot::twa_graph_ptr> comp_neg(m);
unsigned n = vstats.size(); unsigned n = vstats.size();
...@@ -1213,9 +1213,9 @@ namespace ...@@ -1213,9 +1213,9 @@ namespace
<< " edges\n"; << " edges\n";
// Products of the state space with the positive automata. // 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. // 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. // Associated SCC maps.
std::vector<spot::scc_info*> pos_map(m); std::vector<spot::scc_info*> pos_map(m);
std::vector<spot::scc_info*> neg_map(m); std::vector<spot::scc_info*> neg_map(m);
......
...@@ -126,7 +126,7 @@ namespace ...@@ -126,7 +126,7 @@ namespace
{ {
} }
spot::tgba_digraph_ptr spot::twa_graph_ptr
translate(unsigned int translator_num, bool& problem, double& duration) translate(unsigned int translator_num, bool& problem, double& duration)
{ {
output.reset(translator_num); output.reset(translator_num);
...@@ -144,7 +144,7 @@ namespace ...@@ -144,7 +144,7 @@ namespace
int es = exec_with_timeout(cmd.c_str()); int es = exec_with_timeout(cmd.c_str());
duration = sw.stop(); duration = sw.stop();
spot::tgba_digraph_ptr res = nullptr; spot::twa_graph_ptr res = nullptr;
if (timed_out) if (timed_out)
{ {
problem = false; // A timeout is considered benign problem = false; // A timeout is considered benign
......
...@@ -124,7 +124,7 @@ ARGMATCH_VERIFY(acc_args, acc_types); ...@@ -124,7 +124,7 @@ ARGMATCH_VERIFY(acc_args, acc_types);
static acc_type opt_acc = acc_buchi; 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; typedef std::set<std::vector<tr_t>> unique_aut_t;
static spot::ltl::atomic_prop_set aprops; static spot::ltl::atomic_prop_set aprops;
static bool ap_count_given = false; static bool ap_count_given = false;
...@@ -307,7 +307,7 @@ main(int argc, char** argv) ...@@ -307,7 +307,7 @@ main(int argc, char** argv)
if (opt_uniq) if (opt_uniq)
{ {
auto tmp = spot::canonicalize 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, std::vector<tr_t> trans(tmp->transition_vector().begin() + 1,
tmp->transition_vector().end()); tmp->transition_vector().end());
if (!opt_uniq->emplace(trans).second) if (!opt_uniq->emplace(trans).second)
......
...@@ -49,7 +49,7 @@ namespace spot ...@@ -49,7 +49,7 @@ namespace spot
// This function is defined in nra2nba.cc, and used only here. // This function is defined in nra2nba.cc, and used only here.
SPOT_LOCAL 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); const const_tgba_ptr& aut);
namespace namespace
...@@ -217,7 +217,7 @@ namespace spot ...@@ -217,7 +217,7 @@ namespace spot
const std::vector<bool>& realizable): const std::vector<bool>& realizable):
tgba_reachable_iterator_depth_first(a->aut), tgba_reachable_iterator_depth_first(a->aut),
in_(a), in_(a),
out_(make_tgba_digraph(a->aut->get_dict())), out_(make_twa_graph(a->aut->get_dict())),
final_(final), final_(final),
num_states_(a->aut->num_states()), num_states_(a->aut->num_states()),
sm_(sm), sm_(sm),
...@@ -231,7 +231,7 @@ namespace spot ...@@ -231,7 +231,7 @@ namespace spot
} }
tgba_digraph_ptr twa_graph_ptr
result() result()
{ {
return out_; return out_;
...@@ -291,7 +291,7 @@ namespace spot ...@@ -291,7 +291,7 @@ namespace spot
protected: protected:
const const_dstar_aut_ptr& in_; const const_dstar_aut_ptr& in_;
tgba_digraph_ptr out_; twa_graph_ptr out_;
const state_set& final_; const state_set& final_;
size_t num_states_; size_t num_states_;
acc_cond::mark_t acc_; acc_cond::mark_t acc_;
...@@ -302,7 +302,7 @@ namespace spot ...@@ -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); assert(dra->type == Rabin);
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
namespace spot namespace spot
{ {
tgba_digraph_ptr twa_graph_ptr
dstar_to_tgba(const const_dstar_aut_ptr& daut) dstar_to_tgba(const const_dstar_aut_ptr& daut)
{ {
switch (daut->type) switch (daut->type)
......
...@@ -330,7 +330,7 @@ namespace spot ...@@ -330,7 +330,7 @@ namespace spot
} }
result_ r; result_ r;
r.d = std::make_shared<spot::dstar_aut>(); 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.d->accsets = 0;
r.env = &env; r.env = &env;
dstaryy::parser parser(error_list, r); dstaryy::parser parser(error_list, r);
......
...@@ -40,7 +40,7 @@ namespace spot ...@@ -40,7 +40,7 @@ namespace spot
// makes its possible to mask AUT, as needed in dra_to_ba(). // 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): nra_to_nba_worker(const const_dstar_aut_ptr& a, const_tgba_ptr aut):
tgba_reachable_iterator_depth_first(aut), tgba_reachable_iterator_depth_first(aut),
out_(make_tgba_digraph(aut->get_dict())), out_(make_twa_graph(aut->get_dict())),
d_(a), d_(a),
num_states_(a->aut->num_states()) num_states_(a->aut->num_states())
{ {
...@@ -55,7 +55,7 @@ namespace spot ...@@ -55,7 +55,7 @@ namespace spot
i->destroy(); i->destroy();
} }
tgba_digraph_ptr twa_graph_ptr
result() result()
{ {
return out_; return out_;
...@@ -105,7 +105,7 @@ namespace spot ...@@ -105,7 +105,7 @@ namespace spot
} }
protected: protected:
tgba_digraph_ptr out_; twa_graph_ptr out_;
const_dstar_aut_ptr d_; const_dstar_aut_ptr d_;
size_t num_states_; size_t num_states_;
}; };
...@@ -115,7 +115,7 @@ namespace spot ...@@ -115,7 +115,7 @@ namespace spot
// In dra_to_dba() we call this function with a second argument // In dra_to_dba() we call this function with a second argument
// that is a masked version of nra->aut. // that is a masked version of nra->aut.
SPOT_LOCAL 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) const const_tgba_ptr& aut)
{ {
assert(nra->type == Rabin); assert(nra->type == Rabin);
...@@ -124,7 +124,7 @@ namespace spot ...@@ -124,7 +124,7 @@ namespace spot
return scc_filter_states(w.result()); 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); return nra_to_nba(nra, nra->aut);
} }
......
...@@ -98,11 +98,11 @@ namespace spot ...@@ -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); assert(nsa->type == Streett);
auto a = nsa->aut; 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); res->copy_ap_of(a);
// Create accpair_count acceptance sets for the output. // Create accpair_count acceptance sets for the output.
......
...@@ -46,7 +46,7 @@ namespace spot ...@@ -46,7 +46,7 @@ namespace spot
{ {
// Transition structure of the automaton. // Transition structure of the automaton.
// This is encoded as a TGBA without acceptance condition. // This is encoded as a TGBA without acceptance condition.
tgba_digraph_ptr aut; twa_graph_ptr aut;
/// Type of the acceptance. /// Type of the acceptance.
dstar_type type; dstar_type type;
/// Number of acceptance pairs. /// Number of acceptance pairs.
...@@ -68,7 +68,7 @@ namespace spot ...@@ -68,7 +68,7 @@ namespace spot
typedef std::shared_ptr<dstar_aut> dstar_aut_ptr; typedef std::shared_ptr<dstar_aut> dstar_aut_ptr;
typedef std::shared_ptr<const dstar_aut> const_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 filename The name of the file to parse.
/// \param error_list A list that will be filled with /// \param error_list A list that will be filled with
/// parse errors that occured during parsing. /// parse errors that occured during parsing.
...@@ -106,14 +106,14 @@ namespace spot ...@@ -106,14 +106,14 @@ namespace spot
/// \brief Convert a non-deterministic Rabin automaton into a /// \brief Convert a non-deterministic Rabin automaton into a
/// non-deterministic Büchi automaton. /// non-deterministic Büchi automaton.
SPOT_API tgba_digraph_ptr SPOT_API twa_graph_ptr
nra_to_nba(const const_dstar_aut_ptr& nra); nra_to_nba(const const_dstar_aut_ptr& nra);
/// \brief Convert a non-deterministic Rabin automaton into a /// \brief Convert a non-deterministic Rabin automaton into a
/// non-deterministic Büchi automaton. /// non-deterministic Büchi automaton.
/// ///
/// This version simply ignores all states in \a ignore. /// 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); nra_to_nba(const const_dstar_aut_ptr& nra, const state_set* ignore);
/// \brief Convert a deterministic Rabin automaton into a /// \brief Convert a deterministic Rabin automaton into a
...@@ -132,18 +132,18 @@ namespace spot ...@@ -132,18 +132,18 @@ namespace spot
/// If the optional \a dba_output argument is non-null, the /// If the optional \a dba_output argument is non-null, the
/// pointed Boolean will be updated to indicate whether the /// pointed Boolean will be updated to indicate whether the
/// returned Büchi automaton is deterministic. /// 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); dra_to_ba(const const_dstar_aut_ptr& dra, bool* dba_output = 0);
/// \brief Convert a non-deterministic Streett automaton into a /// \brief Convert a non-deterministic Streett automaton into a
/// non-deterministic tgba. /// non-deterministic tgba.
SPOT_API tgba_digraph_ptr SPOT_API twa_graph_ptr
nsa_to_tgba(const const_dstar_aut_ptr& nra); nsa_to_tgba(const const_dstar_aut_ptr& nra);
/// \brief Convert a Rabin or Streett automaton into a TGBA. /// \brief Convert a Rabin or Streett automaton into a TGBA.
/// ///
/// This function calls dra_to_ba() or nsa_to_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); dstar_to_tgba(const const_dstar_aut_ptr& dstar);
/// @} /// @}
......
...@@ -29,7 +29,7 @@ void f1() ...@@ -29,7 +29,7 @@ void f1()
auto& e = spot::ltl::default_environment::instance(); 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* f1 = e.require("p1");
auto* f2 = e.require("p2"); auto* f2 = e.require("p2");
......
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
typedef std::map<std::string, bdd> formula_cache; typedef std::map<std::string, bdd> formula_cache;
typedef std::pair<int, std::string*> pair; 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 // 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 // automata, it tries hard to recover from errors, so that we get a
...@@ -1682,7 +1682,7 @@ namespace spot ...@@ -1682,7 +1682,7 @@ namespace spot
restart: restart:
result_ r; result_ r;
r.h = std::make_shared<spot::hoa_aut>(); 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; r.env = &env;
hoayy::parser parser(error_list, r, last_loc); hoayy::parser parser(error_list, r, last_loc);
static bool env_debug = !!getenv("SPOT_DEBUG_PARSER"); static bool env_debug = !!getenv("SPOT_DEBUG_PARSER");
...@@ -1717,7 +1717,7 @@ namespace spot ...@@ -1717,7 +1717,7 @@ namespace spot
return r.h; return r.h;
}; };