diff options
author | Hieu Hoang <hieuhoang@gmail.com> | 2015-11-09 16:40:31 +0300 |
---|---|---|
committer | Hieu Hoang <hieuhoang@gmail.com> | 2015-11-09 16:40:31 +0300 |
commit | 32e29d6b8ad7134e514f849213be9d817033bb73 (patch) | |
tree | 3131bb045e9167fb3ad0370c9a4bd8e024fd9c10 /moses/SearchNormal.cpp | |
parent | d0be56f8abcb6842a37daaf696ef4e84d25db9ea (diff) |
Consistent naming: m_futureScore --> m_estimatedScore
Diffstat (limited to 'moses/SearchNormal.cpp')
-rw-r--r-- | moses/SearchNormal.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/moses/SearchNormal.cpp b/moses/SearchNormal.cpp index 62bf420fc..025e61479 100644 --- a/moses/SearchNormal.cpp +++ b/moses/SearchNormal.cpp @@ -251,14 +251,14 @@ ExpandAllHypotheses(const Hypothesis &hypothesis, size_t startPos, size_t endPos float expectedScore = 0.0f; const Bitmap &sourceCompleted = hypothesis.GetWordsBitmap(); - float futureScore = m_transOptColl.GetFutureScore().CalcFutureScore2( sourceCompleted, startPos, endPos ); + float estimatedScore = m_transOptColl.GetEstimatedScores().CalcEstimatedScore( sourceCompleted, startPos, endPos ); if (m_options.search.UseEarlyDiscarding()) { // expected score is based on score of current hypothesis expectedScore = hypothesis.GetScore(); // add new future score estimate - expectedScore += futureScore; + expectedScore += estimatedScore; } // loop through all translation options @@ -274,7 +274,7 @@ ExpandAllHypotheses(const Hypothesis &hypothesis, size_t startPos, size_t endPos TranslationOptionList::const_iterator iter; for (iter = tol->begin() ; iter != tol->end() ; ++iter) { const TranslationOption &transOpt = **iter; - ExpandHypothesis(hypothesis, transOpt, expectedScore, futureScore, nextBitmap); + ExpandHypothesis(hypothesis, transOpt, expectedScore, estimatedScore, nextBitmap); } } @@ -290,7 +290,7 @@ ExpandAllHypotheses(const Hypothesis &hypothesis, size_t startPos, size_t endPos void SearchNormal::ExpandHypothesis(const Hypothesis &hypothesis, const TranslationOption &transOpt, float expectedScore, - float futureScore, + float estimatedScore, const Bitmap &bitmap) { const StaticData &staticData = StaticData::Instance(); @@ -307,7 +307,7 @@ void SearchNormal::ExpandHypothesis(const Hypothesis &hypothesis, stats.StopTimeBuildHyp(); } if (newHypo==NULL) return; - newHypo->EvaluateWhenApplied(futureScore); + newHypo->EvaluateWhenApplied(estimatedScore); } else // early discarding: check if hypothesis is too bad to build { |