Code refactoring: All FF now get access to AllOptions at load time, s…

…o they don't have to rely on StaticData.

defer/ExternalFeature.cpp

@@ -15,7 +15,7 @@ ExternalFeatureState::ExternalFeatureState(int stateSize, void *data)
   memcpy(m_data, data, stateSize);
 }
 
-void ExternalFeature::Load()
+void ExternalFeature::Load(AllOptions const& opts)
 {
   string nparam = "testing";
 

defer/ExternalFeature.h

@@ -43,7 +43,7 @@ class ExternalFeature : public StatefulFeatureFunction
   }
   ~ExternalFeature();
 
-  void Load();
+  void Load(AllOptions const& opts);
 
   bool IsUseable(const FactorMask &mask) const {
     return true;

defer/Joint.h

@@ -58,7 +58,7 @@ class LanguageModelJoint : public LanguageModelMultiFactor
     delete m_lmImpl;
   }
 
-  bool Load(const std::string &filePath
+  bool Load(AllOptions const& opts, const std::string &filePath
             , const std::vector<FactorType> &factorTypes
             , size_t nGramOrder) {
     m_factorTypes				= FactorMask(factorTypes);
@@ -77,7 +77,7 @@ class LanguageModelJoint : public LanguageModelMultiFactor
       m_sentenceEndWord[factorType] 		= factorCollection.AddFactor(Output, factorType, EOS_);
     }
 
-    m_lmImpl->Load();
+    m_lmImpl->Load(AllOptions const& opts);
   }
 
   LMResult GetValueForgotState(const std::vector<const Word*> &contextFactor, FFState &outState) const {

misc/queryPhraseTableMin.cpp

@@ -9,6 +9,7 @@
 #include "moses/TranslationModel/CompactPT/PhraseDictionaryCompact.h"
 #include "moses/Util.h"
 #include "moses/Phrase.h"
+#include "moses/parameters/AllOptions.h"
 
 void usage();
 
@@ -50,7 +51,8 @@ int main(int argc, char **argv)
   std::stringstream ss;
   ss << nscores;
   PhraseDictionaryCompact pdc("PhraseDictionaryCompact input-factor=0 output-factor=0 num-features=" + ss.str() + " path=" + ttable);
-  pdc.Load();
+  AllOptions opts;
+  pdc.Load(opts);
 
   std::string line;
   while(getline(std::cin, line)) {

moses/FF/CoveredReferenceFeature.cpp

@@ -52,7 +52,7 @@ void CoveredReferenceFeature::EvaluateWithSourceContext(const InputType &input
   estimatedScores->Assign(this, scores);
 }
 
-void CoveredReferenceFeature::Load()
+void CoveredReferenceFeature::Load(AllOptions const& opts)
 {
   InputFileStream refFile(m_path);
   std::string line;

moses/FF/CoveredReferenceFeature.h

@@ -44,7 +44,7 @@ class CoveredReferenceFeature : public StatefulFeatureFunction
     ReadParameters();
   }
 
-  void Load();
+  void Load(AllOptions const& opts);
 
   bool IsUseable(const FactorMask &mask) const {
     return true;

moses/FF/DeleteRules.cpp

@@ -16,7 +16,7 @@ DeleteRules::DeleteRules(const std::string &line)
   ReadParameters();
 }
 
-void DeleteRules::Load()
+void DeleteRules::Load(AllOptions const& opts)
 {
   std::vector<FactorType> factorOrder;
   factorOrder.push_back(0); // unfactored for now

moses/FF/DeleteRules.h

@@ -15,7 +15,7 @@ class DeleteRules : public StatelessFeatureFunction
 public:
   DeleteRules(const std::string &line);
 
-  void Load();
+  void Load(AllOptions const& opts);
 
   bool IsUseable(const FactorMask &mask) const {
     return true;

moses/FF/DynamicCacheBasedLanguageModel.cpp

@@ -323,7 +323,7 @@ void DynamicCacheBasedLanguageModel::Clear()
   m_cache.clear();
 }
 
-void DynamicCacheBasedLanguageModel::Load()
+void DynamicCacheBasedLanguageModel::Load(AllOptions const& opts)
 {
 //  SetPreComputedScores();
   VERBOSE(2,"DynamicCacheBasedLanguageModel::Load()" << std::endl);

moses/FF/DynamicCacheBasedLanguageModel.h

@@ -119,7 +119,7 @@ class DynamicCacheBasedLanguageModel : public StatelessFeatureFunction
     return true;
   }
 
-  void Load();
+  void Load(AllOptions const& opts);
   void Load(const std::string filestr);
   void Execute(std::string command);
   void SetParameter(const std::string& key, const std::string& value);

moses/FF/FeatureFunction.h

@@ -7,12 +7,13 @@
 #include <string>
 #include "moses/FeatureVector.h"
 #include "moses/TypeDef.h"
-
+#include "moses/parameters/AllOptions.h"
 #include <boost/shared_ptr.hpp>
 
 namespace Moses
 {
 
+class AllOptions;
 class Phrase;
 class TargetPhrase;
 class TranslationOptionList;
@@ -69,7 +70,7 @@ class FeatureFunction
   virtual ~FeatureFunction();
 
   //! override to load model files
-  virtual void Load() {
+  virtual void Load(AllOptions const& opts) {
   }
 
   static void ResetDescriptionCounts() {

moses/FF/GlobalLexicalModel.cpp

@@ -51,7 +51,7 @@ GlobalLexicalModel::~GlobalLexicalModel()
   }
 }
 
-void GlobalLexicalModel::Load()
+void GlobalLexicalModel::Load(AllOptions const& opts)
 {
   FactorCollection &factorCollection = FactorCollection::Instance();
   const std::string& factorDelimiter = StaticData::Instance().GetFactorDelimiter();

moses/FF/GlobalLexicalModel.h

@@ -57,7 +57,7 @@ class GlobalLexicalModel : public StatelessFeatureFunction
   std::vector<FactorType> m_inputFactorsVec, m_outputFactorsVec;
   std::string m_filePath;
 
-  void Load();
+  void Load(AllOptions const& opts);
 
   float ScorePhrase( const TargetPhrase& targetPhrase ) const;
   float GetFromCacheOrScorePhrase( const TargetPhrase& targetPhrase ) const;

moses/FF/InputFeature.cpp

@@ -23,7 +23,7 @@ InputFeature::InputFeature(const std::string &line)
   s_instance = this;
 }
 
-void InputFeature::Load()
+void InputFeature::Load(AllOptions const& opts)
 {
 
   const PhraseDictionary *pt = PhraseDictionary::GetColl()[0];

moses/FF/InputFeature.h

@@ -23,7 +23,7 @@ class InputFeature : public StatelessFeatureFunction
 
   InputFeature(const std::string &line);
 
-  void Load();
+  void Load(AllOptions const& opts);
 
   void SetParameter(const std::string& key, const std::string& value);
 

moses/FF/LexicalReordering/LexicalReordering.cpp

@@ -84,7 +84,7 @@ LexicalReordering::
 
 void
 LexicalReordering::
-Load()
+Load(AllOptions const& opts)
 {
   typedef LexicalReorderingTable LRTable;
   if (m_filePath.size())

moses/FF/LexicalReordering/LexicalReordering.h

@@ -33,7 +33,7 @@ class LexicalReordering : public StatefulFeatureFunction
 public:
   LexicalReordering(const std::string &line);
   virtual ~LexicalReordering();
-  void Load();
+  void Load(AllOptions const& opts);
 
   virtual
   bool

moses/FF/Model1Feature.cpp

@@ -159,7 +159,7 @@ void Model1Feature::SetParameter(const std::string& key, const std::string& valu
   }
 }
 
-void Model1Feature::Load()
+void Model1Feature::Load(AllOptions const& opts)
 {
   FEATUREVERBOSE(2, GetScoreProducerDescription() << ": Loading source vocabulary from file " << m_fileNameVcbS << " ...");
   Model1Vocabulary vcbS;

moses/FF/Model1Feature.h

@@ -99,7 +99,7 @@ class Model1Feature : public StatelessFeatureFunction
   Model1LexicalTable m_model1;
   const Factor* m_emptyWord;
 
-  void Load();
+  void Load(AllOptions const& opts);
 
   // cache
   mutable boost::unordered_map<const InputType*, boost::unordered_map<const Factor*, float> > m_cache;

moses/FF/OSM-Feature/OpSequenceModel.cpp

@@ -35,7 +35,7 @@ void OpSequenceModel :: readLanguageModel(const char *lmFile)
 }
 
 
-void OpSequenceModel::Load()
+void OpSequenceModel::Load(AllOptions const& opts)
 {
   readLanguageModel(m_lmPath.c_str());
 }

moses/FF/OSM-Feature/OpSequenceModel.h

@@ -25,7 +25,7 @@ class OpSequenceModel : public StatefulFeatureFunction
   ~OpSequenceModel();
 
   void readLanguageModel(const char *);
-  void Load();
+  void Load(AllOptions const& opts);
 
   FFState* EvaluateWhenApplied(
     const Hypothesis& cur_hypo,

moses/FF/PhraseOrientationFeature.cpp

@@ -75,7 +75,7 @@ void PhraseOrientationFeature::SetParameter(const std::string& key, const std::s
 }
 
 
-void PhraseOrientationFeature::Load()
+void PhraseOrientationFeature::Load(AllOptions const& opts)
 {
   if ( !m_filenameTargetWordList.empty() ) {
     LoadWordList(m_filenameTargetWordList,m_targetWordList);

moses/FF/PhraseOrientationFeature.h

@@ -289,7 +289,7 @@ class PhraseOrientationFeature : public StatefulFeatureFunction
 
   void SetParameter(const std::string& key, const std::string& value);
 
-  void Load();
+  void Load(AllOptions const& opts);
 
   void EvaluateInIsolation(const Phrase &source
                            , const TargetPhrase &targetPhrase

moses/FF/PhrasePairFeature.cpp

@@ -65,7 +65,7 @@ void PhrasePairFeature::SetParameter(const std::string& key, const std::string&
   }
 }
 
-void PhrasePairFeature::Load()
+void PhrasePairFeature::Load(AllOptions const& opts)
 {
   if (m_domainTrigger) {
     // domain trigger terms for each input document

moses/FF/PhrasePairFeature.h

@@ -44,7 +44,7 @@ class PhrasePairFeature: public StatelessFeatureFunction
 public:
   PhrasePairFeature(const std::string &line);
 
-  void Load();
+  void Load(AllOptions const& opts);
   void SetParameter(const std::string& key, const std::string& value);
 
   bool IsUseable(const FactorMask &mask) const;

moses/FF/SoftSourceSyntacticConstraintsFeature.cpp

@@ -88,7 +88,7 @@ void SoftSourceSyntacticConstraintsFeature::SetParameter(const std::string& key,
   }
 }
 
-void SoftSourceSyntacticConstraintsFeature::Load()
+void SoftSourceSyntacticConstraintsFeature::Load(AllOptions const& opts)
 {
   // don't change the loading order!
   LoadSourceLabelSet();

moses/FF/SoftSourceSyntacticConstraintsFeature.h

@@ -31,7 +31,7 @@ class SoftSourceSyntacticConstraintsFeature : public StatelessFeatureFunction
 
   void SetParameter(const std::string& key, const std::string& value);
 
-  void Load();
+  void Load(AllOptions const& opts);
 
   void EvaluateInIsolation(const Phrase &source
                            , const TargetPhrase &targetPhrase

moses/FF/SourceWordDeletionFeature.cpp

@@ -36,7 +36,7 @@ void SourceWordDeletionFeature::SetParameter(const std::string& key, const std::
   }
 }
 
-void SourceWordDeletionFeature::Load()
+void SourceWordDeletionFeature::Load(AllOptions const& opts)
 {
   if (m_filename.empty())
     return;

moses/FF/SourceWordDeletionFeature.h

@@ -23,7 +23,7 @@ class SourceWordDeletionFeature : public StatelessFeatureFunction
 public:
   SourceWordDeletionFeature(const std::string &line);
 
-  void Load();
+  void Load(AllOptions const& opts);
 
   bool IsUseable(const FactorMask &mask) const;
 

moses/FF/TargetBigramFeature.cpp

@@ -48,7 +48,7 @@ void TargetBigramFeature::SetParameter(const std::string& key, const std::string
   }
 }
 
-void TargetBigramFeature::Load()
+void TargetBigramFeature::Load(AllOptions const& opts)
 {
   if (m_filePath == "*")
     return ; //allow all

moses/FF/TargetBigramFeature.h

@@ -34,7 +34,7 @@ class TargetBigramFeature : public StatefulFeatureFunction
 public:
   TargetBigramFeature(const std::string &line);
 
-  void Load();
+  void Load(AllOptions const& opts);
 
   bool IsUseable(const FactorMask &mask) const;
 

moses/FF/TargetNgramFeature.cpp

@@ -74,7 +74,7 @@ void TargetNgramFeature::SetParameter(const std::string& key, const std::string&
   }
 }
 
-void TargetNgramFeature::Load()
+void TargetNgramFeature::Load(AllOptions const& opts)
 {
   if (m_file == "") return; //allow all, for now
 

moses/FF/TargetNgramFeature.h

@@ -203,7 +203,7 @@ class TargetNgramFeature : public StatefulFeatureFunction
 public:
   TargetNgramFeature(const std::string &line);
 
-  void Load();
+  void Load(AllOptions const& opts);
 
   bool IsUseable(const FactorMask &mask) const;
 

moses/FF/TargetWordInsertionFeature.cpp

@@ -34,7 +34,7 @@ void TargetWordInsertionFeature::SetParameter(const std::string& key, const std:
   }
 }
 
-void TargetWordInsertionFeature::Load()
+void TargetWordInsertionFeature::Load(AllOptions const& opts)
 {
   if (m_filename.empty())
     return;

moses/FF/TargetWordInsertionFeature.h

@@ -25,7 +25,7 @@ class TargetWordInsertionFeature : public StatelessFeatureFunction
 
   bool IsUseable(const FactorMask &mask) const;
 
-  void Load();
+  void Load(AllOptions const& opts);
 
   virtual void EvaluateInIsolation(const Phrase &source
                                    , const TargetPhrase &targetPhrase

moses/FF/TreeStructureFeature.cpp

@@ -8,7 +8,7 @@
 namespace Moses
 {
 
-void TreeStructureFeature::Load()
+void TreeStructureFeature::Load(AllOptions const& opts)
 {
 
   // syntactic constraints can be hooked in here.

moses/FF/TreeStructureFeature.h

@@ -74,7 +74,7 @@ class TreeStructureFeature : public StatefulFeatureFunction
     int /* featureID - used to index the state in the previous hypotheses */,
     ScoreComponentCollection* accumulator) const;
 
-  void Load();
+  void Load(AllOptions const& opts);
 };
 
 

moses/FF/WordTranslationFeature.cpp

@@ -87,7 +87,7 @@ void WordTranslationFeature::SetParameter(const std::string& key, const std::str
   }
 }
 
-void WordTranslationFeature::Load()
+void WordTranslationFeature::Load(AllOptions const& opts)
 {
   // load word list for restricted feature set
   if (m_filePathSource.empty()) {

moses/FF/WordTranslationFeature.h

@@ -40,7 +40,7 @@ class WordTranslationFeature : public StatelessFeatureFunction
   void SetParameter(const std::string& key, const std::string& value);
   bool IsUseable(const FactorMask &mask) const;
 
-  void Load();
+  void Load(AllOptions const& opts);
 
   void EvaluateWithSourceContext(const InputType &input
                                  , const InputPath &inputPath

moses/GenerationDictionary.cpp

@@ -44,7 +44,7 @@ GenerationDictionary::GenerationDictionary(const std::string &line)
   ReadParameters();
 }
 
-void GenerationDictionary::Load()
+void GenerationDictionary::Load(AllOptions const& opts)
 {
   FactorCollection &factorCollection = FactorCollection::Instance();