Added a way to specify the .dict file as a program parameter

maca_common/include/ProgramParameters.hpp

@@ -53,6 +53,7 @@ struct ProgramParameters
   static std::string classifierName;
   static int batchSize;
   static std::string loss;
+  static std::string dicts;
 
   private :
 

maca_common/src/ProgramParameters.cpp

@@ -25,6 +25,7 @@ std::string ProgramParameters::devFilename;
 std::string ProgramParameters::devName;
 std::string ProgramParameters::lang;
 std::string ProgramParameters::optimizer;
+std::string ProgramParameters::dicts;
 int ProgramParameters::nbIter;
 int ProgramParameters::seed;
 bool ProgramParameters::removeDuplicates;

trainer/src/macaon_train.cpp

@@ -41,6 +41,8 @@ po::options_description getOptionsDescription()
     ("help,h", "Produce this help message")
     ("debug,d", "Print infos on stderr")
     ("printEntropy", "Print mean entropy and standard deviation accross sequences")
+    ("dicts", po::value<std::string>()->default_value(""),
+      "The .dict file describing all the dictionaries to be used in the experiement. By default the filename specified in the .tm file will be used")
     ("optimizer", po::value<std::string>()->default_value("amsgrad"),
       "The learning algorithm to use : amsgrad | adam | sgd")
     ("loss", po::value<std::string>()->default_value("neglogsoftmax"),
@@ -265,6 +267,7 @@ int main(int argc, char * argv[])
   ProgramParameters::beta2 = vm["b2"].as<float>();
   ProgramParameters::bias = vm["bias"].as<float>();
   ProgramParameters::optimizer = vm["optimizer"].as<std::string>();
+  ProgramParameters::dicts = vm["dicts"].as<std::string>();
   ProgramParameters::loss = vm["loss"].as<std::string>();
   ProgramParameters::dynamicEpoch = vm["epochd"].as<int>();
   ProgramParameters::dynamicProbability = vm["proba"].as<float>();

transition_machine/src/TransitionMachine.cpp

@@ -33,7 +33,10 @@ TransitionMachine::TransitionMachine(bool trainMode)
   if(fscanf(fd, "Dicts : %[^\n]\n", buffer) != 1)
     badFormatAndAbort(ERRINFO);
 
-  Dict::readDicts(ProgramParameters::expPath, ProgramParameters::expPath + buffer, trainMode);
+  if (ProgramParameters::dicts.empty())
+    ProgramParameters::dicts = ProgramParameters::expPath + buffer;
+
+  Dict::readDicts(ProgramParameters::expPath, ProgramParameters::dicts, trainMode);
 
   // Reading %CLASSIFIERS
   if(fscanf(fd, "%%%s\n", buffer) != 1 || buffer != std::string("CLASSIFIERS"))