Skip to content

Commit b68d852

Browse files
author
Emmanuel Benazera
committed
deactivating TPA as default with gradient and sep/vd CMA until more analysis, ref #88
1 parent f681587 commit b68d852

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

src/cmaparameters.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ namespace libcmaes
119119
void set_algo(const int &algo)
120120
{
121121
this->_algo = algo;
122-
if (this->_tpa != 0
122+
/*if (this->_tpa != 0
123123
&& (this->_algo == 6 // sepCMAES
124124
|| this->_algo == 7 //sepIPOP_CMAES
125125
|| this->_algo == 8 //sepBIPOP_CMAES
@@ -129,7 +129,7 @@ namespace libcmaes
129129
|| this->_algo == 12 //VD_CMAES
130130
|| this->_algo == 13 //VD_IPOP_CMAES
131131
|| this->_algo == 14)) //VD_BIPOP_CMAES
132-
set_tpa(2);
132+
set_tpa(2); */ // XXX: deactivated until flaw is fixed
133133
}
134134

135135
/**
@@ -157,8 +157,8 @@ namespace libcmaes
157157
void set_gradient(const bool &gradient)
158158
{
159159
this->_with_gradient = gradient;
160-
if (this->_tpa != 0)
161-
set_tpa(2); // TPA default when gradient is activated.
160+
/*if (this->_tpa != 0)
161+
set_tpa(2);*/ // TPA default when gradient is activated.
162162
}
163163

164164
/**

src/parameters.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,8 @@ namespace libcmaes
423423
void set_gradient(const bool &gradient)
424424
{
425425
_with_gradient = gradient;
426-
set_tpa(true); // TPA default when gradient is activated.
426+
/*if (this->_tpa != 0)
427+
set_tpa(2); */ // TPA default when gradient is activated. XXX: deactivated until flaw is fixed.
427428
}
428429

429430
/**

0 commit comments

Comments
 (0)