share bitmaps

1 files changed, 22 insertions, 1 deletions

diff --git a/moses/Bitmaps.cpp b/moses/Bitmaps.cpp
index f4c78f914..2637cd46d 100644
--- a/moses/Bitmaps.cpp
+++ b/moses/Bitmaps.cpp
@@ -4,6 +4,12 @@
 
 namespace Moses
 {
+Bitmaps::Bitmaps(size_t inputSize)
+{
+	m_initBitmap = new WordsBitmap(inputSize);
+	m_coll.insert(m_initBitmap);
+}
+
 Bitmaps::~Bitmaps()
 {
   RemoveAllInColl(m_coll);
@@ -13,10 +19,25 @@ const WordsBitmap &Bitmaps::GetBitmap(const WordsBitmap &bm)
 {
   Coll::const_iterator iter = m_coll.find(&bm);
   if (iter == m_coll.end()) {
-    WordsBitmap *newBM = new WordsBitmap(bm);
+	WordsBitmap *newBM = new WordsBitmap(bm);
+    m_coll.insert(newBM);
+    return *newBM;
+  } else {
+	return **iter;
+  }
+}
+
+const WordsBitmap &Bitmaps::GetBitmap(const WordsBitmap &bm, const WordsRange &range)
+{
+  WordsBitmap *newBM = new WordsBitmap(bm);
+  newBM->SetValue(range, true);
+
+  Coll::const_iterator iter = m_coll.find(newBM);
+  if (iter == m_coll.end()) {
     m_coll.insert(newBM);
     return *newBM;
   } else {
+	delete newBM;
     return **iter;
   }
 }