move OutputBest() to ChartManager

moses-smt · Dec 10, 2014 · 8164094 · 8164094
1 parent 99cfba8
commit 8164094
Show file tree

Hide file tree

Showing 7 changed files with 80 additions and 98 deletions.
diff --git a/moses/ChartManager.cpp b/moses/ChartManager.cpp
@@ -300,6 +300,16 @@ void ChartManager::OutputSearchGraphMoses(std::ostream &outputSearchGraphStream)
   WriteSearchGraph(writer);
 }
 
+void ChartManager::OutputBest(OutputCollector *collector) const
+{
+  const ChartHypothesis *bestHypo = GetBestHypothesis();
+  if (collector && bestHypo) {
+	  const size_t translationId = m_source.GetTranslationId();
+	  const ChartHypothesis *bestHypo = GetBestHypothesis();
+	  OutputBestHypo(collector, bestHypo, translationId);
+  }
+}
+
 void ChartManager::OutputNBest(OutputCollector *collector) const
 {
 	const StaticData &staticData = StaticData::Instance();
@@ -807,4 +817,61 @@ void ChartManager::OutputSearchGraphHypergraph() const
   }
 }
 
+void ChartManager::OutputBestHypo(OutputCollector *collector, const ChartHypothesis *hypo, long translationId) const
+{
+  if (!collector)
+    return;
+  std::ostringstream out;
+  FixPrecision(out);
+  if (hypo != NULL) {
+    VERBOSE(1,"BEST TRANSLATION: " << *hypo << endl);
+    VERBOSE(3,"Best path: ");
+    Backtrack(hypo);
+    VERBOSE(3,"0" << std::endl);
+
+    if (StaticData::Instance().GetOutputHypoScore()) {
+      out << hypo->GetTotalScore() << " ";
+    }
+
+    if (StaticData::Instance().IsPathRecoveryEnabled()) {
+      out << "||| ";
+    }
+    Phrase outPhrase(ARRAY_SIZE_INCR);
+    hypo->GetOutputPhrase(outPhrase);
+
+    // delete 1st & last
+    UTIL_THROW_IF2(outPhrase.GetSize() < 2,
+  		  "Output phrase should have contained at least 2 words (beginning and end-of-sentence)");
+
+    outPhrase.RemoveWord(0);
+    outPhrase.RemoveWord(outPhrase.GetSize() - 1);
+
+    const std::vector<FactorType> outputFactorOrder = StaticData::Instance().GetOutputFactorOrder();
+    string output = outPhrase.GetStringRep(outputFactorOrder);
+    out << output << endl;
+  } else {
+    VERBOSE(1, "NO BEST TRANSLATION" << endl);
+
+    if (StaticData::Instance().GetOutputHypoScore()) {
+      out << "0 ";
+    }
+
+    out << endl;
+  }
+  collector->Write(translationId, out.str());
+}
+
+void ChartManager::Backtrack(const ChartHypothesis *hypo) const
+{
+  const vector<const ChartHypothesis*> &prevHypos = hypo->GetPrevHypos();
+
+  vector<const ChartHypothesis*>::const_iterator iter;
+  for (iter = prevHypos.begin(); iter != prevHypos.end(); ++iter) {
+    const ChartHypothesis *prevHypo = *iter;
+
+    VERBOSE(3,prevHypo->GetId() << " <= ");
+    Backtrack(prevHypo);
+  }
+}
+
 } // namespace Moses
diff --git a/moses/ChartManager.h b/moses/ChartManager.h
@@ -99,6 +99,8 @@ class ChartManager : public BaseManager
 		  const std::vector<boost::shared_ptr<Moses::ChartKBestExtractor::Derivation> > &nBestList,
 		  const Sentence &sentence,
 		  long translationId) const;
+  void OutputBestHypo(OutputCollector *collector, const ChartHypothesis *hypo, long translationId) const;
+  void Backtrack(const ChartHypothesis *hypo) const;
 
 public:
   ChartManager(InputType const& source);
@@ -143,6 +145,7 @@ class ChartManager : public BaseManager
   const ChartParser &GetParser() const { return m_parser; }
 
   // outputs
+  void OutputBest(OutputCollector *collector) const;
   void OutputNBest(OutputCollector *collector) const;
   void OutputLatticeSamples(OutputCollector *collector) const
   {}

diff --git a/moses/IOWrapper.cpp b/moses/IOWrapper.cpp
@@ -278,97 +278,6 @@ std::map<size_t, const Factor*> IOWrapper::GetPlaceholders(const Hypothesis &hyp
   return ret;
 }
 
-
-void IOWrapper::OutputBestHypo(const ChartHypothesis *hypo, long translationId)
-{
-  if (!m_singleBestOutputCollector)
-    return;
-  std::ostringstream out;
-  FixPrecision(out);
-  if (hypo != NULL) {
-    VERBOSE(1,"BEST TRANSLATION: " << *hypo << endl);
-    VERBOSE(3,"Best path: ");
-    Backtrack(hypo);
-    VERBOSE(3,"0" << std::endl);
-
-    if (StaticData::Instance().GetOutputHypoScore()) {
-      out << hypo->GetTotalScore() << " ";
-    }
-
-    if (StaticData::Instance().IsPathRecoveryEnabled()) {
-      out << "||| ";
-    }
-    Phrase outPhrase(ARRAY_SIZE_INCR);
-    hypo->GetOutputPhrase(outPhrase);
-
-    // delete 1st & last
-    UTIL_THROW_IF2(outPhrase.GetSize() < 2,
-  		  "Output phrase should have contained at least 2 words (beginning and end-of-sentence)");
-
-    outPhrase.RemoveWord(0);
-    outPhrase.RemoveWord(outPhrase.GetSize() - 1);
-
-    const std::vector<FactorType> outputFactorOrder = StaticData::Instance().GetOutputFactorOrder();
-    string output = outPhrase.GetStringRep(outputFactorOrder);
-    out << output << endl;
-  } else {
-    VERBOSE(1, "NO BEST TRANSLATION" << endl);
-
-    if (StaticData::Instance().GetOutputHypoScore()) {
-      out << "0 ";
-    }
-
-    out << endl;
-  }
-  m_singleBestOutputCollector->Write(translationId, out.str());
-}
-
-void IOWrapper::OutputBestHypo(search::Applied applied, long translationId)
-{
-  if (!m_singleBestOutputCollector) return;
-  std::ostringstream out;
-  FixPrecision(out);
-  if (StaticData::Instance().GetOutputHypoScore()) {
-    out << applied.GetScore() << ' ';
-  }
-  Phrase outPhrase;
-  Incremental::ToPhrase(applied, outPhrase);
-  // delete 1st & last
-  UTIL_THROW_IF2(outPhrase.GetSize() < 2,
-		  "Output phrase should have contained at least 2 words (beginning and end-of-sentence)");
-  outPhrase.RemoveWord(0);
-  outPhrase.RemoveWord(outPhrase.GetSize() - 1);
-  out << outPhrase.GetStringRep(StaticData::Instance().GetOutputFactorOrder());
-  out << '\n';
-  m_singleBestOutputCollector->Write(translationId, out.str());
-
-  VERBOSE(1,"BEST TRANSLATION: " << outPhrase << "[total=" << applied.GetScore() << "]" << endl);
-}
-
-void IOWrapper::OutputBestNone(long translationId)
-{
-  if (!m_singleBestOutputCollector) return;
-  if (StaticData::Instance().GetOutputHypoScore()) {
-    m_singleBestOutputCollector->Write(translationId, "0 \n");
-  } else {
-    m_singleBestOutputCollector->Write(translationId, "\n");
-  }
-}
-
-void IOWrapper::Backtrack(const ChartHypothesis *hypo)
-{
-  const vector<const ChartHypothesis*> &prevHypos = hypo->GetPrevHypos();
-
-  vector<const ChartHypothesis*>::const_iterator iter;
-  for (iter = prevHypos.begin(); iter != prevHypos.end(); ++iter) {
-    const ChartHypothesis *prevHypo = *iter;
-
-    VERBOSE(3,prevHypo->GetId() << " <= ");
-    Backtrack(prevHypo);
-  }
-}
-
-
 void IOWrapper::OutputTranslationOptions(std::ostream &out, ApplicationContext &applicationContext, const ChartHypothesis *hypo, const Sentence &sentence, long translationId)
 {
   if (hypo != NULL) {

diff --git a/moses/IOWrapper.h b/moses/IOWrapper.h
@@ -103,7 +103,6 @@ class IOWrapper
   // CHART
   typedef std::vector<std::pair<Moses::Word, Moses::WordsRange> > ApplicationContext;
 
-  void Backtrack(const ChartHypothesis *hypo);
   void OutputTranslationOptions(std::ostream &out, ApplicationContext &applicationContext, const Moses::ChartHypothesis *hypo, const Moses::Sentence &sentence, long translationId);
   void OutputTranslationOptions(std::ostream &out, ApplicationContext &applicationContext, const search::Applied *applied, const Moses::Sentence &sentence, long translationId);
   void OutputTranslationOption(std::ostream &out, ApplicationContext &applicationContext, const Moses::ChartHypothesis *hypo, const Moses::Sentence &sentence, long translationId);
@@ -171,10 +170,6 @@ class IOWrapper
 
 
   // CHART
-  void OutputBestHypo(const Moses::ChartHypothesis *hypo, long translationId);
-  void OutputBestHypo(search::Applied applied, long translationId);
-
-  void OutputBestNone(long translationId);
 
   // phrase-based
   void OutputBestSurface(std::ostream &out, const Moses::Hypothesis *hypo, const std::vector<Moses::FactorType> &outputFactorOrder, char reportSegmentation, bool reportAllFactors);

diff --git a/moses/Manager.cpp b/moses/Manager.cpp
@@ -1450,6 +1450,11 @@ SentenceStats& Manager::GetSentenceStats() const
 
 }
 
+void Manager::OutputBest(OutputCollector *collector)  const
+{
+
+}
+
 void Manager::OutputNBest(OutputCollector *collector) const
 {
   const StaticData &staticData = StaticData::Instance();

diff --git a/moses/Manager.h b/moses/Manager.h
@@ -187,6 +187,7 @@ class Manager : public BaseManager
                                      std::vector< const Hypothesis* >* pConnectedList, std::map < const Hypothesis*, std::set < const Hypothesis* > >* pOutgoingHyps, std::vector< float>* pFwdBwdScores) const;
 
   // outputs
+  void OutputBest(OutputCollector *collector)  const;
   void OutputNBest(OutputCollector *collector)  const;
   void OutputAlignment(OutputCollector *collector) const;
   void OutputLatticeSamples(OutputCollector *collector) const;

diff --git a/moses/TranslationTask.cpp b/moses/TranslationTask.cpp
@@ -90,6 +90,8 @@ void TranslationTask::RunPb()
 
   additionalReportingTime.stop();
 
+  manager.OutputBest(m_ioWrapper.GetSingleBestOutputCollector());
+
   // apply decision rule and output best translation(s)
   if (m_ioWrapper.GetSingleBestOutputCollector()) {
     ostringstream out;
@@ -285,8 +287,8 @@ void TranslationTask::RunChart()
 	manager.OutputSearchGraphHypergraph();
 
 	// 1-best
-	const ChartHypothesis *bestHypo = manager.GetBestHypothesis();
-	m_ioWrapper.OutputBestHypo(bestHypo, translationId);
+	manager.OutputBest(m_ioWrapper.GetSingleBestOutputCollector());
+
 	IFVERBOSE(2) {
 	  PrintUserTime("Best Hypothesis Generation Time:");
 	}