From d35581357525d02e3126e9fe901904cc764e1f5c Mon Sep 17 00:00:00 2001 From: Vincent Rouvreau Date: Fri, 13 Jan 2023 14:31:59 +0100 Subject: code review: was not DRY at all --- .../Delaunay_complex_Epeck_dynamic_unit_test.cpp | 41 ++---------------- .../Delaunay_complex_Epeck_static_unit_test.cpp | 41 ++---------------- .../Delaunay_complex_Epick_dynamic_unit_test.cpp | 41 ++---------------- .../Delaunay_complex_Epick_static_unit_test.cpp | 41 ++---------------- .../test/Delaunay_complex_unit_test.h | 49 ++++++++++++++++++++++ 5 files changed, 61 insertions(+), 152 deletions(-) create mode 100644 src/Alpha_complex/test/Delaunay_complex_unit_test.h diff --git a/src/Alpha_complex/test/Delaunay_complex_Epeck_dynamic_unit_test.cpp b/src/Alpha_complex/test/Delaunay_complex_Epeck_dynamic_unit_test.cpp index 575a36fc..afe065fc 100644 --- a/src/Alpha_complex/test/Delaunay_complex_Epeck_dynamic_unit_test.cpp +++ b/src/Alpha_complex/test/Delaunay_complex_Epeck_dynamic_unit_test.cpp @@ -14,44 +14,9 @@ #include -#include -#include // NaN -#include - -#include -// to construct a simplex_tree from Delaunay_triangulation -#include -#include -#include -#include - -// Use dynamic_dimension_tag for the user to be able to set dimension -typedef CGAL::Epeck_d< CGAL::Dynamic_dimension_tag > Exact_kernel_d; - -using Simplex_tree = Gudhi::Simplex_tree<>; -using Simplex_handle = Simplex_tree::Simplex_handle; +#include "Delaunay_complex_unit_test.h" BOOST_AUTO_TEST_CASE(Delaunay_complex_exact_kernel_dynamic_simplices_comparison) { - std::cout << "*****************************************************************************************************"; - using Point = typename Exact_kernel_d::Point_d; - std::vector points; - // 50 points on a 4-sphere - points = Gudhi::generate_points_on_sphere_d(10, 5, 1.); - - Gudhi::alpha_complex::Alpha_complex alpha_complex(points); - - // Alpha complex - Simplex_tree stree_from_alpha_complex; - BOOST_CHECK(alpha_complex.create_complex(stree_from_alpha_complex)); - - // Delaunay complex - Simplex_tree stree_from_delaunay_complex; - BOOST_CHECK(alpha_complex.create_complex(stree_from_delaunay_complex, 0., false, true)); - - // Check all the simplices from alpha complex are in the Delaunay complex - for (auto f_simplex : stree_from_alpha_complex.complex_simplex_range()) { - Simplex_handle sh = stree_from_delaunay_complex.find(stree_from_alpha_complex.simplex_vertex_range(f_simplex)); - BOOST_CHECK(std::isnan(stree_from_delaunay_complex.filtration(sh))); - BOOST_CHECK(sh != stree_from_delaunay_complex.null_simplex()); - } + // Use dynamic_dimension_tag for the user to be able to set dimension + compare_delaunay_complex_simplices>(); } diff --git a/src/Alpha_complex/test/Delaunay_complex_Epeck_static_unit_test.cpp b/src/Alpha_complex/test/Delaunay_complex_Epeck_static_unit_test.cpp index fd69a81e..c84766ea 100644 --- a/src/Alpha_complex/test/Delaunay_complex_Epeck_static_unit_test.cpp +++ b/src/Alpha_complex/test/Delaunay_complex_Epeck_static_unit_test.cpp @@ -14,44 +14,9 @@ #include -#include -#include // NaN -#include - -#include -// to construct a simplex_tree from Delaunay_triangulation -#include -#include -#include -#include - -// Use static dimension_tag for the user not to be able to set dimension -typedef CGAL::Epeck_d< CGAL::Dimension_tag<5> > Exact_kernel_s; - -using Simplex_tree = Gudhi::Simplex_tree<>; -using Simplex_handle = Simplex_tree::Simplex_handle; +#include "Delaunay_complex_unit_test.h" BOOST_AUTO_TEST_CASE(Delaunay_complex_exact_kernel_static_simplices_comparison) { - std::cout << "*****************************************************************************************************"; - using Point = typename Exact_kernel_s::Point_d; - std::vector points; - // 50 points on a 4-sphere - points = Gudhi::generate_points_on_sphere_d(10, 5, 1.); - - Gudhi::alpha_complex::Alpha_complex alpha_complex(points); - - // Alpha complex - Simplex_tree stree_from_alpha_complex; - BOOST_CHECK(alpha_complex.create_complex(stree_from_alpha_complex)); - - // Delaunay complex - Simplex_tree stree_from_delaunay_complex; - BOOST_CHECK(alpha_complex.create_complex(stree_from_delaunay_complex, 0., false, true)); - - // Check all the simplices from alpha complex are in the Delaunay complex - for (auto f_simplex : stree_from_alpha_complex.complex_simplex_range()) { - Simplex_handle sh = stree_from_delaunay_complex.find(stree_from_alpha_complex.simplex_vertex_range(f_simplex)); - BOOST_CHECK(std::isnan(stree_from_delaunay_complex.filtration(sh))); - BOOST_CHECK(sh != stree_from_delaunay_complex.null_simplex()); - } + // Use static dimension_tag for the user not to be able to set dimension + compare_delaunay_complex_simplices >>(); } diff --git a/src/Alpha_complex/test/Delaunay_complex_Epick_dynamic_unit_test.cpp b/src/Alpha_complex/test/Delaunay_complex_Epick_dynamic_unit_test.cpp index e04d86bb..956bab41 100644 --- a/src/Alpha_complex/test/Delaunay_complex_Epick_dynamic_unit_test.cpp +++ b/src/Alpha_complex/test/Delaunay_complex_Epick_dynamic_unit_test.cpp @@ -14,44 +14,9 @@ #include -#include -#include // NaN -#include - -#include -// to construct a simplex_tree from Delaunay_triangulation -#include -#include -#include -#include - -// Use dynamic_dimension_tag for the user to be able to set dimension -typedef CGAL::Epick_d< CGAL::Dynamic_dimension_tag > Inexact_kernel_d; - -using Simplex_tree = Gudhi::Simplex_tree<>; -using Simplex_handle = Simplex_tree::Simplex_handle; +#include "Delaunay_complex_unit_test.h" BOOST_AUTO_TEST_CASE(Delaunay_complex_inexact_kernel_dynamic_simplices_comparison) { - std::cout << "*****************************************************************************************************"; - using Point = typename Inexact_kernel_d::Point_d; - std::vector points; - // 50 points on a 4-sphere - points = Gudhi::generate_points_on_sphere_d(10, 5, 1.); - - Gudhi::alpha_complex::Alpha_complex alpha_complex(points); - - // Alpha complex - Simplex_tree stree_from_alpha_complex; - BOOST_CHECK(alpha_complex.create_complex(stree_from_alpha_complex)); - - // Delaunay complex - Simplex_tree stree_from_delaunay_complex; - BOOST_CHECK(alpha_complex.create_complex(stree_from_delaunay_complex, 0., false, true)); - - // Check all the simplices from alpha complex are in the Delaunay complex - for (auto f_simplex : stree_from_alpha_complex.complex_simplex_range()) { - Simplex_handle sh = stree_from_delaunay_complex.find(stree_from_alpha_complex.simplex_vertex_range(f_simplex)); - BOOST_CHECK(std::isnan(stree_from_delaunay_complex.filtration(sh))); - BOOST_CHECK(sh != stree_from_delaunay_complex.null_simplex()); - } + // Use dynamic_dimension_tag for the user to be able to set dimension + compare_delaunay_complex_simplices>(); } diff --git a/src/Alpha_complex/test/Delaunay_complex_Epick_static_unit_test.cpp b/src/Alpha_complex/test/Delaunay_complex_Epick_static_unit_test.cpp index 6bd2a72c..a401f09e 100644 --- a/src/Alpha_complex/test/Delaunay_complex_Epick_static_unit_test.cpp +++ b/src/Alpha_complex/test/Delaunay_complex_Epick_static_unit_test.cpp @@ -14,44 +14,9 @@ #include -#include -#include // NaN -#include - -#include -// to construct a simplex_tree from Delaunay_triangulation -#include -#include -#include -#include - -// Use static dimension_tag for the user not to be able to set dimension -typedef CGAL::Epick_d< CGAL::Dimension_tag<5> > Inexact_kernel_s; - -using Simplex_tree = Gudhi::Simplex_tree<>; -using Simplex_handle = Simplex_tree::Simplex_handle; +#include "Delaunay_complex_unit_test.h" BOOST_AUTO_TEST_CASE(Delaunay_complex_inexact_kernel_static_simplices_comparison) { - std::cout << "*****************************************************************************************************"; - using Point = typename Inexact_kernel_s::Point_d; - std::vector points; - // 50 points on a 4-sphere - points = Gudhi::generate_points_on_sphere_d(10, 5, 1.); - - Gudhi::alpha_complex::Alpha_complex alpha_complex(points); - - // Alpha complex - Simplex_tree stree_from_alpha_complex; - BOOST_CHECK(alpha_complex.create_complex(stree_from_alpha_complex)); - - // Delaunay complex - Simplex_tree stree_from_delaunay_complex; - BOOST_CHECK(alpha_complex.create_complex(stree_from_delaunay_complex, 0., false, true)); - - // Check all the simplices from alpha complex are in the Delaunay complex - for (auto f_simplex : stree_from_alpha_complex.complex_simplex_range()) { - Simplex_handle sh = stree_from_delaunay_complex.find(stree_from_alpha_complex.simplex_vertex_range(f_simplex)); - BOOST_CHECK(std::isnan(stree_from_delaunay_complex.filtration(sh))); - BOOST_CHECK(sh != stree_from_delaunay_complex.null_simplex()); - } + // Use static dimension_tag for the user not to be able to set dimension + compare_delaunay_complex_simplices >>(); } diff --git a/src/Alpha_complex/test/Delaunay_complex_unit_test.h b/src/Alpha_complex/test/Delaunay_complex_unit_test.h new file mode 100644 index 00000000..e9a73f62 --- /dev/null +++ b/src/Alpha_complex/test/Delaunay_complex_unit_test.h @@ -0,0 +1,49 @@ +/* This file is part of the Gudhi Library - https://gudhi.inria.fr/ - which is released under MIT. + * See file LICENSE or go to https://gudhi.inria.fr/licensing/ for full license details. + * Author(s): Vincent Rouvreau + * + * Copyright (C) 2020 Inria + * + * Modification(s): + * - YYYY/MM Author: Description of the modification + */ + +#include +#include // NaN +#include + +#include +// to construct a simplex_tree from Delaunay_triangulation +#include +#include +#include +#include + +using Simplex_tree = Gudhi::Simplex_tree<>; +using Simplex_handle = Simplex_tree::Simplex_handle; + +template +void compare_delaunay_complex_simplices() { + std::cout << "*****************************************************************************************************"; + using Point = typename CGAL_kernel::Point_d; + std::vector points; + // 50 points on a 4-sphere + points = Gudhi::generate_points_on_sphere_d(10, 5, 1.); + + Gudhi::alpha_complex::Alpha_complex alpha_complex(points); + + // Alpha complex + Simplex_tree stree_from_alpha_complex; + BOOST_CHECK(alpha_complex.create_complex(stree_from_alpha_complex)); + + // Delaunay complex + Simplex_tree stree_from_delaunay_complex; + BOOST_CHECK(alpha_complex.create_complex(stree_from_delaunay_complex, 0., false, true)); + + // Check all the simplices from alpha complex are in the Delaunay complex + for (auto f_simplex : stree_from_alpha_complex.complex_simplex_range()) { + Simplex_handle sh = stree_from_delaunay_complex.find(stree_from_alpha_complex.simplex_vertex_range(f_simplex)); + BOOST_CHECK(std::isnan(stree_from_delaunay_complex.filtration(sh))); + BOOST_CHECK(sh != stree_from_delaunay_complex.null_simplex()); + } +} -- cgit v1.2.3