moses-smt/mosesdecoder
1
1
Fork 0
mirror of https://github.com/moses-smt/mosesdecoder.git synced 2024-12-26 05:14:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

Make it possible for TranslationTasks to be accessed by the LM

Browse Source
This commit is contained in:
XapaJIaMnu 2015-06-23 13:24:42 +01:00
parent 2a242afa34
commit aaf8397d6f
6 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
moses/BaseManager.cpp
View File

@ -27,6 +27,11 @@ BaseManager::GetSource() const
return m_source; return m_source;
} }
const ttasksptr&
BaseManager::GetTtask() const {
return m_ttask.lock();
}
void void
BaseManager:: BaseManager::
OutputSearchGraphAsHypergraph(std::ostream& out) const OutputSearchGraphAsHypergraph(std::ostream& out) const

1
moses/BaseManager.h
View File

@ -50,6 +50,7 @@ public:
//! the input sentence being decoded //! the input sentence being decoded
const InputType& GetSource() const; const InputType& GetSource() const;
const ttasksptr& GetTtask() const;
virtual void Decode() = 0; virtual void Decode() = 0;
// outputs // outputs

8
moses/FF/StatefulFeatureFunction.h
View File

@ -37,6 +37,14 @@ public:
const FFState* prev_state, const FFState* prev_state,
ScoreComponentCollection* accumulator) const = 0; ScoreComponentCollection* accumulator) const = 0;
virtual FFState* EvaluateWhenAppliedWithContext(
ttasksptr const& ttasks,
const Hypothesis& cur_hypo,
const FFState* prev_state,
ScoreComponentCollection* accumulator) const {
return EvaluateWhenApplied(cur_hypo, prev_state, accumulator);
}
virtual FFState* EvaluateWhenApplied( virtual FFState* EvaluateWhenApplied(
const ChartHypothesis& /* cur_hypo */, const ChartHypothesis& /* cur_hypo */,
int /* featureID - used to index the state in the previous hypotheses */, int /* featureID - used to index the state in the previous hypotheses */,

8
moses/Hypothesis.cpp
View File

@ -230,9 +230,11 @@ EvaluateWhenApplied(StatefulFeatureFunction const& sfff,
{ {
const StaticData &staticData = StaticData::Instance(); const StaticData &staticData = StaticData::Instance();
if (! staticData.IsFeatureFunctionIgnored( sfff )) { if (! staticData.IsFeatureFunctionIgnored( sfff )) {
m_ffStates[state_idx] Manager& manager = this->GetManager(); //Get the manager and the ttask
= sfff.EvaluateWhenApplied ttasksptr const& ttask = manager.GetTtask();
(*this, m_prevHypo ? m_prevHypo->m_ffStates[state_idx] : NULL,
m_ffStates[state_idx] = sfff.EvaluateWhenAppliedWithContext
(ttask, *this, m_prevHypo ? m_prevHypo->m_ffStates[state_idx] : NULL,
&m_currScoreBreakdown); &m_currScoreBreakdown);
} }
} }

2
moses/LM/IRST.cpp
View File

@ -278,7 +278,7 @@ void LanguageModelIRST::CalcScore(const Phrase &phrase, float &fullScore, float
fullScore = ngramScore + before_boundary; fullScore = ngramScore + before_boundary;
} }
FFState* LanguageModelIRST::EvaluateWhenApplied(const Hypothesis &hypo, const FFState *ps, ScoreComponentCollection *out) const FFState* LanguageModelIRST::EvaluateWhenAppliedWithContext(ttasksptr const& ttasks, const Hypothesis &hypo, const FFState *ps, ScoreComponentCollection *out) const
{ {
if (!hypo.GetCurrTargetLength()) { if (!hypo.GetCurrTargetLength()) {
std::auto_ptr<IRSTLMState> ret(new IRSTLMState(ps)); std::auto_ptr<IRSTLMState> ret(new IRSTLMState(ps));

2
moses/LM/IRST.h
View File

@ -93,7 +93,7 @@ public:
virtual LMResult GetValue(const std::vector<const Word*> &contextFactor, State* finalState = NULL) const; virtual LMResult GetValue(const std::vector<const Word*> &contextFactor, State* finalState = NULL) const;
virtual FFState *EvaluateWhenApplied(const Hypothesis &hypo, const FFState *ps, ScoreComponentCollection *out) const; virtual FFState *EvaluateWhenAppliedWithContext(ttasksptr const& ttasks, const Hypothesis &hypo, const FFState *ps, ScoreComponentCollection *out) const;
virtual void CalcScore(const Phrase &phrase, float &fullScore, float &ngramScore, size_t &oovCount) const; virtual void CalcScore(const Phrase &phrase, float &fullScore, float &ngramScore, size_t &oovCount) const;