Added new feature function hook: EvaluateWithSourceContextCollecton(...)

2024-09-11 11:25:40 +03:00 · 2015-01-06 10:46:31 +01:00 · 2015-01-06 10:46:31 +01:00 · f932058af4
commit f932058af4
parent ab0227ea48
48 changed files with 431 additions and 2 deletions
--- a/moses/FF/BleuScoreFeature.h
+++ b/moses/FF/BleuScoreFeature.h
@ -128,6 +128,15 @@ public:
                , ScoreComponentCollection &scoreBreakdown
                , ScoreComponentCollection *estimatedFutureScore = NULL) const
  {}
+
+  void EvaluateWithSourceContextCollection(const InputType &input
+              , const InputPath &inputPath
+              , const TargetPhraseCollection &targetPhraseCollection
+              , const StackVec *stackVec
+              , ScoreComponentCollection &scoreBreakdown
+              , ScoreComponentCollection *estimatedFutureScore = NULL) const
+  {}
+
  void EvaluateInIsolation(const Phrase &source
                , const TargetPhrase &targetPhrase
                , ScoreComponentCollection &scoreBreakdown
--- a/moses/FF/ConstrainedDecoding.h
+++ b/moses/FF/ConstrainedDecoding.h
@ -55,6 +55,15 @@ public:
                , ScoreComponentCollection *estimatedFutureScore = NULL) const
  {}
  
+  void EvaluateWithSourceContextCollection(const InputType &input
+              , const InputPath &inputPath
+              , const TargetPhraseCollection &targetPhraseCollection
+              , const StackVec *stackVec
+              , ScoreComponentCollection &scoreBreakdown
+              , ScoreComponentCollection *estimatedFutureScore = NULL) const
+  {}
+
+  
  FFState* EvaluateWhenApplied(
    const Hypothesis& cur_hypo,
    const FFState* prev_state,
--- a/moses/FF/ControlRecombination.h
+++ b/moses/FF/ControlRecombination.h
@ -69,6 +69,16 @@ public:
                , ScoreComponentCollection &scoreBreakdown
                , ScoreComponentCollection *estimatedFutureScore = NULL) const
  {}
+  
+  void EvaluateWithSourceContextCollection(const InputType &input
+              , const InputPath &inputPath
+              , const TargetPhraseCollection &targetPhraseCollection
+              , const StackVec *stackVec
+              , ScoreComponentCollection &scoreBreakdown
+              , ScoreComponentCollection *estimatedFutureScore = NULL) const
+  {}
+
+  
  FFState* EvaluateWhenApplied(
    const Hypothesis& cur_hypo,
    const FFState* prev_state,
--- a/moses/FF/CountNonTerms.h
+++ b/moses/FF/CountNonTerms.h
@ -25,6 +25,15 @@ public:
                , ScoreComponentCollection &scoreBreakdown
                , ScoreComponentCollection *estimatedFutureScore = NULL) const
  {}
+  
+  void EvaluateWithSourceContextCollection(const InputType &input
+              , const InputPath &inputPath
+              , const TargetPhraseCollection &targetPhraseCollection
+              , const StackVec *stackVec
+              , ScoreComponentCollection &scoreBreakdown
+              , ScoreComponentCollection *estimatedFutureScore = NULL) const
+  {}
+

  void EvaluateWhenApplied(const Hypothesis& hypo,
                ScoreComponentCollection* accumulator) const
--- a/moses/FF/CoveredReferenceFeature.h
+++ b/moses/FF/CoveredReferenceFeature.h
@ -61,6 +61,16 @@ public:
                , const StackVec *stackVec
                , ScoreComponentCollection &scoreBreakdown
                , ScoreComponentCollection *estimatedFutureScore = NULL) const;
+  
+  void EvaluateWithSourceContextCollection(const InputType &input
+              , const InputPath &inputPath
+              , const TargetPhraseCollection &targetPhraseCollection
+              , const StackVec *stackVec
+              , ScoreComponentCollection &scoreBreakdown
+              , ScoreComponentCollection *estimatedFutureScore = NULL) const
+  {}
+
+  
  FFState* EvaluateWhenApplied(
    const Hypothesis& cur_hypo,
    const FFState* prev_state,
--- a/moses/FF/DecodeFeature.h
+++ b/moses/FF/DecodeFeature.h
@ -78,6 +78,14 @@ public:
                , ScoreComponentCollection &scoreBreakdown
                , ScoreComponentCollection *estimatedFutureScore = NULL) const
  {}
+  void EvaluateWithSourceContextCollection(const InputType &input
+                , const InputPath &inputPath
+                , const TargetPhraseCollection &targetPhraseCollection
+                , const StackVec *stackVec
+                , ScoreComponentCollection &scoreBreakdown
+                , ScoreComponentCollection *estimatedFutureScore = NULL) const
+  {}
+  
  void EvaluateInIsolation(const Phrase &source
                , const TargetPhrase &targetPhrase
                , ScoreComponentCollection &scoreBreakdown
--- a/moses/FF/DistortionScoreProducer.h
+++ b/moses/FF/DistortionScoreProducer.h
@ -54,12 +54,21 @@ public:
                , ScoreComponentCollection &scoreBreakdown
                , ScoreComponentCollection *estimatedFutureScore = NULL) const
  {}
+  
+  void EvaluateWithSourceContextCollection(const InputType &input
+              , const InputPath &inputPath
+              , const TargetPhraseCollection &targetPhraseCollection
+              , const StackVec *stackVec
+              , ScoreComponentCollection &scoreBreakdown
+              , ScoreComponentCollection *estimatedFutureScore = NULL) const
+  {}
+
+  
  void EvaluateInIsolation(const Phrase &source
                , const TargetPhrase &targetPhrase
                , ScoreComponentCollection &scoreBreakdown
                , ScoreComponentCollection &estimatedFutureScore) const
  {}
-
 };
 }

--- a/moses/FF/DynamicCacheBasedLanguageModel.h
+++ b/moses/FF/DynamicCacheBasedLanguageModel.h
@ -137,6 +137,15 @@ public:
                , ScoreComponentCollection &scoreBreakdown
                , ScoreComponentCollection *estimatedFutureScore = NULL) const
  {}
+  
+  void EvaluateWithSourceContextCollection(const InputType &input
+              , const InputPath &inputPath
+              , const TargetPhraseCollection &targetPhraseCollection
+              , const StackVec *stackVec
+              , ScoreComponentCollection &scoreBreakdown
+              , ScoreComponentCollection *estimatedFutureScore = NULL) const
+  {}
+

  void EvaluateWhenApplied(const Hypothesis& hypo,
                ScoreComponentCollection* accumulator) const
--- a/moses/FF/ExternalFeature.h
+++ b/moses/FF/ExternalFeature.h
@ -63,6 +63,16 @@ public:
                , ScoreComponentCollection &scoreBreakdown
                , ScoreComponentCollection *estimatedFutureScore = NULL) const
  {}
+  
+  void EvaluateWithSourceContextCollection(const InputType &input
+              , const InputPath &inputPath
+              , const TargetPhraseCollection &targetPhraseCollection
+              , const StackVec *stackVec
+              , ScoreComponentCollection &scoreBreakdown
+              , ScoreComponentCollection *estimatedFutureScore = NULL) const
+  {}
+
+  
  FFState* EvaluateWhenApplied(
    const Hypothesis& cur_hypo,
    const FFState* prev_state,
--- a/moses/FF/FeatureFunction.h
+++ b/moses/FF/FeatureFunction.h
@ -12,6 +12,7 @@ namespace Moses

 class Phrase;
 class TargetPhrase;
+class TargetPhraseCollection;
 class TranslationOption;
 class Hypothesis;
 class ChartHypothesis;
@ -131,6 +132,20 @@ public:
                        , const StackVec *stackVec
                        , ScoreComponentCollection &scoreBreakdown
                        , ScoreComponentCollection *estimatedFutureScore = NULL) const = 0;
+  
+  // This method is called once all the translation options are retrieved from the phrase table, and
+  // just before search.
+  // 'inputPath' is guaranteed to be the raw substring from the input. No factors were added or taken away
+  // 'stackVec' is a vector of chart cells that the RHS non-terms cover.
+  // It is guaranteed to be in the same order as the non-terms in the source phrase.
+  // For pb models, stackvec is NULL.
+  // No FF should set estimatedFutureScore in both overloads!
+  virtual void EvaluateWithSourceContextCollection(const InputType &input
+                        , const InputPath &inputPath
+                        , const TargetPhraseCollection &targetPhraseCollection
+                        , const StackVec *stackVec
+                        , ScoreComponentCollection &scoreBreakdown
+                        , ScoreComponentCollection *estimatedFutureScore = NULL) const = 0;

  virtual void SetParameter(const std::string& key, const std::string& value);
  virtual void ReadParameters();
--- a/moses/FF/GlobalLexicalModel.h
+++ b/moses/FF/GlobalLexicalModel.h
@ -90,6 +90,15 @@ public:
                , ScoreComponentCollection *estimatedFutureScore = NULL) const
  {}

+  void EvaluateWithSourceContextCollection(const InputType &input
+              , const InputPath &inputPath
+              , const TargetPhraseCollection &targetPhraseCollection
+              , const StackVec *stackVec
+              , ScoreComponentCollection &scoreBreakdown
+              , ScoreComponentCollection *estimatedFutureScore = NULL) const
+  {}
+
+  
 };

 }
--- a/moses/FF/GlobalLexicalModelUnlimited.h
+++ b/moses/FF/GlobalLexicalModelUnlimited.h
@ -97,6 +97,16 @@ public:
                , ScoreComponentCollection &scoreBreakdown
                , ScoreComponentCollection *estimatedFutureScore = NULL) const
  {}
+  
+  void EvaluateWithSourceContextCollection(const InputType &input
+              , const InputPath &inputPath
+              , const TargetPhraseCollection &targetPhraseCollection
+              , const StackVec *stackVec
+              , ScoreComponentCollection &scoreBreakdown
+              , ScoreComponentCollection *estimatedFutureScore = NULL) const
+  {}
+
+  
  void EvaluateInIsolation(const Phrase &source
                , const TargetPhrase &targetPhrase
                , ScoreComponentCollection &scoreBreakdown
--- a/moses/FF/HyperParameterAsWeight.h
+++ b/moses/FF/HyperParameterAsWeight.h
@ -32,6 +32,15 @@ public:
                        , ScoreComponentCollection *estimatedFutureScore = NULL) const
  {}

+  virtual void EvaluateWithSourceContextCollection(const InputType &input
+              , const InputPath &inputPath
+              , const TargetPhraseCollection &targetPhraseCollection
+              , const StackVec *stackVec
+              , ScoreComponentCollection &scoreBreakdown
+              , ScoreComponentCollection *estimatedFutureScore = NULL) const
+  {}
+
+  
  virtual void EvaluateWhenApplied(const Hypothesis& hypo,
                        ScoreComponentCollection* accumulator) const
  {}
--- a/moses/FF/InputFeature.h
+++ b/moses/FF/InputFeature.h
@ -54,6 +54,15 @@ public:
                , ScoreComponentCollection &scoreBreakdown
                , ScoreComponentCollection *estimatedFutureScore = NULL) const;

+  void EvaluateWithSourceContextCollection(const InputType &input
+              , const InputPath &inputPath
+              , const TargetPhraseCollection &targetPhraseCollection
+              , const StackVec *stackVec
+              , ScoreComponentCollection &scoreBreakdown
+              , ScoreComponentCollection *estimatedFutureScore = NULL) const
+  {}
+
+                
  void EvaluateWhenApplied(const Hypothesis& hypo,
                ScoreComponentCollection* accumulator) const
  {}
--- a/moses/FF/LexicalReordering/LexicalReordering.h
+++ b/moses/FF/LexicalReordering/LexicalReordering.h
@ -61,6 +61,16 @@ public:
                , ScoreComponentCollection &scoreBreakdown
                , ScoreComponentCollection *estimatedFutureScore = NULL) const
  {}
+  
+  void EvaluateWithSourceContextCollection(const InputType &input
+              , const InputPath &inputPath
+              , const TargetPhraseCollection &targetPhraseCollection
+              , const StackVec *stackVec
+              , ScoreComponentCollection &scoreBreakdown
+              , ScoreComponentCollection *estimatedFutureScore = NULL) const
+  {}
+
+  
  void EvaluateInIsolation(const Phrase &source
                , const TargetPhrase &targetPhrase
                , ScoreComponentCollection &scoreBreakdown
--- a/moses/FF/MaxSpanFreeNonTermSource.h
+++ b/moses/FF/MaxSpanFreeNonTermSource.h
@ -27,6 +27,14 @@ public:
 	                         , ScoreComponentCollection &scoreBreakdown
 	                         , ScoreComponentCollection *estimatedFutureScore = NULL) const;

+    void EvaluateWithSourceContextCollection(const InputType &input
+                , const InputPath &inputPath
+                , const TargetPhraseCollection &targetPhraseCollection
+                , const StackVec *stackVec
+                , ScoreComponentCollection &scoreBreakdown
+                , ScoreComponentCollection *estimatedFutureScore = NULL) const
+    {}
+
 	  virtual void EvaluateWhenApplied(const Hypothesis& hypo,
 	                        ScoreComponentCollection* accumulator) const
 	  {}
--- a/moses/FF/NieceTerminal.h
+++ b/moses/FF/NieceTerminal.h
@ -29,6 +29,16 @@ public:
                , const StackVec *stackVec
                , ScoreComponentCollection &scoreBreakdown
                , ScoreComponentCollection *estimatedFutureScore = NULL) const;
+  
+  void EvaluateWithSourceContextCollection(const InputType &input
+              , const InputPath &inputPath
+              , const TargetPhraseCollection &targetPhraseCollection
+              , const StackVec *stackVec
+              , ScoreComponentCollection &scoreBreakdown
+              , ScoreComponentCollection *estimatedFutureScore = NULL) const
+  {}
+
+  
  void EvaluateWhenApplied(const Hypothesis& hypo,
                ScoreComponentCollection* accumulator) const;
  void EvaluateWhenApplied(const ChartHypothesis &hypo,
--- a/moses/FF/OSM-Feature/OpSequenceModel.h
+++ b/moses/FF/OSM-Feature/OpSequenceModel.h
@ -44,6 +44,16 @@ public:
                , ScoreComponentCollection &scoreBreakdown
                , ScoreComponentCollection *estimatedFutureScore = NULL) const
  {}
+  
+  void EvaluateWithSourceContextCollection(const InputType &input
+              , const InputPath &inputPath
+              , const TargetPhraseCollection &targetPhraseCollection
+              , const StackVec *stackVec
+              , ScoreComponentCollection &scoreBreakdown
+              , ScoreComponentCollection *estimatedFutureScore = NULL) const
+  {}
+
+  
  void  EvaluateInIsolation(const Phrase &source
                 , const TargetPhrase &targetPhrase
                 , ScoreComponentCollection &scoreBreakdown
--- a/moses/FF/PhraseBoundaryFeature.h
+++ b/moses/FF/PhraseBoundaryFeature.h
@ -60,6 +60,15 @@ public:
                , ScoreComponentCollection &scoreBreakdown
                , ScoreComponentCollection *estimatedFutureScore = NULL) const
  {}
+  
+  void EvaluateWithSourceContextCollection(const InputType &input
+              , const InputPath &inputPath
+              , const TargetPhraseCollection &targetPhraseCollection
+              , const StackVec *stackVec
+              , ScoreComponentCollection &scoreBreakdown
+              , ScoreComponentCollection *estimatedFutureScore = NULL) const
+  {}
+
  void EvaluateInIsolation(const Phrase &source
                , const TargetPhrase &targetPhrase
                , ScoreComponentCollection &scoreBreakdown
--- a/moses/FF/PhraseLengthFeature.h
+++ b/moses/FF/PhraseLengthFeature.h
@ -39,6 +39,14 @@ public:
                , ScoreComponentCollection &scoreBreakdown
                , ScoreComponentCollection *estimatedFutureScore = NULL) const
  {}
+  
+  void EvaluateWithSourceContextCollection(const InputType &input
+              , const InputPath &inputPath
+              , const TargetPhraseCollection &targetPhraseCollection
+              , const StackVec *stackVec
+              , ScoreComponentCollection &scoreBreakdown
+              , ScoreComponentCollection *estimatedFutureScore = NULL) const
+  {}

  virtual void EvaluateInIsolation(const Phrase &source
                        , const TargetPhrase &targetPhrase
--- a/moses/FF/PhraseOrientationFeature.h
+++ b/moses/FF/PhraseOrientationFeature.h
@ -173,6 +173,14 @@ public:
                , ScoreComponentCollection *estimatedFutureScore = NULL) const
  {};

+  void EvaluateWithSourceContextCollection(const InputType &input
+              , const InputPath &inputPath
+              , const TargetPhraseCollection &targetPhraseCollection
+              , const StackVec *stackVec
+              , ScoreComponentCollection &scoreBreakdown
+              , ScoreComponentCollection *estimatedFutureScore = NULL) const
+  {}
+
  FFState* EvaluateWhenApplied(
    const Hypothesis& cur_hypo,
    const FFState* prev_state,
--- a/moses/FF/PhrasePairFeature.h
+++ b/moses/FF/PhrasePairFeature.h
@ -46,6 +46,14 @@ public:
                , ScoreComponentCollection &estimatedFutureScore) const
  {}

+  void EvaluateWithSourceContextCollection(const InputType &input
+              , const InputPath &inputPath
+              , const TargetPhraseCollection &targetPhraseCollection
+              , const StackVec *stackVec
+              , ScoreComponentCollection &scoreBreakdown
+              , ScoreComponentCollection *estimatedFutureScore = NULL) const
+  {}
+
  void EvaluateWithSourceContext(const InputType &input
                , const InputPath &inputPath
                , const TargetPhrase &targetPhrase
--- a/moses/FF/PhrasePenalty.h
+++ b/moses/FF/PhrasePenalty.h
@ -37,6 +37,14 @@ public:
                , ScoreComponentCollection *estimatedFutureScore = NULL) const
  {}

+  void EvaluateWithSourceContextCollection(const InputType &input
+              , const InputPath &inputPath
+              , const TargetPhraseCollection &targetPhraseCollection
+              , const StackVec *stackVec
+              , ScoreComponentCollection &scoreBreakdown
+              , ScoreComponentCollection *estimatedFutureScore = NULL) const
+  {}
+
  void SetParameter(const std::string& key, const std::string& value);

 protected:
--- a/moses/FF/ReferenceComparison.h
+++ b/moses/FF/ReferenceComparison.h
@ -29,6 +29,14 @@ public:
 	                         , ScoreComponentCollection *estimatedFutureScore = NULL) const
 	  {}

+    void EvaluateWithSourceContextCollection(const InputType &input
+          , const InputPath &inputPath
+          , const TargetPhraseCollection &targetPhraseCollection
+          , const StackVec *stackVec
+          , ScoreComponentCollection &scoreBreakdown
+          , ScoreComponentCollection *estimatedFutureScore = NULL) const
+    {}
+
 	  virtual void EvaluateWhenApplied(const Hypothesis& hypo,
 	                        ScoreComponentCollection* accumulator) const
 	  {}
--- a/moses/FF/RuleScope.h
+++ b/moses/FF/RuleScope.h
@ -26,6 +26,15 @@ public:
 	                         , ScoreComponentCollection &scoreBreakdown
 	                         , ScoreComponentCollection *estimatedFutureScore = NULL) const
 	  {}
+      
+        void EvaluateWithSourceContextCollection(const InputType &input
+              , const InputPath &inputPath
+              , const TargetPhraseCollection &targetPhraseCollection
+              , const StackVec *stackVec
+              , ScoreComponentCollection &scoreBreakdown
+              , ScoreComponentCollection *estimatedFutureScore = NULL) const
+        {}
+

 	  virtual void EvaluateWhenApplied(const Hypothesis& hypo,
 	                        ScoreComponentCollection* accumulator) const
--- a/moses/FF/SetSourcePhrase.h
+++ b/moses/FF/SetSourcePhrase.h
@ -26,6 +26,14 @@ public:
                         , ScoreComponentCollection &scoreBreakdown
                         , ScoreComponentCollection *estimatedFutureScore = NULL) const
  {}
+  
+    void EvaluateWithSourceContextCollection(const InputType &input
+                , const InputPath &inputPath
+                , const TargetPhraseCollection &targetPhraseCollection
+                , const StackVec *stackVec
+                , ScoreComponentCollection &scoreBreakdown
+                , ScoreComponentCollection *estimatedFutureScore = NULL) const
+    {}

  virtual void EvaluateWhenApplied(const Hypothesis& hypo,
                        ScoreComponentCollection* accumulator) const
--- a/moses/FF/SkeletonChangeInput.cpp
+++ b/moses/FF/SkeletonChangeInput.cpp
@ -47,6 +47,14 @@ void SkeletonChangeInput::EvaluateWithSourceContext(const InputType &input

 }

+void SkeletonChangeInput::EvaluateWithSourceContextCollection(const InputType &input
+								  , const InputPath &inputPath
+								  , const TargetPhraseCollection &targetPhraseCollection
+								  , const StackVec *stackVec
+								  , ScoreComponentCollection &scoreBreakdown
+								  , ScoreComponentCollection *estimatedFutureScore) const
+{}
+
 void SkeletonChangeInput::EvaluateWhenApplied(const Hypothesis& hypo,
                                   ScoreComponentCollection* accumulator) const
 {}
--- a/moses/FF/SkeletonChangeInput.h
+++ b/moses/FF/SkeletonChangeInput.h
@ -28,6 +28,14 @@ public:
                , const StackVec *stackVec
                , ScoreComponentCollection &scoreBreakdown
                , ScoreComponentCollection *estimatedFutureScore = NULL) const;
+  
+  void EvaluateWithSourceContextCollection(const InputType &input
+                , const InputPath &inputPath
+                , const TargetPhraseCollection &targetPhraseCollection
+                , const StackVec *stackVec
+                , ScoreComponentCollection &scoreBreakdown
+                , ScoreComponentCollection *estimatedFutureScore = NULL) const;
+  
  void EvaluateWhenApplied(const Hypothesis& hypo,
                ScoreComponentCollection* accumulator) const;
  void EvaluateWhenApplied(const ChartHypothesis &hypo,
--- a/moses/FF/SkeletonStatefulFF.cpp
+++ b/moses/FF/SkeletonStatefulFF.cpp
@ -37,6 +37,14 @@ void SkeletonStatefulFF::EvaluateWithSourceContext(const InputType &input
                                  , ScoreComponentCollection *estimatedFutureScore) const
 {}

+void SkeletonStatefulFF::EvaluateWithSourceContextCollection(const InputType &input
+                                  , const InputPath &inputPath
+                                  , const TargetPhraseCollection &targetPhraseCollection
+                                  , const StackVec *stackVec
+                                  , ScoreComponentCollection &scoreBreakdown
+                                  , ScoreComponentCollection *estimatedFutureScore) const
+{}
+
 FFState* SkeletonStatefulFF::EvaluateWhenApplied(
  const Hypothesis& cur_hypo,
  const FFState* prev_state,
--- a/moses/FF/SkeletonStatefulFF.h
+++ b/moses/FF/SkeletonStatefulFF.h
@ -40,6 +40,14 @@ public:
                , const StackVec *stackVec
                , ScoreComponentCollection &scoreBreakdown
                , ScoreComponentCollection *estimatedFutureScore = NULL) const;
+  
+  void EvaluateWithSourceContextCollection(const InputType &input
+                , const InputPath &inputPath
+                , const TargetPhraseCollection &targetPhraseCollection
+                , const StackVec *stackVec
+                , ScoreComponentCollection &scoreBreakdown
+                , ScoreComponentCollection *estimatedFutureScore = NULL) const;
+  
  FFState* EvaluateWhenApplied(
    const Hypothesis& cur_hypo,
    const FFState* prev_state,
--- a/moses/FF/SkeletonStatelessFF.cpp
+++ b/moses/FF/SkeletonStatelessFF.cpp
@ -41,9 +41,16 @@ void SkeletonStatelessFF::EvaluateWithSourceContext(const InputType &input
 		  newScores[0] = - std::numeric_limits<float>::infinity();
 		  scoreBreakdown.PlusEquals(this, newScores);
 	}
-
 }

+void SkeletonStatelessFF::EvaluateWithSourceContextCollection(const InputType &input
+                , const InputPath &inputPath
+                , const TargetPhraseCollection &targetPhraseCollection
+                , const StackVec *stackVec
+                , ScoreComponentCollection &scoreBreakdown
+                , ScoreComponentCollection *estimatedFutureScore) const
+{}
+
 void SkeletonStatelessFF::EvaluateWhenApplied(const Hypothesis& hypo,
                                   ScoreComponentCollection* accumulator) const
 {}
--- a/moses/FF/SkeletonStatelessFF.h
+++ b/moses/FF/SkeletonStatelessFF.h
@ -25,11 +25,20 @@ public:
                , const StackVec *stackVec
                , ScoreComponentCollection &scoreBreakdown
                , ScoreComponentCollection *estimatedFutureScore = NULL) const;
+
+  void EvaluateWithSourceContextCollection(const InputType &input
+                , const InputPath &inputPath
+                , const TargetPhraseCollection &targetPhraseCollection
+                , const StackVec *stackVec
+                , ScoreComponentCollection &scoreBreakdown
+                , ScoreComponentCollection *estimatedFutureScore = NULL) const;
+
  void EvaluateWhenApplied(const Hypothesis& hypo,
                ScoreComponentCollection* accumulator) const;
  void EvaluateWhenApplied(const ChartHypothesis &hypo,
                     ScoreComponentCollection* accumulator) const;

+
  void SetParameter(const std::string& key, const std::string& value);

 };
--- a/moses/FF/SoftMatchingFeature.h
+++ b/moses/FF/SoftMatchingFeature.h
@ -32,6 +32,15 @@ public:
                , const StackVec *stackVec
                , ScoreComponentCollection &scoreBreakdown
                , ScoreComponentCollection *estimatedFutureScore = NULL) const {};
+
+  void EvaluateWithSourceContextCollection(const InputType &input
+                , const InputPath &inputPath
+                , const TargetPhraseCollection &targetPhraseCollection
+                , const StackVec *stackVec
+                , ScoreComponentCollection &scoreBreakdown
+                , ScoreComponentCollection *estimatedFutureScore = NULL) const
+  {}
+
  void EvaluateWhenApplied(const Hypothesis& hypo,
                ScoreComponentCollection* accumulator) const {};

--- a/moses/FF/SoftSourceSyntacticConstraintsFeature.h
+++ b/moses/FF/SoftSourceSyntacticConstraintsFeature.h
@ -44,6 +44,15 @@ public:
                , ScoreComponentCollection &scoreBreakdown
                , ScoreComponentCollection *estimatedFutureScore = NULL) const;

+  void EvaluateWithSourceContextCollection(const InputType &input
+                , const InputPath &inputPath
+                , const TargetPhraseCollection &targetPhraseCollection
+                , const StackVec *stackVec
+                , ScoreComponentCollection &scoreBreakdown
+                , ScoreComponentCollection *estimatedFutureScore = NULL) const
+  {}
+
+                
  void EvaluateWhenApplied(
    const Hypothesis& cur_hypo,
    ScoreComponentCollection* accumulator) const
--- a/moses/FF/SourceGHKMTreeInputMatchFeature.h
+++ b/moses/FF/SourceGHKMTreeInputMatchFeature.h
@ -29,6 +29,15 @@ public:
                , ScoreComponentCollection &scoreBreakdown
                , ScoreComponentCollection *estimatedFutureScore = NULL) const;

+  void EvaluateWithSourceContextCollection(const InputType &input
+                , const InputPath &inputPath
+                , const TargetPhraseCollection &targetPhraseCollection
+                , const StackVec *stackVec
+                , ScoreComponentCollection &scoreBreakdown
+                , ScoreComponentCollection *estimatedFutureScore = NULL) const
+  {}
+
+                
  void EvaluateWhenApplied(const Hypothesis& hypo,
                ScoreComponentCollection* accumulator) const {};

--- a/moses/FF/SourceWordDeletionFeature.h
+++ b/moses/FF/SourceWordDeletionFeature.h
@ -39,6 +39,16 @@ public:
                , ScoreComponentCollection &scoreBreakdown
                , ScoreComponentCollection *estimatedFutureScore = NULL) const
  {}
+
+  void EvaluateWithSourceContextCollection(const InputType &input
+                , const InputPath &inputPath
+                , const TargetPhraseCollection &targetPhraseCollection
+                , const StackVec *stackVec
+                , ScoreComponentCollection &scoreBreakdown
+                , ScoreComponentCollection *estimatedFutureScore = NULL) const
+  {}
+
+  
  void EvaluateWhenApplied(const Hypothesis& hypo,
                ScoreComponentCollection* accumulator) const
  {}
--- a/moses/FF/SpanLength.h
+++ b/moses/FF/SpanLength.h
@ -26,6 +26,14 @@ public:
 	                         , ScoreComponentCollection &scoreBreakdown
 	                         , ScoreComponentCollection *estimatedFutureScore = NULL) const;

+  void EvaluateWithSourceContextCollection(const InputType &input
+                , const InputPath &inputPath
+                , const TargetPhraseCollection &targetPhraseCollection
+                , const StackVec *stackVec
+                , ScoreComponentCollection &scoreBreakdown
+                , ScoreComponentCollection *estimatedFutureScore = NULL) const
+  {}
+

 	  virtual void EvaluateWhenApplied(const Hypothesis& hypo,
 	                        ScoreComponentCollection* accumulator) const
--- a/moses/FF/SparseHieroReorderingFeature.h
+++ b/moses/FF/SparseHieroReorderingFeature.h
@ -44,6 +44,14 @@ public:
                        , ScoreComponentCollection *estimatedFutureScore = NULL)  const
 	{}

+  void EvaluateWithSourceContextCollection(const InputType &input
+                , const InputPath &inputPath
+                , const TargetPhraseCollection &targetPhraseCollection
+                , const StackVec *stackVec
+                , ScoreComponentCollection &scoreBreakdown
+                , ScoreComponentCollection *estimatedFutureScore = NULL) const
+  {}
+
  virtual void EvaluateWhenApplied(const Hypothesis& hypo,
                        ScoreComponentCollection* accumulator) const
  {}
--- a/moses/FF/SyntaxRHS.h
+++ b/moses/FF/SyntaxRHS.h
@ -25,6 +25,15 @@ public:
                , const StackVec *stackVec
                , ScoreComponentCollection &scoreBreakdown
                , ScoreComponentCollection *estimatedFutureScore = NULL) const;
+  
+  void EvaluateWithSourceContextCollection(const InputType &input
+                , const InputPath &inputPath
+                , const TargetPhraseCollection &targetPhraseCollection
+                , const StackVec *stackVec
+                , ScoreComponentCollection &scoreBreakdown
+                , ScoreComponentCollection *estimatedFutureScore = NULL) const
+  {}
+
  void EvaluateWhenApplied(const Hypothesis& hypo,
                ScoreComponentCollection* accumulator) const
  {}
--- a/moses/FF/TargetBigramFeature.h
+++ b/moses/FF/TargetBigramFeature.h
@ -60,6 +60,14 @@ public:
                , ScoreComponentCollection &estimatedFutureScore) const
  {}

+  void EvaluateWithSourceContextCollection(const InputType &input
+                , const InputPath &inputPath
+                , const TargetPhraseCollection &targetPhraseCollection
+                , const StackVec *stackVec
+                , ScoreComponentCollection &scoreBreakdown
+                , ScoreComponentCollection *estimatedFutureScore = NULL) const
+  {}
+  
  void SetParameter(const std::string& key, const std::string& value);

 private:
--- a/moses/FF/TargetNgramFeature.h
+++ b/moses/FF/TargetNgramFeature.h
@ -199,6 +199,15 @@ public:
                , ScoreComponentCollection &scoreBreakdown
                , ScoreComponentCollection *estimatedFutureScore = NULL) const
  {}
+  
+  void EvaluateWithSourceContextCollection(const InputType &input
+                , const InputPath &inputPath
+                , const TargetPhraseCollection &targetPhraseCollection
+                , const StackVec *stackVec
+                , ScoreComponentCollection &scoreBreakdown
+                , ScoreComponentCollection *estimatedFutureScore = NULL) const
+  {}
+
  void EvaluateInIsolation(const Phrase &source
                , const TargetPhrase &targetPhrase
                , ScoreComponentCollection &scoreBreakdown
--- a/moses/FF/TargetWordInsertionFeature.h
+++ b/moses/FF/TargetWordInsertionFeature.h
@ -45,6 +45,14 @@ public:
  void EvaluateWhenApplied(const ChartHypothesis &hypo,
                     ScoreComponentCollection* accumulator) const
  {}
+  
+  void EvaluateWithSourceContextCollection(const InputType &input
+                , const InputPath &inputPath
+                , const TargetPhraseCollection &targetPhraseCollection
+                , const StackVec *stackVec
+                , ScoreComponentCollection &scoreBreakdown
+                , ScoreComponentCollection *estimatedFutureScore = NULL) const
+  {}

  void ComputeFeatures(const Phrase &source,
                       const TargetPhrase& targetPhrase,
--- a/moses/FF/TreeStructureFeature.h
+++ b/moses/FF/TreeStructureFeature.h
@ -62,6 +62,16 @@ public:
                , const StackVec *stackVec
                , ScoreComponentCollection &scoreBreakdown
                , ScoreComponentCollection *estimatedFutureScore = NULL) const {};
+  
+  void EvaluateWithSourceContextCollection(const InputType &input
+                , const InputPath &inputPath
+                , const TargetPhraseCollection &targetPhraseCollection
+                , const StackVec *stackVec
+                , ScoreComponentCollection &scoreBreakdown
+                , ScoreComponentCollection *estimatedFutureScore = NULL) const
+  {}
+
+  
  FFState* EvaluateWhenApplied(
    const Hypothesis& cur_hypo,
    const FFState* prev_state,
--- a/moses/FF/UnknownWordPenaltyProducer.h
+++ b/moses/FF/UnknownWordPenaltyProducer.h
@ -47,6 +47,15 @@ public:
                , ScoreComponentCollection &scoreBreakdown
                , ScoreComponentCollection *estimatedFutureScore = NULL) const
  {}
+
+  void EvaluateWithSourceContextCollection(const InputType &input
+                , const InputPath &inputPath
+                , const TargetPhraseCollection &targetPhraseCollection
+                , const StackVec *stackVec
+                , ScoreComponentCollection &scoreBreakdown
+                , ScoreComponentCollection *estimatedFutureScore = NULL) const
+  {}
+
  void EvaluateInIsolation(const Phrase &source
                , const TargetPhrase &targetPhrase
                , ScoreComponentCollection &scoreBreakdown
--- a/moses/FF/WordPenaltyProducer.h
+++ b/moses/FF/WordPenaltyProducer.h
@ -47,6 +47,15 @@ public:
                , ScoreComponentCollection &scoreBreakdown
                , ScoreComponentCollection *estimatedFutureScore = NULL) const
  {}
+  
+  void EvaluateWithSourceContextCollection(const InputType &input
+                , const InputPath &inputPath
+                , const TargetPhraseCollection &targetPhraseCollection
+                , const StackVec *stackVec
+                , ScoreComponentCollection &scoreBreakdown
+                , ScoreComponentCollection *estimatedFutureScore = NULL) const
+  {}
+


  /*
--- a/moses/FF/WordTranslationFeature.h
+++ b/moses/FF/WordTranslationFeature.h
@ -68,6 +68,15 @@ public:
  void EvaluateWhenApplied(const ChartHypothesis &hypo,
                     ScoreComponentCollection* accumulator) const
  {}
+  
+  void EvaluateWithSourceContextCollection(const InputType &input
+                , const InputPath &inputPath
+                , const TargetPhraseCollection &targetPhraseCollection
+                , const StackVec *stackVec
+                , ScoreComponentCollection &scoreBreakdown
+                , ScoreComponentCollection *estimatedFutureScore = NULL) const
+  {}
+

 };

--- a/moses/LM/Base.h
+++ b/moses/LM/Base.h
@ -99,6 +99,15 @@ public:
                , ScoreComponentCollection *estimatedFutureScore = NULL) const
  {}

+  void EvaluateWithSourceContextCollection(const InputType &input
+              , const InputPath &inputPath
+              , const TargetPhraseCollection &targetPhraseCollection
+              , const StackVec *stackVec
+              , ScoreComponentCollection &scoreBreakdown
+              , ScoreComponentCollection *estimatedFutureScore = NULL) const
+  {}
+
+
 };

 }
--- a/moses/ScoreComponentCollectionTest.cpp
+++ b/moses/ScoreComponentCollectionTest.cpp
@ -43,6 +43,15 @@ public:
                , ScoreComponentCollection &scoreBreakdown
                , ScoreComponentCollection *estimatedFutureScore) const
  {}
+  
+  void EvaluateWithSourceContextCollection(const InputType &input
+              , const InputPath &inputPath
+              , const TargetPhraseCollection &targetPhraseCollection
+              , const StackVec *stackVec
+              , ScoreComponentCollection &scoreBreakdown
+              , ScoreComponentCollection *estimatedFutureScore = NULL) const
+  {}
+
  void EvaluateInIsolation(const Phrase &source
                , const TargetPhrase &targetPhrase
                , ScoreComponentCollection &scoreBreakdown