alarsyo/spot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Handle all automata through shared_ptr. (monstro patch)

Browse source 
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 2014-08-14 20:18:04 +02:00
parent ca85d4184d
commit 51151ab271
195 changed files with 1792 additions and 1837 deletions
Download patch file Download diff file Expand all files Collapse all files

156
src/tgbaalgos/simulation.cc
View file

@ -156,6 +156,18 @@ namespace spot
{
}
automaton_size(const tgba_digraph_ptr& a)
: transitions(a->num_transitions()),
states(a->num_states())
{
}
void set_size(const tgba_digraph_ptr& a)
{
states = a->num_states();
transitions = a->num_transitions();
}
inline bool operator!=(const automaton_size& r)
{
return transitions != r.transitions || states != r.states;
@ -204,7 +216,8 @@ namespace spot
// Shortcut used in update_po and go_to_next_it.
typedef std::map<bdd, bdd, bdd_less_than> map_bdd_bdd;
public:
direct_simulation(const tgba* t, const map_constraint* map_cst = 0)
direct_simulation(const const_tgba_ptr& t,
const map_constraint* map_cst = 0)
: a_(0),
po_size_(0),
all_class_var_(bddtrue),
@ -230,7 +243,7 @@ namespace spot
{
if (Cosimulation)
{
a_ = new tgba_digraph(a_->get_dict());
a_ = make_tgba_digraph(a_->get_dict());
a_->copy_ap_of(old_a_);
a_->copy_acceptance_conditions_of(old_a_);
}
@ -311,11 +324,6 @@ namespace spot
{
a_->get_dict()->unregister_all_my_variables(this);
delete scc_map_;
delete old_a_;
// a_ is a new automaton only if we are doing a cosimulation.
if (Cosimulation)
delete a_;
}
// Update the name of the classes.
@ -363,7 +371,7 @@ namespace spot
}
// The core loop of the algorithm.
tgba_digraph* run()
tgba_digraph_ptr run()
{
main_loop();
return build_result();
@ -518,13 +526,6 @@ namespace spot
}
}
automaton_size get_stat() const
{
assert(stat.states != 0);
return stat;
}
bool result_is_deterministic() const
{
assert(stat.states != 0);
@ -535,7 +536,7 @@ namespace spot
// Build the minimal resulting automaton.
tgba_digraph* build_result()
tgba_digraph_ptr build_result()
{
// We have all the a_'s acceptances conditions
// complemented. So we need to complement it when adding a
@ -545,7 +546,7 @@ namespace spot
acc_compl reverser(all_acceptance_conditions_,
a_->neg_acceptance_conditions());
tgba_digraph* res = new tgba_digraph(a_->get_dict());
tgba_digraph_ptr res = make_tgba_digraph(a_->get_dict());
res->copy_ap_of(a_);
res->set_acceptance_conditions(all_acceptance_conditions_);
if (Sba)
@ -728,8 +729,8 @@ namespace spot
protected:
// The automaton which is simulated.
tgba_digraph* a_;
tgba_digraph* old_a_;
tgba_digraph_ptr a_;
tgba_digraph_ptr old_a_;
// Relation is aimed to represent the same thing than
// rel_. The difference is in the way it does.
@ -775,7 +776,7 @@ namespace spot
const map_constraint* map_cst_;
const tgba* original_;
const_tgba_ptr original_;
bdd all_acceptance_conditions_;
@ -795,7 +796,7 @@ namespace spot
public:
direct_simulation_dont_care(const tgba* t)
direct_simulation_dont_care(const const_tgba_ptr& t)
: direct_simulation<false, false>(t)
{
// This variable is used in the new signature.
@ -1098,12 +1099,7 @@ namespace spot
return res;
}
inline automaton_size get_stat() const
{
return min_size_;
}
tgba_digraph* run()
tgba_digraph_ptr run()
{
// Iterate the simulation until the end. We just don't return
// an automaton. This allows us to get all the information
@ -1188,14 +1184,14 @@ namespace spot
assert(previous_class_[i.second] == i.first);
#endif
tgba_digraph* min = 0;
tgba_digraph_ptr min = nullptr;
map_constraint cstr;
if (has_limit_)
rec(cc, cstr, &min, limit_);
rec(cc, cstr, min, limit_);
else
rec(cc, cstr, &min);
rec(cc, cstr, min);
return min;
}
@ -1247,7 +1243,7 @@ namespace spot
// Compute recursively all the combinations.
void rec(constraint_list constraints,
map_constraint cstr,
tgba_digraph** min,
tgba_digraph_ptr& min,
int max_depth = std::numeric_limits<int>::max())
{
assert(max_depth > 0);
@ -1265,19 +1261,14 @@ namespace spot
empty_seen_ = true;
direct_simulation<false, false> dir_sim(original_, &cstr);
tgba_digraph* tmp = dir_sim.run();
automaton_size cur_size = dir_sim.get_stat();
if (*min == 0 || min_size_ > cur_size)
tgba_digraph_ptr tmp = dir_sim.run();
automaton_size cur_size(tmp);
if (!min || min_size_ > cur_size)
{
delete *min;
*min = tmp;
min = tmp;
min_size_ = cur_size;
res_is_deterministic = dir_sim.result_is_deterministic();
}
else
{
delete tmp;
}
}
void set_limit(int n)
@ -1309,29 +1300,29 @@ namespace spot
} // End namespace anonymous.
tgba_digraph*
simulation(const tgba* t)
tgba_digraph_ptr
simulation(const const_tgba_ptr& t)
{
direct_simulation<false, false> simul(t);
return simul.run();
}
tgba_digraph*
simulation_sba(const tgba* t)
tgba_digraph_ptr
simulation_sba(const const_tgba_ptr& t)
{
direct_simulation<false, true> simul(t);
return simul.run();
}
tgba_digraph*
cosimulation(const tgba* t)
tgba_digraph_ptr
cosimulation(const const_tgba_ptr& t)
{
direct_simulation<true, false> simul(t);
return simul.run();
}
tgba_digraph*
cosimulation_sba(const tgba* t)
tgba_digraph_ptr
cosimulation_sba(const const_tgba_ptr& t)
{
direct_simulation<true, true> simul(t);
return simul.run();
@ -1339,10 +1330,10 @@ namespace spot
template<bool Sba>
tgba_digraph*
iterated_simulations_(const tgba* t)
tgba_digraph_ptr
iterated_simulations_(const const_tgba_ptr& t)
{
tgba_digraph* res = 0;
tgba_digraph_ptr res = 0;
automaton_size prev;
automaton_size next;
@ -1350,80 +1341,59 @@ namespace spot
{
prev = next;
direct_simulation<false, Sba> simul(res ? res : t);
tgba_digraph* after_simulation = simul.run();
delete res;
res = simul.run();
if (simul.result_is_deterministic())
{
res = after_simulation;
break;
}
break;
direct_simulation<true, Sba> cosimul(after_simulation);
tgba_digraph* after_cosimulation = cosimul.run();
next = cosimul.get_stat();
delete after_simulation;
direct_simulation<true, Sba> cosimul(res);
res = cosimul.run();
next.set_size(res);
if (Sba)
res = scc_filter_states(after_cosimulation);
res = scc_filter_states(res);
else
res = scc_filter(after_cosimulation, false);
delete after_cosimulation;
res = scc_filter(res, false);
}
while (prev != next);
return res;
}
tgba_digraph*
iterated_simulations(const tgba* t)
tgba_digraph_ptr
iterated_simulations(const const_tgba_ptr& t)
{
return iterated_simulations_<false>(t);
}
tgba_digraph*
iterated_simulations_sba(const tgba* t)
tgba_digraph_ptr
iterated_simulations_sba(const const_tgba_ptr& t)
{
return iterated_simulations_<true>(t);
}
tgba_digraph*
dont_care_simulation(const tgba* t, int limit)
tgba_digraph_ptr
dont_care_simulation(const const_tgba_ptr& t, int limit)
{
direct_simulation<false, false> sim(t);
tgba_digraph* tmp = sim.run();
direct_simulation_dont_care s(tmp);
direct_simulation_dont_care s(sim.run());
if (limit > 0)
s.set_limit(limit);
tgba_digraph* res = s.run();
delete tmp;
return res;
return s.run();
}
tgba_digraph*
dont_care_iterated_simulations(const tgba* t, int limit)
tgba_digraph_ptr
dont_care_iterated_simulations(const const_tgba_ptr& t, int limit)
{
tgba_digraph* res = 0;
tgba_digraph_ptr res = 0;
automaton_size prev;
automaton_size next;
do
{
prev = next;
tgba_digraph* after_simulation =
dont_care_simulation(res ? res : t, limit);
delete res;
direct_simulation<true, false> cosimul(after_simulation);
tgba_digraph* after_cosimulation = cosimul.run();
delete after_simulation;
next = cosimul.get_stat();
res = scc_filter(after_cosimulation, true);
delete after_cosimulation;
res = cosimulation(dont_care_simulation(res ? res : t, limit));
res = scc_filter(res, true);
next.set_size(res);
}
while (prev != next);