precalculate number of words covered

1 files changed, 37 insertions, 1 deletions

diff --git a/moses/Bitmap.cpp b/moses/Bitmap.cpp
index 2fe4c2987..87219479c 100644
--- a/moses/Bitmap.cpp
+++ b/moses/Bitmap.cpp
@@ -27,11 +27,47 @@ namespace Moses
 
 TO_STRING_BODY(Bitmap);
 
+Bitmap::Bitmap(size_t size, const std::vector<bool>& initializer)
+  :m_bitmap(initializer.begin(), initializer.end())
+{
+
+  // The initializer may not be of the same length.  Change to the desired
+  // length.  If we need to add any elements, initialize them to false.
+  m_bitmap.resize(size, false);
+
+  m_numWordsCovered = std::count(m_bitmap.begin(), m_bitmap.end(), true);
+
+  // Find the first gap, and cache it.
+  std::vector<char>::const_iterator first_gap = std::find(
+        m_bitmap.begin(), m_bitmap.end(), false);
+  m_firstGap = (
+                 (first_gap == m_bitmap.end()) ?
+                 NOT_FOUND : first_gap - m_bitmap.begin());
+}
+
+//! Create Bitmap of length size and initialise.
+Bitmap::Bitmap(size_t size)
+  :m_bitmap(size, false)
+   ,m_firstGap(0)
+   ,m_numWordsCovered(0)
+
+{
+}
+
+//! Deep copy.
+Bitmap::Bitmap(const Bitmap &copy)
+  :m_bitmap(copy.m_bitmap)
+  ,m_firstGap(copy.m_firstGap)
+  ,m_numWordsCovered(copy.m_numWordsCovered)
+{
+}
+
 Bitmap::Bitmap(const Bitmap &copy, const Range &range)
 :m_bitmap(copy.m_bitmap)
 ,m_firstGap(copy.m_firstGap)
+,m_numWordsCovered(copy.m_numWordsCovered)
 {
-	SetValue(range, true);
+	SetValueNonOverlap(range);
 }
 
 // for unordered_set in stack