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.
187 lines
4.5 KiB
C++
187 lines
4.5 KiB
C++
// -*- coding: utf-8 -*-
|
|
// Copyright (C) 2009, 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/>.
|
|
|
|
#include <cassert>
|
|
#include "sabareachiter.hh"
|
|
|
|
namespace spot
|
|
{
|
|
// saba_reachable_iterator
|
|
//////////////////////////////////////////////////////////////////////
|
|
|
|
saba_reachable_iterator::saba_reachable_iterator(const const_saba_ptr& a)
|
|
: automata_(a)
|
|
{
|
|
}
|
|
|
|
saba_reachable_iterator::~saba_reachable_iterator()
|
|
{
|
|
seen_map::const_iterator s = seen.begin();
|
|
while (s != seen.end())
|
|
{
|
|
// Advance the iterator before deleting the "key" pointer.
|
|
const saba_state* ptr = s->first;
|
|
++s;
|
|
delete ptr;
|
|
}
|
|
}
|
|
|
|
void
|
|
saba_reachable_iterator::run()
|
|
{
|
|
int n = 0;
|
|
int conjn = 0;
|
|
|
|
start();
|
|
saba_state* i = automata_->get_init_state();
|
|
if (want_state(i))
|
|
add_state(i);
|
|
seen[i] = ++n;
|
|
const saba_state* t;
|
|
while ((t = next_state()))
|
|
{
|
|
assert(seen.find(t) != seen.end());
|
|
int tn = seen[t];
|
|
saba_succ_iterator* si = automata_->succ_iter(t);
|
|
process_state(t, tn);
|
|
for (si->first(); !si->done(); si->next())
|
|
{
|
|
saba_state_conjunction* conj = si->current_conjunction();
|
|
++conjn;
|
|
process_state_conjunction(t, tn, conj, conjn, si);
|
|
|
|
for (conj->first(); !conj->done(); conj->next())
|
|
{
|
|
const saba_state* current = conj->current_state();
|
|
seen_map::const_iterator s = seen.find(current);
|
|
bool ws = want_state(current);
|
|
|
|
if (s == seen.end())
|
|
{
|
|
seen[current] = ++n;
|
|
if (ws)
|
|
{
|
|
add_state(current);
|
|
process_link(t, tn, current, n, conj, conjn, si);
|
|
}
|
|
}
|
|
else
|
|
{
|
|
if (ws)
|
|
process_link(t, tn, s->first, s->second, conj, conjn, si);
|
|
delete current;
|
|
}
|
|
}
|
|
delete conj;
|
|
}
|
|
delete si;
|
|
}
|
|
end();
|
|
}
|
|
|
|
bool
|
|
saba_reachable_iterator::want_state(const saba_state*) const
|
|
{
|
|
return true;
|
|
}
|
|
|
|
void
|
|
saba_reachable_iterator::start()
|
|
{
|
|
}
|
|
|
|
void
|
|
saba_reachable_iterator::end()
|
|
{
|
|
}
|
|
|
|
void
|
|
saba_reachable_iterator::process_state(const saba_state*, int)
|
|
{
|
|
}
|
|
|
|
void
|
|
saba_reachable_iterator::
|
|
process_state_conjunction(const saba_state*, int,
|
|
const saba_state_conjunction*,
|
|
int,
|
|
const saba_succ_iterator*)
|
|
{
|
|
}
|
|
|
|
void
|
|
saba_reachable_iterator::process_link(const saba_state*, int,
|
|
const saba_state*, int,
|
|
const saba_state_conjunction*,
|
|
int,
|
|
const saba_succ_iterator*)
|
|
{
|
|
}
|
|
|
|
// saba_reachable_iterator_depth_first
|
|
//////////////////////////////////////////////////////////////////////
|
|
|
|
saba_reachable_iterator_depth_first::
|
|
saba_reachable_iterator_depth_first(const const_saba_ptr& a)
|
|
: saba_reachable_iterator(a)
|
|
{
|
|
}
|
|
|
|
void
|
|
saba_reachable_iterator_depth_first::add_state(const saba_state* s)
|
|
{
|
|
todo.push(s);
|
|
}
|
|
|
|
const saba_state*
|
|
saba_reachable_iterator_depth_first::next_state()
|
|
{
|
|
if (todo.empty())
|
|
return 0;
|
|
const saba_state* s = todo.top();
|
|
todo.pop();
|
|
return s;
|
|
}
|
|
|
|
// saba_reachable_iterator_breadth_first
|
|
//////////////////////////////////////////////////////////////////////
|
|
|
|
saba_reachable_iterator_breadth_first::
|
|
saba_reachable_iterator_breadth_first(const const_saba_ptr& a)
|
|
: saba_reachable_iterator(a)
|
|
{
|
|
}
|
|
|
|
void
|
|
saba_reachable_iterator_breadth_first::add_state(const saba_state* s)
|
|
{
|
|
todo.push_back(s);
|
|
}
|
|
|
|
const saba_state*
|
|
saba_reachable_iterator_breadth_first::next_state()
|
|
{
|
|
if (todo.empty())
|
|
return 0;
|
|
const saba_state* s = todo.front();
|
|
todo.pop_front();
|
|
return s;
|
|
}
|
|
|
|
}
|