Bug fix related to context-sensitive decoding: --context-string had no effect, even when --context-window was not specified.

1 files changed, 9 insertions, 6 deletions

diff --git a/moses/IOWrapper.cpp b/moses/IOWrapper.cpp
index 29769f180..8cbf4f091 100644
--- a/moses/IOWrapper.cpp
+++ b/moses/IOWrapper.cpp
@@ -296,16 +296,19 @@ GetBufferedInput()
 }
 
 boost::shared_ptr<InputType>
-IOWrapper::ReadInput()
+IOWrapper::
+ReadInput()
 {
 #ifdef WITH_THREADS
   boost::lock_guard<boost::mutex> lock(m_lock);
 #endif
   boost::shared_ptr<InputType> source = GetBufferedInput();
-  if (source) {
-    source->SetTranslationId(m_currentLine++);
-    this->set_context_for(*source);
-  }
+  if (source) 
+    {
+      source->SetTranslationId(m_currentLine++);
+      if (m_look_ahead || m_look_back) 
+	this->set_context_for(*source);
+    }
   m_past_input.push_back(source);
   return source;
 }
@@ -344,7 +347,7 @@ set_context_for(InputType& source)
     }
   }
   // cerr << string(80,'=') << endl;
-  source.SetContext(context);
+  if (context->size()) source.SetContext(context);
 }