Chart stateless ff interface only allows essential info.

Not tested
2024-12-28 14:32:38 +03:00 · 2012-09-13 22:08:01 +01:00 · 2012-09-13 22:08:01 +01:00 · 96b5c2e633
commit 96b5c2e633
parent 23b2204cc1
15 changed files with 66 additions and 45 deletions
--- a/moses/src/ChartHypothesis.cpp
+++ b/moses/src/ChartHypothesis.cpp
@ -168,7 +168,8 @@ void ChartHypothesis::CalcScore()
    m_manager.GetTranslationSystem()->GetStatelessFeatureFunctions();
  for (unsigned i = 0; i < sfs.size(); ++i)
  	if (sfs[i]->ComputeValueInTranslationOption() == false)
-  		sfs[i]->EvaluateChart(*this,i,&m_scoreBreakdown);
+  		sfs[i]->EvaluateChart(GetCurrTargetPhrase(),
+        GetManager().GetSource(),GetCurrSourceRange(),&m_scoreBreakdown);

  const std::vector<const StatefulFeatureFunction*>& ffs =
    m_manager.GetTranslationSystem()->GetStatefulFeatureFunctions();
--- a/moses/src/DummyScoreProducers.h
+++ b/moses/src/DummyScoreProducers.h
@ -29,8 +29,8 @@ public:
    ScoreComponentCollection* accumulator) const;

  virtual FFState* EvaluateChart(
-    const ChartHypothesis&,
-    int /* featureID */,
+    const ChartHypothesis& /* cur_hypo */,
+    int /* featureID - used to index the state in the previous hypotheses */,
    ScoreComponentCollection*) const {
 		CHECK(0); // feature function not valid in chart decoder
 		return NULL;
@ -54,11 +54,16 @@ public:
  	ScoreComponentCollection* accumulator) const;

  virtual void EvaluateChart(
-    const ChartHypothesis&,
-    int /* featureID */,
-    ScoreComponentCollection*) const {
-		// needs to be implemented but does nothing
-	}
+    const TargetPhrase& targetPhrase,
+    const InputType& inputType,
+    const WordsRange& sourceSpan,
+    ScoreComponentCollection* accumulator) const 
+    {
+      //required but does nothing.
+    }
+
+
+
 };

 /** unknown word penalty */
@ -79,8 +84,9 @@ public:
  }

  void EvaluateChart(
-    const ChartHypothesis& cur_hypo,
-    int featureID,
+    const TargetPhrase& targetPhrase,
+    const InputType& inputType,
+    const WordsRange& sourceSpan,
    ScoreComponentCollection* accumulator) const
  {
    //do nothing - not a real feature
--- a/moses/src/FeatureFunction.h
+++ b/moses/src/FeatureFunction.h
@ -16,6 +16,7 @@ class FFState;
 class InputType;
 class ScoreComponentCollection;
 class WordsBitmap;
+class WordsRange;

 /** base class for all feature functions.
 * @todo is this for pb & hiero too?
@ -51,8 +52,9 @@ public:
                        const WordsBitmap& coverageVector,
  											ScoreComponentCollection* accumulator) const = 0;

-  virtual void EvaluateChart(const ChartHypothesis& cur_hypo,
-  													 int featureID,
+  virtual void EvaluateChart(const TargetPhrase& targetPhrase,
+                             const InputType& inputType,
+                             const WordsRange& sourceSpan,
                             ScoreComponentCollection* accumulator) const  = 0;

  //If true, then the feature is evaluated before search begins, and stored in
--- a/moses/src/GenerationDictionary.h
+++ b/moses/src/GenerationDictionary.h
@ -98,8 +98,9 @@ public:
    throw std::runtime_error("GenerationDictionary::Evaluate() Not implemented");
  }

-  virtual void EvaluateChart(const ChartHypothesis& cur_hypo,
-  													 int featureID,
+  virtual void EvaluateChart(const TargetPhrase& targetPhrase,
+                             const InputType& inputType,
+                             const WordsRange& sourceSpan,
                             ScoreComponentCollection* accumulator) const 
  {
    throw std::runtime_error("GenerationDictionary.Evaluate() Not implemented");
--- a/moses/src/GlobalLexicalModel.h
+++ b/moses/src/GlobalLexicalModel.h
@ -81,8 +81,9 @@ public:


  void EvaluateChart(
-    const ChartHypothesis& cur_hypo,
-    int featureID,
+    const TargetPhrase& targetPhrase,
+    const InputType& inputType,
+    const WordsRange& sourceSpan,
    ScoreComponentCollection* accumulator) const
  {
  	std::cerr << "EvaluateChart not implemented." << std::endl;
--- a/moses/src/PhraseDictionary.h
+++ b/moses/src/PhraseDictionary.h
@ -144,8 +144,9 @@ public:
    throw std::runtime_error("PhraseDictionary.Evaluate() Not implemented");
  }

-  virtual void EvaluateChart(const ChartHypothesis& cur_hypo,
-  													 int featureID,
+  virtual void EvaluateChart(const TargetPhrase& targetPhrase,
+                             const InputType& inputType,
+                             const WordsRange& sourceSpan,
                             ScoreComponentCollection* accumulator) const 
  {
    throw std::runtime_error("PhraseDictionary.EvaluateChart() Not implemented");
--- a/moses/src/PhraseLengthFeature.h
+++ b/moses/src/PhraseLengthFeature.h
@ -25,10 +25,10 @@ public:
                const WordsBitmap& coverageVector,
                ScoreComponentCollection* accumulator) const;

-  void EvaluateChart(
-    const ChartHypothesis&,
-    int /* featureID */,
-    ScoreComponentCollection*) const {
+  void EvaluateChart(const TargetPhrase& targetPhrase,
+                     const InputType& inputType,
+                     const WordsRange& sourceSpan,
+                     ScoreComponentCollection*) const {
 		CHECK(0); // feature function not valid in chart decoder
 	}

--- a/moses/src/PhrasePairFeature.h
+++ b/moses/src/PhrasePairFeature.h
@ -71,10 +71,10 @@ class PhrasePairFeature: public StatelessFeatureFunction {
                const WordsBitmap& coverageVector,
                ScoreComponentCollection* accumulator) const;

-    void EvaluateChart(
-      const ChartHypothesis&,
-      int /* featureID */,
-      ScoreComponentCollection*) const {
+    void EvaluateChart(const TargetPhrase& targetPhrase,
+                       const InputType& inputType,
+                       const WordsRange& sourceSpan,
+                       ScoreComponentCollection*) const {
  		CHECK(0); // feature function not valid in chart decoder
  	}

--- a/moses/src/SourceWordDeletionFeature.cpp
+++ b/moses/src/SourceWordDeletionFeature.cpp
@ -43,10 +43,12 @@ void SourceWordDeletionFeature::Evaluate(
 	ComputeFeatures(targetPhrase, accumulator, alignment);
 }

-void SourceWordDeletionFeature::EvaluateChart(const ChartHypothesis& cur_hypo, int featureId,
-		                   	 	 	 	 	 	 	 	 	 	 	 	ScoreComponentCollection* accumulator) const
+void SourceWordDeletionFeature::EvaluateChart(
+            const TargetPhrase& targetPhrase,
+            const InputType& inputType,
+            const WordsRange& sourceSpan,
+		 	 	 	 	ScoreComponentCollection* accumulator) const
 {
-	const TargetPhrase& targetPhrase = cur_hypo.GetCurrTargetPhrase();
 	const AlignmentInfo &alignmentInfo = targetPhrase.GetAlignmentInfo();
 	const AlignmentInfo::CollType &alignment = alignmentInfo.GetTerminalAlignments();
 	ComputeFeatures(targetPhrase, accumulator, alignment);
--- a/moses/src/SourceWordDeletionFeature.h
+++ b/moses/src/SourceWordDeletionFeature.h
@ -34,8 +34,9 @@ public:
              const WordsBitmap& coverageVector,
              ScoreComponentCollection* accumulator) const;

-  void EvaluateChart(const ChartHypothesis& cur_hypo,
-  		               int featureId,
+  void EvaluateChart(const TargetPhrase& targetPhrase,
+                     const InputType& inputType,
+                     const WordsRange& sourceSpan,
  		               ScoreComponentCollection* accumulator) const;

  void ComputeFeatures(const TargetPhrase& targetPhrase, 
--- a/moses/src/SparsePhraseDictionaryFeature.h
+++ b/moses/src/SparsePhraseDictionaryFeature.h
@ -22,8 +22,9 @@ public:
              ScoreComponentCollection* accumulator) const;
  
  void EvaluateChart(
-    const ChartHypothesis&,
-    int /* featureID */,
+    const TargetPhrase& targetPhrase,
+    const InputType& inputType,
+    const WordsRange& sourceSpan,
    ScoreComponentCollection*) const {
 		CHECK(0); // feature function not valid in chart decoder
 	}
--- a/moses/src/TargetWordInsertionFeature.cpp
+++ b/moses/src/TargetWordInsertionFeature.cpp
@ -43,11 +43,12 @@ void TargetWordInsertionFeature::Evaluate(
 	ComputeFeatures(targetPhrase, accumulator, alignment);
 }

-void TargetWordInsertionFeature::EvaluateChart(const ChartHypothesis& cur_hypo,
-											   int featureID,
-											   ScoreComponentCollection* accumulator) const
+void TargetWordInsertionFeature::EvaluateChart(
+            const TargetPhrase& targetPhrase,
+            const InputType& inputType,
+            const WordsRange& sourceSpan,
+						ScoreComponentCollection* accumulator) const
 {
-	const TargetPhrase& targetPhrase = cur_hypo.GetCurrTargetPhrase();
 	const AlignmentInfo &alignmentInfo = targetPhrase.GetAlignmentInfo();
 	const AlignmentInfo::CollType &alignment = alignmentInfo.GetTerminalAlignments();
 	ComputeFeatures(targetPhrase, accumulator, alignment);
--- a/moses/src/TargetWordInsertionFeature.h
+++ b/moses/src/TargetWordInsertionFeature.h
@ -35,9 +35,10 @@ public:
  								ScoreComponentCollection* accumulator) const;

  void EvaluateChart(
-    const ChartHypothesis& cur_hypo,
-    int featureID,
-    ScoreComponentCollection* accumulator) const;
+      const TargetPhrase& targetPhrase,
+      const InputType& inputType,
+      const WordsRange& sourceSpan,
+      ScoreComponentCollection* accumulator) const;

  void ComputeFeatures(const TargetPhrase& targetPhrase,
 		           	   ScoreComponentCollection* accumulator,
--- a/moses/src/WordTranslationFeature.cpp
+++ b/moses/src/WordTranslationFeature.cpp
@ -197,11 +197,13 @@ void WordTranslationFeature::Evaluate
  }
 }

-void WordTranslationFeature::EvaluateChart(const ChartHypothesis& cur_hypo, int featureID,
-    																			 ScoreComponentCollection* accumulator) const
+void WordTranslationFeature::EvaluateChart(
+            const TargetPhrase& targetPhrase,
+            const InputType& inputType,
+            const WordsRange& sourceSpan,
+    				ScoreComponentCollection* accumulator) const
 {
  //const Sentence& input = *(m_local->input);
-  const TargetPhrase& targetPhrase = cur_hypo.GetCurrTargetPhrase();
  const AlignmentInfo &alignmentInfo = targetPhrase.GetAlignmentInfo();
  const AlignmentInfo::CollType &alignment = alignmentInfo.GetTerminalAlignments();

--- a/moses/src/WordTranslationFeature.h
+++ b/moses/src/WordTranslationFeature.h
@ -93,8 +93,9 @@ public:
                        const WordsBitmap& coverageVector,
  											ScoreComponentCollection* accumulator) const;

-  void EvaluateChart(const ChartHypothesis& cur_hypo,
-  								   int featureID,
+  void EvaluateChart(const TargetPhrase& targetPhrase,
+                     const InputType& inputType,
+                     const WordsRange& sourceSpan,
                     ScoreComponentCollection* accumulator) const;

  // basic properties