use zone and walls for normal and batch algorithm

This commit is contained in:
Hieu Hoang 2016-06-07 16:08:31 +01:00
parent b63380dae4
commit 462b17de8a
2 changed files with 10 additions and 1 deletions

View File

@ -102,6 +102,11 @@ void Search::Extend(const Hypothesis &hypo, const InputPath &path)
if (!CanExtend(hypoBitmap, hypoRange.GetEndPos(), pathRange)) {
return;
}
const ReorderingConstraint &reorderingConstraint = mgr.GetInput().GetReorderingConstraint();
if (!reorderingConstraint.Check(hypoBitmap, pathRange.GetStartPos(), pathRange.GetEndPos())) {
return;
}
//cerr << " YES" << endl;
// extend this hypo

View File

@ -92,7 +92,11 @@ void Search::Extend(const Hypothesis &hypo, const InputPath &path)
if (!CanExtend(hypoBitmap, hypoRange.GetEndPos(), pathRange)) {
return;
}
//cerr << " YES" << endl;
const ReorderingConstraint &reorderingConstraint = mgr.GetInput().GetReorderingConstraint();
if (!reorderingConstraint.Check(hypoBitmap, pathRange.GetStartPos(), pathRange.GetEndPos())) {
return;
}
// extend this hypo
const Bitmap &newBitmap = mgr.GetBitmaps().GetBitmap(hypoBitmap, pathRange);