Revert "share bitmaps"

This reverts commit d28b00a1c6da6347d0c9f8a0ee4b01dff279e495.

1 files changed, 3 insertions, 5 deletions

diff --git a/moses/Bitmaps.h b/moses/Bitmaps.h
index 7a2f7b626..8db57a9c3 100644
--- a/moses/Bitmaps.h
+++ b/moses/Bitmaps.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <boost/unordered_set.hpp>
-#include <boost/unordered_map.hpp>
 #include <set>
 #include "WordsBitmap.h"
 #include "Util.h"
@@ -11,19 +10,18 @@ namespace Moses
 
 class Bitmaps
 {
-  typedef boost::unordered_map<WordsRange, const WordsBitmap*> NextBitmaps;
-  typedef boost::unordered_map<const WordsBitmap*, NextBitmaps, UnorderedComparer<WordsBitmap>, UnorderedComparer<WordsBitmap> > Coll;
+  typedef boost::unordered_set<WordsRange, const WordsBitmap*> NextBitmaps;
+  typedef boost::unordered_set<const WordsBitmap*, UnorderedComparer<WordsBitmap>, UnorderedComparer<WordsBitmap> > Coll;
   //typedef std::set<const WordsBitmap*, OrderedComparer<WordsBitmap> > Coll;
   Coll m_coll;
   const WordsBitmap *m_initBitmap;
-
-  const WordsBitmap &GetNextBitmap(const WordsBitmap &bm, const WordsRange &range);
 public:
   Bitmaps(size_t inputSize);
   virtual ~Bitmaps();
 
   const WordsBitmap &GetInitialBitmap() const
   { return *m_initBitmap; }
+  const WordsBitmap &GetBitmap(const WordsBitmap &bm);
   const WordsBitmap &GetBitmap(const WordsBitmap &bm, const WordsRange &range);
 
 };