can prune stack < max stack size

moses-smt · Dec 7, 2016 · ab28a3f · ab28a3f
1 parent 883f2e4
commit ab28a3f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/contrib/moses2/HypothesisColl.cpp b/contrib/moses2/HypothesisColl.cpp
@@ -242,8 +242,8 @@ void HypothesisColl::PruneHypos(const ManagerBase &mgr, ArcLists &arcLists)
 void HypothesisColl::PruneHypos(const ManagerBase &mgr, ArcLists &arcLists, const HypothesisBase **sortedHypos) const
 {
   size_t maxStackSize = mgr.system.options.search.stack_size;
-  assert(maxStackSize); // can't do stack=0 - unlimited stack size. No-one ever uses that
-  assert(GetSize() > maxStackSize);
+  //assert(maxStackSize); // can't do stack=0 - unlimited stack size. No-one ever uses that
+  //assert(GetSize() > maxStackSize);
   //assert(sortedHypos.size() == GetSize());
 
   /*
@@ -259,7 +259,19 @@ void HypothesisColl::PruneHypos(const ManagerBase &mgr, ArcLists &arcLists, cons
     ++ind;
   }
 
-  const HypothesisBase **iterMiddle = sortedHypos + maxStackSize;
+  size_t indMiddle;
+  if (maxStackSize == 0) {
+    indMiddle = GetSize();
+  }
+  else if (GetSize() > maxStackSize) {
+    indMiddle = maxStackSize;
+  }
+  else {
+    // GetSize() <= maxStackSize
+    indMiddle = GetSize();
+  }
+
+  const HypothesisBase **iterMiddle = sortedHypos + indMiddle;
 
   std::partial_sort(
       sortedHypos,

diff --git a/contrib/moses2/legacy/Parameter.cpp b/contrib/moses2/legacy/Parameter.cpp
@@ -84,7 +84,7 @@ Parameter::Parameter()
   //AddParam(search_opts, "early-discarding-threshold", "edt",
   //    "threshold for constructing hypotheses based on estimate cost");
   AddParam(search_opts, "stack", "s",
-      "maximum stack size for histogram pruning. CANNOT USE 0 = unlimited stack size");
+      "maximum stack size for histogram pruning. 0 = unlimited stack size");
   //AddParam(search_opts, "stack-diversity", "sd",
   //    "minimum number of hypothesis of each coverage in stack (default 0)");