Merge branch 'master' of https://github.com/moses-smt/mosesdecoder

Conflicts:
	moses/TranslationOptionCollection.cpp
	moses/TranslationOptionCollectionLattice.cpp
	moses/TranslationOptionCollectionLattice.h
	moses/TranslationOptionList.h

1 files changed, 8 insertions, 8 deletions

diff --git a/moses/SearchNormal.cpp b/moses/SearchNormal.cpp
index 2314d85f7..786b554c6 100644
--- a/moses/SearchNormal.cpp
+++ b/moses/SearchNormal.cpp
@@ -49,7 +49,7 @@ SearchNormal::~SearchNormal()
  * Main decoder loop that translates a sentence by expanding
  * hypotheses stack by stack, until the end of the sentence.
  */
-void SearchNormal::ProcessSentence()
+void SearchNormal::Decode()
 {
   const StaticData &staticData = StaticData::Instance();
   SentenceStats &stats = m_manager.GetSentenceStats();
@@ -397,13 +397,13 @@ void SearchNormal::OutputHypoStackSize()
 
 void SearchNormal::OutputHypoStack()
 {
-    // all stacks
-    int i = 0;
-    vector < HypothesisStack* >::iterator iterStack;
-    for (iterStack = m_hypoStackColl.begin() ; iterStack != m_hypoStackColl.end() ; ++iterStack) {
-      HypothesisStackNormal &hypoColl = *static_cast<HypothesisStackNormal*>(*iterStack);
-      TRACE_ERR( "Stack " << i++ << ": " << endl << hypoColl << endl);
-    }
+  // all stacks
+  int i = 0;
+  vector < HypothesisStack* >::iterator iterStack;
+  for (iterStack = m_hypoStackColl.begin() ; iterStack != m_hypoStackColl.end() ; ++iterStack) {
+    HypothesisStackNormal &hypoColl = *static_cast<HypothesisStackNormal*>(*iterStack);
+    TRACE_ERR( "Stack " << i++ << ": " << endl << hypoColl << endl);
+  }
 }
 
 }