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, 5 insertions, 0 deletions

diff --git a/moses/TypeDef.h b/moses/TypeDef.h
index cdcb99dbc..09b2ef680 100644
--- a/moses/TypeDef.h
+++ b/moses/TypeDef.h
@@ -160,6 +160,11 @@ enum FormatType {
   ,HieroFormat
 };
 
+enum S2TParsingAlgorithm {
+  RecursiveCYKPlus,
+  Scope3
+};
+
 // typedef
 typedef size_t FactorType;