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

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

2
edo/CMakeLists.txt
View file

@ -125,7 +125,7 @@ SET(SAMPLE_SRCS)
ADD_SUBDIRECTORY(src) ADD_SUBDIRECTORY(src)
ADD_SUBDIRECTORY(application) ADD_SUBDIRECTORY(application)
ADD_SUBDIRECTORY(test) #ADD_SUBDIRECTORY(test)
ADD_SUBDIRECTORY(doc) ADD_SUBDIRECTORY(doc)
###################################################################################### ######################################################################################

2
edo/application/cmaes/main.cpp
View file

@ -26,7 +26,7 @@ Authors:
*/ */
#include <eo> #include <eo>
#include <mo> //#include <mo>
#include <eoEvalFuncCounterBounder.h> #include <eoEvalFuncCounterBounder.h>

4
edo/build_gcc_linux_release
View file

@ -2,6 +2,8 @@
mkdir -p release mkdir -p release
cd release cd release
cmake -DWITH_BOOST=1 .. cmake -DWITH_EIGEN=1 ..
#cmake -DWITH_BOOST=1 ..
make make
cd .. cd ..

10
edo/install.cmake-dist
View file

@ -2,19 +2,9 @@
# directory we need to build project # directory we need to build project
SET(EO_DIR "<<PATH_TO_EO>>" CACHE PATH "EO directory" FORCE) SET(EO_DIR "<<PATH_TO_EO>>" CACHE PATH "EO directory" FORCE)
SET(MO_DIR "<<PATH_TO_MO>>" CACHE PATH "MO directory" FORCE)
# automagically set parameters, do not edit # automagically set parameters, do not edit
SET(EO_INCLUDE_DIRS "${EO_DIR}/src" CACHE PATH "EO include directory" FORCE) SET(EO_INCLUDE_DIRS "${EO_DIR}/src" CACHE PATH "EO include directory" FORCE)
SET(EO_LIBRARY_DIRS "${EO_DIR}/release/lib" CACHE PATH "EO library directory" FORCE) SET(EO_LIBRARY_DIRS "${EO_DIR}/release/lib" CACHE PATH "EO library directory" FORCE)
SET(EO_LIBRARIES eoutils eo es ga cma gcov) # do not use quotes around this list or it will fail SET(EO_LIBRARIES eoutils eo es ga cma gcov) # do not use quotes around this list or it will fail
SET(MO_INCLUDE_DIRS "${MO_DIR}/src" CACHE PATH "MO include directory" FORCE)
SET(MO_LIBRARY_DIRS "${MO_DIR}/release/lib" CACHE PATH "MO library directory" FORCE)
#SET(MO_LIBRARIES "mo") # no library is generated when building MO
# ... or rather use pkg-config (dont forget to comment the code above)
#PKG_CHECK_MODULES(EO eo REQUIRED)
#PKG_CHECK_MODULES(MO mo REQUIRED)

2
edo/src/edoEDASA.h
View file

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

6
edo/src/edoNormalMono.h
View file

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

2
edo/src/utils/edoStatNormalMulti.h
View file

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

2
edo/test/t-edoEstimatorNormalMulti.cpp
View file

@ -29,7 +29,7 @@ Authors:
#include <iomanip> #include <iomanip>
#include <eo> #include <eo>
#include <mo> //#include <mo>
#include <edo> #include <edo>

2
edo/test/t-mean-distance.cpp
View file

@ -33,7 +33,7 @@ Authors:
#include <fstream> #include <fstream>
#include <eo> #include <eo>
#include <mo> //#include <mo>
#include <edo> #include <edo>