merged master into dynamic-models and solved conflicts

1 files changed, 11 insertions, 0 deletions

diff --git a/moses/ChartCellLabelSet.h b/moses/ChartCellLabelSet.h
index 2c1e8b50f..591aa17a6 100644
--- a/moses/ChartCellLabelSet.h
+++ b/moses/ChartCellLabelSet.h
@@ -72,6 +72,8 @@ public:
     size_t idx = w[0]->GetId();
     if (! ChartCellExists(idx)) {
       m_size++;
+
+
       m_map[idx] = new ChartCellLabel(m_coverage, w);
     }
   }
@@ -119,6 +121,15 @@ public:
     }
   }
 
+  const ChartCellLabel *Find(size_t idx) const {
+    try {
+      return m_map.at(idx);
+    }
+    catch (const std::out_of_range& oor) {
+      return NULL;
+    }
+  }
+
   ChartCellLabel::Stack &FindOrInsert(const Word &w) {
     size_t idx = w[0]->GetId();
     if (! ChartCellExists(idx)) {