Merge pull request #86 from marxin/distortion-scorer-no-dyncast

DistortionFunctionScorer dyn_cast removed in FF.

1 files changed, 6 insertions, 10 deletions

diff --git a/moses/BitmapContainer.cpp b/moses/BitmapContainer.cpp
index fd6fc1cd0..2585c2eee 100644
--- a/moses/BitmapContainer.cpp
+++ b/moses/BitmapContainer.cpp
@@ -56,19 +56,15 @@ public:
     m_transOptRange(transOptRange) {
     m_totalWeightDistortion = 0;
     const StaticData &staticData = StaticData::Instance();
-    const std::vector<FeatureFunction*> &ffs = FeatureFunction::GetFeatureFunctions();
-    std::vector<FeatureFunction*>::const_iterator iter;
+
+    const std::vector<const DistortionScoreProducer*> &ffs = FeatureFunction::GetDistortionFeatureFunctions();
+    std::vector<const DistortionScoreProducer*>::const_iterator iter;
     for (iter = ffs.begin(); iter != ffs.end(); ++iter) {
-      const FeatureFunction *ff = *iter;
+      const DistortionScoreProducer *ff = *iter;
 
-      const DistortionScoreProducer *model = dynamic_cast<const DistortionScoreProducer*>(ff);
-      if (model) {
-        float weight =staticData.GetAllWeights().GetScoreForProducer(model);
-        m_totalWeightDistortion += weight;
-      }
+      float weight =staticData.GetAllWeights().GetScoreForProducer(ff);
+      m_totalWeightDistortion += weight;
     }
-  
-      
   }
 
   const WordsRange* m_transOptRange;