Added -report-all-factors, so that stdout is more verbose.

git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@300 1f5c12ca-751b-0410-a591-d2e778427230

moses-cmd/src/IOCommandLine.cpp

@@ -65,24 +65,28 @@ InputType*IOCommandLine::GetInput(InputType* in)
 }
 
 // help fn
-void OutputSurface(std::ostream &out, const Phrase &phrase)
+void OutputSurface(std::ostream &out, const Phrase &phrase, bool reportAllFactors)
 {
-	size_t size = phrase.GetSize();
+    if (reportAllFactors == true) {
-	for (size_t pos = 0 ; pos < size ; pos++)
+        out << phrase;
-	{
+    } else {
-		const Factor *factor = phrase.GetFactor(pos, Surface);
+	  size_t size = phrase.GetSize();
-		if (factor != NULL) {
+	  for (size_t pos = 0 ; pos < size ; pos++)
-			out << *factor << " ";
+	  {
+		  const Factor *factor = phrase.GetFactor(pos, Surface);
+		  if (factor != NULL) {
+			  out << *factor << " ";
+          }
         }
 	}
 }
 
-void OutputSurface(std::ostream &out, const Hypothesis *hypo, bool reportSourceSpan)
+void OutputSurface(std::ostream &out, const Hypothesis *hypo, bool reportSourceSpan, bool reportAllFactors)
 {
 	if ( hypo != NULL)
 	{
-		OutputSurface(out, hypo->GetPrevHypo(), reportSourceSpan);
+		OutputSurface(out, hypo->GetPrevHypo(), reportSourceSpan, reportAllFactors);
-		OutputSurface(out, hypo->GetPhrase());
+		OutputSurface(out, hypo->GetPhrase(), reportAllFactors);
 
         if (reportSourceSpan == true
           && hypo->GetPhrase().GetSize() > 0) {
@@ -101,14 +105,14 @@ void IOCommandLine::Backtrack(const Hypothesis *hypo){
 	}
 }
 
-void IOCommandLine::SetOutput(const Hypothesis *hypo, long /*translationId*/, bool reportSourceSpan)
+void IOCommandLine::SetOutput(const Hypothesis *hypo, long /*translationId*/, bool reportSourceSpan, bool reportAllFactors)
 {
 	if (hypo != NULL)
 	{
 		TRACE_ERR("BEST HYPO: " << *hypo << endl);
 		Backtrack(hypo);
 
-		OutputSurface(cout, hypo, reportSourceSpan);
+		OutputSurface(cout, hypo, reportSourceSpan, reportAllFactors);
 	}
 	else
 	{
@@ -132,7 +136,7 @@ void IOCommandLine::SetNBest(const LatticePathList &nBestList, long translationI
 		for (int currEdge = (int)edges.size() - 1 ; currEdge >= 0 ; currEdge--)
 		{
 			const LatticeEdge &edge = *edges[currEdge];
-			OutputSurface(m_nBestFile, edge.GetTargetPhrase());
+			OutputSurface(m_nBestFile, edge.GetTargetPhrase(), false); // false for not reporting all factors
 		}
 		m_nBestFile << " ||| ";
 

moses-cmd/src/IOCommandLine.h

@@ -59,7 +59,7 @@ public:
 				, const std::string							&nBestFilePath);
 
 	InputType* GetInput(InputType*);
-	void SetOutput(const Hypothesis *hypo, long translationId, bool reportSourceSpan);
+	void SetOutput(const Hypothesis *hypo, long translationId, bool reportSourceSpan, bool reportAllFactors);
 	void SetNBest(const LatticePathList &nBestList, long translationId);
 	void Backtrack(const Hypothesis *hypo);
 };

moses-cmd/src/IOMySQL.cpp

@@ -104,7 +104,7 @@ InputType *IOMySQL::GetInput(InputType*)
 	return NULL;
 }
 
-void IOMySQL::SetOutput(const Hypothesis *hypo, long translationId, bool reportSourceSpan)
+void IOMySQL::SetOutput(const Hypothesis *hypo, long translationId, bool reportSourceSpan, bool reportAllFactors)
 {
 	//m_threadMySQL->SetTranslation(hypo, translationId);
 }

moses-cmd/src/IOMySQL.h

@@ -69,7 +69,7 @@ public:
 	~IOMySQL();
 	void Connect(mysqlpp::Connection &conn);
 	InputType *GetInput(InputType*);
-	void SetOutput(const Hypothesis *hypo, long translationId, bool reportSourceSpan);
+	void SetOutput(const Hypothesis *hypo, long translationId, bool reportSourceSpan, bool reportAllFactors);
 	void SetNBest(const LatticePathList &nBestList, long translationId)
 	{
 	}

moses-cmd/src/Main.cpp

@@ -111,7 +111,10 @@ int main(int argc, char* argv[])
 		staticData.InitializeBeforeSentenceProcessing(*source);
 		Manager manager(*source, *translationOptionCollection, staticData);
 		manager.ProcessSentence();
-		inputOutput->SetOutput(manager.GetBestHypothesis(), source->GetTranslationId(), staticData.GetReportSourceSpan());
+		inputOutput->SetOutput(manager.GetBestHypothesis(), source->GetTranslationId(),
+                        staticData.GetReportSourceSpan(),
+                        staticData.GetReportAllFactors()
+                        );
 
 		// n-best
 		size_t nBestSize = staticData.GetNBestSize();

moses/src/InputOutput.h

@@ -38,7 +38,7 @@ class InputOutput
  public:
 	InputOutput();
 	virtual InputType* GetInput(InputType*) = 0;
-	virtual void SetOutput(const Hypothesis *hypo, long translationId, bool reportSourceSpan) = 0;
+	virtual void SetOutput(const Hypothesis *hypo, long translationId, bool reportSourceSpan, bool reportAllFactors) = 0;
 	virtual void SetNBest(const LatticePathList &nBestList, long translationId) = 0;
 	virtual ~InputOutput();
 	virtual void Release(InputType*);

moses/src/Parameter.cpp

@@ -64,6 +64,7 @@ Parameter::Parameter()
 	AddParam("stack");
 	AddParam("verbose");
 	AddParam("report-source-span");
+	AddParam("report-all-factors");
 	AddParam("drop-unknown");
 	AddParam("inputtype");
 }
@@ -256,6 +257,7 @@ bool Parameter::LoadParam(int argc, char* argv[])
 	OverwriteParam("-s", "stack", argc, argv);
 	OverwriteParam("-v", "verbose", argc, argv);
 	OverwriteParam("-report-source-span", "report-source-span", argc, argv);
+	OverwriteParam("-report-all-factors", "report-all-factors", argc, argv);
 	OverwriteParam("-drop-unknown", "drop-unknown", argc, argv);
 	OverwriteParam("-inputtype","inputtype",argc,argv);
   // check if parameters make sense

moses/src/StaticData.cpp

@@ -93,6 +93,13 @@ bool StaticData::LoadParameters(int argc, char* argv[])
         m_reportSourceSpan = false;
 
 
+	// print all factors of output translations
+	if (m_parameter.GetParam("report-all-factors").size() > 0)
+		m_reportAllFactors = Scan<bool>(m_parameter.GetParam("report-all-factors")[0]);
+	else
+        m_reportAllFactors = false;
+
+
 	//input-factors
 	const vector<string> &inputFactorVector = m_parameter.GetParam("input-factors");
 	for(size_t i=0; i<inputFactorVector.size(); i++) 

moses/src/StaticData.h

@@ -81,6 +81,7 @@ protected:
 	size_t m_verboseLevel;
 
 	bool m_reportSourceSpan;
+	bool m_reportAllFactors;
 
 public:
 	StaticData();
@@ -209,6 +210,10 @@ public:
 	{
 		return m_reportSourceSpan;
 	}
+	bool GetReportAllFactors() const
+	{
+		return m_reportAllFactors;
+	}
 
 	// for mert
 	size_t GetNBestSize() const

moses/src/Word.cpp

@@ -101,7 +101,7 @@ std::string Word::ToString(const FactorArray &factorArray)
 			const Factor *factor = factorArray[currFactor];
 		if (factor != NULL)
 		{
-			strme << *factor << ",";
+			strme << *factor << "|";
 		}
 	}
 	string str = strme.str();
@@ -121,7 +121,7 @@ ostream& operator<<(ostream& out, const Word& word)
 		const Factor *factor = word.GetFactor(factorType);
 		if (factor != NULL)
 		{
-			strme << *factor << ",";
+			strme << *factor << "|";
 		}
 	}
 	string str = strme.str();