redo parsing of feature function parameters

moses/FF/DistortionScoreProducer.cpp

@@ -23,16 +23,7 @@ struct DistortionState_traditional : public FFState {
 
 DistortionScoreProducer::DistortionScoreProducer(const std::string &line)
   : StatefulFeatureFunction("Distortion", 1, line) {
-  size_t ind = 0;
+  ReadParameters();
-  while (ind < m_args.size()) {
-	vector<string> &args = m_args[ind];
-	bool consumed = SetParameter(args[0], args[1]);
-	if (consumed) {
-	  m_args.erase(m_args.begin() + ind);
-	} else {
-	  ++ind;
-	}
-  }
 }
 
 const FFState* DistortionScoreProducer::EmptyHypothesisState(const InputType &input) const

moses/FF/FeatureFunction.cpp

@@ -107,5 +107,19 @@ void FeatureFunction::OverrideParameter(const std::string& key, const std::strin
   UTIL_THROW_IF(!ret, util::Exception, "Unknown argument" << key);
 }
 
+void FeatureFunction::ReadParameters()
+{
+  size_t ind = 0;
+  while (ind < m_args.size()) {
+	vector<string> &args = m_args[ind];
+	bool consumed = SetParameter(args[0], args[1]);
+	if (consumed) {
+	  m_args.erase(m_args.begin() + ind);
+	} else {
+	  ++ind;
+	}
+  }
+}
+
 }
 

moses/FF/FeatureFunction.h

@@ -108,6 +108,7 @@ public:
 
   virtual bool SetParameter(const std::string& key, const std::string& value);
   virtual void OverrideParameter(const std::string& key, const std::string& value);
+  virtual void ReadParameters();
 };
 
 }

moses/FF/GlobalLexicalModel.cpp

@@ -13,18 +13,7 @@ GlobalLexicalModel::GlobalLexicalModel(const std::string &line)
   : StatelessFeatureFunction("GlobalLexicalModel",1, line)
 {
   std::cerr << "Creating global lexical model...\n";
-
+  ReadParameters();
-  size_t ind = 0;
-  while (ind < m_args.size()) {
-    vector<string> &args = m_args[ind];
-    bool consumed = SetParameter(args[0], args[1]);
-    if (consumed) {
-      m_args.erase(m_args.begin() + ind);
-    } else {
-      ++ind;
-    }
-  }
-  CHECK(m_args.size() == 0);
 
   // define bias word
   FactorCollection &factorCollection = FactorCollection::Instance();

moses/FF/PhraseBoundaryFeature.cpp

@@ -19,19 +19,7 @@ PhraseBoundaryFeature::PhraseBoundaryFeature(const std::string &line)
   : StatefulFeatureFunction("PhraseBoundaryFeature", 0, line)
 {
   std::cerr << "Initializing source word deletion feature.." << std::endl;
-
+  ReadParameters();
-  size_t ind = 0;
-  while (ind < m_args.size()) {
-    vector<string> &args = m_args[ind];
-    bool consumed = SetParameter(args[0], args[1]);
-    if (consumed) {
-      m_args.erase(m_args.begin() + ind);
-    } else {
-      ++ind;
-    }
-  }
-  CHECK(m_args.size() == 0);
-
 }
 
 bool PhraseBoundaryFeature::SetParameter(const std::string& key, const std::string& value)

moses/FF/PhraseLengthFeature.cpp

@@ -12,16 +12,7 @@ using namespace std;
 PhraseLengthFeature::PhraseLengthFeature(const std::string &line)
   :StatelessFeatureFunction("PhraseLengthFeature", 0, line)
 {
-  size_t ind = 0;
+  ReadParameters();
-  while (ind < m_args.size()) {
-	vector<string> &args = m_args[ind];
-	bool consumed = SetParameter(args[0], args[1]);
-	if (consumed) {
-	  m_args.erase(m_args.begin() + ind);
-	} else {
-	  ++ind;
-	}
-  }
 }
 
 void PhraseLengthFeature::Evaluate(const Phrase &source

moses/FF/PhrasePairFeature.cpp

@@ -17,18 +17,7 @@ PhrasePairFeature::PhrasePairFeature(const std::string &line)
   :StatelessFeatureFunction("PhrasePairFeature", 0, line)
 {
   std::cerr << "Initializing PhrasePairFeature.." << std::endl;
-
+  ReadParameters();
-  size_t ind = 0;
-  while (ind < m_args.size()) {
-    vector<string> &args = m_args[ind];
-    bool consumed = SetParameter(args[0], args[1]);
-    if (consumed) {
-      m_args.erase(m_args.begin() + ind);
-    } else {
-      ++ind;
-    }
-  }
-  CHECK(m_args.size() == 0);
 
   if (m_simple == 1) std::cerr << "using simple phrase pairs.. ";
   if (m_sourceContext == 1) std::cerr << "using source context.. ";

moses/FF/SourceWordDeletionFeature.cpp

@@ -22,18 +22,7 @@ SourceWordDeletionFeature::SourceWordDeletionFeature(const std::string &line)
    m_unrestricted(true)
 {
   std::cerr << "Initializing source word deletion feature.." << std::endl;
-
+  ReadParameters();
-  size_t ind = 0;
-  while (ind < m_args.size()) {
-    vector<string> &args = m_args[ind];
-    bool consumed = SetParameter(args[0], args[1]);
-    if (consumed) {
-      m_args.erase(m_args.begin() + ind);
-    } else {
-      ++ind;
-    }
-  }
-  CHECK(m_args.size() == 0);
 }
 
 bool SourceWordDeletionFeature::SetParameter(const std::string& key, const std::string& value)

moses/FF/TargetBigramFeature.cpp

@@ -21,18 +21,7 @@ TargetBigramFeature::TargetBigramFeature(const std::string &line)
   :StatefulFeatureFunction("TargetBigramFeature", 0, line)
 {
   std::cerr << "Initializing target bigram feature.." << std::endl;
-
+  ReadParameters();
-  size_t ind = 0;
-  while (ind < m_args.size()) {
-    vector<string> &args = m_args[ind];
-    bool consumed = SetParameter(args[0], args[1]);
-    if (consumed) {
-      m_args.erase(m_args.begin() + ind);
-    } else {
-      ++ind;
-    }
-  }
-  CHECK(m_args.size() == 0);
 
   FactorCollection& factorCollection = FactorCollection::Instance();
   const Factor* bosFactor =

moses/FF/TargetNgramFeature.cpp

@@ -41,19 +41,7 @@ TargetNgramFeature::TargetNgramFeature(const std::string &line)
   :StatefulFeatureFunction("TargetNgramFeature", 0, line)
 {
   std::cerr << "Initializing target ngram feature.." << std::endl;
-
+  ReadParameters();
-  size_t ind = 0;
-  while (ind < m_args.size()) {
-    vector<string> &args = m_args[ind];
-    bool consumed = SetParameter(args[0], args[1]);
-    if (consumed) {
-      m_args.erase(m_args.begin() + ind);
-    } else {
-      ++ind;
-    }
-  }
-  CHECK(m_args.size() == 0);
-
 }
 
 bool TargetNgramFeature::SetParameter(const std::string& key, const std::string& value)

moses/FF/TargetWordInsertionFeature.cpp

@@ -20,18 +20,7 @@ TargetWordInsertionFeature::TargetWordInsertionFeature(const std::string &line)
    m_unrestricted(true)
 {
   std::cerr << "Initializing target word insertion feature.." << std::endl;
-  size_t ind = 0;
+  ReadParameters();
-  while (ind < m_args.size()) {
-    vector<string> &args = m_args[ind];
-    bool consumed = SetParameter(args[0], args[1]);
-    if (consumed) {
-      m_args.erase(m_args.begin() + ind);
-    } else {
-      ++ind;
-    }
-  }
-  CHECK(m_args.size() == 0);
-
 }
 
 bool TargetWordInsertionFeature::SetParameter(const std::string& key, const std::string& value)

moses/FF/UnknownWordPenaltyProducer.cpp

@@ -9,17 +9,7 @@ namespace Moses
 UnknownWordPenaltyProducer::UnknownWordPenaltyProducer(const std::string &line)
   : StatelessFeatureFunction("UnknownWordPenalty",1, line) {
   m_tuneable = false;
-
+  ReadParameters();
-  size_t ind = 0;
-  while (ind < m_args.size()) {
-	vector<string> &args = m_args[ind];
-	bool consumed = SetParameter(args[0], args[1]);
-	if (consumed) {
-	  m_args.erase(m_args.begin() + ind);
-	} else {
-	  ++ind;
-	}
-  }
 }
 
 }

moses/FF/WordPenaltyProducer.cpp

@@ -8,16 +8,7 @@ namespace Moses
 {
 WordPenaltyProducer::WordPenaltyProducer(const std::string &line)
   : StatelessFeatureFunction("WordPenalty",1, line) {
-  size_t ind = 0;
+  ReadParameters();
-  while (ind < m_args.size()) {
-	vector<string> &args = m_args[ind];
-	bool consumed = SetParameter(args[0], args[1]);
-	if (consumed) {
-	  m_args.erase(m_args.begin() + ind);
-	} else {
-	  ++ind;
-	}
-  }
 }
 
 void WordPenaltyProducer::Evaluate(const Phrase &source

moses/FF/WordTranslationFeature.cpp

@@ -26,18 +26,7 @@ WordTranslationFeature::WordTranslationFeature(const std::string &line)
   ,m_domainTrigger(false)
 {
   std::cerr << "Initializing word translation feature.. " << endl;
-
+  ReadParameters();
-  size_t ind = 0;
-  while (ind < m_args.size()) {
-    vector<string> &args = m_args[ind];
-    bool consumed = SetParameter(args[0], args[1]);
-    if (consumed) {
-      m_args.erase(m_args.begin() + ind);
-    } else {
-      ++ind;
-    }
-  }
-  CHECK(m_args.size() == 0);
 
   if (m_simple == 1) std::cerr << "using simple word translations.. ";
   if (m_sourceContext == 1) std::cerr << "using source context.. ";

moses/GenerationDictionary.cpp

@@ -38,16 +38,7 @@ namespace Moses
 GenerationDictionary::GenerationDictionary(const std::string &line)
   : DecodeFeature("Generation", line)
 {
-  size_t ind = 0;
+  ReadParameters();
-  while (ind < m_args.size()) {
-	vector<string> &args = m_args[ind];
-	bool consumed = SetParameter(args[0], args[1]);
-	if (consumed) {
-	  m_args.erase(m_args.begin() + ind);
-	} else {
-	  ++ind;
-	}
-  }
 }
 
 void GenerationDictionary::Load()

moses/TranslationModel/CompactPT/PhraseDictionaryCompact.cpp

@@ -49,16 +49,7 @@ PhraseDictionaryCompact::PhraseDictionaryCompact(const std::string &line)
   ,m_phraseDecoder(0)
   ,m_weight(0)
 {
-  size_t ind = 0;
+  ReadParameters();
-  while (ind < m_args.size()) {
-	vector<string> &args = m_args[ind];
-	bool consumed = SetParameter(args[0], args[1]);
-	if (consumed) {
-	  m_args.erase(m_args.begin() + ind);
-	} else {
-	  ++ind;
-	}
-  }
 }
 
 void PhraseDictionaryCompact::Load()

moses/TranslationModel/PhraseDictionaryDynSuffixArray.cpp

@@ -12,18 +12,7 @@ PhraseDictionaryDynSuffixArray::PhraseDictionaryDynSuffixArray(const std::string
   :PhraseDictionary("PhraseDictionaryDynSuffixArray", line)
   ,m_biSA(new BilingualDynSuffixArray())
 {
-  size_t ind = 0;
+  ReadParameters();
-  while (ind < m_args.size()) {
-    vector<string> &args = m_args[ind];
-    bool consumed = SetParameter(args[0], args[1]);
-    if (consumed) {
-      m_args.erase(m_args.begin() + ind);
-    } else {
-      ++ind;
-    }
-  }
-  CHECK(m_args.size() == 0);
-
 }
 
 PhraseDictionaryDynSuffixArray::~PhraseDictionaryDynSuffixArray()

moses/TranslationModel/PhraseDictionaryMemory.cpp

@@ -42,16 +42,7 @@ namespace Moses
 PhraseDictionaryMemory::PhraseDictionaryMemory(const std::string &line)
   : RuleTableTrie("PhraseDictionaryMemory", line)
 {
-  size_t ind = 0;
+  ReadParameters();
-  while (ind < m_args.size()) {
-    vector<string> &args = m_args[ind];
-    bool consumed = SetParameter(args[0], args[1]);
-    if (consumed) {
-      m_args.erase(m_args.begin() + ind);
-    } else {
-      ++ind;
-    }
-  }
 }
 
 TargetPhraseCollection &PhraseDictionaryMemory::GetOrCreateTargetPhraseCollection(

moses/TranslationModel/PhraseDictionaryMultiModel.cpp

@@ -28,17 +28,7 @@ namespace Moses
 PhraseDictionaryMultiModel::PhraseDictionaryMultiModel(const std::string &line)
   :PhraseDictionary("PhraseDictionaryMultiModel", line)
 {
-  size_t ind = 0;
+  ReadParameters();
-  while (ind < m_args.size()) {
-    vector<string> &args = m_args[ind];
-    bool consumed = SetParameter(args[0], args[1]);
-    if (consumed) {
-      m_args.erase(m_args.begin() + ind);
-    } else {
-      ++ind;
-    }
-  }
-  CHECK(m_args.size() == 0);
 
   if (m_mode != "interpolate") {
     ostringstream msg;

moses/TranslationModel/PhraseDictionaryMultiModelCounts.cpp

@@ -68,17 +68,7 @@ PhraseDictionaryMultiModelCounts::PhraseDictionaryMultiModelCounts(const std::st
   //m_mode = "interpolate";
   //m_combineFunction = LinearInterpolationFromCounts;
   cerr << "m_args=" << m_args.size() << endl;
-  size_t ind = 0;
+  ReadParameters();
-  while (ind < m_args.size()) {
-    vector<string> &args = m_args[ind];
-    bool consumed = SetParameter(args[0], args[1]);
-    if (consumed) {
-      m_args.erase(m_args.begin() + ind);
-    } else {
-      ++ind;
-    }
-  }
-  CHECK(m_args.size() == 0);
 
   CHECK(m_targetTable.size() == m_pdStr.size());
 

moses/TranslationModel/PhraseDictionaryTreeAdaptor.cpp

@@ -29,16 +29,7 @@ PhraseDictionaryTreeAdaptor::
 PhraseDictionaryTreeAdaptor(const std::string &line)
   : PhraseDictionary("PhraseDictionaryBinary", line)
 {
-  size_t ind = 0;
+  ReadParameters();
-  while (ind < m_args.size()) {
-    vector<string> &args = m_args[ind];
-    bool consumed = SetParameter(args[0], args[1]);
-    if (consumed) {
-      m_args.erase(m_args.begin() + ind);
-    } else {
-      ++ind;
-    }
-  }
 }
 
 PhraseDictionaryTreeAdaptor::~PhraseDictionaryTreeAdaptor()

moses/TranslationModel/RuleTable/PhraseDictionaryOnDisk.cpp

@@ -32,16 +32,7 @@ namespace Moses
 {
 PhraseDictionaryOnDisk::PhraseDictionaryOnDisk(const std::string &line)
   : MyBase("PhraseDictionaryOnDisk", line) {
-  size_t ind = 0;
+  ReadParameters();
-  while (ind < m_args.size()) {
-	vector<string> &args = m_args[ind];
-	bool consumed = SetParameter(args[0], args[1]);
-	if (consumed) {
-	  m_args.erase(m_args.begin() + ind);
-	} else {
-	  ++ind;
-	}
-  }
 }
 
 PhraseDictionaryOnDisk::~PhraseDictionaryOnDisk()