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

Dump two ugly, old overrides of Hypothesis::EvaluateWhenApplied()

Browse Source 
A Brief History of Time:

65ddbf3 7/2/12 Wilson, "Implement batched LM requests."
776da79 8/6/15 Hoang, "delete old unused code"
This commit is contained in:
David Madl 2015-11-13 12:05:05 +00:00
parent e5a8438149
commit b1ea3d624b
2 changed files with 6 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
moses/Hypothesis.cpp
View File

@ -141,30 +141,6 @@ AddArc(Hypothesis *loserHypo)
m_arcList->push_back(loserHypo);
}
void
Hypothesis::
EvaluateWhenApplied(StatefulFeatureFunction const& sfff, int state_idx)
{
const StaticData &staticData = StaticData::Instance();
if (! staticData.IsFeatureFunctionIgnored( sfff )) {
// Manager& manager = this->GetManager(); //Get the manager and the ttask
// ttasksptr const& ttask = manager.GetTtask();
FFState const* prev = m_prevHypo ? m_prevHypo->m_ffStates[state_idx] : NULL;
m_ffStates[state_idx]
= sfff.EvaluateWhenApplied(*this, prev, &m_currScoreBreakdown);
}
}
void
Hypothesis::
EvaluateWhenApplied(const StatelessFeatureFunction& slff)
{
const StaticData &staticData = StaticData::Instance();
if (! staticData.IsFeatureFunctionIgnored( slff )) {
slff.EvaluateWhenApplied(*this, &m_currScoreBreakdown);
}
}
/***
* calculate the logarithm of our total translation score (sum up components)
*/
@ -172,6 +148,8 @@ void
Hypothesis::
EvaluateWhenApplied(float estimatedScore)
{
const StaticData &staticData = StaticData::Instance();
IFVERBOSE(2) {
m_manager.GetSentenceStats().StartTimeOtherScore();
}
@ -186,15 +164,16 @@ EvaluateWhenApplied(float estimatedScore)
StatelessFeatureFunction::GetStatelessFeatureFunctions();
for (unsigned i = 0; i < sfs.size(); ++i) {
const StatelessFeatureFunction &ff = *sfs[i];
EvaluateWhenApplied(ff);
if(!staticData.IsFeatureFunctionIgnored(ff)) {
ff.EvaluateWhenApplied(*this, &m_currScoreBreakdown);
}
}
const vector<const StatefulFeatureFunction*>& ffs =
StatefulFeatureFunction::GetStatefulFeatureFunctions();
for (unsigned i = 0; i < ffs.size(); ++i) {
const StatefulFeatureFunction &ff = *ffs[i];
const StaticData &staticData = StaticData::Instance();
if (! staticData.IsFeatureFunctionIgnored(ff)) {
if(!staticData.IsFeatureFunctionIgnored(ff)) {
FFState const* s = m_prevHypo ? m_prevHypo->m_ffStates[i] : NULL;
m_ffStates[i] = ff.EvaluateWhenApplied(*this, s, &m_currScoreBreakdown);
}

7
moses/Hypothesis.h
View File

@ -230,13 +230,6 @@ public:
m_ffStates[idx] = state;
}
// Added by oliver.wilson@ed.ac.uk for async lm stuff.
void EvaluateWhenApplied(const StatefulFeatureFunction &sfff, int state_idx);
void EvaluateWhenApplied(const StatelessFeatureFunction &slff);
//! target span that trans opt would populate if applied to this hypo. Used for alignment check
size_t GetNextStartPos(const TranslationOption &transOpt) const;
std::vector<std::vector<unsigned int> > *GetLMStats() const {
return NULL;
}