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.
231 lines
5.2 KiB
C++
231 lines
5.2 KiB
C++
// -*- coding: utf-8 -*-
|
|
// Copyright (C) 2013, 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 "tgbamask.hh"
|
|
#include <vector>
|
|
|
|
namespace spot
|
|
{
|
|
namespace
|
|
{
|
|
struct transition
|
|
{
|
|
const state* dest;
|
|
bdd cond;
|
|
acc_cond::mark_t acc;
|
|
};
|
|
typedef std::vector<transition> transitions;
|
|
|
|
struct succ_iter_filtered: public tgba_succ_iterator
|
|
{
|
|
~succ_iter_filtered()
|
|
{
|
|
for (auto& t: trans_)
|
|
t.dest->destroy();
|
|
}
|
|
|
|
bool first()
|
|
{
|
|
it_ = trans_.begin();
|
|
return it_ != trans_.end();
|
|
}
|
|
|
|
bool next()
|
|
{
|
|
++it_;
|
|
return it_ != trans_.end();
|
|
}
|
|
|
|
bool done() const
|
|
{
|
|
return it_ == trans_.end();
|
|
}
|
|
|
|
state* current_state() const
|
|
{
|
|
return it_->dest->clone();
|
|
}
|
|
|
|
bdd current_condition() const
|
|
{
|
|
return it_->cond;
|
|
}
|
|
|
|
acc_cond::mark_t current_acceptance_conditions() const
|
|
{
|
|
return it_->acc;
|
|
}
|
|
|
|
transitions trans_;
|
|
transitions::const_iterator it_;
|
|
};
|
|
|
|
/// \ingroup tgba_on_the_fly_algorithms
|
|
/// \brief A masked TGBA (abstract).
|
|
///
|
|
/// Ignores some states from a TGBA. What state are preserved or
|
|
/// ignored is controlled by the wanted() method.
|
|
///
|
|
/// This is an abstract class. You should inherit from it and
|
|
/// supply a wanted() method to specify which states to keep.
|
|
class tgba_mask: public tgba_proxy
|
|
{
|
|
protected:
|
|
/// \brief Constructor.
|
|
/// \param masked The automaton to mask
|
|
/// \param init Any state to use as initial state. This state will be
|
|
/// destroyed by the destructor.
|
|
tgba_mask(const const_tgba_ptr& masked, const state* init = 0):
|
|
tgba_proxy(masked),
|
|
init_(init)
|
|
{
|
|
if (!init)
|
|
init_ = masked->get_init_state();
|
|
}
|
|
|
|
|
|
public:
|
|
virtual ~tgba_mask()
|
|
{
|
|
init_->destroy();
|
|
}
|
|
|
|
virtual state* get_init_state() const
|
|
{
|
|
return init_->clone();
|
|
}
|
|
|
|
virtual tgba_succ_iterator*
|
|
succ_iter(const state* local_state) const
|
|
{
|
|
succ_iter_filtered* res;
|
|
if (iter_cache_)
|
|
{
|
|
res = down_cast<succ_iter_filtered*>(iter_cache_);
|
|
res->trans_.clear();
|
|
iter_cache_ = nullptr;
|
|
}
|
|
else
|
|
{
|
|
res = new succ_iter_filtered;
|
|
}
|
|
for (auto it: original_->succ(local_state))
|
|
{
|
|
const spot::state* s = it->current_state();
|
|
auto acc = it->current_acceptance_conditions();
|
|
if (!wanted(s, acc))
|
|
{
|
|
s->destroy();
|
|
continue;
|
|
}
|
|
res->trans_.emplace_back
|
|
(transition {s, it->current_condition(), acc});
|
|
}
|
|
return res;
|
|
}
|
|
|
|
virtual bool wanted(const state* s, acc_cond::mark_t acc) const = 0;
|
|
|
|
protected:
|
|
const state* init_;
|
|
};
|
|
|
|
class tgba_mask_keep: public tgba_mask
|
|
{
|
|
const state_set& mask_;
|
|
public:
|
|
tgba_mask_keep(const const_tgba_ptr& masked,
|
|
const state_set& mask,
|
|
const state* init)
|
|
: tgba_mask(masked, init),
|
|
mask_(mask)
|
|
{
|
|
}
|
|
|
|
bool wanted(const state* s, const acc_cond::mark_t) const
|
|
{
|
|
state_set::const_iterator i = mask_.find(s);
|
|
return i != mask_.end();
|
|
}
|
|
};
|
|
|
|
class tgba_mask_ignore: public tgba_mask
|
|
{
|
|
const state_set& mask_;
|
|
public:
|
|
tgba_mask_ignore(const const_tgba_ptr& masked,
|
|
const state_set& mask,
|
|
const state* init)
|
|
: tgba_mask(masked, init),
|
|
mask_(mask)
|
|
{
|
|
}
|
|
|
|
bool wanted(const state* s, const acc_cond::mark_t) const
|
|
{
|
|
state_set::const_iterator i = mask_.find(s);
|
|
return i == mask_.end();
|
|
}
|
|
};
|
|
|
|
class tgba_mask_acc_ignore: public tgba_mask
|
|
{
|
|
unsigned mask_;
|
|
public:
|
|
tgba_mask_acc_ignore(const const_tgba_ptr& masked,
|
|
unsigned mask,
|
|
const state* init)
|
|
: tgba_mask(masked, init),
|
|
mask_(mask)
|
|
{
|
|
}
|
|
|
|
bool wanted(const state*, const acc_cond::mark_t acc) const
|
|
{
|
|
return !acc.has(mask_);
|
|
}
|
|
};
|
|
|
|
}
|
|
|
|
const_tgba_ptr
|
|
build_tgba_mask_keep(const const_tgba_ptr& to_mask,
|
|
const state_set& to_keep,
|
|
const state* init)
|
|
{
|
|
return std::make_shared<tgba_mask_keep>(to_mask, to_keep, init);
|
|
}
|
|
|
|
const_tgba_ptr
|
|
build_tgba_mask_ignore(const const_tgba_ptr& to_mask,
|
|
const state_set& to_ignore,
|
|
const state* init)
|
|
{
|
|
return std::make_shared<tgba_mask_ignore>(to_mask, to_ignore, init);
|
|
}
|
|
|
|
const_tgba_ptr
|
|
build_tgba_mask_acc_ignore(const const_tgba_ptr& to_mask,
|
|
unsigned to_ignore,
|
|
const state* init)
|
|
{
|
|
return std::make_shared<tgba_mask_acc_ignore>(to_mask, to_ignore, init);
|
|
}
|
|
|
|
}
|