Options refactoring. Moses crashed in server mode when asked to provide n-best translations with scores.

2 files changed, 9 insertions, 10 deletions

diff --git a/moses/Syntax/Manager.cpp b/moses/Syntax/Manager.cpp
index 10b0d25c9..9a22b593a 100644
--- a/moses/Syntax/Manager.cpp
+++ b/moses/Syntax/Manager.cpp
@@ -26,12 +26,12 @@ void Manager::OutputBest(OutputCollector *collector) const
   const SHyperedge *best = GetBestSHyperedge();
   if (best == NULL) {
     VERBOSE(1, "NO BEST TRANSLATION" << std::endl);
-    if (StaticData::Instance().GetOutputHypoScore()) {
+    if (options().output.ReportHypoScore) {
       out << "0 ";
     }
     out << '\n';
   } else {
-    if (StaticData::Instance().GetOutputHypoScore()) {
+    if (options().output.ReportHypoScore) {
       out << best->label.score << " ";
     }
     Phrase yield = GetOneBestTargetYield(*best);
@@ -49,12 +49,10 @@ void Manager::OutputBest(OutputCollector *collector) const
 void Manager::OutputNBest(OutputCollector *collector) const
 {
   if (collector) {
-    const StaticData &staticData = StaticData::Instance();
     long translationId = m_source.GetTranslationId();
-
     KBestExtractor::KBestVec nBestList;
-    ExtractKBest(staticData.options().nbest.nbest_size, nBestList,
-                 staticData.options().nbest.only_distinct);
+    ExtractKBest(options().nbest.nbest_size, nBestList,
+                 options().nbest.only_distinct);
     OutputNBestList(collector, nBestList, translationId);
   }
 }
@@ -111,7 +109,8 @@ void Manager::OutputNBestList(OutputCollector *collector,
     out << translationId << " ||| ";
     OutputSurface(out, outputPhrase, outputFactorOrder, false);
     out << " ||| ";
-    derivation.scoreBreakdown.OutputAllFeatureScores(out);
+    bool with_labels = options().nbest.include_feature_labels;
+    derivation.scoreBreakdown.OutputAllFeatureScores(out, with_labels);
     out << " ||| " << derivation.score;
 
     // optionally, print word alignments
diff --git a/moses/Syntax/S2T/OovHandler-inl.h b/moses/Syntax/S2T/OovHandler-inl.h
index 9f26563d5..3655a0155 100644
--- a/moses/Syntax/S2T/OovHandler-inl.h
+++ b/moses/Syntax/S2T/OovHandler-inl.h
@@ -66,7 +66,7 @@ template<typename RuleTrie>
 TargetPhrase *OovHandler<RuleTrie>::SynthesizeTargetPhrase(
   const Word &oov, const Phrase &srcPhrase, const Word &targetLhs, float prob)
 {
-  const StaticData &staticData = StaticData::Instance();
+  const StaticData &SD = StaticData::Instance();
 
   const UnknownWordPenaltyProducer &unknownWordPenaltyProducer =
     UnknownWordPenaltyProducer::Instance();
@@ -82,8 +82,8 @@ TargetPhrase *OovHandler<RuleTrie>::SynthesizeTargetPhrase(
   targetPhrase->EvaluateInIsolation(srcPhrase);
   targetPhrase->SetTargetLHS(&targetLhs);
   targetPhrase->SetAlignmentInfo("0-0");
-  if (staticData.IsDetailedTreeFragmentsTranslationReportingEnabled() ||
-      staticData.GetTreeStructure() != NULL) {
+  if (!SD.options().output.detailed_tree_transrep_filepath.empty() ||
+      SD.GetTreeStructure() != NULL) {
     std::string value = "[ " + targetLhs[0]->GetString().as_string() + " " +
                         oov[0]->GetString().as_string() + " ]";
     targetPhrase->SetProperty("Tree", value);