Commit 1290727b authored by André Anjos's avatar André Anjos 💬
Browse files

Improve compatibility with gcc-4.2.1 (bis)

parent 9d1154e8
Pipeline #7070 canceled with stages
in 7 minutes and 12 seconds
......@@ -13,13 +13,21 @@
//Defining maps for each initializatio method
static const std::map<std::string, bob::learn::em::PLDATrainer::InitFMethod> FMethod = boost::assign::map_list_of
{{"RANDOM_F", bob::learn::em::PLDATrainer::RANDOM_F}, {"BETWEEN_SCATTER", bob::learn::em::PLDATrainer::BETWEEN_SCATTER}};
static const std::map<std::string, bob::learn::em::PLDATrainer::InitGMethod> GMethod = {{"RANDOM_G", bob::learn::em::PLDATrainer::RANDOM_G}, {"WITHIN_SCATTER", bob::learn::em::PLDATrainer::WITHIN_SCATTER}};
static const std::map<std::string, bob::learn::em::PLDATrainer::InitSigmaMethod> SigmaMethod = {{"RANDOM_SIGMA", bob::learn::em::PLDATrainer::RANDOM_SIGMA}, {"VARIANCE_G", bob::learn::em::PLDATrainer::VARIANCE_G}, {"CONSTANT", bob::learn::em::PLDATrainer::CONSTANT}, {"VARIANCE_DATA", bob::learn::em::PLDATrainer::VARIANCE_DATA}};
("RANDOM_F", bob::learn::em::PLDATrainer::RANDOM_F)
("BETWEEN_SCATTER", bob::learn::em::PLDATrainer::BETWEEN_SCATTER)
;
static const std::map<std::string, bob::learn::em::PLDATrainer::InitGMethod> GMethod = boost::assign::map_list_of
("RANDOM_G", bob::learn::em::PLDATrainer::RANDOM_G)
("WITHIN_SCATTER", bob::learn::em::PLDATrainer::WITHIN_SCATTER)
;
static const std::map<std::string, bob::learn::em::PLDATrainer::InitSigmaMethod> SigmaMethod = boost::assign::map_list_of
("RANDOM_SIGMA", bob::learn::em::PLDATrainer::RANDOM_SIGMA)
("VARIANCE_G", bob::learn::em::PLDATrainer::VARIANCE_G)
("CONSTANT", bob::learn::em::PLDATrainer::CONSTANT)
("VARIANCE_DATA", bob::learn::em::PLDATrainer::VARIANCE_DATA)
;
//String to type
static inline bob::learn::em::PLDATrainer::InitFMethod string2FMethod(const std::string& o){
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment