From 1290727b475a6188f215e10318208a842cc9b8ce Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.dos.anjos@gmail.com>
Date: Sat, 11 Feb 2017 01:47:32 +0100
Subject: [PATCH] Improve compatibility with gcc-4.2.1 (bis)
---
bob/learn/em/plda_trainer.cpp | 22 +++++++++++++++-------
1 file changed, 15 insertions(+), 7 deletions(-)
diff --git a/bob/learn/em/plda_trainer.cpp b/bob/learn/em/plda_trainer.cpp
index edff615..eb04f09 100644
--- a/bob/learn/em/plda_trainer.cpp
+++ b/bob/learn/em/plda_trainer.cpp
@@ -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){
--
GitLab