port coverage / abs->fabs changes from NFM

Author: Ithanil

.travis.yml

@@ -6,13 +6,10 @@ services:
 addons:
   apt:
     packages:
-    - cmake
     - valgrind
-    - python-pip
 
   homebrew:
     packages:
-    - cmake
     - valgrind
 
 matrix:

build.sh

@@ -3,4 +3,4 @@
 mkdir -p build
 cd build
 cmake -DCMAKE_CXX_COMPILER="${CXX_COMPILER}" -DUSER_CXX_FLAGS="${CXX_FLAGS}" -DUSE_COVERAGE="${USE_COVERAGE}" ..
-make
+make -j$(nproc)

src/CMakeLists.txt

@@ -6,8 +6,3 @@ if (MPI_FOUND)
   target_link_libraries(mci ${MPI_CXX_LIBRARIES})
   target_link_libraries(mci_static ${MPI_CXX_LIBRARIES})
 endif()
-
-if (USE_COVERAGE)
-  target_link_libraries(mci --coverage)
-  target_link_libraries(mci_static --coverage)
-endif()

test/CMakeLists.txt

@@ -1,8 +1,5 @@
 include_directories(common/)
 link_libraries(mci)
-if (USE_COVERAGE)
-  link_libraries(--coverage)
-endif()
 
 add_executable(check main.cpp)
 add_executable(ut1.exe ut1/main.cpp)

test/ut1/main.cpp

@@ -34,16 +34,16 @@ int main(){
     // this integral will give a wrong answer! This is because the starting point is very bad and initialDecorrelation is skipped (as well as the MRT2step automatic setting)
     mci->setX(x);
     mci->integrate(NMC, average, error, false, false);
-    assert( abs(average[0]-CORRECT_RESULT) > 2.*error[0] );
+    assert( fabs(average[0]-CORRECT_RESULT) > 2.*error[0] );
 
     // this integral, instead, will provide the right answer
     mci->setX(x);
     mci->integrate(NMC, average, error);
-    assert( abs(average[0]-CORRECT_RESULT) < 2.*error[0] );
+    assert( fabs(average[0]-CORRECT_RESULT) < 2.*error[0] );
 
     // now, doing an integral without finding again the MRT2step and doing the initialDecorrelation will also result in a correct result
     mci->integrate(NMC, average, error, false, false);
-    assert( abs(average[0]-CORRECT_RESULT) < 2.*error[0] );
+    assert( fabs(average[0]-CORRECT_RESULT) < 2.*error[0] );
 
 
 

test/ut2/main.cpp

@@ -37,20 +37,20 @@ int main(){
     mci->setX(x);
     mci->integrate(NMC, average, error, false, false);
     for (int i=0; i<mci->getNObsDim(); ++i) {
-        assert( abs(average[i]-CORRECT_RESULT) > 2.*error[i] );
+        assert( fabs(average[i]-CORRECT_RESULT) > 2.*error[i] );
     }
 
     // this integral, instead, will provide the right answer
     mci->setX(x);
     mci->integrate(NMC, average, error);
     for (int i=0; i<mci->getNObsDim(); ++i) {
-        assert( abs(average[i]-CORRECT_RESULT) < 2.*error[i] );
+        assert( fabs(average[i]-CORRECT_RESULT) < 2.*error[i] );
     }
 
     // now, doing an integral without finding again the MRT2step and doing the initialDecorrelation will also result in a correct result
     mci->integrate(NMC, average, error, false, false);
     for (int i=0; i<mci->getNObsDim(); ++i) {
-        assert( abs(average[i]-CORRECT_RESULT) < 2.*error[i] );
+        assert( fabs(average[i]-CORRECT_RESULT) < 2.*error[i] );
     }
 
 

test/ut3/main.cpp

@@ -38,21 +38,21 @@ int main(){
     // this integral will give a wrong answer! This is because the starting point is very bad and initialDecorrelation is skipped (as well as the MRT2step automatic setting)
     mci->setX(x);
     mci->integrate(NMC, average, error, false, false);
-    assert( abs(average[0]-CORRECT_RESULT) > 2.*error[0] );
+    assert( fabs(average[0]-CORRECT_RESULT) > 2.*error[0] );
 
     // this integral, instead, will provide the right answer
     mci->setX(x);
     mci->integrate(NMC, average, error, true, true);
-    assert( abs(average[0]-CORRECT_RESULT) < 2.*error[0] );
+    assert( fabs(average[0]-CORRECT_RESULT) < 2.*error[0] );
 
     // now, doing an integral without finding again the MRT2step and doing the initialDecorrelation will also result in a correct result
     mci->integrate(NMC, average, error, false, false);
-    assert( abs(average[0]-CORRECT_RESULT) < 2.*error[0] );
+    assert( fabs(average[0]-CORRECT_RESULT) < 2.*error[0] );
 
     // and using fixed blocking also gives the same result
     mci->setNBlocks(15);
     mci->integrate(NMC, average, error, false, false);
-    assert( abs(average[0]-CORRECT_RESULT) < 2.*error[0] );
+    assert( fabs(average[0]-CORRECT_RESULT) < 2.*error[0] );
 
 
     delete pdf;