moses-smt/mosesdecoder
1
1
Fork 0
mirror of https://github.com/moses-smt/mosesdecoder.git synced 2024-09-11 11:25:40 +03:00
Code Issues Packages Projects Releases Wiki Activity

Bug fix in server: Moses server now handles the placeholder mechanism for translations provided with the input.

Browse Source
This commit is contained in:
Ulrich Germann 2015-11-18 17:09:52 +00:00
parent 220d82041a
commit edacfbb9fd
2 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
moses/server/TranslationRequest.cpp
View File

@ -164,15 +164,15 @@ insertGraphInfo(Manager& manager, map<string, xmlrpc_c::value>& retData)
retData["sg"] = xmlrpc_c::value_array(searchGraphXml);
}
void
TranslationRequest::
output_phrase(ostream& out, Phrase const& phrase) const
{
if (!m_options.output.ReportAllFactors) {
for (size_t i = 0 ; i < phrase.GetSize(); ++i)
out << *phrase.GetFactor(i, 0) << " ";
} else out << phrase;
}
// void
// TranslationRequest::
// output_phrase(ostream& out, Phrase const& phrase) const
// {
// if (!m_options.output.ReportAllFactors) {
// for (size_t i = 0 ; i < phrase.GetSize(); ++i)
// out << *phrase.GetFactor(i, 0) << " ";
// } else out << phrase;
// }
void
TranslationRequest::
@ -193,7 +193,7 @@ outputNBest(const Manager& manager, map<string, xmlrpc_c::value>& retData)
vector<const Hypothesis *> const& E = path->GetEdges();
if (!E.size()) continue;
std::map<std::string, xmlrpc_c::value> nBestXmlItem;
pack_hypothesis(E, "hyp", nBestXmlItem);
pack_hypothesis(manager, E, "hyp", nBestXmlItem);
if (m_withScoreBreakdown) {
// should the score breakdown be reported in a more structured manner?
ostringstream buf;
@ -367,13 +367,19 @@ run_chart_decoder()
void
TranslationRequest::
pack_hypothesis(vector<Hypothesis const* > const& edges, string const& key,
map<string, xmlrpc_c::value> & dest) const
pack_hypothesis(Moses::Manager const& manager,
vector<Hypothesis const* > const& edges,
string const& key, map<string, xmlrpc_c::value> & dest) const
{
// target string
ostringstream target;
BOOST_REVERSE_FOREACH(Hypothesis const* e, edges)
output_phrase(target, e->GetCurrTargetPhrase());
{
// output_phrase(target, e->GetCurrTargetPhrase());
manager.OutputSurface(target,*e, m_options.output.factor_order,
m_options.output.ReportSegmentation,
m_options.output.ReportAllFactors);
}
XVERBOSE(1,"SERVER TRANSLATION: " << target.str() << std::endl);
dest[key] = xmlrpc_c::value_string(target.str());
@ -398,14 +404,15 @@ pack_hypothesis(vector<Hypothesis const* > const& edges, string const& key,
void
TranslationRequest::
pack_hypothesis(Hypothesis const* h, string const& key,
pack_hypothesis(Moses::Manager const& manager,
Hypothesis const* h, string const& key,
map<string, xmlrpc_c::value>& dest) const
{
using namespace std;
vector<Hypothesis const*> edges;
for (; h; h = h->GetPrevHypo())
edges.push_back(h);
pack_hypothesis(edges, key, dest);
pack_hypothesis(manager, edges, key, dest);
}
@ -422,7 +429,7 @@ run_phrase_decoder()
manager.Decode();
pack_hypothesis(manager.GetBestHypothesis(), "text", m_retData);
pack_hypothesis(manager, manager.GetBestHypothesis(), "text", m_retData);
if (m_session_id)
m_retData["session-id"] = xmlrpc_c::value_int(m_session_id);

10
moses/server/TranslationRequest.h
View File

@ -58,17 +58,19 @@ TranslationRequest : public virtual Moses::TranslationTask
run_phrase_decoder();
void
pack_hypothesis(std::vector<Moses::Hypothesis const* > const& edges,
pack_hypothesis(Moses::Manager const& manager,
std::vector<Moses::Hypothesis const* > const& edges,
std::string const& key,
std::map<std::string, xmlrpc_c::value> & dest) const;
void
pack_hypothesis(Moses::Hypothesis const* h, std::string const& key,
pack_hypothesis(Moses::Manager const& manager,
Moses::Hypothesis const* h, std::string const& key,
std::map<std::string, xmlrpc_c::value> & dest) const;
void
output_phrase(std::ostream& out, Moses::Phrase const& phrase) const;
// void
// output_phrase(std::ostream& out, Moses::Phrase const& phrase) const;
void
add_phrase_aln_info(Moses::Hypothesis const& h,