added segment level time out

1 files changed, 14 insertions, 6 deletions

diff --git a/moses/Search.cpp b/moses/Search.cpp
index 2d8c74b5f..33a4cab49 100644
--- a/moses/Search.cpp
+++ b/moses/Search.cpp
@@ -17,19 +17,27 @@ Search::Search(Manager& manager)
   , interrupted_flag(0)
 {
   m_initialTransOpt.SetInputPath(m_inputPath);
+  m_timer.start();
 }
 
-
 bool
 Search::
 out_of_time()
 {
   int const& timelimit = m_options.search.timeout;
-  if (!timelimit) return false;
-  double elapsed_time = GetUserTime();
-  if (elapsed_time <= timelimit) return false;
-  VERBOSE(1,"Decoding is out of time (" << elapsed_time << ","
-          << timelimit << ")" << std::endl);
+  if (timelimit > 0) {
+    double elapsed_time = GetUserTime();
+    if (elapsed_time <= timelimit) return false;
+    VERBOSE(1,"Decoding is out of time (" << elapsed_time << ","
+            << timelimit << ")" << std::endl);
+  }
+  int const& segment_timelimit = m_options.search.segment_timeout;
+  if (segment_timelimit > 0) {
+    double elapsed_time = m_timer.get_elapsed_time();
+    if (elapsed_time <= segment_timelimit) return false;
+    VERBOSE(1,"Decoding for segment is out of time (" << elapsed_time << ","
+            << segment_timelimit << ")" << std::endl);
+  }
   interrupted_flag = 1;
   return true;
 }