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
|
|
@ -467,8 +467,8 @@ if output_type == 'f':
|
|||
if not f.is_syntactic_safety() or not f.is_syntactic_guarantee():
|
||||
dict = spot.bdd_dict()
|
||||
automaton = spot.ltl_to_tgba_fm(f, dict, False, True)
|
||||
minimized = spot.minimize_obligation_new(automaton, f)
|
||||
if minimized:
|
||||
minimized = spot.minimize_obligation(automaton, f)
|
||||
if minimized != automaton:
|
||||
g = spot.is_guarantee_automaton(minimized)
|
||||
s = spot.is_safety_mwdba(minimized)
|
||||
if s and not f.is_syntactic_safety():
|
||||
|
|
@ -669,8 +669,8 @@ if prune_scc:
|
|||
issba = False
|
||||
|
||||
if wdba_minimize:
|
||||
minimized = spot.minimize_obligation_new(automaton, f)
|
||||
if minimized:
|
||||
minimized = spot.minimize_obligation(automaton, f)
|
||||
if minimized != automaton:
|
||||
automaton = minimized
|
||||
minimized = 0
|
||||
degen = False # No need to degeneralize anymore
|
||||
|
|
|
|||
|
|
@ -28,9 +28,35 @@
|
|||
|
||||
%module(directors="1") spot
|
||||
|
||||
%include "std_shared_ptr.i"
|
||||
%include "std_string.i"
|
||||
%include "std_list.i"
|
||||
|
||||
// git grep 'typedef.*std::shared_ptr' | grep -v const
|
||||
// sed 's/.*<\(.*\)>.*/%shared_ptr(spot::\1)/g'
|
||||
%shared_ptr(spot::bdd_dict)
|
||||
%shared_ptr(spot::dstar_aut)
|
||||
%shared_ptr(spot::dstar_aut)
|
||||
%shared_ptr(spot::future_conditions_collector)
|
||||
%shared_ptr(spot::kripke)
|
||||
%shared_ptr(spot::saba)
|
||||
%shared_ptr(spot::saba_complement_tgba)
|
||||
%shared_ptr(spot::ta)
|
||||
%shared_ptr(spot::taa_tgba_formula)
|
||||
%shared_ptr(spot::taa_tgba_string)
|
||||
%shared_ptr(spot::ta_explicit)
|
||||
%shared_ptr(spot::ta_product)
|
||||
%shared_ptr(spot::taa_tgba)
|
||||
%shared_ptr(spot::tgba)
|
||||
%shared_ptr(spot::tgba_digraph)
|
||||
%shared_ptr(spot::tgba_kv_complement)
|
||||
%shared_ptr(spot::tgba_product)
|
||||
%shared_ptr(spot::tgba_product_init)
|
||||
%shared_ptr(spot::tgba_safra_complement)
|
||||
%shared_ptr(spot::tgba_sgba_proxy)
|
||||
%shared_ptr(spot::tgta)
|
||||
%shared_ptr(spot::tgta_explicit)
|
||||
|
||||
namespace std {
|
||||
%template(liststr) list<string>;
|
||||
};
|
||||
|
|
@ -76,6 +102,7 @@ namespace std {
|
|||
#include "tgba/bddprint.hh"
|
||||
#include "tgba/state.hh"
|
||||
#include "tgba/succiter.hh"
|
||||
#include "tgba/fwd.hh"
|
||||
#include "tgba/tgba.hh"
|
||||
#include "tgba/taatgba.hh"
|
||||
#include "tgba/tgbaproduct.hh"
|
||||
|
|
@ -185,37 +212,16 @@ using namespace spot;
|
|||
%feature("new") spot::emptiness_check_result::accepting_run;
|
||||
%feature("new") spot::explicit_magic_search;
|
||||
%feature("new") spot::explicit_se05_search;
|
||||
%feature("new") spot::ltl_to_taa;
|
||||
%feature("new") spot::ltl_to_tgba_fm;
|
||||
%feature("new") spot::compsusp;
|
||||
%feature("new") spot::minimize_wdba;
|
||||
%feature("new") spot::minimize_monitor;
|
||||
%feature("new") spot::scc_filter;
|
||||
%feature("new") spot::tgba_dupexp_bfs;
|
||||
%feature("new") spot::tgba_dupexp_dfs;
|
||||
%feature("new") spot::tgba::get_init_state;
|
||||
%feature("new") spot::tgba::succ_iter;
|
||||
%feature("new") spot::tgba_succ_iterator::current_state;
|
||||
%feature("new") spot::simulation;
|
||||
%feature("new") spot::cosimulation;
|
||||
%feature("new") spot::iterated_simulations;
|
||||
%feature("new") spot::degeneralize;
|
||||
%feature("new") spot::degeneralize_tba;
|
||||
%feature("new") spot::tgba_parse;
|
||||
%feature("new") spot::tgba_to_ta;
|
||||
%feature("new") spot::tgba_to_tgta;
|
||||
%feature("new") spot::postprocessor::run;
|
||||
|
||||
// The argument to postprocessor::run() will be deleted.
|
||||
// Apparently SWIG can only disown arguments based on their
|
||||
// names...
|
||||
%apply SWIGTYPE *DISOWN { SWIGTYPE * input_disown };
|
||||
|
||||
// Help SWIG with namespace lookups.
|
||||
#define ltl spot::ltl
|
||||
%include "tgba/bddprint.hh"
|
||||
%include "tgba/state.hh"
|
||||
%include "tgba/succiter.hh"
|
||||
%include "tgba/fwd.hh"
|
||||
%include "tgba/tgba.hh"
|
||||
%include "tgba/taatgba.hh"
|
||||
%include "tgba/tgbaproduct.hh"
|
||||
|
|
@ -313,32 +319,7 @@ namespace std {
|
|||
};
|
||||
}
|
||||
|
||||
%feature("new") minimize_obligation_new;
|
||||
|
||||
%inline %{
|
||||
|
||||
// A variant of minimize_obligation() that always return a new object.
|
||||
const spot::tgba_digraph*
|
||||
minimize_obligation_new(const spot::tgba* a, const spot::ltl::formula* f)
|
||||
{
|
||||
auto aa = dynamic_cast<const spot::tgba_digraph*>(a);
|
||||
bool freeit = false;
|
||||
if (!aa)
|
||||
{
|
||||
freeit = true;
|
||||
aa = tgba_dupexp_dfs(a);
|
||||
}
|
||||
auto res = spot::minimize_obligation(aa, f);
|
||||
// Return 0 if the output is the same as the input, otherwise
|
||||
// it is hard for swig to know if the output is "new" or not.
|
||||
if (freeit)
|
||||
delete aa;
|
||||
if (res == aa)
|
||||
return 0;
|
||||
else
|
||||
return res;
|
||||
}
|
||||
|
||||
spot::ltl::parse_error_list
|
||||
empty_parse_error_list()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -50,8 +50,9 @@ while not it.done():
|
|||
it.next()
|
||||
buddy.bdd_printset(b); spot.nl_cout()
|
||||
sys.stdout.write("%s\n" % b)
|
||||
del it
|
||||
del s0
|
||||
del b
|
||||
del c
|
||||
del f
|
||||
del a
|
||||
del simp
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue