Bug fix: m_reportAllFactors was never initialized or set.

Removed altogether, now using m_options.output.ReportAllFactors.

2 files changed, 1 insertions, 7 deletions

diff --git a/moses/server/TranslationRequest.cpp b/moses/server/TranslationRequest.cpp
index ec4d0fad0..8f15b30ff 100644
--- a/moses/server/TranslationRequest.cpp
+++ b/moses/server/TranslationRequest.cpp
@@ -168,7 +168,7 @@ void
 TranslationRequest::
 output_phrase(ostream& out, Phrase const& phrase) const
 {
-  if (!m_reportAllFactors) {
+  if (!m_options.output.ReportAllFactors) {
     for (size_t i = 0 ; i < phrase.GetSize(); ++i)
       out << *phrase.GetFactor(i, 0) << " ";
   } else out << phrase;
@@ -294,8 +294,6 @@ parse_request(std::map<std::string, xmlrpc_c::value> const& params)
   m_withWordAlignInfo   = check(params, "word-align");
   m_withGraphInfo       = check(params, "sg");
   m_withTopts           = check(params, "topt");
-  // m_reportAllFactors    = check(params, "report-all-factors");
-  // m_nbestDistinct       = check(params, "nbest-distinct");
   m_withScoreBreakdown  = check(params, "add-score-breakdown");
   si = params.find("lambda");
   if (si != params.end()) 
diff --git a/moses/server/TranslationRequest.h b/moses/server/TranslationRequest.h
index 9736a7a8f..b93043b9b 100644
--- a/moses/server/TranslationRequest.h
+++ b/moses/server/TranslationRequest.h
@@ -42,11 +42,7 @@ TranslationRequest : public virtual Moses::TranslationTask
   bool m_withWordAlignInfo;
   bool m_withGraphInfo;
   bool m_withTopts;
-  bool m_reportAllFactors;
-  // bool m_nbestDistinct;
   bool m_withScoreBreakdown;
-  // size_t m_nbestSize;
-
   uint64_t m_session_id; // 0 means none, 1 means new
 
   void