Handle all automata through shared_ptr. (monstro patch)
A type such as 'const tgba_digraph*' and 'tgba_digraph*' are replaced by 'const_tgba_digraph_ptr' and 'tgba_digraph_ptr'. Additionally 'new tgba_digraph(...)' is replaced by 'make_tgba_digraph(...)'. This convention is followed by all automata types. Those smart pointers should normally be passed by const reference as input of function to avoid the atomic increments/decrements, but I probably missed a few, as this huge patch took me nearly 12h. * src/kripke/fwd.hh, src/tgba/fwd.hh: New files. * src/kripke/Makefile.am, src/tgba/Makefile.am: Adjust. * iface/dve2/dve2.cc, iface/dve2/dve2.hh, iface/dve2/dve2check.cc, src/bin/common_output.hh, src/bin/dstar2tgba.cc, src/bin/ltl2tgba.cc, src/bin/ltl2tgta.cc, src/bin/ltlcross.cc, src/bin/ltlfilt.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/kripke/fairkripke.hh, src/kripke/kripke.hh, src/kripke/kripkeexplicit.cc, src/kripke/kripkeexplicit.hh, src/kripke/kripkeprint.cc, src/kripke/kripkeprint.hh, src/kripkeparse/kripkeparse.yy, src/kripkeparse/public.hh, src/kripketest/parse_print_test.cc, src/ltlvisit/apcollect.cc, src/ltlvisit/apcollect.hh, src/ltlvisit/contain.cc, src/ltlvisit/contain.hh, src/neverparse/neverclaimparse.yy, src/neverparse/public.hh, src/priv/accmap.hh, src/priv/countstates.cc, src/priv/countstates.hh, src/saba/saba.hh, src/saba/sabacomplementtgba.cc, src/saba/sabacomplementtgba.hh, src/sabaalgos/sabadotty.cc, src/sabaalgos/sabadotty.hh, src/sabaalgos/sabareachiter.cc, src/sabaalgos/sabareachiter.hh, src/sabatest/sabacomplementtgba.cc, src/ta/ta.hh, src/ta/taexplicit.cc, src/ta/taexplicit.hh, src/ta/taproduct.cc, src/ta/taproduct.hh, src/ta/tgta.hh, src/ta/tgtaexplicit.cc, src/ta/tgtaexplicit.hh, src/ta/tgtaproduct.cc, src/ta/tgtaproduct.hh, src/taalgos/dotty.cc, src/taalgos/dotty.hh, src/taalgos/emptinessta.cc, src/taalgos/emptinessta.hh, src/taalgos/minimize.cc, src/taalgos/minimize.hh, src/taalgos/reachiter.cc, src/taalgos/reachiter.hh, src/taalgos/statessetbuilder.cc, src/taalgos/statessetbuilder.hh, src/taalgos/stats.cc, src/taalgos/stats.hh, src/taalgos/tgba2ta.cc, src/taalgos/tgba2ta.hh, src/tgba/bdddict.cc, src/tgba/bdddict.hh, src/tgba/formula2bdd.hh, src/tgba/futurecondcol.cc, src/tgba/futurecondcol.hh, src/tgba/taatgba.hh, src/tgba/tgba.cc, src/tgba/tgba.hh, src/tgba/tgbagraph.hh, src/tgba/tgbakvcomplement.cc, src/tgba/tgbakvcomplement.hh, src/tgba/tgbamask.cc, src/tgba/tgbamask.hh, src/tgba/tgbaproduct.cc, src/tgba/tgbaproduct.hh, src/tgba/tgbaproxy.cc, src/tgba/tgbaproxy.hh, src/tgba/tgbasafracomplement.cc, src/tgba/tgbasafracomplement.hh, src/tgba/tgbascc.cc, src/tgba/tgbascc.hh, src/tgba/tgbasgba.cc, src/tgba/tgbasgba.hh, src/tgba/wdbacomp.cc, src/tgba/wdbacomp.hh, src/tgbaalgos/bfssteps.cc, src/tgbaalgos/bfssteps.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/dotty.hh, src/tgbaalgos/dottydec.cc, src/tgbaalgos/dottydec.hh, 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/gtec/gtec.cc, src/tgbaalgos/gtec/gtec.hh, src/tgbaalgos/gtec/status.cc, src/tgbaalgos/gtec/status.hh, src/tgbaalgos/gv04.cc, src/tgbaalgos/gv04.hh, src/tgbaalgos/isdet.cc, src/tgbaalgos/isdet.hh, src/tgbaalgos/isweakscc.cc, src/tgbaalgos/lbtt.cc, src/tgbaalgos/lbtt.hh, src/tgbaalgos/ltl2taa.cc, src/tgbaalgos/ltl2taa.hh, src/tgbaalgos/ltl2tgba_fm.cc, src/tgbaalgos/ltl2tgba_fm.hh, src/tgbaalgos/magic.cc, src/tgbaalgos/magic.hh, src/tgbaalgos/minimize.cc, src/tgbaalgos/minimize.hh, src/tgbaalgos/ndfs_result.hxx, src/tgbaalgos/neverclaim.cc, src/tgbaalgos/neverclaim.hh, src/tgbaalgos/postproc.cc, src/tgbaalgos/postproc.hh, src/tgbaalgos/powerset.cc, src/tgbaalgos/powerset.hh, src/tgbaalgos/projrun.cc, src/tgbaalgos/projrun.hh, src/tgbaalgos/randomgraph.cc, src/tgbaalgos/randomgraph.hh, src/tgbaalgos/reachiter.cc, src/tgbaalgos/reachiter.hh, src/tgbaalgos/reducerun.cc, src/tgbaalgos/reducerun.hh, src/tgbaalgos/replayrun.cc, src/tgbaalgos/replayrun.hh, src/tgbaalgos/rundotdec.cc, src/tgbaalgos/rundotdec.hh, src/tgbaalgos/safety.cc, src/tgbaalgos/safety.hh, src/tgbaalgos/save.cc, src/tgbaalgos/save.hh, src/tgbaalgos/scc.cc, src/tgbaalgos/scc.hh, src/tgbaalgos/sccfilter.cc, src/tgbaalgos/sccfilter.hh, src/tgbaalgos/sccinfo.cc, src/tgbaalgos/sccinfo.hh, src/tgbaalgos/se05.cc, src/tgbaalgos/se05.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/tau03.cc, src/tgbaalgos/tau03.hh, src/tgbaalgos/tau03opt.cc, src/tgbaalgos/tau03opt.hh, src/tgbaalgos/translate.cc, src/tgbaalgos/translate.hh, src/tgbaparse/public.hh, src/tgbaparse/tgbaparse.yy, src/tgbatest/complementation.cc, src/tgbatest/explprod.cc, src/tgbatest/ltl2tgba.cc, src/tgbatest/ltlprod.cc, src/tgbatest/maskacc.cc, src/tgbatest/powerset.cc, src/tgbatest/randtgba.cc, src/tgbatest/taatgba.cc, src/tgbatest/tgbaread.cc, src/tgbatest/tripprod.cc, wrap/python/ajax/spot.in, wrap/python/spot.i, wrap/python/tests/interdep.py: Use shared pointers for automata.
This commit is contained in:
Alexandre Duret-Lutz
parent
ca85d4184d
commit
51151ab271
195 changed files with 1792 additions and 1837 deletions
|
|
@ -48,7 +48,8 @@ namespace spot
|
|||
|
||||
// This function is defined in nra2nba.cc, and used only here.
|
||||
SPOT_LOCAL
|
||||
tgba_digraph* nra_to_nba(const dstar_aut* nra, const tgba* aut);
|
||||
tgba_digraph_ptr nra_to_nba(const const_dstar_aut_ptr& nra,
|
||||
const const_tgba_ptr& aut);
|
||||
|
||||
namespace
|
||||
{
|
||||
|
|
@ -63,15 +64,15 @@ namespace spot
|
|||
// retrive acceptances.
|
||||
|
||||
static bool
|
||||
filter_states(const tgba* aut,
|
||||
const dstar_aut* dra,
|
||||
filter_states(const const_tgba_ptr& aut,
|
||||
const const_dstar_aut_ptr& dra,
|
||||
const state_list& sl,
|
||||
state_list& final,
|
||||
state_list& nonfinal);
|
||||
|
||||
static bool
|
||||
filter_scc(const tgba* aut,
|
||||
const dstar_aut* dra,
|
||||
filter_scc(const const_tgba_ptr& aut,
|
||||
const const_dstar_aut_ptr& dra,
|
||||
state_list& final,
|
||||
state_list& nonfinal)
|
||||
{
|
||||
|
|
@ -97,8 +98,8 @@ namespace spot
|
|||
}
|
||||
|
||||
static bool
|
||||
filter_states(const tgba* aut,
|
||||
const dstar_aut* dra,
|
||||
filter_states(const const_tgba_ptr& aut,
|
||||
const const_dstar_aut_ptr& dra,
|
||||
const state_list& sl,
|
||||
state_list& final,
|
||||
state_list& nonfinal)
|
||||
|
|
@ -146,15 +147,11 @@ namespace spot
|
|||
// could be improved.
|
||||
{
|
||||
state_set keep(sl.begin(), sl.end());
|
||||
const tgba* masked =
|
||||
build_tgba_mask_keep(dra->aut, keep, sl.front());
|
||||
const tgba* nba = nra_to_nba(dra, masked);
|
||||
emptiness_check* ec = couvreur99(nba);
|
||||
auto masked = build_tgba_mask_keep(dra->aut, keep, sl.front());
|
||||
emptiness_check* ec = couvreur99(nra_to_nba(dra, masked));
|
||||
emptiness_check_result* ecr = ec->check();
|
||||
delete ecr;
|
||||
delete ec;
|
||||
delete nba;
|
||||
delete masked;
|
||||
if (ecr)
|
||||
{
|
||||
// This SCC is not DBA-realizable.
|
||||
|
|
@ -197,13 +194,11 @@ namespace spot
|
|||
//std::cerr << "unknown\n";
|
||||
// Build a sub-automaton for just the unknown states,
|
||||
// starting from any state in the SCC.
|
||||
const tgba* scc_mask =
|
||||
build_tgba_mask_keep(aut, unknown, *unknown.begin());
|
||||
auto scc_mask = build_tgba_mask_keep(aut, unknown, *unknown.begin());
|
||||
state_list local_final;
|
||||
state_list local_nonfinal;
|
||||
bool dbarealizable =
|
||||
filter_scc(scc_mask, dra, local_final, local_nonfinal);
|
||||
delete scc_mask;
|
||||
if (!dbarealizable)
|
||||
return false;
|
||||
for (state_list::const_iterator i = local_final.begin();
|
||||
|
|
@ -223,13 +218,13 @@ namespace spot
|
|||
class dra_to_ba_worker: public tgba_reachable_iterator_depth_first
|
||||
{
|
||||
public:
|
||||
dra_to_ba_worker(const dstar_aut* a,
|
||||
dra_to_ba_worker(const const_dstar_aut_ptr& a,
|
||||
const state_set& final,
|
||||
const scc_map& sm,
|
||||
const std::vector<bool>& realizable):
|
||||
tgba_reachable_iterator_depth_first(a->aut),
|
||||
in_(a),
|
||||
out_(new tgba_digraph(a->aut->get_dict())),
|
||||
out_(make_tgba_digraph(a->aut->get_dict())),
|
||||
final_(final),
|
||||
num_states_(a->aut->num_states()),
|
||||
sm_(sm),
|
||||
|
|
@ -242,7 +237,7 @@ namespace spot
|
|||
out_->set_init_state(a->aut->get_init_state_number());
|
||||
}
|
||||
|
||||
tgba_digraph*
|
||||
tgba_digraph_ptr
|
||||
result()
|
||||
{
|
||||
return out_;
|
||||
|
|
@ -301,8 +296,8 @@ namespace spot
|
|||
}
|
||||
|
||||
protected:
|
||||
const dstar_aut* in_;
|
||||
tgba_digraph* out_;
|
||||
const const_dstar_aut_ptr& in_;
|
||||
tgba_digraph_ptr out_;
|
||||
const state_set& final_;
|
||||
size_t num_states_;
|
||||
bdd acc_;
|
||||
|
|
@ -313,7 +308,7 @@ namespace spot
|
|||
}
|
||||
|
||||
|
||||
tgba_digraph* dra_to_ba(const dstar_aut* dra, bool* dba)
|
||||
tgba_digraph_ptr dra_to_ba(const const_dstar_aut_ptr& dra, bool* dba)
|
||||
{
|
||||
assert(dra->type == Rabin);
|
||||
|
||||
|
|
@ -358,10 +353,7 @@ namespace spot
|
|||
state_set fs(final.begin(), final.end());
|
||||
dra_to_ba_worker w(dra, fs, sm, realizable);
|
||||
w.run();
|
||||
auto res1 = w.result();
|
||||
auto res2 = scc_filter_states(res1);
|
||||
delete res1;
|
||||
return res2;
|
||||
return scc_filter_states(w.result());
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,8 +21,8 @@
|
|||
|
||||
namespace spot
|
||||
{
|
||||
tgba_digraph*
|
||||
dstar_to_tgba(const dstar_aut* daut)
|
||||
tgba_digraph_ptr
|
||||
dstar_to_tgba(const const_dstar_aut_ptr& daut)
|
||||
{
|
||||
switch (daut->type)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@
|
|||
|
||||
struct result_
|
||||
{
|
||||
spot::dstar_aut* d;
|
||||
spot::dstar_aut_ptr d;
|
||||
spot::ltl::environment* env;
|
||||
std::vector<bdd> guards;
|
||||
std::vector<bdd>::const_iterator cur_guard;
|
||||
|
|
@ -143,8 +143,7 @@ header: auttype opt_eols V2 opt_eols EXPLICIT opt_eols sizes
|
|||
}
|
||||
if (err)
|
||||
{
|
||||
delete result.d->aut;
|
||||
result.d->aut = 0;
|
||||
result.d->aut = nullptr;
|
||||
YYABORT;
|
||||
}
|
||||
result.d->aut->new_states(result.state_count);;
|
||||
|
|
@ -313,10 +312,10 @@ dstaryy::parser::error(const location_type& location,
|
|||
|
||||
namespace spot
|
||||
{
|
||||
dstar_aut*
|
||||
dstar_aut_ptr
|
||||
dstar_parse(const std::string& name,
|
||||
dstar_parse_error_list& error_list,
|
||||
bdd_dict_ptr dict,
|
||||
const bdd_dict_ptr& dict,
|
||||
ltl::environment& env,
|
||||
bool debug)
|
||||
{
|
||||
|
|
@ -327,8 +326,8 @@ namespace spot
|
|||
return 0;
|
||||
}
|
||||
result_ r;
|
||||
r.d = new dstar_aut;
|
||||
r.d->aut = new tgba_digraph(dict);
|
||||
r.d = std::make_shared<spot::dstar_aut>();
|
||||
r.d->aut = make_tgba_digraph(dict);
|
||||
r.d->accsets = 0;
|
||||
r.env = &env;
|
||||
dstaryy::parser parser(error_list, r);
|
||||
|
|
@ -337,10 +336,7 @@ namespace spot
|
|||
dstaryyclose();
|
||||
|
||||
if (!r.d->aut || !r.d->accsets)
|
||||
{
|
||||
delete r.d;
|
||||
return 0;
|
||||
}
|
||||
return nullptr;
|
||||
return r.d;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -38,9 +38,9 @@ namespace spot
|
|||
// AUT is the automate we iterate on, while A is the automaton
|
||||
// we read the acceptance conditions from. Separating the two
|
||||
// makes its possible to mask AUT, as needed in dra_to_ba().
|
||||
nra_to_nba_worker(const dstar_aut* a, const tgba* aut):
|
||||
nra_to_nba_worker(const const_dstar_aut_ptr& a, const_tgba_ptr aut):
|
||||
tgba_reachable_iterator_depth_first(aut),
|
||||
out_(new tgba_digraph(aut->get_dict())),
|
||||
out_(make_tgba_digraph(aut->get_dict())),
|
||||
d_(a),
|
||||
num_states_(a->aut->num_states())
|
||||
{
|
||||
|
|
@ -54,7 +54,7 @@ namespace spot
|
|||
i->destroy();
|
||||
}
|
||||
|
||||
tgba_digraph*
|
||||
tgba_digraph_ptr
|
||||
result()
|
||||
{
|
||||
return out_;
|
||||
|
|
@ -104,8 +104,8 @@ namespace spot
|
|||
}
|
||||
|
||||
protected:
|
||||
tgba_digraph* out_;
|
||||
const dstar_aut* d_;
|
||||
tgba_digraph_ptr out_;
|
||||
const_dstar_aut_ptr d_;
|
||||
size_t num_states_;
|
||||
};
|
||||
|
||||
|
|
@ -114,19 +114,17 @@ 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* nra_to_nba(const dstar_aut* nra, const tgba* aut)
|
||||
tgba_digraph_ptr nra_to_nba(const const_dstar_aut_ptr& nra,
|
||||
const const_tgba_ptr& aut)
|
||||
{
|
||||
assert(nra->type == Rabin);
|
||||
nra_to_nba_worker w(nra, aut);
|
||||
w.run();
|
||||
auto res1 = w.result();
|
||||
auto res2 = scc_filter_states(res1);
|
||||
delete res1;
|
||||
return res2;
|
||||
return scc_filter_states(w.result());
|
||||
}
|
||||
|
||||
SPOT_API
|
||||
tgba_digraph* nra_to_nba(const dstar_aut* nra)
|
||||
tgba_digraph_ptr nra_to_nba(const const_dstar_aut_ptr& nra)
|
||||
{
|
||||
return nra_to_nba(nra, nra->aut);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -99,11 +99,11 @@ namespace spot
|
|||
}
|
||||
|
||||
SPOT_API
|
||||
tgba_digraph* nsa_to_tgba(const dstar_aut* nsa)
|
||||
tgba_digraph_ptr nsa_to_tgba(const const_dstar_aut_ptr& nsa)
|
||||
{
|
||||
assert(nsa->type == Streett);
|
||||
auto a = nsa->aut;
|
||||
auto res = new tgba_digraph(a->get_dict());
|
||||
auto res = make_tgba_digraph(a->get_dict());
|
||||
res->copy_ap_of(a);
|
||||
|
||||
// Create accpair_count acceptance sets for the output.
|
||||
|
|
@ -204,4 +204,3 @@ namespace spot
|
|||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ namespace spot
|
|||
{
|
||||
// Transition structure of the automaton.
|
||||
// This is encoded as a TGBA without acceptance condition.
|
||||
tgba_digraph* aut;
|
||||
tgba_digraph_ptr aut;
|
||||
/// Type of the acceptance.
|
||||
dstar_type type;
|
||||
/// Number of acceptance pairs.
|
||||
|
|
@ -62,11 +62,12 @@ namespace spot
|
|||
|
||||
~dstar_aut()
|
||||
{
|
||||
delete aut;
|
||||
delete accsets;
|
||||
}
|
||||
};
|
||||
|
||||
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.
|
||||
/// \param filename The name of the file to parse.
|
||||
|
|
@ -85,10 +86,10 @@ namespace spot
|
|||
/// was parsed succesfully, check \a error_list for emptiness.
|
||||
///
|
||||
/// \warning This function is not reentrant.
|
||||
SPOT_API dstar_aut*
|
||||
SPOT_API dstar_aut_ptr
|
||||
dstar_parse(const std::string& filename,
|
||||
dstar_parse_error_list& error_list,
|
||||
bdd_dict_ptr dict,
|
||||
const bdd_dict_ptr& dict,
|
||||
ltl::environment& env = ltl::default_environment::instance(),
|
||||
bool debug = false);
|
||||
|
||||
|
|
@ -106,15 +107,15 @@ namespace spot
|
|||
|
||||
/// \brief Convert a non-deterministic Rabin automaton into a
|
||||
/// non-deterministic Büchi automaton.
|
||||
SPOT_API tgba_digraph*
|
||||
nra_to_nba(const dstar_aut* nra);
|
||||
SPOT_API tgba_digraph_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*
|
||||
nra_to_nba(const dstar_aut* nra, const state_set* ignore);
|
||||
SPOT_API tgba_digraph_ptr
|
||||
nra_to_nba(const const_dstar_aut_ptr& nra, const state_set* ignore);
|
||||
|
||||
/// \brief Convert a deterministic Rabin automaton into a
|
||||
/// Büchi automaton, deterministic when possible.
|
||||
|
|
@ -132,19 +133,19 @@ 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*
|
||||
dra_to_ba(const dstar_aut* dra, bool* dba_output = 0);
|
||||
SPOT_API tgba_digraph_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*
|
||||
nsa_to_tgba(const dstar_aut* nra);
|
||||
SPOT_API tgba_digraph_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*
|
||||
dstar_to_tgba(const dstar_aut* dstar);
|
||||
SPOT_API tgba_digraph_ptr
|
||||
dstar_to_tgba(const const_dstar_aut_ptr& dstar);
|
||||
|
||||
|
||||
/// @}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue