Merge /home/nojhan/mnt/alevol/eo into pre-release-1.3.0

This commit is contained in:
Johann Dreo 2012-07-24 11:07:29 +02:00
commit 2d1856938d
9 changed files with 14 additions and 18 deletions

View file

@ -29,7 +29,7 @@ Authors:
#define _edoEDASA_h
#include <eo>
#include <mo>
//#include <mo>
#include <utils/eoRNG.h>

View file

@ -46,7 +46,11 @@ Authors:
template < typename EOT >
class edoNormalMono : public edoDistrib< EOT >
{
public:
public:
edoNormalMono()
: _mean(EOT(1,0)), _variance(EOT(1,1))
{}
edoNormalMono( const EOT& mean, const EOT& variance )
: _mean(mean), _variance(variance)
{

View file

@ -50,7 +50,7 @@ template < typename EOT >
class edoStatNormalMulti : public edoDistribStat< edoNormalMulti< EOT > >
{
public:
typedef typename EOT::AtomType AtomType;
// typedef typename EOT::AtomType AtomType;
using edoDistribStat< edoNormalMulti< EOT > >::value;