From 599d5bde3d28f12283d9a65cb90f2eb5ed719df0 Mon Sep 17 00:00:00 2001
From: Hieu Hoang <hieu@hoang.co.uk>
Date: Tue, 5 Feb 2013 19:02:36 +0000
Subject: [PATCH] GenerationDictionary doesn't inherit from Dictionary

---
 moses/GenerationDictionary.cpp | 2 +-
 moses/GenerationDictionary.h   | 2 +-
 moses/Parameter.cpp            | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/moses/GenerationDictionary.cpp b/moses/GenerationDictionary.cpp
index 35659864e..0a5120b3f 100644
--- a/moses/GenerationDictionary.cpp
+++ b/moses/GenerationDictionary.cpp
@@ -35,7 +35,7 @@ namespace Moses
 {
 
 GenerationDictionary::GenerationDictionary(const std::string &line)
-: Dictionary(2), DecodeFeature("Generation",2, line)
+: DecodeFeature("Generation", line)
 {
   string filePath;
 
diff --git a/moses/GenerationDictionary.h b/moses/GenerationDictionary.h
index 98950f85a..08ff5ab53 100644
--- a/moses/GenerationDictionary.h
+++ b/moses/GenerationDictionary.h
@@ -43,7 +43,7 @@ typedef std::map < Word , ScoreComponentCollection > OutputWordCollection;
 
 /** Implementation of a generation table in a trie.
  */
-class GenerationDictionary : public Dictionary, public DecodeFeature
+class GenerationDictionary : public DecodeFeature
 {
   typedef std::map<const Word* , OutputWordCollection, WordComparer> Collection;
 protected:
diff --git a/moses/Parameter.cpp b/moses/Parameter.cpp
index 80443d0a6..d1c01945f 100644
--- a/moses/Parameter.cpp
+++ b/moses/Parameter.cpp
@@ -627,6 +627,7 @@ void Parameter::ConvertWeightArgsGeneration(const std::string &oldWeightName, co
       strme << "Generation "
                   << "input-factor=" << modelToks[0] << " "
                   << "output-factor=" << modelToks[1] << " "
+                  << "num-features=" << modelToks[2] << " "
                   << "path=" << modelToks[3];
       AddFeature(strme.str());
     }