update confusion network to query InputFeature for paramters, rather than StaticData

1 files changed, 9 insertions, 2 deletions

diff --git a/moses/ConfusionNet.cpp b/moses/ConfusionNet.cpp
index ae88a2477..8281237fd 100644
--- a/moses/ConfusionNet.cpp
+++ b/moses/ConfusionNet.cpp
@@ -10,6 +10,7 @@
 #include "StaticData.h"
 #include "Sentence.h"
 #include "UserMessage.h"
+#include "moses/FF/InputFeature.h"
 
 namespace Moses
 {
@@ -118,8 +119,14 @@ bool ConfusionNet::ReadFormat0(std::istream& in,
                                const std::vector<FactorType>& factorOrder)
 {
   Clear();
-  size_t numInputScores = StaticData::Instance().GetNumInputScores();
-  size_t numRealWordCount = StaticData::Instance().GetNumRealWordsInInput();
+
+  const StaticData &staticData = StaticData::Instance();
+  const InputFeature *inputFeature = staticData.GetInputFeature();
+  size_t numInputScores = inputFeature->GetNumInputScores();
+  size_t numRealWordCount = inputFeature->GetNumRealWordsInInput();
+  //size_t numInputScores = staticData.GetNumInputScores();
+  //size_t numRealWordCount = staticData.GetNumRealWordsInInput();
+
   size_t totalCount = numInputScores + numRealWordCount;
   bool addRealWordCount = (numRealWordCount > 0);