* NEWS: Mention this. * COPYING: Replace by GPL v3. * src/sanity/style.test: Check files with the wrong license, in case we forgot to update it during a merge. * Makefile.am, bench/Makefile.am, bench/emptchk/Makefile.am, bench/emptchk/defs.in, bench/emptchk/ltl-human.sh, bench/emptchk/ltl-random.sh, bench/emptchk/pml-clserv.sh, bench/emptchk/pml-eeaean.sh, bench/emptchk/pml2tgba.pl, bench/ltl2tgba/big, bench/ltl2tgba/defs.in, bench/ltl2tgba/known, bench/ltl2tgba/lbtt2csv.pl, bench/ltl2tgba/ltl2baw.in, bench/ltl2tgba/parseout.pl, bench/ltl2tgba/small, bench/ltlclasses/Makefile.am, bench/ltlclasses/defs.in, bench/ltlclasses/run, bench/ltlcounter/Makefile.am, bench/ltlcounter/defs.in, bench/ltlcounter/run, bench/scc-stats/Makefile.am, bench/scc-stats/stats.cc, bench/split-product/Makefile.am, bench/split-product/cutscc.cc, bench/split-product/pml2tgba.pl, bench/wdba/Makefile.am, bench/wdba/defs.in, bench/wdba/run, configure.ac, doc/Makefile.am, doc/dot.in, doc/tl/Makefile.am, iface/Makefile.am, iface/dve2/Makefile.am, iface/dve2/defs.in, iface/dve2/dve2.cc, iface/dve2/dve2.hh, iface/dve2/dve2check.cc, iface/dve2/dve2check.test, iface/dve2/finite.test, iface/dve2/kripke.test, iface/gspn/Makefile.am, iface/gspn/common.cc, iface/gspn/common.hh, iface/gspn/dcswave.test, iface/gspn/dcswaveeltl.test, iface/gspn/dcswavefm.test, iface/gspn/dcswaveltl.test, iface/gspn/dottygspn.cc, iface/gspn/dottyssp.cc, iface/gspn/gspn.cc, iface/gspn/gspn.hh, iface/gspn/ltlgspn.cc, iface/gspn/simple.test, iface/gspn/ssp.cc, iface/gspn/ssp.hh, iface/gspn/udcsefm.test, iface/gspn/udcseltl.test, iface/gspn/udcsfm.test, iface/gspn/udcsltl.test, src/Makefile.am, src/bin/Makefile.am, src/bin/common_cout.cc, src/bin/common_cout.hh, src/bin/common_finput.cc, src/bin/common_finput.hh, src/bin/common_output.cc, src/bin/common_output.hh, src/bin/common_post.cc, src/bin/common_post.hh, src/bin/common_r.cc, src/bin/common_r.hh, src/bin/common_range.cc, src/bin/common_range.hh, src/bin/common_setup.cc, src/bin/common_setup.hh, src/bin/common_sys.hh, src/bin/genltl.cc, src/bin/ltl2tgba.cc, src/bin/ltl2tgta.cc, src/bin/ltlfilt.cc, src/bin/man/Makefile.am, src/bin/randltl.cc, src/eltlparse/Makefile.am, src/eltlparse/eltlparse.yy, src/eltlparse/eltlscan.ll, src/eltlparse/fmterror.cc, src/eltlparse/parsedecl.hh, src/eltlparse/public.hh, src/eltltest/Makefile.am, src/eltltest/acc.cc, src/eltltest/acc.test, src/eltltest/defs.in, src/eltltest/nfa.cc, src/eltltest/nfa.test, src/evtgba/Makefile.am, src/evtgba/evtgba.cc, src/evtgba/evtgba.hh, src/evtgba/evtgbaiter.hh, src/evtgba/explicit.cc, src/evtgba/explicit.hh, src/evtgba/product.cc, src/evtgba/product.hh, src/evtgba/symbol.cc, src/evtgba/symbol.hh, src/evtgbaalgos/Makefile.am, src/evtgbaalgos/dotty.cc, src/evtgbaalgos/dotty.hh, src/evtgbaalgos/reachiter.cc, src/evtgbaalgos/reachiter.hh, src/evtgbaalgos/save.cc, src/evtgbaalgos/save.hh, src/evtgbaalgos/tgba2evtgba.cc, src/evtgbaalgos/tgba2evtgba.hh, src/evtgbaparse/Makefile.am, src/evtgbaparse/evtgbaparse.yy, src/evtgbaparse/evtgbascan.ll, src/evtgbaparse/fmterror.cc, src/evtgbaparse/parsedecl.hh, src/evtgbaparse/public.hh, src/evtgbatest/Makefile.am, src/evtgbatest/defs.in, src/evtgbatest/explicit.cc, src/evtgbatest/explicit.test, src/evtgbatest/ltl2evtgba.cc, src/evtgbatest/ltl2evtgba.test, src/evtgbatest/product.cc, src/evtgbatest/product.test, src/evtgbatest/readsave.cc, src/evtgbatest/readsave.test, src/kripke/Makefile.am, 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/kripke/kripkeprint.cc, src/kripke/kripkeprint.hh, src/kripkeparse/Makefile.am, src/kripkeparse/fmterror.cc, src/kripkeparse/kripkeparse.yy, src/kripkeparse/kripkescan.ll, src/kripkeparse/parsedecl.hh, src/kripkeparse/public.hh, src/kripkeparse/scankripke.ll, src/kripketest/Makefile.am, src/kripketest/bad_parsing.test, src/kripketest/defs.in, src/kripketest/kripke.test, src/kripketest/parse_print_test.cc, src/ltlast/Makefile.am, src/ltlast/allnodes.hh, src/ltlast/atomic_prop.cc, src/ltlast/atomic_prop.hh, src/ltlast/automatop.cc, src/ltlast/automatop.hh, src/ltlast/binop.cc, src/ltlast/binop.hh, src/ltlast/bunop.cc, src/ltlast/bunop.hh, src/ltlast/constant.cc, src/ltlast/constant.hh, src/ltlast/formula.cc, src/ltlast/formula.hh, src/ltlast/formula_tree.cc, src/ltlast/formula_tree.hh, src/ltlast/multop.cc, src/ltlast/multop.hh, src/ltlast/nfa.cc, src/ltlast/nfa.hh, src/ltlast/predecl.hh, src/ltlast/refformula.cc, src/ltlast/refformula.hh, src/ltlast/unop.cc, src/ltlast/unop.hh, src/ltlast/visitor.hh, src/ltlenv/Makefile.am, src/ltlenv/declenv.cc, src/ltlenv/declenv.hh, src/ltlenv/defaultenv.cc, src/ltlenv/defaultenv.hh, src/ltlenv/environment.hh, src/ltlparse/Makefile.am, src/ltlparse/fmterror.cc, src/ltlparse/ltlfile.cc, src/ltlparse/ltlfile.hh, src/ltlparse/ltlparse.yy, src/ltlparse/ltlscan.ll, src/ltlparse/parsedecl.hh, src/ltlparse/public.hh, src/ltltest/Makefile.am, src/ltltest/consterm.cc, src/ltltest/consterm.test, src/ltltest/defs.in, src/ltltest/equals.cc, src/ltltest/equals.test, src/ltltest/kind.cc, src/ltltest/kind.test, src/ltltest/length.cc, src/ltltest/length.test, src/ltltest/lunabbrev.test, src/ltltest/nenoform.test, src/ltltest/parse.test, src/ltltest/parseerr.test, src/ltltest/readltl.cc, src/ltltest/reduc.cc, src/ltltest/reduc.test, src/ltltest/reduccmp.test, src/ltltest/reducpsl.test, src/ltltest/syntimpl.cc, src/ltltest/syntimpl.test, src/ltltest/tostring.cc, src/ltltest/tostring.test, src/ltltest/tunabbrev.test, src/ltltest/tunenoform.test, src/ltltest/utf8.test, src/ltltest/uwrm.test, src/ltlvisit/Makefile.am, src/ltlvisit/apcollect.cc, src/ltlvisit/apcollect.hh, src/ltlvisit/clone.cc, src/ltlvisit/clone.hh, src/ltlvisit/contain.cc, src/ltlvisit/contain.hh, src/ltlvisit/destroy.cc, src/ltlvisit/destroy.hh, src/ltlvisit/dotty.cc, src/ltlvisit/dotty.hh, src/ltlvisit/dump.cc, src/ltlvisit/dump.hh, src/ltlvisit/lbt.cc, src/ltlvisit/lbt.hh, src/ltlvisit/length.cc, src/ltlvisit/length.hh, src/ltlvisit/lunabbrev.cc, src/ltlvisit/lunabbrev.hh, src/ltlvisit/mark.cc, src/ltlvisit/mark.hh, src/ltlvisit/nenoform.cc, src/ltlvisit/nenoform.hh, src/ltlvisit/postfix.cc, src/ltlvisit/postfix.hh, src/ltlvisit/randomltl.cc, src/ltlvisit/randomltl.hh, src/ltlvisit/reduce.cc, src/ltlvisit/reduce.hh, src/ltlvisit/relabel.cc, src/ltlvisit/relabel.hh, src/ltlvisit/simpfg.cc, src/ltlvisit/simpfg.hh, src/ltlvisit/simplify.cc, src/ltlvisit/simplify.hh, src/ltlvisit/snf.cc, src/ltlvisit/snf.hh, src/ltlvisit/tostring.cc, src/ltlvisit/tostring.hh, src/ltlvisit/tunabbrev.cc, src/ltlvisit/tunabbrev.hh, src/ltlvisit/wmunabbrev.cc, src/ltlvisit/wmunabbrev.hh, src/misc/Makefile.am, src/misc/acccompl.cc, src/misc/acccompl.hh, src/misc/accconv.cc, src/misc/accconv.hh, src/misc/bareword.cc, src/misc/bareword.hh, src/misc/bddalloc.cc, src/misc/bddalloc.hh, src/misc/bddlt.hh, src/misc/bddop.cc, src/misc/bddop.hh, src/misc/casts.hh, src/misc/escape.cc, src/misc/escape.hh, src/misc/fixpool.hh, src/misc/freelist.cc, src/misc/freelist.hh, src/misc/hash.hh, src/misc/hashfunc.hh, src/misc/intvcmp2.cc, src/misc/intvcmp2.hh, src/misc/intvcomp.cc, src/misc/intvcomp.hh, src/misc/ltstr.hh, src/misc/memusage.cc, src/misc/memusage.hh, src/misc/minato.cc, src/misc/minato.hh, src/misc/modgray.cc, src/misc/modgray.hh, src/misc/mspool.hh, src/misc/optionmap.cc, src/misc/optionmap.hh, src/misc/random.cc, src/misc/random.hh, src/misc/timer.cc, src/misc/timer.hh, src/misc/unique_ptr.hh, src/misc/version.cc, src/misc/version.hh, src/neverparse/Makefile.am, src/neverparse/fmterror.cc, src/neverparse/neverclaimparse.yy, src/neverparse/neverclaimscan.ll, src/neverparse/parsedecl.hh, src/neverparse/public.hh, src/saba/Makefile.am, src/saba/explicitstateconjunction.cc, src/saba/explicitstateconjunction.hh, src/saba/saba.cc, src/saba/saba.hh, src/saba/sabacomplementtgba.cc, src/saba/sabacomplementtgba.hh, src/saba/sabastate.hh, src/saba/sabasucciter.hh, src/sabaalgos/Makefile.am, src/sabaalgos/sabadotty.cc, src/sabaalgos/sabadotty.hh, src/sabaalgos/sabareachiter.cc, src/sabaalgos/sabareachiter.hh, src/sabatest/Makefile.am, src/sabatest/defs.in, src/sabatest/sabacomplementtgba.cc, src/sanity/Makefile.am, src/sanity/readme.test, src/sanity/style.test, src/ta/Makefile.am, 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/Makefile.am, 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/Makefile.am, src/tgba/bdddict.cc, src/tgba/bdddict.hh, src/tgba/bddprint.cc, src/tgba/bddprint.hh, src/tgba/formula2bdd.cc, src/tgba/formula2bdd.hh, src/tgba/futurecondcol.cc, src/tgba/futurecondcol.hh, src/tgba/public.hh, src/tgba/sba.hh, src/tgba/state.hh, src/tgba/statebdd.cc, src/tgba/statebdd.hh, src/tgba/succiter.hh, src/tgba/succiterconcrete.cc, src/tgba/succiterconcrete.hh, src/tgba/taatgba.cc, src/tgba/taatgba.hh, src/tgba/tgba.cc, src/tgba/tgba.hh, src/tgba/tgbabddconcrete.cc, src/tgba/tgbabddconcrete.hh, src/tgba/tgbabddconcretefactory.cc, src/tgba/tgbabddconcretefactory.hh, src/tgba/tgbabddconcreteproduct.cc, src/tgba/tgbabddconcreteproduct.hh, src/tgba/tgbabddcoredata.cc, src/tgba/tgbabddcoredata.hh, src/tgba/tgbabddfactory.hh, src/tgba/tgbaexplicit.cc, src/tgba/tgbaexplicit.hh, src/tgba/tgbakvcomplement.cc, src/tgba/tgbakvcomplement.hh, src/tgba/tgbaproduct.cc, src/tgba/tgbaproduct.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/tgbatba.cc, src/tgba/tgbatba.hh, src/tgba/tgbaunion.cc, src/tgba/tgbaunion.hh, src/tgba/wdbacomp.cc, src/tgba/wdbacomp.hh, src/tgbaalgos/Makefile.am, src/tgbaalgos/bfssteps.cc, src/tgbaalgos/bfssteps.hh, src/tgbaalgos/cutscc.cc, src/tgbaalgos/cutscc.hh, src/tgbaalgos/cycles.cc, 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/dupexp.cc, src/tgbaalgos/dupexp.hh, src/tgbaalgos/eltl2tgba_lacim.cc, src/tgbaalgos/eltl2tgba_lacim.hh, src/tgbaalgos/emptiness.cc, src/tgbaalgos/emptiness.hh, src/tgbaalgos/emptiness_stats.hh, src/tgbaalgos/gtec/Makefile.am, src/tgbaalgos/gtec/ce.cc, src/tgbaalgos/gtec/ce.hh, src/tgbaalgos/gtec/explscc.cc, src/tgbaalgos/gtec/explscc.hh, src/tgbaalgos/gtec/gtec.cc, src/tgbaalgos/gtec/gtec.hh, src/tgbaalgos/gtec/nsheap.cc, src/tgbaalgos/gtec/nsheap.hh, src/tgbaalgos/gtec/sccstack.cc, src/tgbaalgos/gtec/sccstack.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/isweakscc.hh, 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/ltl2tgba_lacim.cc, src/tgbaalgos/ltl2tgba_lacim.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/reductgba_sim.cc, src/tgbaalgos/reductgba_sim.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/se05.cc, src/tgbaalgos/se05.hh, src/tgbaalgos/simulation.cc, src/tgbaalgos/simulation.hh, src/tgbaalgos/stats.cc, src/tgbaalgos/stats.hh, src/tgbaalgos/tau03.cc, src/tgbaalgos/tau03.hh, src/tgbaalgos/tau03opt.cc, src/tgbaalgos/tau03opt.hh, src/tgbaalgos/weight.cc, src/tgbaalgos/weight.hh, src/tgbaparse/Makefile.am, src/tgbaparse/fmterror.cc, src/tgbaparse/parsedecl.hh, src/tgbaparse/public.hh, src/tgbaparse/tgbaparse.yy, src/tgbaparse/tgbascan.ll, src/tgbatest/Makefile.am, src/tgbatest/babiak.test, src/tgbatest/bddprod.test, src/tgbatest/complementation.cc, src/tgbatest/complementation.test, src/tgbatest/cycles.test, src/tgbatest/defs.in, src/tgbatest/degendet.test, src/tgbatest/degenid.test, src/tgbatest/dfs.test, src/tgbatest/dupexp.test, src/tgbatest/eltl2tgba.test, src/tgbatest/emptchk.test, src/tgbatest/emptchke.test, src/tgbatest/emptchkr.test, src/tgbatest/explicit.cc, src/tgbatest/explicit.test, src/tgbatest/explicit2.cc, src/tgbatest/explicit2.test, src/tgbatest/explpro2.test, src/tgbatest/explpro3.test, src/tgbatest/explpro4.test, src/tgbatest/explprod.cc, src/tgbatest/explprod.test, src/tgbatest/intvcmp2.cc, src/tgbatest/intvcomp.cc, src/tgbatest/intvcomp.test, src/tgbatest/kv.test, src/tgbatest/ltl2neverclaim.test, src/tgbatest/ltl2ta.test, src/tgbatest/ltl2tgba.cc, src/tgbatest/ltl2tgba.test, src/tgbatest/ltlcounter.test, src/tgbatest/ltlprod.cc, src/tgbatest/ltlprod.test, src/tgbatest/mixprod.cc, src/tgbatest/mixprod.test, src/tgbatest/neverclaimread.test, src/tgbatest/nondet.test, src/tgbatest/obligation.test, src/tgbatest/powerset.cc, src/tgbatest/randpsl.test, src/tgbatest/randtgba.cc, src/tgbatest/randtgba.test, src/tgbatest/readsave.test, src/tgbatest/renault.test, src/tgbatest/scc.test, src/tgbatest/sccsimpl.test, src/tgbatest/spotlbtt.test, src/tgbatest/spotlbtt2.test, src/tgbatest/taatgba.cc, src/tgbatest/taatgba.test, src/tgbatest/tgbaread.cc, src/tgbatest/tgbaread.test, src/tgbatest/tripprod.cc, src/tgbatest/tripprod.test, src/tgbatest/wdba.test, src/tgbatest/wdba2.test, wrap/Makefile.am, wrap/python/Makefile.am, wrap/python/ajax/Makefile.am, wrap/python/ajax/spot.in, wrap/python/buddy.i, wrap/python/spot.i, wrap/python/tests/Makefile.am, wrap/python/tests/alarm.py, wrap/python/tests/bddnqueen.py, wrap/python/tests/implies.py, wrap/python/tests/interdep.py, wrap/python/tests/ltl2tgba.py, wrap/python/tests/ltl2tgba.test, wrap/python/tests/ltlparse.py, wrap/python/tests/ltlsimple.py, wrap/python/tests/minato.py, wrap/python/tests/modgray.py, wrap/python/tests/optionmap.py, wrap/python/tests/parsetgba.py, wrap/python/tests/run.in, wrap/python/tests/setxor.py: Update licence version, and replace the FSF address by a URL.
371 lines
11 KiB
C++
371 lines
11 KiB
C++
// Copyright (C) 2012 Laboratoire de Recherche et
|
|
// Développement 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/>.
|
|
|
|
|
|
#include "degen.hh"
|
|
#include "tgba/tgbaexplicit.hh"
|
|
#include "misc/hash.hh"
|
|
#include "misc/hashfunc.hh"
|
|
#include "ltlast/constant.hh"
|
|
#include <deque>
|
|
#include <vector>
|
|
|
|
namespace spot
|
|
{
|
|
namespace
|
|
{
|
|
// A state in the degenalized automaton corresponds to a state in
|
|
// the TGBA associated to a level. The level is just an index in
|
|
// the list of acceptance sets.
|
|
typedef std::pair<const state*, unsigned> degen_state;
|
|
|
|
struct degen_state_hash
|
|
{
|
|
size_t
|
|
operator()(const degen_state& s) const
|
|
{
|
|
return s.first->hash() & wang32_hash(s.second);
|
|
}
|
|
};
|
|
|
|
struct degen_state_equal
|
|
{
|
|
bool
|
|
operator()(const degen_state& left,
|
|
const degen_state& right) const
|
|
{
|
|
if (left.second != right.second)
|
|
return false;
|
|
return left.first->compare(right.first) == 0;
|
|
}
|
|
};
|
|
|
|
// Associate the degeneralized state to its number.
|
|
typedef Sgi::hash_map<degen_state, int,
|
|
degen_state_hash, degen_state_equal> ds2num_map;
|
|
|
|
// Queue of state to be processed.
|
|
typedef std::deque<degen_state> queue_t;
|
|
|
|
// Memory management for the input states.
|
|
class unicity_table
|
|
{
|
|
typedef Sgi::hash_set<const state*,
|
|
state_ptr_hash, state_ptr_equal> uniq_set;
|
|
uniq_set m;
|
|
public:
|
|
const state* operator()(const state* s)
|
|
{
|
|
uniq_set::const_iterator i = m.find(s);
|
|
if (i == m.end())
|
|
{
|
|
m.insert(s);
|
|
return s;
|
|
}
|
|
else
|
|
{
|
|
s->destroy();
|
|
return *i;
|
|
}
|
|
}
|
|
|
|
~unicity_table()
|
|
{
|
|
for (uniq_set::iterator i = m.begin(); i != m.end();)
|
|
{
|
|
// Advance the iterator before destroying its key. This
|
|
// avoid issues with old g++ implementations.
|
|
uniq_set::iterator old = i++;
|
|
(*old)->destroy();
|
|
}
|
|
}
|
|
};
|
|
|
|
// Acceptance set common to all outgoing transitions of some state.
|
|
class outgoing_acc
|
|
{
|
|
const tgba* a_;
|
|
typedef std::pair<bdd, bdd> cache_entry;
|
|
typedef Sgi::hash_map<const state*, cache_entry,
|
|
state_ptr_hash, state_ptr_equal> cache_t;
|
|
cache_t cache_;
|
|
|
|
public:
|
|
outgoing_acc(const tgba* a): a_(a)
|
|
{
|
|
}
|
|
|
|
cache_t::const_iterator fill_cache(const state* s)
|
|
{
|
|
bdd common = a_->all_acceptance_conditions();
|
|
bdd union_ = bddfalse;
|
|
tgba_succ_iterator* it = a_->succ_iter(s);
|
|
for (it->first(); !it->done(); it->next())
|
|
{
|
|
bdd set = it->current_acceptance_conditions();
|
|
common &= set;
|
|
union_ |= set;
|
|
}
|
|
delete it;
|
|
cache_entry e(common, union_);
|
|
return cache_.insert(std::make_pair(s, e)).first;
|
|
}
|
|
|
|
// Intersection of all outgoing acceptance sets
|
|
bdd common_acc(const state* s)
|
|
{
|
|
cache_t::const_iterator i = cache_.find(s);
|
|
if (i == cache_.end())
|
|
i = fill_cache(s);
|
|
return i->second.first;
|
|
}
|
|
|
|
// Union of all outgoing acceptance sets
|
|
bdd union_acc(const state* s)
|
|
{
|
|
cache_t::const_iterator i = cache_.find(s);
|
|
if (i == cache_.end())
|
|
i = fill_cache(s);
|
|
return i->second.second;
|
|
}
|
|
};
|
|
}
|
|
|
|
sba*
|
|
degeneralize(const tgba* a)
|
|
{
|
|
bdd_dict* dict = a->get_dict();
|
|
|
|
// The result (degeneralized) automaton uses numbered state.
|
|
sba_explicit_number* res = new sba_explicit_number(dict);
|
|
dict->register_all_variables_of(a, res);
|
|
// FIXME: unregister acceptance conditions.
|
|
|
|
// Invent a new acceptance set for the degeneralized automaton.
|
|
int accvar =
|
|
dict->register_acceptance_variable(ltl::constant::true_instance(), res);
|
|
bdd degen_acc = bdd_ithvar(accvar);
|
|
res->set_acceptance_conditions(degen_acc);
|
|
|
|
// Create an order of acceptance conditions. Each entry in this
|
|
// vector correspond to an acceptance set. Each index can
|
|
// be used as a level in degen_state to indicate the next expected
|
|
// acceptance set. Level order.size() is a special level used to
|
|
// denote accepting states.
|
|
std::vector<bdd> order;
|
|
{
|
|
// The order is arbitrary, but it turns out that using push_back
|
|
// instead of push_front often gives better results because
|
|
// acceptance sets at the beginning if the cycle are more often
|
|
// used in the automaton. (This surprising fact is probably
|
|
// related to the order in which we declare the BDD variables
|
|
// during the translation.)
|
|
bdd all = a->all_acceptance_conditions();
|
|
while (all != bddfalse)
|
|
{
|
|
bdd next = bdd_satone(all);
|
|
all -= next;
|
|
order.push_back(next);
|
|
}
|
|
}
|
|
|
|
outgoing_acc outgoing(a);
|
|
|
|
// Make sure we always use the same pointer for identical states
|
|
// from the input automaton.
|
|
unicity_table uniq;
|
|
|
|
// These maps make it possible to convert degen_state to number
|
|
// and vice-versa.
|
|
ds2num_map ds2num;
|
|
|
|
// This map is used to find transitions that go to the same
|
|
// destination with the same acceptance. The integer key is
|
|
// (dest*2+acc) where dest is the destination state number, and
|
|
// acc is 1 iff the transition is accepting. The source
|
|
// is always that of the current iteration.
|
|
typedef std::map<int, state_explicit_number::transition*> tr_cache_t;
|
|
tr_cache_t tr_cache;
|
|
|
|
queue_t todo;
|
|
|
|
const state* s0 = uniq(a->get_init_state());
|
|
degen_state s(s0, 0);
|
|
|
|
// As an heuristic, if the initial state has accepting self-loops,
|
|
// start the degeneralization on the accepting level.
|
|
{
|
|
bdd all = a->all_acceptance_conditions();
|
|
tgba_succ_iterator* it = a->succ_iter(s0);
|
|
for (it->first(); !it->done(); it->next())
|
|
{
|
|
// Look only for transitions that are accepting.
|
|
if (all != it->current_acceptance_conditions())
|
|
continue;
|
|
// Look only for self-loops.
|
|
const state* dest = uniq(it->current_state());
|
|
if (dest == s0)
|
|
{
|
|
// The initial state has an accepting self-loop.
|
|
s.second = order.size();
|
|
break;
|
|
}
|
|
}
|
|
delete it;
|
|
}
|
|
|
|
ds2num[s] = 0;
|
|
todo.push_back(s);
|
|
|
|
while (!todo.empty())
|
|
{
|
|
s = todo.front();
|
|
todo.pop_front();
|
|
int src = ds2num[s];
|
|
unsigned slevel = s.second;
|
|
|
|
// If we have a state on the last level, it should be accepting.
|
|
bool is_acc = slevel == order.size();
|
|
// On the accepting level, start again from level 0.
|
|
if (is_acc)
|
|
slevel = 0;
|
|
|
|
tgba_succ_iterator* i = a->succ_iter(s.first);
|
|
for (i->first(); !i->done(); i->next())
|
|
{
|
|
degen_state d(uniq(i->current_state()), 0);
|
|
|
|
// The old level is slevel. What should be the new one?
|
|
bdd acc = i->current_acceptance_conditions();
|
|
bdd otheracc = outgoing.common_acc(d.first);
|
|
|
|
if (is_acc)
|
|
{
|
|
// Ignore the last expected acceptance set (the value of
|
|
// *prev below) if it is common to all other outgoing
|
|
// transitions (of the current state) AND if it is not
|
|
// used by any outgoing transition of the destination
|
|
// state.
|
|
//
|
|
// 1) It's correct to do that, because this acceptance
|
|
// set is common to other outgoing transitions.
|
|
// Therefore if we make a cycle to this state we
|
|
// will eventually see that acceptance set thanks
|
|
// to the "pulling" of the common acceptance sets
|
|
// of the destination state (d.first).
|
|
//
|
|
// 2) It's also desirable because it makes the
|
|
// degeneralization idempotent (up to a renaming of
|
|
// states). Consider the following automaton where
|
|
// 1 is initial and => marks accepting transitions:
|
|
// 1=>1, 1=>2, 2->2, 2->1 This is already an SBA,
|
|
// with 1 as accepting state. However if you try
|
|
// degeralize it without ignoring *prev, you'll get
|
|
// two copies of states 2, depending on whether we
|
|
// reach it using 1=>2 or from 2->2. If this
|
|
// example was not clear, uncomment this following
|
|
// "if" block, and play with the "degenid.test"
|
|
// test case.
|
|
//
|
|
// 3) Ignoring all common acceptance sets would also
|
|
// be correct, but it would make the
|
|
// degeneralization produce larger automata in some
|
|
// cases. The current condition to ignore only one
|
|
// acceptance set if is this not used by the next
|
|
// state is a heuristic that is compatible with
|
|
// point 2) above while not causing more states to
|
|
// be generated in our benchmark of 188 formulae
|
|
// from the literature.
|
|
if (!order.empty())
|
|
{
|
|
unsigned prev = order.size() - 1;
|
|
bdd common = outgoing.common_acc(s.first);
|
|
if (bdd_implies(order[prev], common))
|
|
{
|
|
bdd u = outgoing.union_acc(d.first);
|
|
if (!bdd_implies(order[prev], u))
|
|
acc -= order[prev];
|
|
}
|
|
}
|
|
}
|
|
// A transition in the SLEVEL acceptance set should
|
|
// be directed to the next acceptance set. If the
|
|
// current transition is also in the next acceptance
|
|
// set, then go to the one after, etc.
|
|
//
|
|
// See Denis Oddoux's PhD thesis for a nice
|
|
// explanation (in French).
|
|
// @PhDThesis{ oddoux.03.phd,
|
|
// author = {Denis Oddoux},
|
|
// title = {Utilisation des automates alternants pour un
|
|
// model-checking efficace des logiques
|
|
// temporelles lin{\'e}aires.},
|
|
// school = {Universit{\'e}e Paris 7},
|
|
// year = {2003},
|
|
// address= {Paris, France},
|
|
// month = {December}
|
|
// }
|
|
unsigned next = slevel;
|
|
// Consider both the current acceptance sets, and the
|
|
// acceptance sets common to the outgoing transitions of
|
|
// the destination state.
|
|
acc |= otheracc;
|
|
while (next < order.size() && bdd_implies(order[next], acc))
|
|
++next;
|
|
|
|
d.second = next;
|
|
|
|
// Have we already seen this destination?
|
|
int dest;
|
|
ds2num_map::const_iterator di = ds2num.find(d);
|
|
if (di != ds2num.end())
|
|
{
|
|
dest = di->second;
|
|
}
|
|
else
|
|
{
|
|
dest = ds2num.size();
|
|
ds2num[d] = dest;
|
|
todo.push_back(d);
|
|
}
|
|
|
|
state_explicit_number::transition*& t =
|
|
tr_cache[dest * 2 + is_acc];
|
|
|
|
if (t == 0)
|
|
{
|
|
// Actually create the transition.
|
|
t = res->create_transition(src, dest);
|
|
t->condition = i->current_condition();
|
|
// If the source state is accepting, we have to put
|
|
// degen_acc on all outgoing transitions. (We are still
|
|
// building a TGBA; we only assure that it can be used as
|
|
// an SBA.)
|
|
t->acceptance_conditions = is_acc ? degen_acc : bddfalse;
|
|
}
|
|
else
|
|
{
|
|
t->condition |= i->current_condition();
|
|
}
|
|
}
|
|
delete i;
|
|
tr_cache.clear();
|
|
}
|
|
return res;
|
|
}
|
|
}
|