Store membership to acceptance sets using bitsets, not BDDs.

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.
2014-09-29 18:17:34 +02:00 · 2014-09-29 18:17:34 +02:00 · 2c764fb3c7
commit 2c764fb3c7
parent 37ece2b878
125 changed files with 1950 additions and 3254 deletions
--- a/src/tgba/acc.hh
+++ b/src/tgba/acc.hh
@ -0,0 +1,433 @@
+// -*- coding: utf-8 -*-
+// Copyright (C) 2014 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/>.
+
+#ifndef SPOT_TGBA_ACC_HH
+# define SPOT_TGBA_ACC_HH
+
+# include <functional>
+# include <unordered_map>
+# include <sstream>
+# include "bdddict.hh"
+# include "ltlenv/defaultenv.hh"
+
+namespace spot
+{
+  class acc_cond
+  {
+  public:
+    struct mark_t
+    {
+      typedef unsigned value_t;
+      value_t id;
+
+      mark_t() = default;
+
+      mark_t(value_t id)
+	: id(id)
+      {
+      }
+
+      bool operator==(unsigned o) const
+      {
+	assert(o == 0U);
+	return id == o;
+      }
+
+      bool operator!=(unsigned o) const
+      {
+	assert(o == 0U);
+	return id != o;
+      }
+
+      bool operator==(mark_t o) const
+      {
+	return id == o.id;
+      }
+
+      bool operator!=(mark_t o) const
+      {
+	return id != o.id;
+      }
+
+      bool operator<(mark_t o) const
+      {
+	return id < o.id;
+      }
+
+      bool operator<=(mark_t o) const
+      {
+	return id <= o.id;
+      }
+
+      bool operator>(mark_t o) const
+      {
+	return id > o.id;
+      }
+
+      bool operator>=(mark_t o) const
+      {
+	return id >= o.id;
+      }
+
+      operator bool() const
+      {
+	return id != 0;
+      }
+
+
+      bool has(unsigned u) const
+      {
+	return id & (1U << u);
+      }
+
+      mark_t& operator&=(mark_t r)
+      {
+	id &= r.id;
+	return *this;
+      }
+
+      mark_t& operator|=(mark_t r)
+      {
+	id |= r.id;
+	return *this;
+      }
+
+      mark_t& operator-=(mark_t r)
+      {
+	id &= ~r.id;
+	return *this;
+      }
+
+      mark_t operator&(mark_t r) const
+      {
+	return id & r.id;
+      }
+
+      mark_t operator|(mark_t r) const
+      {
+	return id | r.id;
+      }
+
+      mark_t operator-(mark_t r) const
+      {
+	return id & ~r.id;
+      }
+
+      // Number of bits sets.
+      unsigned count() const
+      {
+#ifdef __GNUC__
+	return __builtin_popcount(id);
+#else
+	unsigned c = 0U;
+	auto v = id;
+	while (v)
+	  {
+	    ++c;
+	    v &= v - 1;
+	  }
+	return c;
+#endif
+      }
+
+      // Remove n bits that where set
+      mark_t& remove_some(unsigned n)
+      {
+	while (n--)
+	  id &= id - 1;
+	return *this;
+      }
+
+      friend std::ostream& operator<<(std::ostream& os, mark_t m)
+      {
+	auto a = m.id;
+	os << '{';
+	unsigned level = 0;
+	const char* comma = "";
+	while (a)
+	  {
+	    if (a & 1)
+	      {
+		os << comma << level;
+		comma = ",";
+	      }
+	    a >>= 1;
+	    ++level;
+	  }
+	os << '}';
+	return os;
+      }
+    };
+
+    acc_cond(const bdd_dict_ptr& dict, unsigned n_sets = 0)
+      : d_(dict), num_(0U), all_(0U)
+    {
+      add_sets(n_sets);
+    }
+
+    acc_cond(const acc_cond& o)
+      : num_(o.num_), all_(o.all_)
+    {
+    }
+
+    ~acc_cond()
+    {
+    }
+
+    const bdd_dict_ptr& get_dict() const
+    {
+      return d_;
+    }
+
+    unsigned add_sets(unsigned num)
+    {
+      if (num == 0)
+	return -1U;
+      unsigned j = num_;
+      num_ += num;
+      if (num_ > 8 * sizeof(mark_t::id))
+	throw std::runtime_error("Too many acceptance sets used.");
+      all_ = all_sets_();
+      return j;
+    }
+
+    unsigned add_set()
+    {
+      return add_sets(1);
+    }
+
+    mark_t mark(unsigned u) const
+    {
+      return out(mark_(u));
+    }
+
+    template<class iterator>
+    mark_t marks(const iterator& begin, const iterator& end) const
+    {
+      mark_t::value_t res = 0U;
+      for (iterator i = begin; i != end; ++i)
+	res |= mark_(*i);
+      return out(res);
+    }
+
+    mark_t marks(std::initializer_list<unsigned> vals) const
+    {
+      return marks(vals.begin(), vals.end());
+    }
+
+    template<class iterator>
+    void fill_from(mark_t m, iterator here) const
+    {
+      auto a = in(m);
+      unsigned level = 0;
+      while (a)
+	{
+	  if (a & 1)
+	    *here++ = level;
+	  ++level;
+	  a >>= 1;
+	}
+      assert(level <= num_sets());
+    }
+
+    // FIXME: Return some iterable object without building a vector.
+    std::vector<unsigned> sets(mark_t m) const
+    {
+      std::vector<unsigned> res;
+      fill_from(m, std::back_inserter(res));
+      return res;
+    }
+
+    // whether m contains u
+    bool has(mark_t m, unsigned u) const
+    {
+      return m.has(u);
+    }
+
+    mark_t cup(mark_t l, mark_t r) const
+    {
+      return l | r;
+    }
+
+    mark_t cap(mark_t l, mark_t r) const
+    {
+      return l & r;
+    }
+
+    mark_t set_minus(mark_t l, mark_t r) const
+    {
+      return l - r;
+    }
+
+    mark_t join(const acc_cond& la, mark_t lm,
+		const acc_cond& ra, mark_t rm) const
+    {
+      assert(la.num_sets() + ra.num_sets() == num_sets());
+      return la.in(lm) | (ra.in(rm) << la.num_sets());
+    }
+
+    mark_t comp(mark_t l) const
+    {
+      return out(all_ ^ in(l));
+    }
+
+    mark_t all_sets() const
+    {
+      return out(all_);
+    }
+
+    bool accepting(mark_t inf) const
+    {
+      return in(inf) == all_;
+    }
+
+    std::ostream& format_quoted(std::ostream& os, mark_t m) const
+    {
+      auto a = in(m);
+      if (a == 0U)
+	return os;
+      unsigned level = 0;
+      const char* space = "";
+      while (a)
+	{
+	  if (a & 1)
+	    {
+	      os << space << '"' << level << '"';
+	      space = " ";
+	    }
+	  a >>= 1;
+	  ++level;
+	}
+      return os;
+    }
+
+    std::ostream& format(std::ostream& os, mark_t m) const
+    {
+      auto a = in(m);
+      if (a == 0U)
+	return os;
+      return os << m;
+    }
+
+    std::string format(mark_t m) const
+    {
+      std::ostringstream os;
+      format(os, m);
+      return os.str();
+    }
+
+    unsigned num_sets() const
+    {
+      return num_;
+    }
+
+    template<class iterator>
+    mark_t useless(iterator begin, iterator end) const
+    {
+      mark_t::value_t u = 0U;	// The set of useless marks.
+      for (unsigned x = 0; x < num_; ++x)
+	{
+	  // Skip marks that are already known to be useless.
+	  if (u & (1 << x))
+	    continue;
+	  unsigned all = all_ ^ (u | (1 << x));
+	  for (iterator y = begin; y != end; ++y)
+	    {
+	      auto v = in(*y);
+	      if (v & (1 << x))
+		{
+		  all &= v;
+		  if (!all)
+		    break;
+		}
+	    }
+	  u |= all;
+	}
+      return out(u);
+    }
+
+    mark_t strip(mark_t x, mark_t y) const
+    {
+      // strip every bit of x that is marked in y
+      // strip(100101110100,
+      //       001011001000)
+      //   ==  10 1  11 100
+      //   ==      10111100
+
+      auto xv = in(x);		// 100101110100
+      auto yv = in(y);		// 001011001000
+
+      while (yv && xv)
+	{
+	  // Mask for everything after the last 1 in y
+	  auto rm = (~yv) & (yv - 1);	// 000000000111
+	  // Mask for everything before the last 1 in y
+	  auto lm = ~(yv ^ (yv - 1));	// 111111110000
+	  xv = ((xv & lm) >> 1) | (xv & rm);
+	  yv = (yv & lm) >> 1;
+	}
+
+      return out(xv);
+    }
+
+  protected:
+    mark_t::value_t mark_(unsigned u) const
+    {
+      assert(u < num_sets());
+      return 1U << u;
+    }
+
+    mark_t::value_t all_sets_() const
+    {
+      if (num_ == 0)
+	return 0;
+      return -1U >> (8 * sizeof(mark_t::value_t) - num_);
+    }
+
+    mark_t::value_t in(mark_t m) const
+    {
+      return m.id;
+    }
+
+    mark_t out(mark_t::value_t r) const
+    {
+      return r;
+    }
+
+    bdd_dict_ptr d_;
+    unsigned num_;
+    mark_t::value_t all_;
+  };
+
+}
+
+namespace std
+{
+  template<>
+  struct hash<spot::acc_cond::mark_t>
+  {
+    size_t operator()(spot::acc_cond::mark_t m) const
+    {
+      std::hash<decltype(m.id)> h;
+      return h(m.id);
+    }
+  };
+}
+
+#endif // SPOT_TGBA_ACC_HH