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

trying to replicate moses1

Browse Source
This commit is contained in:
Hieu Hoang 2016-01-29 23:10:57 +00:00
parent 30eb2950ca
commit 8f8434affc
2 changed files with 43 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
contrib/other-builds/moses2/Search/CubePruningCardinalStack/Stack.cpp
View File

@ -92,8 +92,16 @@ Stack::SortedHypos Stack::GetSortedAndPruneHypos(const Manager &mgr) const
MemPool &pool = mgr.GetPool();
// divide hypos by [bitmap, last end pos]
// prune and sort
Hypotheses *allHypos = new (pool.Allocate<Hypotheses>()) Hypotheses(pool, GetHypoSize());
size_t i = 0;
BOOST_FOREACH(const Hypothesis *hypo, m_coll) {
(*allHypos)[i++] = hypo;
}
SortAndPruneHypos(mgr, *allHypos);
// divide hypos by [bitmap, last end pos]
BOOST_FOREACH(const Hypothesis *hypo, *allHypos) {
HypoCoverage key(&hypo->GetBitmap(), hypo->GetInputPath().range.GetEndPos());
Hypotheses *hypos;
@ -109,15 +117,42 @@ Stack::SortedHypos Stack::GetSortedAndPruneHypos(const Manager &mgr) const
hypos->push_back(hypo);
}
// put into real return variable and sort
BOOST_FOREACH(SortedHypos::value_type &val, ret) {
Hypotheses &hypos = *val.second;
SortAndPruneHypos(mgr, hypos);
}
return ret;
}
//Stack::SortedHypos Stack::GetSortedAndPruneHypos(const Manager &mgr) const
//{
// SortedHypos ret;
//
// MemPool &pool = mgr.GetPool();
//
// // divide hypos by [bitmap, last end pos]
// BOOST_FOREACH(const Hypothesis *hypo, m_coll) {
// HypoCoverage key(&hypo->GetBitmap(), hypo->GetInputPath().range.GetEndPos());
//
// Hypotheses *hypos;
// SortedHypos::iterator iter;
// iter = ret.find(key);
// if (iter == ret.end()) {
// hypos = new (pool.Allocate<Hypotheses>()) Hypotheses(pool);
// ret[key] = hypos;
// }
// else {
// hypos = iter->second;
// }
// hypos->push_back(hypo);
// }
//
// // put into real return variable and sort
// BOOST_FOREACH(SortedHypos::value_type &val, ret) {
// Hypotheses &hypos = *val.second;
// SortAndPruneHypos(mgr, hypos);
// }
//
// return ret;
//}
void Stack::SortAndPruneHypos(const Manager &mgr, Hypotheses &hypos) const
{
size_t stackSize = mgr.system.stackSize;

1
contrib/other-builds/moses2/TypeDef.h
View File

@ -49,6 +49,7 @@ enum SearchAlgorithm {
CubePruningPerMiniStack = 10,
CubePruningPerBitmap = 11,
CubePruningCardinalStack = 12,
CubePruningBitmapStack = 13,
DefaultSearchAlgorithm = 777 // means: use StaticData.m_searchAlgorithm
};