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

Conflicts:
	edo/src/edoSamplerNormalMulti.h

edo/src/edoRepairerRound.h

@@ -86,7 +86,11 @@ public:
     typedef typename EOT::AtomType ArgType;
 
     //! 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 );
+    }
 };
 
 

edo/src/edoSamplerNormalMulti.h

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

eo/CMakeLists.txt

@@ -16,7 +16,7 @@ INCLUDE(eo-conf.cmake OPTIONAL)
 PROJECT(EO)
 
 # 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_MINOR 1)