Measure TimeOtherScore in Search instead of in Hypothesis

1 files changed, 17 insertions, 0 deletions

diff --git a/moses/SearchNormal.cpp b/moses/SearchNormal.cpp
index 4d7fd8a2c..bca49a6af 100644
--- a/moses/SearchNormal.cpp
+++ b/moses/SearchNormal.cpp
@@ -307,7 +307,24 @@ void SearchNormal::ExpandHypothesis(const Hypothesis &hypothesis,
       stats.StopTimeBuildHyp();
     }
     if (newHypo==NULL) return;
+
+    IFVERBOSE(2) {
+      m_manager.GetSentenceStats().StartTimeOtherScore();
+    }
     newHypo->EvaluateWhenApplied(estimatedScore);
+    IFVERBOSE(2) {
+      m_manager.GetSentenceStats().StopTimeOtherScore();
+
+      // TODO: these have been meaningless for a while.
+      // At least since commit 67fb5c
+      // should now be measured in SearchNormal.cpp:254 instead, around CalcFutureScore2()
+      // CalcFutureScore2() also called in BackwardsEdge::Initialize().
+      //
+      // however, CalcFutureScore2() should be quick
+      // since it uses dynamic programming results in SquareMatrix
+      m_manager.GetSentenceStats().StartTimeEstimateScore();
+      m_manager.GetSentenceStats().StopTimeEstimateScore();
+    }
   } else
     // early discarding: check if hypothesis is too bad to build
   {