code review: was not DRY at all

5 files changed, 61 insertions, 152 deletions

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 <CGAL/Epeck_d.h>
 
-#include <vector>
-#include <limits>  // NaN
-#include <cmath>
-
-#include <gudhi/Alpha_complex.h>
-// to construct a simplex_tree from Delaunay_triangulation
-#include <gudhi/graph_simplicial_complex.h>
-#include <gudhi/Simplex_tree.h>
-#include <gudhi/Unitary_tests_utils.h>
-#include <gudhi/random_point_generators.h>
-
-// 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<Point> points;
-  // 50 points on a 4-sphere
-  points = Gudhi::generate_points_on_sphere_d<Exact_kernel_d>(10, 5, 1.);
-
-  Gudhi::alpha_complex::Alpha_complex<Exact_kernel_d> 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<CGAL::Epeck_d< CGAL::Dynamic_dimension_tag >>();
 }
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 <CGAL/Epeck_d.h>
 
-#include <vector>
-#include <limits>  // NaN
-#include <cmath>
-
-#include <gudhi/Alpha_complex.h>
-// to construct a simplex_tree from Delaunay_triangulation
-#include <gudhi/graph_simplicial_complex.h>
-#include <gudhi/Simplex_tree.h>
-#include <gudhi/Unitary_tests_utils.h>
-#include <gudhi/random_point_generators.h>
-
-// 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<Point> points;
-  // 50 points on a 4-sphere
-  points = Gudhi::generate_points_on_sphere_d<Exact_kernel_s>(10, 5, 1.);
-
-  Gudhi::alpha_complex::Alpha_complex<Exact_kernel_s> 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<CGAL::Epeck_d< CGAL::Dimension_tag<5> >>();
 }
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 <CGAL/Epick_d.h>
 
-#include <vector>
-#include <limits>  // NaN
-#include <cmath>
-
-#include <gudhi/Alpha_complex.h>
-// to construct a simplex_tree from Delaunay_triangulation
-#include <gudhi/graph_simplicial_complex.h>
-#include <gudhi/Simplex_tree.h>
-#include <gudhi/Unitary_tests_utils.h>
-#include <gudhi/random_point_generators.h>
-
-// 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<Point> points;
-  // 50 points on a 4-sphere
-  points = Gudhi::generate_points_on_sphere_d<Inexact_kernel_d>(10, 5, 1.);
-
-  Gudhi::alpha_complex::Alpha_complex<Inexact_kernel_d> 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<CGAL::Epick_d< CGAL::Dynamic_dimension_tag >>();
 }
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 <CGAL/Epick_d.h>
 
-#include <vector>
-#include <limits>  // NaN
-#include <cmath>
-
-#include <gudhi/Alpha_complex.h>
-// to construct a simplex_tree from Delaunay_triangulation
-#include <gudhi/graph_simplicial_complex.h>
-#include <gudhi/Simplex_tree.h>
-#include <gudhi/Unitary_tests_utils.h>
-#include <gudhi/random_point_generators.h>
-
-// 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<Point> points;
-  // 50 points on a 4-sphere
-  points = Gudhi::generate_points_on_sphere_d<Inexact_kernel_s>(10, 5, 1.);
-
-  Gudhi::alpha_complex::Alpha_complex<Inexact_kernel_s> 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<CGAL::Epick_d< CGAL::Dimension_tag<5> >>();
 }
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 <vector>
+#include <limits>  // NaN
+#include <cmath>
+
+#include <gudhi/Alpha_complex.h>
+// to construct a simplex_tree from Delaunay_triangulation
+#include <gudhi/graph_simplicial_complex.h>
+#include <gudhi/Simplex_tree.h>
+#include <gudhi/Unitary_tests_utils.h>
+#include <gudhi/random_point_generators.h>
+
+using Simplex_tree = Gudhi::Simplex_tree<>;
+using Simplex_handle = Simplex_tree::Simplex_handle;
+
+template<class CGAL_kernel>
+void compare_delaunay_complex_simplices() {
+  std::cout << "*****************************************************************************************************";
+  using Point = typename CGAL_kernel::Point_d;
+  std::vector<Point> points;
+  // 50 points on a 4-sphere
+  points = Gudhi::generate_points_on_sphere_d<CGAL_kernel>(10, 5, 1.);
+
+  Gudhi::alpha_complex::Alpha_complex<CGAL_kernel> 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());
+  }
+}