mirror of
https://github.com/moses-smt/mosesdecoder.git
synced 2024-10-27 03:49:57 +03:00
consistent naming of future scores, estimated scores
This commit is contained in:
parent
5f3ab98044
commit
c118849e97
@ -65,7 +65,7 @@ void
|
|||||||
Distortion::EvaluateInIsolation(const System &system,
|
Distortion::EvaluateInIsolation(const System &system,
|
||||||
const PhraseBase &source, const TargetPhrase &targetPhrase,
|
const PhraseBase &source, const TargetPhrase &targetPhrase,
|
||||||
Scores &scores,
|
Scores &scores,
|
||||||
Scores *estimatedFutureScores) const
|
Scores *estimatedScore) const
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -25,7 +25,7 @@ public:
|
|||||||
const PhraseBase &source,
|
const PhraseBase &source,
|
||||||
const TargetPhrase &targetPhrase,
|
const TargetPhrase &targetPhrase,
|
||||||
Scores &scores,
|
Scores &scores,
|
||||||
Scores *estimatedFutureScores) const;
|
Scores *estimatedScore) const;
|
||||||
|
|
||||||
virtual Moses::FFState* EvaluateWhenApplied(const Manager &mgr,
|
virtual Moses::FFState* EvaluateWhenApplied(const Manager &mgr,
|
||||||
const Hypothesis &hypo,
|
const Hypothesis &hypo,
|
||||||
|
@ -41,7 +41,7 @@ public:
|
|||||||
EvaluateInIsolation(const System &system,
|
EvaluateInIsolation(const System &system,
|
||||||
const PhraseBase &source, const TargetPhrase &targetPhrase,
|
const PhraseBase &source, const TargetPhrase &targetPhrase,
|
||||||
Scores &scores,
|
Scores &scores,
|
||||||
Scores *estimatedFutureScores) const = 0;
|
Scores *estimatedScore) const = 0;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
size_t m_startInd;
|
size_t m_startInd;
|
||||||
|
@ -150,15 +150,15 @@ FeatureFunctions::EvaluateInIsolation(MemPool &pool, const System &system,
|
|||||||
const PhraseBase &source, TargetPhrase &targetPhrase) const
|
const PhraseBase &source, TargetPhrase &targetPhrase) const
|
||||||
{
|
{
|
||||||
size_t numScores = system.GetFeatureFunctions().GetNumScores();
|
size_t numScores = system.GetFeatureFunctions().GetNumScores();
|
||||||
Scores *estimatedFutureScores = new (pool.Allocate<Scores>()) Scores(pool, numScores);
|
Scores *estimatedScore = new (pool.Allocate<Scores>()) Scores(pool, numScores);
|
||||||
|
|
||||||
BOOST_FOREACH(const FeatureFunction *ff, m_featureFunctions) {
|
BOOST_FOREACH(const FeatureFunction *ff, m_featureFunctions) {
|
||||||
Scores& scores = targetPhrase.GetScores();
|
Scores& scores = targetPhrase.GetScores();
|
||||||
ff->EvaluateInIsolation(system, source, targetPhrase, scores, estimatedFutureScores);
|
ff->EvaluateInIsolation(system, source, targetPhrase, scores, estimatedScore);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (estimatedFutureScores) {
|
if (estimatedScore) {
|
||||||
targetPhrase.SetEstimatedScore(estimatedFutureScores->GetTotalScore());
|
targetPhrase.SetEstimatedScore(estimatedScore->GetTotalScore());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -126,7 +126,7 @@ void
|
|||||||
LanguageModel::EvaluateInIsolation(const System &system,
|
LanguageModel::EvaluateInIsolation(const System &system,
|
||||||
const PhraseBase &source, const TargetPhrase &targetPhrase,
|
const PhraseBase &source, const TargetPhrase &targetPhrase,
|
||||||
Scores &scores,
|
Scores &scores,
|
||||||
Scores *estimatedFutureScores) const
|
Scores *estimatedScore) const
|
||||||
{
|
{
|
||||||
if (targetPhrase.GetSize() == 0) {
|
if (targetPhrase.GetSize() == 0) {
|
||||||
return;
|
return;
|
||||||
@ -146,15 +146,15 @@ LanguageModel::EvaluateInIsolation(const System &system,
|
|||||||
std::pair<SCORE, void*> fromScoring = Score(context);
|
std::pair<SCORE, void*> fromScoring = Score(context);
|
||||||
score += fromScoring.first;
|
score += fromScoring.first;
|
||||||
}
|
}
|
||||||
else if (estimatedFutureScores) {
|
else if (estimatedScore) {
|
||||||
std::pair<SCORE, void*> fromScoring = Score(context);
|
std::pair<SCORE, void*> fromScoring = Score(context);
|
||||||
nonFullScore += fromScoring.first;
|
nonFullScore += fromScoring.first;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
scores.PlusEquals(system, *this, score);
|
scores.PlusEquals(system, *this, score);
|
||||||
if (estimatedFutureScores) {
|
if (estimatedScore) {
|
||||||
estimatedFutureScores->PlusEquals(system, *this, nonFullScore);
|
estimatedScore->PlusEquals(system, *this, nonFullScore);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -56,7 +56,7 @@ public:
|
|||||||
EvaluateInIsolation(const System &system,
|
EvaluateInIsolation(const System &system,
|
||||||
const PhraseBase &source, const TargetPhrase &targetPhrase,
|
const PhraseBase &source, const TargetPhrase &targetPhrase,
|
||||||
Scores &scores,
|
Scores &scores,
|
||||||
Scores *estimatedFutureScores) const;
|
Scores *estimatedScore) const;
|
||||||
|
|
||||||
virtual Moses::FFState* EvaluateWhenApplied(const Manager &mgr,
|
virtual Moses::FFState* EvaluateWhenApplied(const Manager &mgr,
|
||||||
const Hypothesis &hypo,
|
const Hypothesis &hypo,
|
||||||
|
@ -65,7 +65,7 @@ void
|
|||||||
PhraseTable::EvaluateInIsolation(const System &system,
|
PhraseTable::EvaluateInIsolation(const System &system,
|
||||||
const PhraseBase &source, const TargetPhrase &targetPhrase,
|
const PhraseBase &source, const TargetPhrase &targetPhrase,
|
||||||
Scores &scores,
|
Scores &scores,
|
||||||
Scores *estimatedFutureScores) const
|
Scores *estimatedScore) const
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -37,7 +37,7 @@ public:
|
|||||||
EvaluateInIsolation(const System &system,
|
EvaluateInIsolation(const System &system,
|
||||||
const PhraseBase &source, const TargetPhrase &targetPhrase,
|
const PhraseBase &source, const TargetPhrase &targetPhrase,
|
||||||
Scores &scores,
|
Scores &scores,
|
||||||
Scores *estimatedFutureScores) const;
|
Scores *estimatedScore) const;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
std::string m_path;
|
std::string m_path;
|
||||||
|
@ -45,7 +45,7 @@ void
|
|||||||
SkeletonStatefulFF::EvaluateInIsolation(const System &system,
|
SkeletonStatefulFF::EvaluateInIsolation(const System &system,
|
||||||
const PhraseBase &source, const TargetPhrase &targetPhrase,
|
const PhraseBase &source, const TargetPhrase &targetPhrase,
|
||||||
Scores &scores,
|
Scores &scores,
|
||||||
Scores *estimatedFutureScores) const
|
Scores *estimatedScore) const
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -22,7 +22,7 @@ public:
|
|||||||
EvaluateInIsolation(const System &system,
|
EvaluateInIsolation(const System &system,
|
||||||
const PhraseBase &source, const TargetPhrase &targetPhrase,
|
const PhraseBase &source, const TargetPhrase &targetPhrase,
|
||||||
Scores &scores,
|
Scores &scores,
|
||||||
Scores *estimatedFutureScores) const;
|
Scores *estimatedScore) const;
|
||||||
|
|
||||||
virtual Moses::FFState* EvaluateWhenApplied(const Manager &mgr,
|
virtual Moses::FFState* EvaluateWhenApplied(const Manager &mgr,
|
||||||
const Hypothesis &hypo,
|
const Hypothesis &hypo,
|
||||||
|
@ -21,7 +21,7 @@ void
|
|||||||
SkeletonStatelessFF::EvaluateInIsolation(const System &system,
|
SkeletonStatelessFF::EvaluateInIsolation(const System &system,
|
||||||
const PhraseBase &source, const TargetPhrase &targetPhrase,
|
const PhraseBase &source, const TargetPhrase &targetPhrase,
|
||||||
Scores &scores,
|
Scores &scores,
|
||||||
Scores *estimatedFutureScores) const
|
Scores *estimatedScore) const
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -19,6 +19,6 @@ public:
|
|||||||
EvaluateInIsolation(const System &system,
|
EvaluateInIsolation(const System &system,
|
||||||
const PhraseBase &source, const TargetPhrase &targetPhrase,
|
const PhraseBase &source, const TargetPhrase &targetPhrase,
|
||||||
Scores &scores,
|
Scores &scores,
|
||||||
Scores *estimatedFutureScores) const;
|
Scores *estimatedScore) const;
|
||||||
|
|
||||||
};
|
};
|
||||||
|
@ -71,7 +71,7 @@ void
|
|||||||
UnknownWordPenalty::EvaluateInIsolation(const System &system,
|
UnknownWordPenalty::EvaluateInIsolation(const System &system,
|
||||||
const PhraseBase &source, const TargetPhrase &targetPhrase,
|
const PhraseBase &source, const TargetPhrase &targetPhrase,
|
||||||
Scores &scores,
|
Scores &scores,
|
||||||
Scores *estimatedFutureScores) const
|
Scores *estimatedScore) const
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -22,7 +22,7 @@ public:
|
|||||||
EvaluateInIsolation(const System &system,
|
EvaluateInIsolation(const System &system,
|
||||||
const PhraseBase &source, const TargetPhrase &targetPhrase,
|
const PhraseBase &source, const TargetPhrase &targetPhrase,
|
||||||
Scores &scores,
|
Scores &scores,
|
||||||
Scores *estimatedFutureScores) const;
|
Scores *estimatedScore) const;
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -26,7 +26,7 @@ WordPenalty::EvaluateInIsolation(const System &system,
|
|||||||
const PhraseBase &source,
|
const PhraseBase &source,
|
||||||
const TargetPhrase &targetPhrase,
|
const TargetPhrase &targetPhrase,
|
||||||
Scores &scores,
|
Scores &scores,
|
||||||
Scores *estimatedFutureScores) const
|
Scores *estimatedScore) const
|
||||||
{
|
{
|
||||||
SCORE score = - (SCORE) targetPhrase.GetSize();
|
SCORE score = - (SCORE) targetPhrase.GetSize();
|
||||||
scores.PlusEquals(system, *this, score);
|
scores.PlusEquals(system, *this, score);
|
||||||
|
@ -21,7 +21,7 @@ public:
|
|||||||
const PhraseBase &source,
|
const PhraseBase &source,
|
||||||
const TargetPhrase &targetPhrase,
|
const TargetPhrase &targetPhrase,
|
||||||
Scores &scores,
|
Scores &scores,
|
||||||
Scores *estimatedFutureScores) const;
|
Scores *estimatedScore) const;
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user