clean up weights code for confusion networks & lattices. Works, except for multiple phrase-tables or factors

1 files changed, 7 insertions, 5 deletions

diff --git a/moses/WordLattice.cpp b/moses/WordLattice.cpp
index f3344dc67..228d8e995 100644
--- a/moses/WordLattice.cpp
+++ b/moses/WordLattice.cpp
@@ -33,12 +33,14 @@ void WordLattice::Print(std::ostream& out) const
 
 int WordLattice::InitializeFromPCNDataType(const PCN::CN& cn, const std::vector<FactorType>& factorOrder, const std::string& debug_line)
 {
-  size_t numLinkParams = StaticData::Instance().GetNumLinkParams();
-  size_t numLinkWeights = StaticData::Instance().GetNumInputScores();
   size_t maxSizePhrase = StaticData::Instance().GetMaxPhraseLength();
 
+  size_t numInputScores = StaticData::Instance().GetNumInputScores();
+  size_t numRealWordCount = StaticData::Instance().GetNumRealWordsInInput();
+  size_t totalCount = numInputScores + numRealWordCount;
+  bool addRealWordCount = (numRealWordCount > 0);
+
   //when we have one more weight than params, we add a word count feature
-  bool addRealWordCount = ((numLinkParams + 1) == numLinkWeights);
   data.resize(cn.size());
   next_nodes.resize(cn.size());
   for(size_t i=0; i<cn.size(); ++i) {
@@ -51,8 +53,8 @@ int WordLattice::InitializeFromPCNDataType(const PCN::CN& cn, const std::vector<
 
 
       //check for correct number of link parameters
-      if (alt.first.second.size() != numLinkParams) {
-        TRACE_ERR("ERROR: need " << numLinkParams << " link parameters, found " << alt.first.second.size() << " while reading column " << i << " from " << debug_line << "\n");
+      if (alt.first.second.size() != numInputScores) {
+        TRACE_ERR("ERROR: need " << numInputScores << " link parameters, found " << alt.first.second.size() << " while reading column " << i << " from " << debug_line << "\n");
         return false;
       }