Eliminated EvaluateWhenAppliedWithContext().

The Phrase class now provides access to the TranslationTask.

1 files changed, 6 insertions, 8 deletions

diff --git a/moses/Hypothesis.cpp b/moses/Hypothesis.cpp
index 847c14f81..d1ef92494 100644
--- a/moses/Hypothesis.cpp
+++ b/moses/Hypothesis.cpp
@@ -143,17 +143,15 @@ AddArc(Hypothesis *loserHypo)
 
 void
 Hypothesis::
-EvaluateWhenApplied(StatefulFeatureFunction const& sfff,
-                    int state_idx)
+EvaluateWhenApplied(StatefulFeatureFunction const& sfff, int state_idx)
 {
   const StaticData &staticData = StaticData::Instance();
   if (! staticData.IsFeatureFunctionIgnored( sfff )) {
-    Manager& manager = this->GetManager(); //Get the manager and the ttask
-    ttasksptr const& ttask = manager.GetTtask();
-
-    m_ffStates[state_idx] = sfff.EvaluateWhenAppliedWithContext
-                            (ttask, *this, m_prevHypo ? m_prevHypo->m_ffStates[state_idx] : NULL,
-                             &m_currScoreBreakdown);
+    // Manager& manager = this->GetManager(); //Get the manager and the ttask
+    // ttasksptr const& ttask = manager.GetTtask();
+    FFState const* prev = m_prevHypo ? m_prevHypo->m_ffStates[state_idx] : NULL;
+    m_ffStates[state_idx] 
+      = sfff.EvaluateWhenApplied(*this, prev, &m_currScoreBreakdown);
   }
 }