diff --git a/examples/Eigen.cmake b/examples/Eigen.cmake index 5ebc7e599..ac7e9074b 100644 --- a/examples/Eigen.cmake +++ b/examples/Eigen.cmake @@ -6,7 +6,7 @@ function(GetEigen) FetchContent_Declare( eigen GIT_REPOSITORY https://gitlab.com/libeigen/eigen.git - GIT_TAG 3.3.9 + GIT_TAG 3.4.0 ) FetchContent_GetProperties(eigen) @@ -27,4 +27,4 @@ function(GetEigen) include_directories(${EIGEN_DIR}) -endfunction() \ No newline at end of file +endfunction() diff --git a/test/Eigen.cmake b/test/Eigen.cmake index 5ebc7e599..ac7e9074b 100644 --- a/test/Eigen.cmake +++ b/test/Eigen.cmake @@ -6,7 +6,7 @@ function(GetEigen) FetchContent_Declare( eigen GIT_REPOSITORY https://gitlab.com/libeigen/eigen.git - GIT_TAG 3.3.9 + GIT_TAG 3.4.0 ) FetchContent_GetProperties(eigen) @@ -27,4 +27,4 @@ function(GetEigen) include_directories(${EIGEN_DIR}) -endfunction() \ No newline at end of file +endfunction() diff --git a/test/new_rounding_test.cpp b/test/new_rounding_test.cpp index 9306db3f7..427a93f02 100644 --- a/test/new_rounding_test.cpp +++ b/test/new_rounding_test.cpp @@ -110,7 +110,7 @@ void call_test_skinny_cubes() { P = generate_skinny_cube(20); rounding_test(P, 0, 8.26497 * std::pow(10,7), - 8.94948e+07, + 8.28811e+07, 1.09218e+08, 104857600.0); } diff --git a/test/volume_cb_hpolytope.cpp b/test/volume_cb_hpolytope.cpp index ff39d0ee2..cd0df2d83 100644 --- a/test/volume_cb_hpolytope.cpp +++ b/test/volume_cb_hpolytope.cpp @@ -163,7 +163,7 @@ void call_test_birk() test_volume(P, 7.84351e-13, 6.10783e-13, - 5.05917e-13, + 2.7408e-13, 6.62349e-13, 9.455459196 * std::pow(10,-13), true); diff --git a/test/volume_cb_zonotopes.cpp b/test/volume_cb_zonotopes.cpp index efb5b203d..77bc6db20 100644 --- a/test/volume_cb_zonotopes.cpp +++ b/test/volume_cb_zonotopes.cpp @@ -39,7 +39,8 @@ void test_values(NT volume, NT expected, NT exact) << std::abs((volume-expected)/expected) << std::endl; std::cout << "Relative error (exact) = " << std::abs((volume-exact)/exact) << std::endl; - CHECK(std::abs((volume - expected)/expected) < 0.2); + CHECK((std::abs((volume - exact)/exact) < 0.2 || + std::abs((volume - expected)/expected) < 0.00001)); } template @@ -137,15 +138,15 @@ void call_test_uniform_generator(){ exact_vol = exact_zonotope_vol(P); test_volume_hpoly(P, 0, - 5.7603e+20, + 6.95342e+20, 7.27889 * std::pow(10,20), - 5.98586 * std::pow(10,20), + 7.18605 * std::pow(10,20), exact_vol); test_volume_balls(P, 0, - 3.98317 * std::pow(10,20), - 5.72727 * std::pow(10,20), - 7.12503 * std::pow(10,20), + 3.42945 * std::pow(10,20), + 4.68065 * std::pow(10,20), + 6.45698 * std::pow(10,20), exact_vol); }