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

Merge branch 'master' of ssh://localhost:8479/gitroot/eodev/eodev

Browse source 
Conflicts:
	edo/src/edoSamplerNormalMulti.h
This commit is contained in:
nojhan 2011-12-23 16:06:52 +01:00
commit fdf3549b1c
3 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
edo/src/edoRepairerRound.h
View file

@ -86,7 +86,11 @@ public:
typedef typename EOT::AtomType ArgType; typedef typename EOT::AtomType ArgType;
//! Generally speaking, we expect decimals being <= 1, but it can work for higher values //! Generally speaking, we expect decimals being <= 1, but it can work for higher values
edoRepairerRoundDecimals( ArgType decimals ) : edoRepairerApplyBinary<EOT>( edoRound<ArgType>, 1 / decimals ) {} edoRepairerRoundDecimals( ArgType decimals ) : edoRepairerApplyBinary<EOT>( edoRound<ArgType>, 1 / decimals )
{
assert( decimals <= 1.0 );
assert( 1/decimals >= 1.0 );
}
}; };

3
edo/src/edoSamplerNormalMulti.h
View file

@ -29,6 +29,7 @@ Authors:
#define _edoSamplerNormalMulti_h #define _edoSamplerNormalMulti_h
#include <cmath> #include <cmath>
#include <limits>
#include <edoSampler.h> #include <edoSampler.h>
#include <boost/numeric/ublas/lu.hpp> #include <boost/numeric/ublas/lu.hpp>
@ -47,8 +48,6 @@ class edoSamplerNormalMulti : public edoSampler< EOD >
public: public:
typedef typename EOT::AtomType AtomType; typedef typename EOT::AtomType AtomType;
edoSamplerNormalMulti( edoRepairer<EOT> & repairer, typename Cholesky::Method use = Cholesky::absolute ) edoSamplerNormalMulti( edoRepairer<EOT> & repairer, typename Cholesky::Method use = Cholesky::absolute )
: edoSampler< EOD >( repairer), _cholesky(use) : edoSampler< EOD >( repairer), _cholesky(use)
{} {}

2
eo/CMakeLists.txt
View file

@ -16,7 +16,7 @@ INCLUDE(eo-conf.cmake OPTIONAL)
PROJECT(EO) PROJECT(EO)
# CMake > 2.8 is needed, because of the FindOpenMP feature # CMake > 2.8 is needed, because of the FindOpenMP feature
cmake_minimum_required(VERSION 2.8) #cmake_minimum_required(VERSION 2.8)
#SET(PROJECT_VERSION_MAJOR 1) #SET(PROJECT_VERSION_MAJOR 1)
#SET(PROJECT_VERSION_MINOR 1) #SET(PROJECT_VERSION_MINOR 1)