Add helper to print type in tests; Remove duplicate function of random...

Add helper to print type in tests; Remove duplicate function of random generation of eigen vectors; Add test, which should fail sanitizer

.gitlab-ci.yml

@@ -226,14 +226,15 @@ cuda-memcheck:
     - gcc
     - cuda
 
-sanitize-asan-ubsan:
+asan-ubsan:
   <<: *nightly_job
   stage: sanitizer
   image: $CUDA_IMAGE
   script:
     - mkdir -p build
     - cd build
-    - cmake -GNinja -DCMAKE_BUILD_TYPE=Debug -DELSA_SANITIZER="Address;Undefined" ..
+    - rm -f CMakeCache.txt # remove cache, as we sometimes get the wrong cache
+    - cmake -GNinja -DELSA_BUILD_CUDA_PROJECTORS=OFF -DCMAKE_BUILD_TYPE=Debug -DELSA_SANITIZER="Address;Undefined" ..
     - ninja tests
   tags:
     - linux
@@ -241,34 +242,6 @@ sanitize-asan-ubsan:
     - gcc
     - cuda
 
-sanitize-tsan:
-  <<: *nightly_job
-  stage: sanitizer
-  image: $CUDA_IMAGE
-  script:
-    - mkdir -p build
-    - cd build
-    - CC=clang CXX=clang cmake -GNinja -DCMAKE_BUILD_TYPE=Debug -DELSA_SANITIZER="Thread" ..
-    - ninja tests
-  tags:
-    - linux
-    - elsa
-    - cuda
-
-sanitize-memsan:
-  <<: *nightly_job
-  stage: sanitizer
-  image: $CUDA_IMAGE
-  script:
-    - mkdir -p build
-    - cd build
-    - CC=clang CXX=clang cmake -GNinja -DCMAKE_BUILD_TYPE=Debug -DELSA_SANITIZER="Memory" ..
-    - ninja tests
-  tags:
-    - linux
-    - elsa
-    - cuda
-
 
 ### test coverage ###
 

CMakeLists.txt

@@ -113,8 +113,7 @@ if(ELSA_CUDA_VECTOR)
     endif()
 endif()
 
-
-# ------------ setup tools -----------
+# ------------ Setup Tools -----------
 # ------------
 
 # Includes clang-format, clang-tidy, cmake-format, and sanitizers
@@ -143,6 +142,7 @@ if(ELSA_TESTING OR ELSA_BENCHMARKS)
         add_custom_target(tests
             COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure
             WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+            USES_TERMINAL
             COMMENT "Build and run all the tests.")
         if(ELSA_COVERAGE)
             message(STATUS "elsa test coverage is enabled")

elsa/core/tests/test_DataContainer.cpp

@@ -13,6 +13,8 @@
 #include "IdenticalBlocksDescriptor.h"
 #include "testHelpers.h"
 
+#include <type_traits>
+
 using namespace elsa;
 using namespace Catch::literals; // to enable 0.0_a approximate floats
 
@@ -43,6 +45,8 @@ TEMPLATE_PRODUCT_TEST_CASE("Scenario: Constructing DataContainers", "", (TestHel
 {
     using data_t = typename TestType::data_t;
 
+    INFO("Testing type: " << TypeName_v<const data_t>);
+
     GIVEN("a DataDescriptor")
     {
         IndexVector_t numCoeff(3);
@@ -63,8 +67,7 @@ TEMPLATE_PRODUCT_TEST_CASE("Scenario: Constructing DataContainers", "", (TestHel
 
         WHEN("constructing an initialized DataContainer")
         {
-            Eigen::Matrix<data_t, Eigen::Dynamic, 1> data{desc.getNumberOfCoefficients()};
-            data.setRandom();
+            auto data = generateRandomMatrix<data_t>(desc.getNumberOfCoefficients());
 
             DataContainer<data_t> dc(desc, data, TestType::handler_t);
 
@@ -87,8 +90,8 @@ TEMPLATE_PRODUCT_TEST_CASE("Scenario: Constructing DataContainers", "", (TestHel
         DataDescriptor desc(numCoeff);
 
         DataContainer<data_t> otherDc(desc, TestType::handler_t);
-        Eigen::Matrix<data_t, Eigen::Dynamic, 1> randVec{otherDc.getSize()};
-        randVec.setRandom();
+
+        auto randVec = generateRandomMatrix<data_t>(otherDc.getSize());
         for (index_t i = 0; i < otherDc.getSize(); ++i)
             otherDc[i] = randVec(i);
 
@@ -165,6 +168,8 @@ TEMPLATE_PRODUCT_TEST_CASE("Scenario: Element-wise access of DataContainers", ""
 {
     using data_t = typename TestType::data_t;
 
+    INFO("Testing type: " << TypeName_v<const data_t>);
+
     GIVEN("a DataContainer")
     {
         IndexVector_t numCoeff(2);
@@ -206,19 +211,17 @@ TEMPLATE_PRODUCT_TEST_CASE("Scenario: Testing the reduction operations of DataCo
 {
     using data_t = typename TestType::data_t;
 
+    INFO("Testing type: " << TypeName_v<const data_t>);
+
     GIVEN("a DataContainer")
     {
         IndexVector_t numCoeff(3);
         numCoeff << 11, 73, 45;
         DataDescriptor desc(numCoeff);
-        DataContainer<data_t> dc(desc, TestType::handler_t);
 
         WHEN("putting in some random data")
         {
-            Eigen::Matrix<data_t, Eigen::Dynamic, 1> randVec{dc.getSize()};
-            randVec.setRandom();
-            for (index_t i = 0; i < dc.getSize(); ++i)
-                dc[i] = randVec(i);
+            auto [dc, randVec] = generateRandomContainer<data_t>(desc, TestType::handler_t);
 
             THEN("the reductions work as expected")
             {
@@ -227,13 +230,9 @@ TEMPLATE_PRODUCT_TEST_CASE("Scenario: Testing the reduction operations of DataCo
                 REQUIRE(checkSameNumbers(dc.lInfNorm(), randVec.array().abs().maxCoeff()));
                 REQUIRE(checkSameNumbers(dc.squaredL2Norm(), randVec.squaredNorm()));
 
-                Eigen::Matrix<data_t, Eigen::Dynamic, 1> randVec2{dc.getSize()};
-                randVec2.setRandom();
-                DataContainer<data_t> dc2(desc, TestType::handler_t);
-                for (index_t i = 0; i < dc2.getSize(); ++i)
-                    dc2[i] = randVec2(i);
+                auto [dc2, randVec2] = generateRandomContainer<data_t>(desc, TestType::handler_t);
 
-                REQUIRE(checkSameNumbers(dc.dot(dc2), randVec.dot(randVec2), 10));
+                REQUIRE(checkSameNumbers(dc.dot(dc2), randVec.dot(randVec2)));
             }
         }
     }
@@ -251,25 +250,23 @@ TEMPLATE_PRODUCT_TEST_CASE("Scenario: Testing the element-wise operations of Dat
 {
     using data_t = typename TestType::data_t;
 
+    INFO("Testing type: " << TypeName_v<const data_t>);
+
     GIVEN("a DataContainer")
     {
         IndexVector_t numCoeff(2);
         numCoeff << 47, 11;
         DataDescriptor desc(numCoeff);
-        DataContainer<data_t> dc(desc, TestType::handler_t);
 
         WHEN("putting in some random data")
         {
-            Eigen::Matrix<data_t, Eigen::Dynamic, 1> randVec{dc.getSize()};
-            randVec.setRandom();
-            for (index_t i = 0; i < dc.getSize(); ++i)
-                dc[i] = randVec(i);
+            auto [dc, randVec] = generateRandomContainer<data_t>(desc, TestType::handler_t);
 
             THEN("the element-wise unary operations work as expected")
             {
                 DataContainer dcSquare = square(dc);
                 for (index_t i = 0; i < dc.getSize(); ++i)
-                    REQUIRE(checkSameNumbers(dcSquare[i], randVec.array().square()[i], 10));
+                    REQUIRE(checkSameNumbers(dcSquare[i], randVec.array().square()[i]));
                 DataContainer dcSqrt = sqrt(dcSquare);
                 for (index_t i = 0; i < dc.getSize(); ++i)
                     REQUIRE(checkSameNumbers(dcSqrt[i], randVec.array().square().sqrt()[i]));
@@ -284,7 +281,7 @@ TEMPLATE_PRODUCT_TEST_CASE("Scenario: Testing the element-wise operations of Dat
 
                 DataContainer dcLog = log(dcSquare);
                 for (index_t i = 0; i < dc.getSize(); ++i)
-                    REQUIRE(checkSameNumbers(dcLog[i], randVec.array().square().log()[i], 100));
+                    REQUIRE(checkSameNumbers(dcLog[i], randVec.array().square().log()[i]));
             }
 
             auto scalar = static_cast<data_t>(923.41f);
@@ -327,16 +324,8 @@ TEMPLATE_PRODUCT_TEST_CASE("Scenario: Testing the element-wise operations of Dat
 
         WHEN("having two containers with random data")
         {
-            Eigen::Matrix<data_t, Eigen::Dynamic, 1> randVec{dc.getSize()};
-            randVec.setRandom();
-            for (index_t i = 0; i < dc.getSize(); ++i)
-                dc[i] = randVec(i);
-
-            Eigen::Matrix<data_t, Eigen::Dynamic, 1> randVec2{dc.getSize()};
-            randVec2.setRandom();
-            DataContainer<data_t> dc2(desc, TestType::handler_t);
-            for (index_t i = 0; i < dc2.getSize(); ++i)
-                dc2[i] = randVec2[i];
+            auto [dc, randVec] = generateRandomContainer<data_t>(desc, TestType::handler_t);
+            auto [dc2, randVec2] = generateRandomContainer<data_t>(desc, TestType::handler_t);
 
             THEN("the element-wise in-place addition works as expected")
             {
@@ -356,7 +345,7 @@ TEMPLATE_PRODUCT_TEST_CASE("Scenario: Testing the element-wise operations of Dat
             {
                 dc *= dc2;
                 for (index_t i = 0; i < dc.getSize(); ++i)
-                    REQUIRE(checkSameNumbers(dc[i], randVec(i) * randVec2(i), 100));
+                    REQUIRE(checkSameNumbers(dc[i], randVec(i) * randVec2(i)));
             }
 
             THEN("the element-wise in-place division works as expected")
@@ -364,7 +353,7 @@ TEMPLATE_PRODUCT_TEST_CASE("Scenario: Testing the element-wise operations of Dat
                 dc /= dc2;
                 for (index_t i = 0; i < dc.getSize(); ++i)
                     if (dc2[i] != data_t(0))
-                        REQUIRE(checkSameNumbers(dc[i], randVec(i) / randVec2(i), 10));
+                        REQUIRE(checkSameNumbers(dc[i], randVec(i) / randVec2(i)));
             }
         }
     }
@@ -383,24 +372,16 @@ TEMPLATE_PRODUCT_TEST_CASE(
 {
     using data_t = typename TestType::data_t;
 
+    INFO("Testing type: " << TypeName_v<const data_t>);
+
     GIVEN("some DataContainers")
     {
         IndexVector_t numCoeff(3);
         numCoeff << 52, 7, 29;
         DataDescriptor desc(numCoeff);
 
-        DataContainer<data_t> dc(desc, TestType::handler_t);
-        DataContainer<data_t> dc2(desc, TestType::handler_t);
-
-        Eigen::Matrix<data_t, Eigen::Dynamic, 1> randVec{dc.getSize()};
-        randVec.setRandom();
-        Eigen::Matrix<data_t, Eigen::Dynamic, 1> randVec2{dc.getSize()};
-        randVec2.setRandom();
-
-        for (index_t i = 0; i < dc.getSize(); ++i) {
-            dc[i] = randVec(i);
-            dc2[i] = randVec2(i);
-        }
+        auto [dc, randVec] = generateRandomContainer<data_t>(desc, TestType::handler_t);
+        auto [dc2, randVec2] = generateRandomContainer<data_t>(desc, TestType::handler_t);
 
         THEN("the binary element-wise operations work as expected")
         {
@@ -414,12 +395,12 @@ TEMPLATE_PRODUCT_TEST_CASE(
 
             DataContainer resultMult = dc * dc2;
             for (index_t i = 0; i < dc.getSize(); ++i)
-                REQUIRE(checkSameNumbers(resultMult[i], dc[i] * dc2[i], 100));
+                REQUIRE(checkSameNumbers(resultMult[i], dc[i] * dc2[i]));
 
             DataContainer resultDiv = dc / dc2;
             for (index_t i = 0; i < dc.getSize(); ++i)
                 if (dc2[i] != data_t(0))
-                    REQUIRE(checkSameNumbers(resultDiv[i], dc[i] / dc2[i], 1000));
+                    REQUIRE(checkSameNumbers(resultDiv[i], dc[i] / dc2[i]));
         }
 
         THEN("the operations with a scalar work as expected")
@@ -474,6 +455,8 @@ TEMPLATE_PRODUCT_TEST_CASE("Scenario: Testing creation of Maps through DataConta
 {
     using data_t = typename TestType::data_t;
 
+    INFO("Testing type: " << TypeName_v<const data_t>);
+
     GIVEN("a non-blocked container")
     {
         IndexVector_t numCoeff(3);
@@ -600,8 +583,7 @@ TEMPLATE_TEST_CASE("Scenario: Testing loading data to GPU and vice versa.", "",
         DataContainer<TestType> dcCPU(desc, DataHandlerType::CPU);
         DataContainer<TestType> dcGPU(desc, DataHandlerType::GPU);
 
-        Eigen::Matrix<TestType, Eigen::Dynamic, 1> randVec{dcCPU.getSize()};
-        randVec.setRandom();
+        auto randVec = generateRandomMatrix<TestType>(dcCPU.getSize());
 
         for (index_t i = 0; i < dcCPU.getSize(); ++i) {
             dcCPU[i] = randVec(i);

elsa/core/tests/test_DataHandlerMap.cpp

@@ -786,14 +786,14 @@ TEMPLATE_PRODUCT_TEST_CASE("Scenario: Testing the element-wise operations of Dat
                 for (index_t i = 0; i < size; ++i)
                     if (dh2[i] != data_t(0))
                         // due to floating point arithmetic less precision
-                        REQUIRE(checkSameNumbers(dh[i], oldDh[i] / dh2[i], 100));
+                        REQUIRE(checkSameNumbers(dh[i], oldDh[i] / dh2[i]));
 
                 dh = oldDh;
                 dh /= dhCPU;
                 for (index_t i = 0; i < size; ++i)
                     if (dhCPU[i] != data_t(0))
                         // due to floating point arithmetic less precision
-                        REQUIRE(checkSameNumbers(dh[i], oldDh[i] / dhCPU[i], 100));
+                        REQUIRE(checkSameNumbers(dh[i], oldDh[i] / dhCPU[i]));
             }
 
             THEN("the element-wise binary scalar operations work as expected")

elsa/core/tests/test_DataHandlers.cpp

@@ -13,6 +13,8 @@
 #include "DataHandlerMapCPU.h"
 #include "testHelpers.h"
 
+#include <iostream>
+
 #ifdef ELSA_CUDA_VECTOR
 #include "DataHandlerGPU.h"
 #include "DataHandlerMapGPU.h"
@@ -58,8 +60,7 @@ TEMPLATE_PRODUCT_TEST_CASE("Scenario: Constructing DataHandler", "", (DataHandle
 
         WHEN("constructing with a given vector")
         {
-            Eigen::Matrix<data_t, Eigen::Dynamic, 1> randVec{size};
-            randVec.setRandom();
+            auto randVec = generateRandomMatrix<data_t>(size);
             const TestType dh{randVec};
 
             for (index_t i = 0; i < size; ++i)
@@ -68,8 +69,7 @@ TEMPLATE_PRODUCT_TEST_CASE("Scenario: Constructing DataHandler", "", (DataHandle
 
         WHEN("copy constructing")
         {
-            Eigen::Matrix<data_t, Eigen::Dynamic, 1> randVec{size};
-            randVec.setRandom();
+            auto randVec = generateRandomMatrix<data_t>(size);
             const TestType dh{randVec};
             const auto dhView = dh.getBlock(0, size);
 
@@ -93,8 +93,7 @@ TEMPLATE_PRODUCT_TEST_CASE("Scenario: Constructing DataHandler", "", (DataHandle
 
         WHEN("move constructing")
         {
-            Eigen::Matrix<data_t, Eigen::Dynamic, 1> randVec{size};
-            randVec.setRandom();
+            auto randVec = generateRandomMatrix<data_t>(size);
             TestType dh{randVec};
             const auto dhView = dh.getBlock(0, size);
             TestType testDh{randVec};
@@ -125,9 +124,8 @@ TEMPLATE_PRODUCT_TEST_CASE("Scenario: Testing equality operator on DataHandler",
 
     GIVEN("some DataHandler")
     {
-        index_t size = 314;
-        Eigen::Matrix<data_t, Eigen::Dynamic, 1> randVec{size};
-        randVec.setRandom();
+        const index_t size = 314;
+        auto randVec = generateRandomMatrix<data_t>(size);
         const TestType dh{randVec};
 
         WHEN("comparing to a handler with a different size")
@@ -186,14 +184,14 @@ TEMPLATE_PRODUCT_TEST_CASE("Scenario: Assigning to DataHandlerCPU", "", (DataHan
 
     GIVEN("a DataHandlerCPU with an associated map")
     {
-        index_t size = 314;
+        const index_t size = 314;
         DataHandlerCPU<data_t> dh{size};
         auto dhMap = dh.getBlock(size / 2, size / 3);
 
         WHEN("copy assigning")
         {
-            Eigen::Matrix<data_t, Eigen::Dynamic, 1> randVec{size};
-            randVec.setRandom();
+
+            auto randVec = generateRandomMatrix<data_t>(size);
             const DataHandlerCPU dh2{randVec};
             const auto dh2Map = dh2.getBlock(size / 2, size / 3);
 
@@ -214,8 +212,7 @@ TEMPLATE_PRODUCT_TEST_CASE("Scenario: Assigning to DataHandlerCPU", "", (DataHan
 
         WHEN("move assigning")
         {
-            Eigen::Matrix<data_t, Eigen::Dynamic, 1> randVec{size};
-            randVec.setRandom();
+            auto randVec = generateRandomMatrix<data_t>(size);
             DataHandlerCPU dh2{randVec};
             const auto dh2View = dh2.getBlock(0, size);
             DataHandlerCPU testDh{randVec};
@@ -241,8 +238,8 @@ TEMPLATE_PRODUCT_TEST_CASE("Scenario: Assigning to DataHandlerCPU", "", (DataHan
         WHEN("copy assigning a DataHandlerCPU through base pointers")
         {
             DataHandler<data_t>* dhPtr = &dh;
-            Eigen::Matrix<data_t, Eigen::Dynamic, 1> randVec{size};
-            randVec.setRandom();
+
+            auto randVec = generateRandomMatrix<data_t>(size);
             const auto dh2Ptr = std::make_unique<const DataHandlerCPU<data_t>>(randVec);
             const auto dh2Map = dh2Ptr->getBlock(size / 2, size / 3);
 
@@ -270,8 +267,8 @@ TEMPLATE_PRODUCT_TEST_CASE("Scenario: Assigning to DataHandlerCPU", "", (DataHan
         {
             DataHandler<data_t>* dhPtr = &dh;
             const auto dhCopy = dh;
-            Eigen::Matrix<data_t, Eigen::Dynamic, 1> randVec{2 * size};
-            randVec.setRandom();
+
+            auto randVec = generateRandomMatrix<data_t>(2 * size);
             const DataHandlerCPU<data_t> dh2{randVec};
             const auto dh2Map = dh2.getBlock(0, size);
 
@@ -295,8 +292,8 @@ TEMPLATE_PRODUCT_TEST_CASE("Scenario: Assigning to DataHandlerCPU", "", (DataHan
         WHEN("copy assigning a full DataHandlerMapCPU (aka a view) through base pointers")
         {
             DataHandler<data_t>* dhPtr = &dh;
-            Eigen::Matrix<data_t, Eigen::Dynamic, 1> randVec{size};
-            randVec.setRandom();
+
+            auto randVec = generateRandomMatrix<data_t>(size);
             const DataHandlerCPU<data_t> dh2{randVec};
             const auto dh2View = dh2.getBlock(0, size);
             const auto dh2Map = dh2.getBlock(size / 2, size / 3);
@@ -325,8 +322,8 @@ TEMPLATE_PRODUCT_TEST_CASE("Scenario: Assigning to DataHandlerCPU", "", (DataHan
         WHEN("move assigning a DataHandlerCPU through base pointers")
         {
             DataHandler<data_t>* dhPtr = &dh;
-            Eigen::Matrix<data_t, Eigen::Dynamic, 1> randVec{size};
-            randVec.setRandom();
+
+            auto randVec = generateRandomMatrix<data_t>(size);
             std::unique_ptr<DataHandler<data_t>> dh2Ptr =
                 std::make_unique<DataHandlerCPU<data_t>>(randVec);
             const auto dh2View = dh2Ptr->getBlock(0, size);
@@ -355,8 +352,8 @@ TEMPLATE_PRODUCT_TEST_CASE("Scenario: Assigning to DataHandlerCPU", "", (DataHan
         {
             DataHandler<data_t>* dhPtr = &dh;
             const auto dhCopy = dh;
-            Eigen::Matrix<data_t, Eigen::Dynamic, 1> randVec{2 * size};
-            randVec.setRandom();
+
+            auto randVec = generateRandomMatrix<data_t>(2 * size);
             DataHandlerCPU<data_t> dh2{randVec};
             const auto dh2Map = dh2.getBlock(0, size);
 
@@ -379,8 +376,8 @@ TEMPLATE_PRODUCT_TEST_CASE("Scenario: Assigning to DataHandlerCPU", "", (DataHan
         WHEN("\"move\" assigning a full DataHandlerMapCPU (aka a view) through base pointers")
         {
             DataHandler<data_t>* dhPtr = &dh;
-            Eigen::Matrix<data_t, Eigen::Dynamic, 1> randVec{size};
-            randVec.setRandom();
+
+            auto randVec = generateRandomMatrix<data_t>(size);
             DataHandlerCPU<data_t> dh2{randVec};
             const auto dh2View = dh2.getBlock(0, size);
             const auto dh2Map = dh2.getBlock(size / 2, size / 3);
@@ -454,12 +451,11 @@ TEMPLATE_PRODUCT_TEST_CASE("Scenario: Testing the reduction operatios of DataHan
 
     GIVEN("some DataHandler")
     {
-        index_t size = 284;
+        index_t size = 16;
 
         WHEN("putting in some random data")
         {
-            Eigen::Matrix<data_t, Eigen::Dynamic, 1> randVec{size};
-            randVec.setRandom();
+            auto randVec = generateRandomMatrix<data_t>(size);
             TestType dh(randVec);
 
             THEN("the reductions work as expected")
@@ -469,8 +465,7 @@ TEMPLATE_PRODUCT_TEST_CASE("Scenario: Testing the reduction operatios of DataHan
                 REQUIRE(dh.lInfNorm() == Approx(randVec.array().abs().maxCoeff()));
                 REQUIRE(dh.squaredL2Norm() == Approx(randVec.squaredNorm()));
 
-                Eigen::Matrix<data_t, Eigen::Dynamic, 1> randVec2 =
-                    Eigen::Matrix<data_t, Eigen::Dynamic, 1>::Random(size);
+                auto randVec2 = generateRandomMatrix<data_t>(size);
                 TestType dh2(randVec2);
 
                 REQUIRE(checkSameNumbers(dh.dot(dh2), randVec.dot(randVec2)));
@@ -483,8 +478,8 @@ TEMPLATE_PRODUCT_TEST_CASE("Scenario: Testing the reduction operatios of DataHan
             THEN("the dot product expects correctly sized arguments")
             {
                 index_t wrongSize = size - 1;
-                Eigen::Matrix<data_t, Eigen::Dynamic, 1> randVec2 =
-                    Eigen::Matrix<data_t, Eigen::Dynamic, 1>::Random(wrongSize);
+
+                auto randVec2 = generateRandomMatrix<data_t>(wrongSize);
                 TestType dh2(randVec2);
 
                 REQUIRE_THROWS_AS(dh.dot(dh2), std::invalid_argument);
@@ -511,16 +506,14 @@ TEMPLATE_PRODUCT_TEST_CASE("Scenario: Testing the element-wise operations of Dat
 
         WHEN("putting in some random data")
         {
-            Eigen::Matrix<data_t, Eigen::Dynamic, 1> randVec =
-                Eigen::Matrix<data_t, Eigen::Dynamic, 1>::Random(size);
+            auto randVec = generateRandomMatrix<data_t>(size);
             TestType dh(randVec);
 
             THEN("the element-wise binary vector operations work as expected")
             {
                 TestType oldDh = dh;
 
-                Eigen::Matrix<data_t, Eigen::Dynamic, 1> randVec2 =
-                    Eigen::Matrix<data_t, Eigen::Dynamic, 1>::Random(size);
+                auto randVec2 = generateRandomMatrix<data_t>(size);
                 TestType dh2(randVec2);
 
                 auto dhMap = dh2.getBlock(0, dh2.getSize());
@@ -565,14 +558,14 @@ TEMPLATE_PRODUCT_TEST_CASE("Scenario: Testing the element-wise operations of Dat
                 for (index_t i = 0; i < size; ++i)
                     if (dh2[i] != data_t(0))
                         // due to floating point arithmetic less precision
-                        REQUIRE(checkSameNumbers(dh[i], oldDh[i] / dh2[i], 100));
+                        REQUIRE(checkSameNumbers(dh[i], oldDh[i] / dh2[i]));
 
                 dh = oldDh;
                 dh /= *dhMap;
                 for (index_t i = 0; i < size; ++i)
                     if (dh2[i] != data_t(0))
                         // due to floating point arithmetic less precision
-                        REQUIRE(checkSameNumbers(dh[i], oldDh[i] / dh2[i], 100));
+                        REQUIRE(checkSameNumbers(dh[i], oldDh[i] / dh2[i]));
             }
 
             THEN("the element-wise binary scalar operations work as expected")
@@ -669,10 +662,11 @@ TEMPLATE_PRODUCT_TEST_CASE("Scenario: Testing the copy-on-write mechanism", "",
 {
     using data_t = typename TestType::value_type;
 
+    const index_t size = 42;
+
     GIVEN("A random DataContainer")
     {
-        Eigen::Matrix<data_t, Eigen::Dynamic, 1> randVec =
-            Eigen::Matrix<data_t, Eigen::Dynamic, 1>::Random(42);
+        auto randVec = generateRandomMatrix<data_t>(size);
         TestType dh{randVec};
 
         WHEN("const manipulating a copy constructed shallow copy")

elsa/test_routines/testHelpers.h

@@ -4,6 +4,7 @@
 #include <complex>
 #include <random>
 #include "elsaDefines.h"
+#include "DataDescriptor.h"
 
 #include <iomanip>
 #include <limits>
@@ -27,23 +28,17 @@ namespace elsa
      * fails
      */
     template <typename T>
-    bool checkSameNumbers(T left, T right, int epsilonFactor = 1)
+    bool checkSameNumbers(T left, T right)
     {
-        using numericalBaseType = elsa::GetFloatingPointType_t<T>;
-
-        numericalBaseType eps = std::numeric_limits<numericalBaseType>::epsilon()
-                                * static_cast<numericalBaseType>(epsilonFactor)
-                                * static_cast<numericalBaseType>(100);
-
         if constexpr (std::is_same_v<
                           T, std::complex<float>> || std::is_same_v<T, std::complex<double>>) {
-            CHECK(Approx(left.real()).epsilon(eps) == right.real());
-            CHECK(Approx(left.imag()).epsilon(eps) == right.imag());
-            return Approx(left.real()).epsilon(eps) == right.real()
-                   && Approx(left.imag()).epsilon(eps) == right.imag();
+            CHECK(Approx(left.real()).margin(epsilon) == right.real());
+            CHECK(Approx(left.imag()).margin(epsilon) == right.imag());
+            return Approx(left.real()).margin(epsilon) == right.real()
+                   && Approx(left.imag()).margin(epsilon) == right.imag();
         } else {
-            CHECK(Approx(left).epsilon(eps) == right);
-            return Approx(left).epsilon(eps) == right;
+            CHECK(Approx(left).margin(epsilon) == right);
+            return Approx(left).margin(epsilon) == right;
         }
     }
 
@@ -59,17 +54,27 @@ namespace elsa
      * running into overflow issues.
      */
     template <typename data_t>
-    auto generateRandomMatrix(elsa::index_t size)
+    auto generateRandomMatrix(const index_t size)
     {
         Eigen::Matrix<data_t, Eigen::Dynamic, 1> randVec(size);
 
         if constexpr (std::is_integral_v<data_t>) {
+            // Define range depending on signed or unsigned type
+            const auto [rangeBegin, rangeEnd] = []() -> std::tuple<data_t, data_t> {
+                if constexpr (std::is_signed_v<data_t>) {
+                    return {-100, 100};
+                } else {
+                    return {1, 100};
+                }
+            }();
+
             std::random_device rd;
             std::mt19937 eng(rd());
-            std::uniform_int_distribution<> distr(-100, 100);
+            std::uniform_int_distribution<data_t> distr(rangeBegin, rangeEnd);
 
-            for (elsa::index_t i = 0; i < size; ++i) {