moses-smt/mosesdecoder
1
1
Fork 0
mirror of https://github.com/moses-smt/mosesdecoder.git synced 2025-01-06 19:49:41 +03:00
Code Issues Packages Projects Releases Wiki Activity

renaming future score -> estimated score

Browse Source
This commit is contained in:
Hieu Hoang 2015-11-09 13:54:53 +00:00
parent 3ccd08c4c5
commit 76025091cb
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
contrib/other-builds/moses2/Search/Manager.cpp
View File

@ -50,7 +50,7 @@ Manager::Manager(System &system, const std::string &inputStr)
Manager::~Manager() {
delete m_bitmaps;
delete m_search;
delete m_futureScore;
delete m_estimatedScores;
GetPool().Reset();
GetHypoRecycle().clear();
@ -79,8 +79,8 @@ void Manager::Decode()
void Manager::CalcFutureScore()
{
size_t size = m_input->GetSize();
m_futureScore = new Moses::SquareMatrix(size);
m_futureScore->InitTriangle(-numeric_limits<SCORE>::infinity());
m_estimatedScores = new Moses::SquareMatrix(size);
m_estimatedScores->InitTriangle(-numeric_limits<SCORE>::infinity());
// walk all the translation options and record the cheapest option for each span
BOOST_FOREACH(const InputPath &path, m_inputPaths) {
@ -99,7 +99,7 @@ void Manager::CalcFutureScore()
}
}
}
m_futureScore->SetScore(range.GetStartPos(), range.GetEndPos(), bestScore);
m_estimatedScores->SetScore(range.GetStartPos(), range.GetEndPos(), bestScore);
}
// now fill all the cells in the strictly upper triangle
@ -114,8 +114,8 @@ void Manager::CalcFutureScore()
size_t sPos = diagshift;
size_t ePos = colstart+diagshift;
for(size_t joinAt = sPos; joinAt < ePos ; joinAt++) {
float joinedScore = m_futureScore->GetScore(sPos, joinAt)
+ m_futureScore->GetScore(joinAt+1, ePos);
float joinedScore = m_estimatedScores->GetScore(sPos, joinAt)
+ m_estimatedScores->GetScore(joinAt+1, ePos);
// uncomment to see the cell filling scheme
// TRACE_ERR("[" << sPos << "," << ePos << "] <-? ["
// << sPos << "," << joinAt << "]+["
@ -123,13 +123,13 @@ void Manager::CalcFutureScore()
// << colstart << ", diagshift: " << diagshift << ")"
// << endl);
if (joinedScore > m_futureScore->GetScore(sPos, ePos))
m_futureScore->SetScore(sPos, ePos, joinedScore);
if (joinedScore > m_estimatedScores->GetScore(sPos, ePos))
m_estimatedScores->SetScore(sPos, ePos, joinedScore);
}
}
}
//cerr << "Square matrix:" << endl;
//cerr << *m_futureScore << endl;
//cerr << *m_estimatedScores << endl;
}

4
contrib/other-builds/moses2/Search/Manager.h
View File

@ -42,7 +42,7 @@ public:
{ return *m_input; }
const Moses::SquareMatrix &GetEstimatedScores() const
{ return *m_futureScore; }
{ return *m_estimatedScores; }
const InputPaths &GetInputPaths() const
{ return m_inputPaths; }
@ -57,7 +57,7 @@ protected:
PhraseImpl *m_input;
InputPaths m_inputPaths;
Moses::Bitmaps *m_bitmaps;
Moses::SquareMatrix *m_futureScore;
Moses::SquareMatrix *m_estimatedScores;
Moses::Range m_initRange;
TargetPhrase m_initPhrase;

2
contrib/other-builds/moses2/Search/SearchNormal.cpp
View File

@ -140,7 +140,7 @@ void SearchNormal::Extend(const Hypothesis &hypo, const InputPath &path)
// extend this hypo
const Moses::Bitmap &newBitmap = m_mgr.GetBitmaps().GetBitmap(bitmap, pathRange);
//SCORE estimatedScore = m_mgr.GetEstimatedScores().CalcFutureScore2(bitmap, pathRange.GetStartPos(), pathRange.GetEndPos());
SCORE estimatedScore = m_mgr.GetEstimatedScores().CalcFutureScore(newBitmap);
SCORE estimatedScore = m_mgr.GetEstimatedScores().CalcEstimatedScore(newBitmap);
const std::vector<TargetPhrases::shared_const_ptr> &tpsAllPt = path.targetPhrases;
for (size_t i = 0; i < tpsAllPt.size(); ++i) {