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

use firstGap to loop through input paths

Browse Source
This commit is contained in:
Hieu Hoang 2016-02-09 18:14:31 +00:00
parent 68bf7a3a50
commit bc8269f251
3 changed files with 45 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/other-builds/moses2/InputPaths.h
View File

@ -49,6 +49,9 @@ public:
const InputPath &GetBlank() const
{ return *m_blank; }
const SquareMatrix<InputPath*> &GetMatrix() const
{ return *m_matrix; }
protected:
Coll m_inputPaths;
InputPath *m_blank;

58
contrib/other-builds/moses2/Search/CubePruningMiniStack/Search.cpp
View File

@ -163,42 +163,50 @@ void Search::PostDecode(size_t stackInd)
{
MemPool &pool = mgr.GetPool();
const InputPaths &paths = mgr.GetInputPaths();
const SquareMatrix<InputPath*> &pathMatrix = paths.GetMatrix();
size_t inputSize = pathMatrix.GetRows();
size_t numPaths = pathMatrix.GetCols();
BOOST_FOREACH(const Stack::Coll::value_type &val, m_stack.GetColl()) {
const Bitmap &hypoBitmap = *val.first.first;
size_t firstGap = hypoBitmap.GetFirstGapPos();
size_t hypoEndPos = val.first.second;
//cerr << "key=" << hypoBitmap << " " << hypoEndPos << endl;
//cerr << "key=" << hypoBitmap << " " << firstGap << " " << inputSize << endl;
// create edges to next hypos from existing hypos
const InputPaths &paths = mgr.GetInputPaths();
for (size_t startPos = firstGap; startPos < inputSize; ++startPos) {
for (size_t pathInd = 0; pathInd < numPaths; ++pathInd) {
const InputPath *path = pathMatrix.GetValue(startPos, pathInd);
BOOST_FOREACH(const InputPath *path, paths) {
const Range &pathRange = path->range;
//cerr << "pathRange=" << pathRange << endl;
if (path == NULL || !path->IsUsed()) {
continue;
}
if (!path->IsUsed()) {
continue;
}
if (!CanExtend(hypoBitmap, hypoEndPos, pathRange)) {
continue;
}
const Range &pathRange = path->range;
//cerr << "pathRange=" << pathRange << endl;
if (!CanExtend(hypoBitmap, hypoEndPos, pathRange)) {
continue;
}
const Bitmap &newBitmap = mgr.GetBitmaps().GetBitmap(hypoBitmap, pathRange);
size_t numWords = newBitmap.GetNumWordsCovered();
const Bitmap &newBitmap = mgr.GetBitmaps().GetBitmap(hypoBitmap, pathRange);
size_t numWords = newBitmap.GetNumWordsCovered();
CubeEdges &edges = *m_cubeEdges[numWords];
CubeEdges &edges = *m_cubeEdges[numWords];
// sort hypo for a particular bitmap and hypoEndPos
Hypotheses &sortedHypos = val.second->GetSortedAndPruneHypos(mgr);
// sort hypo for a particular bitmap and hypoEndPos
Hypotheses &sortedHypos = val.second->GetSortedAndPruneHypos(mgr);
size_t numPt = mgr.system.mappings.size();
for (size_t i = 0; i < numPt; ++i) {
const TargetPhrases *tps = path->targetPhrases[i];
if (tps && tps->GetSize()) {
CubeEdge *edge = new (pool.Allocate<CubeEdge>()) CubeEdge(mgr, sortedHypos, *path, *tps, newBitmap);
edges.push_back(edge);
}
}
}
size_t numPt = mgr.system.mappings.size();
for (size_t i = 0; i < numPt; ++i) {
const TargetPhrases *tps = path->targetPhrases[i];
if (tps && tps->GetSize()) {
CubeEdge *edge = new (pool.Allocate<CubeEdge>()) CubeEdge(mgr, sortedHypos, *path, *tps, newBitmap);
edges.push_back(edge);
}
}
}
}
}
}

9
contrib/other-builds/moses2/legacy/SquareMatrix.h
View File

@ -73,6 +73,15 @@ public:
assert(m_rows == m_cols);
return m_rows;
}
inline size_t GetRows() const {
return m_rows;
}
inline size_t GetCols() const {
return m_cols;
}
/** Get a future cost score for a span */
inline const T &GetValue(size_t row, size_t col) const {
return m_array[row * m_cols + col];