moses_chart: more efficient scope-3 parsing if sentence length < max-chart-span

1 files changed, 5 insertions, 7 deletions

diff --git a/moses/ChartParser.cpp b/moses/ChartParser.cpp
index deccf74e4..6a9ec2efb 100644
--- a/moses/ChartParser.cpp
+++ b/moses/ChartParser.cpp
@@ -141,15 +141,13 @@ ChartParser::ChartParser(InputType const &source, ChartCellCollectionBase &cells
   CreateInputPaths(m_source);
 
   const std::vector<PhraseDictionary*> &dictionaries = PhraseDictionary::GetColl();
+  assert(dictionaries.size() == m_decodeGraphList.size());
   m_ruleLookupManagers.reserve(dictionaries.size());
-  for (std::vector<PhraseDictionary*>::const_iterator p = dictionaries.begin();
-       p != dictionaries.end(); ++p) {
-
-    const PhraseDictionary *dict = *p;
+  for (std::size_t i = 0; i < dictionaries.size(); ++i) {
+    const PhraseDictionary *dict = dictionaries[i];
     PhraseDictionary *nonConstDict = const_cast<PhraseDictionary*>(dict);
-
-    ChartRuleLookupManager *lookupMgr = nonConstDict->CreateRuleLookupManager(*this, cells);
-
+    std::size_t maxChartSpan = m_decodeGraphList[i]->GetMaxChartSpan();
+    ChartRuleLookupManager *lookupMgr = nonConstDict->CreateRuleLookupManager(*this, cells, maxChartSpan);
     m_ruleLookupManagers.push_back(lookupMgr);
   }