moses-smt/mosesdecoder
1
1
Fork 0
mirror of https://github.com/moses-smt/mosesdecoder.git synced 2024-12-30 15:34:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

reset beam variables when clearing ministack. They are reused

Browse Source
This commit is contained in:
Hieu Hoang 2016-12-01 14:41:30 +00:00
parent 0f12557e19
commit ef105a1a9b
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
contrib/moses2/HypothesisColl.cpp
View File

@ -18,9 +18,9 @@ using namespace std;
namespace Moses2
{
HypothesisColl::HypothesisColl(const ManagerBase &mgr) :
m_coll(MemPoolAllocator<const HypothesisBase*>(mgr.GetPool())), m_sortedHypos(
NULL)
HypothesisColl::HypothesisColl(const ManagerBase &mgr)
:m_coll(MemPoolAllocator<const HypothesisBase*>(mgr.GetPool()))
,m_sortedHypos(NULL)
{
m_bestScore = -std::numeric_limits<float>::infinity();
m_worstScore = -std::numeric_limits<float>::infinity();
@ -53,17 +53,28 @@ void HypothesisColl::Add(
ArcLists &arcLists)
{
SCORE futureScore = hypo->GetFutureScore();
/*
cerr << "scores:"
<< futureScore << " "
<< m_bestScore << " "
<< m_worstScore << " "
<< GetSize() << " "
<< endl;
*/
if (futureScore < m_worstScore) {
// beam threshold
//cerr << "Discard:" << hypo->Debug(system) << endl;
hypoRecycle.Recycle(hypo);
return;
}
//cerr << "OK:" << hypo->Debug(system) << endl;
if (futureScore > m_bestScore) {
m_bestScore = hypo->GetFutureScore();
// this may also affect the worst score
SCORE beamWidth = system.options.search.beam_width;
//cerr << "beamWidth=" << beamWidth << endl;
if ( m_bestScore + beamWidth > m_worstScore ) {
m_worstScore = m_bestScore + beamWidth;
}
@ -112,7 +123,7 @@ StackAdd HypothesisColl::Add(const HypothesisBase *hypo)
}
}
assert(false);
//assert(false);
}
const Hypotheses &HypothesisColl::GetSortedAndPruneHypos(
@ -192,6 +203,8 @@ void HypothesisColl::Clear()
{
m_sortedHypos = NULL;
m_coll.clear();
m_bestScore = -std::numeric_limits<float>::infinity();
m_worstScore = -std::numeric_limits<float>::infinity();
}
std::string HypothesisColl::Debug(const System &system) const

3
contrib/moses2/PhraseBased/CubePruningMiniStack/Search.cpp
View File

@ -73,10 +73,9 @@ void Search::Decode()
//cerr << "stackInd=" << stackInd << endl;
m_stack.Clear();
Decode(stackInd);
PostDecode(stackInd);
PostDecode(stackInd);
//m_stack.DebugCounts();
//cerr << m_stacks << endl;
}
}