This is a huge patch, that took over a month to complete. The bit sets are currently restricted to what 'unsigned can store', but it should be easy to extend it to 'uint64_t' should we need it. * NEWS: Update. * src/tgba/acc.hh: New file. * src/tgbatest/acc.cc, src/tgbatest/acc.test: Test it. * src/tgba/tgbakvcomplement.cc, src/tgba/tgbakvcomplement.hh, src/tgba/tgbasgba.cc, src/tgba/tgbasgba.hh: Delete. The KV complementation is too slow to be used in practice, and I somehow broke it during the conversion to bitsets. The tgba->sgba conversion was only used for the KV complementation, and should be better redone on tgba_digraph_ptr should it be needed again. * src/bin/ltlcross.cc, src/dstarparse/dra2ba.cc, src/dstarparse/nsa2tgba.cc, src/graphtest/tgbagraph.cc, src/graphtest/tgbagraph.test, src/kripke/fairkripke.cc, src/kripke/fairkripke.hh, src/kripke/kripke.cc, src/kripke/kripke.hh, src/kripke/kripkeexplicit.cc, src/kripke/kripkeexplicit.hh, src/misc/hash.hh, src/neverparse/neverclaimparse.yy, src/priv/accmap.hh, src/ta/ta.cc, src/ta/ta.hh, src/ta/taexplicit.cc, src/ta/taexplicit.hh, src/ta/taproduct.cc, src/ta/taproduct.hh, src/ta/tgta.cc, 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/emptinessta.cc, src/taalgos/minimize.cc, src/taalgos/tgba2ta.cc, src/tgba/Makefile.am, src/tgba/fwd.hh, src/tgba/taatgba.cc, src/tgba/taatgba.hh, src/tgba/tgba.cc, src/tgba/tgba.hh, src/tgba/tgbagraph.cc, src/tgba/tgbagraph.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/tgbaalgos/bfssteps.cc, src/tgbaalgos/complete.cc, src/tgbaalgos/compsusp.cc, src/tgbaalgos/degen.cc, src/tgbaalgos/dotty.cc, src/tgbaalgos/dtbasat.cc, src/tgbaalgos/dtgbacomp.cc, src/tgbaalgos/dtgbasat.cc, src/tgbaalgos/dupexp.cc, src/tgbaalgos/emptiness.cc, src/tgbaalgos/emptiness.hh, src/tgbaalgos/gtec/ce.cc, src/tgbaalgos/gtec/gtec.cc, src/tgbaalgos/gtec/gtec.hh, src/tgbaalgos/gtec/sccstack.cc, src/tgbaalgos/gtec/sccstack.hh, src/tgbaalgos/gv04.cc, src/tgbaalgos/hoaf.cc, src/tgbaalgos/isweakscc.cc, src/tgbaalgos/lbtt.cc, src/tgbaalgos/ltl2tgba_fm.cc, src/tgbaalgos/magic.cc, src/tgbaalgos/ndfs_result.hxx, src/tgbaalgos/neverclaim.cc, src/tgbaalgos/postproc.cc, src/tgbaalgos/powerset.cc, src/tgbaalgos/randomgraph.cc, src/tgbaalgos/randomgraph.hh, src/tgbaalgos/reducerun.cc, src/tgbaalgos/replayrun.cc, src/tgbaalgos/safety.cc, src/tgbaalgos/save.cc, src/tgbaalgos/scc.cc, src/tgbaalgos/scc.hh, src/tgbaalgos/sccfilter.cc, src/tgbaalgos/sccinfo.cc, src/tgbaalgos/sccinfo.hh, src/tgbaalgos/se05.cc, src/tgbaalgos/simulation.cc, src/tgbaalgos/simulation.hh, src/tgbaalgos/stats.cc, src/tgbaalgos/stripacc.cc, src/tgbaalgos/tau03.cc, src/tgbaalgos/tau03opt.cc, src/tgbaalgos/weight.cc, src/tgbaalgos/weight.hh, src/tgbaparse/tgbaparse.yy, src/tgbatest/Makefile.am, src/tgbatest/complementation.cc, src/tgbatest/complementation.test, src/tgbatest/degenlskip.test, src/tgbatest/det.test, src/tgbatest/dstar.test, src/tgbatest/emptchk.cc, src/tgbatest/explpro2.test, src/tgbatest/explpro3.test, src/tgbatest/explpro4.test, src/tgbatest/explprod.test, src/tgbatest/ltl2tgba.cc, src/tgbatest/ltl2tgba.test, src/tgbatest/maskacc.cc, src/tgbatest/maskacc.test, src/tgbatest/neverclaimread.test, src/tgbatest/randtgba.cc, src/tgbatest/readsave.test, src/tgbatest/sim.test, src/tgbatest/sim2.test, src/tgbatest/spotlbtt.test, src/tgbatest/tgbaread.test, src/tgbatest/tripprod.test, iface/dve2/dve2.cc: Adjust or use to the new acceptance interface.
111 lines
3.2 KiB
C++
111 lines
3.2 KiB
C++
// -*- coding: utf-8 -*-
|
|
// Copyright (C) 2009, 2010, 2013, 2014 Laboratoire de Recherche et
|
|
// Developpement de l'Epita
|
|
//
|
|
// 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_KRIPKE_HH
|
|
# define SPOT_KRIPKE_KRIPKE_HH
|
|
|
|
#include "fairkripke.hh"
|
|
|
|
namespace spot
|
|
{
|
|
|
|
/// \ingroup kripke
|
|
/// \brief Iterator code for Kripke structure
|
|
///
|
|
/// This iterator can be used to simplify the writing
|
|
/// of an iterator on a Kripke structure (or lookalike).
|
|
///
|
|
/// If you inherit from this iterator, you should only
|
|
/// redefine
|
|
///
|
|
/// - kripke_succ_iterator::first()
|
|
/// - kripke_succ_iterator::next()
|
|
/// - kripke_succ_iterator::done()
|
|
/// - kripke_succ_iterator::current_state()
|
|
///
|
|
/// This class implements kripke_succ_iterator::current_condition(),
|
|
/// and kripke_succ_iterator::current_acceptance_conditions().
|
|
class SPOT_API kripke_succ_iterator : public tgba_succ_iterator
|
|
{
|
|
public:
|
|
/// \brief Constructor
|
|
///
|
|
/// The \a cond argument will be the one returned
|
|
/// by kripke_succ_iterator::current_condition().
|
|
kripke_succ_iterator(const bdd& cond)
|
|
: cond_(cond)
|
|
{
|
|
}
|
|
|
|
void recycle(const bdd& cond)
|
|
{
|
|
cond_ = cond;
|
|
}
|
|
|
|
virtual ~kripke_succ_iterator();
|
|
|
|
virtual bdd current_condition() const;
|
|
virtual acc_cond::mark_t current_acceptance_conditions() const;
|
|
protected:
|
|
bdd cond_;
|
|
};
|
|
|
|
/// \ingroup kripke
|
|
/// \brief Interface for a Kripke structure
|
|
///
|
|
/// A Kripke structure is a graph in which each node (=state) is
|
|
/// labeled by a conjunction of atomic proposition.
|
|
///
|
|
/// Such a structure can be seen as spot::tgba without
|
|
/// any acceptance condition.
|
|
///
|
|
/// A programmer that develops an instance of Kripke structure needs
|
|
/// just provide an implementation for the following methods:
|
|
///
|
|
/// - kripke::get_init_state()
|
|
/// - kripke::succ_iter()
|
|
/// - kripke::state_condition()
|
|
/// - kripke::format_state()
|
|
/// - and optionally kripke::transition_annotation()
|
|
///
|
|
/// The other methods of the tgba interface (like those dealing with
|
|
/// acceptance conditions) are supplied by this kripke class and
|
|
/// need not be defined.
|
|
///
|
|
/// See also spot::kripke_succ_iterator.
|
|
class SPOT_API kripke: public fair_kripke
|
|
{
|
|
public:
|
|
kripke(const bdd_dict_ptr& d)
|
|
: fair_kripke(d)
|
|
{
|
|
}
|
|
|
|
|
|
virtual ~kripke();
|
|
|
|
virtual acc_cond::mark_t state_acceptance_conditions(const state*) const;
|
|
};
|
|
|
|
|
|
typedef std::shared_ptr<kripke> kripke_ptr;
|
|
typedef std::shared_ptr<const kripke> const_kripke_ptr;
|
|
}
|
|
|
|
#endif // SPOT_KRIPKE_KRIPKE_HH
|