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, 3 insertions, 3 deletions

diff --git a/moses/TreeInput.cpp b/moses/TreeInput.cpp
index 3fef029ad..81a76507e 100644
--- a/moses/TreeInput.cpp
+++ b/moses/TreeInput.cpp
@@ -247,8 +247,8 @@ int TreeInput::Read(std::istream& in,const std::vector<FactorType>& factorOrder)
   // remove extra spaces
   //line = Trim(line);
 
-  std::vector<XMLParseOutput> sourceLabels;
-  ProcessAndStripXMLTags(line, sourceLabels, m_xmlOptions);
+  m_labelledSpans.clear();
+  ProcessAndStripXMLTags(line, m_labelledSpans, m_xmlOptions);
 
   // do words 1st - hack
   stringstream strme;
@@ -266,7 +266,7 @@ int TreeInput::Read(std::istream& in,const std::vector<FactorType>& factorOrder)
 
   // do source labels
   vector<XMLParseOutput>::const_iterator iterLabel;
-  for (iterLabel = sourceLabels.begin(); iterLabel != sourceLabels.end(); ++iterLabel) {
+  for (iterLabel = m_labelledSpans.begin(); iterLabel != m_labelledSpans.end(); ++iterLabel) {
     const XMLParseOutput &labelItem = *iterLabel;
     const WordsRange &range = labelItem.m_range;
     const string &label = labelItem.m_label;