Merge s2t branch

This adds a new string-to-tree decoder, which can be enabled with the -s2t
option.  It's intended to be faster and simpler than the generic chart
decoder, and is designed to support lattice input (still WIP).  For a en-de
system trained on WMT14 data, it's approximately 40% faster in practice.

For background information, see the decoding section of the EMNLP tutorial
on syntax-based MT:

  http://www.emnlp2014.org/tutorials/5_notes.pdf

Some features are not implemented yet, including support for internal tree
structure and soft source-syntactic constraints.

1 files changed, 9 insertions, 0 deletions

diff --git a/moses/StaticData.h b/moses/StaticData.h
index 2cd8e82c5..7d87b2df7 100644
--- a/moses/StaticData.h
+++ b/moses/StaticData.h
@@ -199,6 +199,8 @@ protected:
   FactorType m_placeHolderFactor;
   bool m_useLegacyPT;
   bool m_defaultNonTermOnlyForEmptyRange;
+  bool m_useS2TDecoder;
+  S2TParsingAlgorithm m_s2tParsingAlgorithm;
   bool m_printNBestTrees;
 
   FeatureRegistry m_registry;
@@ -767,6 +769,13 @@ public:
   bool GetDefaultNonTermOnlyForEmptyRange() const
   { return m_defaultNonTermOnlyForEmptyRange; }
 
+  bool UseS2TDecoder() const {
+    return m_useS2TDecoder;
+  }
+  S2TParsingAlgorithm GetS2TParsingAlgorithm() const {
+    return m_s2tParsingAlgorithm;
+  }
+
   bool PrintNBestTrees() const {
     return m_printNBestTrees;
   }