nojhan/paradiseo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: better dimension management in edo/adaptive operators

Browse source
This commit is contained in:
Johann Dreo 2020-04-27 22:00:10 +02:00
commit 4110534122
5 changed files with 50 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

20
edo/src/edoNormalAdaptive.h
View file

@ -119,7 +119,13 @@ public:
unsigned int size()
{
return _mean.innerSize();
assert( _mean.innerSize() == _dim );
assert( _C.innerSize() == _dim && _C.outerSize() == _dim );
assert( _B.innerSize() == _dim && _B.outerSize() == _dim );
assert( _D.innerSize() == _dim );
assert( _p_c.innerSize() == _dim );
assert( _p_s.innerSize() == _dim );
return _dim;
}
Vector mean() const {return _mean;}
@ -139,6 +145,7 @@ public:
*/
void mean( EOT m )
{
assert(m.size() == _dim);
Vector center( m.size() );
for( unsigned int i=0, end=m.size(); i<end; ++i) {
center[i] = m[i];
@ -153,8 +160,17 @@ public:
void path_covar( Vector p ) { _p_c = p; assert( p.size() == _dim ); }
void path_sigma( Vector p ) { _p_s = p; assert( p.size() == _dim ); }
void reset()
/** Reset the distribution, like it was just instanciated.
*
* @param dim Dimension of the space, if set to 0 (the default), use the dimension that was lastly set.
*/
void reset(size_t dim = 0)
{
if(dim == 0) {
dim = _dim;
}
_dim = dim;
_mean = Vector::Zero(_dim);
_C = Matrix::Identity(_dim,_dim);
_B = Matrix::Identity(_dim,_dim);