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
|
|
@ -1,5 +1,5 @@
|
|||
## -*- coding: utf-8 -*-
|
||||
## Copyright (C) 2009, 2011, 2013 Laboratoire de Recherche et
|
||||
## Copyright (C) 2009, 2011, 2013, 2014 Laboratoire de Recherche et
|
||||
## Developpement de l'Epita (LRDE).
|
||||
##
|
||||
## This file is part of Spot, a model checking library.
|
||||
|
|
@ -24,6 +24,7 @@ kripkedir = $(pkgincludedir)/kripke
|
|||
|
||||
kripke_HEADERS = \
|
||||
fairkripke.hh \
|
||||
fwd.hh \
|
||||
kripke.hh \
|
||||
kripkeexplicit.hh \
|
||||
kripkeprint.hh
|
||||
|
|
|
|||
|
|
@ -22,14 +22,13 @@
|
|||
|
||||
#include "tgba/tgba.hh"
|
||||
#include "tgba/succiter.hh"
|
||||
#include "fwd.hh"
|
||||
|
||||
/// \addtogroup kripke Kripke Structures
|
||||
/// \ingroup tgba
|
||||
|
||||
namespace spot
|
||||
{
|
||||
class fair_kripke;
|
||||
|
||||
/// \ingroup kripke
|
||||
/// \brief Iterator code for a Fair Kripke structure.
|
||||
///
|
||||
|
|
|
|||
40
src/kripke/fwd.hh
Normal file
40
src/kripke/fwd.hh
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
// -*- coding: utf-8 -*-
|
||||
// Copyright (C) 2014 Laboratoire de Recherche et Développement de
|
||||
// l'Epita (LRDE).
|
||||
//
|
||||
// This file is part of Spot, a model checking library.
|
||||
//
|
||||
// Spot is free software; you can redistribute it and/or modify it
|
||||
// under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation; either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// Spot is distributed in the hope that it will be useful, but WITHOUT
|
||||
// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
||||
// or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
|
||||
// License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
#ifndef SPOT_KRIPKE_FWD_HH
|
||||
# define SPOT_KRIPKE_FWD_HH
|
||||
|
||||
#include <memory>
|
||||
|
||||
namespace spot
|
||||
{
|
||||
class fair_kripke;
|
||||
typedef std::shared_ptr<fair_kripke> fair_kripke_ptr;
|
||||
typedef std::shared_ptr<const fair_kripke> const_fair_kripke_ptr;
|
||||
|
||||
class kripke;
|
||||
typedef std::shared_ptr<const kripke> const_kripke_ptr;
|
||||
typedef std::shared_ptr<kripke> tgba_kripke_ptr;
|
||||
|
||||
class kripke_explicit;
|
||||
typedef std::shared_ptr<const kripke_explicit> const_kripke_explicit_ptr;
|
||||
typedef std::shared_ptr<kripke_explicit> kripke_explicit_ptr;
|
||||
}
|
||||
|
||||
#endif // SPOT_KRIPKE_FWD_HH
|
||||
|
|
@ -98,6 +98,10 @@ namespace spot
|
|||
virtual bdd neg_acceptance_conditions() const;
|
||||
virtual bdd all_acceptance_conditions() const;
|
||||
};
|
||||
|
||||
|
||||
typedef std::shared_ptr<kripke> kripke_ptr;
|
||||
typedef std::shared_ptr<const kripke> const_kripke_ptr;
|
||||
}
|
||||
|
||||
#endif // SPOT_KRIPKE_KRIPKE_HH
|
||||
|
|
|
|||
|
|
@ -126,14 +126,8 @@ namespace spot
|
|||
// kripke_explicit
|
||||
|
||||
|
||||
kripke_explicit::kripke_explicit(bdd_dict_ptr dict)
|
||||
: dict_(dict),
|
||||
init_(0)
|
||||
{
|
||||
}
|
||||
|
||||
kripke_explicit::kripke_explicit(bdd_dict_ptr dict,
|
||||
state_kripke* init)
|
||||
state_kripke* init)
|
||||
: dict_(dict),
|
||||
init_ (init)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -114,8 +114,7 @@ namespace spot
|
|||
class SPOT_API kripke_explicit : public kripke
|
||||
{
|
||||
public:
|
||||
kripke_explicit(bdd_dict_ptr);
|
||||
kripke_explicit(bdd_dict_ptr, state_kripke*);
|
||||
kripke_explicit(bdd_dict_ptr, state_kripke* = nullptr);
|
||||
~kripke_explicit();
|
||||
|
||||
bdd_dict_ptr get_dict() const;
|
||||
|
|
@ -180,5 +179,12 @@ namespace spot
|
|||
std::map<const std::string, state_kripke*> ns_nodes_;
|
||||
std::map<const state_kripke*, std::string> sn_nodes_;
|
||||
};
|
||||
|
||||
inline kripke_explicit_ptr
|
||||
make_kripke_explicit(const bdd_dict_ptr& d,
|
||||
state_kripke* init = nullptr)
|
||||
{
|
||||
return std::make_shared<kripke_explicit>(d, init);
|
||||
}
|
||||
}
|
||||
#endif // SPOT_KRIPKE_KRIPKEEXPLICIT_HH
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ namespace spot
|
|||
class kripke_printer : public tgba_reachable_iterator_breadth_first
|
||||
{
|
||||
public:
|
||||
kripke_printer(const kripke* a, std::ostream& os)
|
||||
kripke_printer(const const_kripke_ptr& a, std::ostream& os)
|
||||
: tgba_reachable_iterator_breadth_first(a), os_(os)
|
||||
{
|
||||
}
|
||||
|
|
@ -45,10 +45,9 @@ namespace spot
|
|||
os_ << '"';
|
||||
escape_str(os_, aut_->format_state(s));
|
||||
os_ << "\", \"";
|
||||
const kripke* automata = down_cast<const kripke*> (aut_);
|
||||
assert(automata);
|
||||
escape_str(os_, bdd_format_formula(d,
|
||||
automata->state_condition(s)));
|
||||
auto aut = std::static_pointer_cast<const kripke> (aut_);
|
||||
assert(aut);
|
||||
escape_str(os_, bdd_format_formula(d, aut->state_condition(s)));
|
||||
|
||||
os_ << "\",";
|
||||
for (si->first(); !si->done(); si->next())
|
||||
|
|
@ -69,7 +68,7 @@ namespace spot
|
|||
public tgba_reachable_iterator_breadth_first
|
||||
{
|
||||
public:
|
||||
kripke_printer_renumbered(const kripke* a, std::ostream& os)
|
||||
kripke_printer_renumbered(const const_kripke_ptr& a, std::ostream& os)
|
||||
: tgba_reachable_iterator_breadth_first(a), os_(os),
|
||||
notfirst(false)
|
||||
{
|
||||
|
|
@ -90,10 +89,10 @@ namespace spot
|
|||
|
||||
const bdd_dict_ptr d = aut_->get_dict();
|
||||
os_ << 'S' << in_s << ", \"";
|
||||
const kripke* automata = down_cast<const kripke*>(aut_);
|
||||
assert(automata);
|
||||
auto aut = std::static_pointer_cast<const kripke>(aut_);
|
||||
assert(aut);
|
||||
escape_str(os_, bdd_format_formula(d,
|
||||
automata->state_condition(s)));
|
||||
aut->state_condition(s)));
|
||||
os_ << "\",";
|
||||
}
|
||||
|
||||
|
|
@ -119,7 +118,7 @@ namespace spot
|
|||
}
|
||||
|
||||
std::ostream&
|
||||
kripke_save_reachable(std::ostream& os, const kripke* k)
|
||||
kripke_save_reachable(std::ostream& os, const const_kripke_ptr& k)
|
||||
{
|
||||
kripke_printer p(k, os);
|
||||
p.run();
|
||||
|
|
@ -127,7 +126,7 @@ namespace spot
|
|||
}
|
||||
|
||||
std::ostream&
|
||||
kripke_save_reachable_renumbered(std::ostream& os, const kripke* k)
|
||||
kripke_save_reachable_renumbered(std::ostream& os, const const_kripke_ptr& k)
|
||||
{
|
||||
kripke_printer_renumbered p(k, os);
|
||||
p.run();
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
// -*- coding: utf-8 -*-
|
||||
// Copyright (C) 2011, 2013 Laboratoire de Recherche et Developpement
|
||||
// Copyright (C) 2011, 2013, 2014 Laboratoire de Recherche et Developpement
|
||||
// de l'Epita (LRDE)
|
||||
//
|
||||
// This file is part of Spot, a model checking library.
|
||||
|
|
@ -23,12 +23,11 @@
|
|||
|
||||
# include "misc/common.hh"
|
||||
# include <iosfwd>
|
||||
# include "kripke.hh"
|
||||
|
||||
namespace spot
|
||||
{
|
||||
|
||||
class kripke;
|
||||
|
||||
/// \ingroup tgba_io
|
||||
/// \brief Save the reachable part of Kripke structure in text format.
|
||||
///
|
||||
|
|
@ -39,7 +38,7 @@ namespace spot
|
|||
/// kripke_save_reachable_renumbered() for large output.
|
||||
///
|
||||
SPOT_API std::ostream&
|
||||
kripke_save_reachable(std::ostream& os, const kripke* k);
|
||||
kripke_save_reachable(std::ostream& os, const const_kripke_ptr& k);
|
||||
|
||||
/// \ingroup tgba_io
|
||||
/// \brief Save the reachable part of Kripke structure in text format.
|
||||
|
|
@ -50,7 +49,7 @@ namespace spot
|
|||
/// the state name is lost.
|
||||
///
|
||||
SPOT_API std::ostream&
|
||||
kripke_save_reachable_renumbered(std::ostream& os, const kripke* k);
|
||||
kripke_save_reachable_renumbered(std::ostream& os, const const_kripke_ptr& k);
|
||||
|
||||
} // End namespace spot
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue