Partial merge of t2s branch (implements t2s and f2s algorithms)

Implements search algorithms 7, 8, and 9:

-search-algorithm 7
  tree-to-string (STSG-based, currently a special-case of forest-to-string)

-search-algorithm 8
  tree-to-string (SCFG-based)

-search-algorithm 9
  forest-to-string (STSG-based)

1 files changed, 5 insertions, 1 deletions

diff --git a/moses/IOWrapper.cpp b/moses/IOWrapper.cpp
index f187d9ea6..53a78b4bf 100644
--- a/moses/IOWrapper.cpp
+++ b/moses/IOWrapper.cpp
@@ -37,9 +37,9 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <boost/algorithm/string.hpp>
 
 #include "moses/Syntax/KBestExtractor.h"
+#include "moses/Syntax/PVertex.h"
 #include "moses/Syntax/SHyperedge.h"
 #include "moses/Syntax/S2T/DerivationWriter.h"
-#include "moses/Syntax/PVertex.h"
 #include "moses/Syntax/SVertex.h"
 
 #include "moses/TypeDef.h"
@@ -53,6 +53,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "moses/FF/StatefulFeatureFunction.h"
 #include "moses/FF/StatelessFeatureFunction.h"
 #include "moses/TreeInput.h"
+#include "moses/ForestInput.h"
 #include "moses/ConfusionNet.h"
 #include "moses/WordLattice.h"
 #include "moses/Incremental.h"
@@ -273,6 +274,9 @@ bool IOWrapper::ReadInput(InputTypeEnum inputType, InputType*& source)
   case TabbedSentenceInput:
     source = GetInput(new TabbedSentence);
     break;
+  case ForestInputType:
+    source = GetInput(new ForestInput);
+    break;
   default:
     TRACE_ERR("Unknown input type: " << inputType << "\n");
   }