merged master into dynamic-models and solved conflicts

1 files changed, 5 insertions, 0 deletions

diff --git a/moses/InputPath.h b/moses/InputPath.h
index 33857b5d2..aef14e7b1 100644
--- a/moses/InputPath.h
+++ b/moses/InputPath.h
@@ -6,6 +6,7 @@
 #include "Phrase.h"
 #include "WordsRange.h"
 #include "NonTerminal.h"
+#include "moses/FactorCollection.h"
 
 namespace Moses
 {
@@ -45,6 +46,7 @@ protected:
   // for syntax model only
   mutable std::vector<std::vector<const Word*> > m_ruleSourceFromInputPath;
   const NonTerminalSet m_sourceNonTerms;
+  std::vector<bool> m_sourceNonTermArray;
 
 
 public:
@@ -65,6 +67,9 @@ public:
   const NonTerminalSet &GetNonTerminalSet() const {
     return m_sourceNonTerms;
   }
+  const std::vector<bool> &GetNonTerminalArray() const {
+    return m_sourceNonTermArray;
+  }
   const WordsRange &GetWordsRange() const {
     return m_range;
   }