share bitmaps

1 files changed, 24 insertions, 17 deletions

diff --git a/moses/Bitmaps.cpp b/moses/Bitmaps.cpp
index 2637cd46d..a052f1f7e 100644
--- a/moses/Bitmaps.cpp
+++ b/moses/Bitmaps.cpp
@@ -7,39 +7,46 @@ namespace Moses
 Bitmaps::Bitmaps(size_t inputSize)
 {
 	m_initBitmap = new WordsBitmap(inputSize);
-	m_coll.insert(m_initBitmap);
+	m_coll[m_initBitmap];
 }
 
 Bitmaps::~Bitmaps()
 {
-  RemoveAllInColl(m_coll);
+  //RemoveAllInColl(m_coll);
 }
 
-const WordsBitmap &Bitmaps::GetBitmap(const WordsBitmap &bm)
+const WordsBitmap &Bitmaps::GetNextBitmap(const WordsBitmap &bm, const WordsRange &range)
 {
-  Coll::const_iterator iter = m_coll.find(&bm);
+  WordsBitmap *newBM = new WordsBitmap(bm);
+  newBM->SetValue(range, true);
+
+  Coll::const_iterator iter = m_coll.find(newBM);
   if (iter == m_coll.end()) {
-	WordsBitmap *newBM = new WordsBitmap(bm);
-    m_coll.insert(newBM);
+    m_coll[newBM];
     return *newBM;
   } else {
-	return **iter;
+	return *iter->first;
   }
 }
 
 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;
+  Coll::iterator iter = m_coll.find(&bm);
+  assert(iter != m_coll.end());
+
+  const WordsBitmap *newBM;
+  NextBitmaps &next = iter->second;
+  NextBitmaps::const_iterator iterNext = next.find(range);
+  if (iterNext == next.end()) {
+	  // not seen the link yet.
+	  newBM = &GetNextBitmap(bm, range);
+	  next[range] = newBM;
+  }
+  else {
+	  // link exist
+	  newBM = iterNext->second;
   }
+  return *newBM;
 }
 
 }