From 99537e4671cbcbd1d0f40eb3fcd62a5e54903b86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mael=20Rouxel-Labb=C3=A9?= Date: Wed, 14 Jun 2017 17:46:53 +0200 Subject: [PATCH] Minor improvements to P3T3's tests -- It's a bit dangerous to take random points in the complete periodic domain because insert(p) should have p in the original domain and half the border of the periodic domain is open -- Cleaned some unused variables --- .../include/CGAL/_test_cls_periodic_3_delaunay_3.h | 12 ++++++------ .../test_p3rt3_insert_remove_point_set.cpp | 4 ++-- .../test_periodic_3_regular_triangulation_3.cpp | 12 ++++++------ 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Periodic_3_triangulation_3/test/Periodic_3_triangulation_3/include/CGAL/_test_cls_periodic_3_delaunay_3.h b/Periodic_3_triangulation_3/test/Periodic_3_triangulation_3/include/CGAL/_test_cls_periodic_3_delaunay_3.h index d0bbabd90e0..ece2c6702c3 100644 --- a/Periodic_3_triangulation_3/test/Periodic_3_triangulation_3/include/CGAL/_test_cls_periodic_3_delaunay_3.h +++ b/Periodic_3_triangulation_3/test/Periodic_3_triangulation_3/include/CGAL/_test_cls_periodic_3_delaunay_3.h @@ -105,7 +105,7 @@ _test_cls_periodic_3_delaunay_3(const Periodic_3Triangulation_3 &, pts_rnd10.push_back(Point(-0.255508, 0.816668, 0.823991 )); // Create a triangulation for testing - P3T3 PT(pts_rnd10.begin(), pts_rnd10.end(), Iso_cuboid(-1,-1,-1,1,1,1)); + P3T3 PT(pts_rnd10.begin(), pts_rnd10.end(), Iso_cuboid(-1,-1,-1, 1,1,1)); assert(PT.number_of_vertices() == 10); assert(PT.is_valid()); @@ -117,11 +117,11 @@ _test_cls_periodic_3_delaunay_3(const Periodic_3Triangulation_3 &, assert(PT_def.number_of_vertices() == 0); assert(PT_def.is_valid()); - P3T3 PT_dom(Iso_cuboid(-1,-2,0,3,2,4)); + P3T3 PT_dom(Iso_cuboid(-1,-2,0, 3,2,4)); assert(PT_dom.number_of_vertices() == 0); assert(PT_dom.is_valid()); - P3T3 PT_gt(Iso_cuboid(0,0,0,1,1,1),GT()); + P3T3 PT_gt(Iso_cuboid(0,0,0, 1,1,1), GT()); assert(PT_gt.number_of_vertices() == 0); assert(PT_gt.is_valid()); @@ -133,8 +133,7 @@ _test_cls_periodic_3_delaunay_3(const Periodic_3Triangulation_3 &, std::cout << " Special constructor" << std::endl; - P3T3 PT_range(pts_rnd10.begin(), pts_rnd10.end(), - Iso_cuboid(-1,-1,-1,1,1,1)); + P3T3 PT_range(pts_rnd10.begin(), pts_rnd10.end(), Iso_cuboid(-1,-1,-1, 1,1,1)); assert(PT_range.number_of_vertices() == 10); assert(PT_range.is_valid()); @@ -214,7 +213,8 @@ _test_cls_periodic_3_delaunay_3(const Periodic_3Triangulation_3 &, std::cout << " Iterator range insertion" << std::endl; - P3T3 PT_range_ins(Iso_cuboid(-1,-1,-1,1,1,1)); + // "1.1" because random points are in the cube (-1,-1,-1, 1,1,1) + P3T3 PT_range_ins(Iso_cuboid(-1,-1,-1, 1.1,1.1,1.1)); pts_rnd1000.push_back(Point(-1,-1,-1)); assert(PT_range_ins.insert(pts_rnd1000.begin(), pts_rnd1000.end(), true) == 1001); diff --git a/Periodic_3_triangulation_3/test/Periodic_3_triangulation_3/test_p3rt3_insert_remove_point_set.cpp b/Periodic_3_triangulation_3/test/Periodic_3_triangulation_3/test_p3rt3_insert_remove_point_set.cpp index d5a3263c035..e17cfff6ad5 100644 --- a/Periodic_3_triangulation_3/test/Periodic_3_triangulation_3/test_p3rt3_insert_remove_point_set.cpp +++ b/Periodic_3_triangulation_3/test/Periodic_3_triangulation_3/test_p3rt3_insert_remove_point_set.cpp @@ -84,8 +84,8 @@ public: std::cout << "--- test_insert_rnd (" << pt_count << ", " << seed << ')' << std::endl; CGAL::Random random(seed); - typedef CGAL::Creator_uniform_3 Creator; - CGAL::Random_points_in_cube_3 in_cube(0.5, random); +// typedef CGAL::Creator_uniform_3 Creator; +// CGAL::Random_points_in_cube_3 in_cube(0.5, random); Iso_cuboid iso_cuboid(-0.5, -0.5, -0.5, 0.5, 0.5, 0.5); P3RT3 p3rt3(iso_cuboid); diff --git a/Periodic_3_triangulation_3/test/Periodic_3_triangulation_3/test_periodic_3_regular_triangulation_3.cpp b/Periodic_3_triangulation_3/test/Periodic_3_triangulation_3/test_periodic_3_regular_triangulation_3.cpp index e0297ccdffb..a31e7717064 100644 --- a/Periodic_3_triangulation_3/test/Periodic_3_triangulation_3/test_periodic_3_regular_triangulation_3.cpp +++ b/Periodic_3_triangulation_3/test/Periodic_3_triangulation_3/test_periodic_3_regular_triangulation_3.cpp @@ -343,7 +343,7 @@ public: typedef CGAL::Creator_uniform_3 Creator; CGAL::Random_points_in_cube_3 in_cube(0.5, random); - Iso_cuboid iso_cuboid(-0.5, -0.5, -0.5, 0.5, 0.5, 0.5); + Iso_cuboid iso_cuboid(-0.5, -0.5, -0.5, 0.6, 0.6, 0.6); P3RT3 p3rt3(iso_cuboid); for (unsigned cnt = 1; cnt <= pt_count; ++cnt) @@ -488,13 +488,13 @@ public: assert(p3rt3 == p3rt3_b); } - static void test_insert_range (unsigned pt_count, unsigned seed) + static void test_insert_range (unsigned pt_count, unsigned /* seed */) { std::cout << "--- test_insert_range" << std::endl; - CGAL::Random random(seed); - typedef CGAL::Creator_uniform_3 Creator; - CGAL::Random_points_in_cube_3 in_cube(0.5, random); +// CGAL::Random random(seed); +// typedef CGAL::Creator_uniform_3 Creator; +// CGAL::Random_points_in_cube_3 in_cube(0.5, random); Iso_cuboid iso_cuboid(-0.5, -0.5, -0.5, 0.5, 0.5, 0.5); P3RT3 p3rt3(iso_cuboid); @@ -693,7 +693,7 @@ public: typedef CGAL::Creator_uniform_3 Creator; CGAL::Random_points_in_cube_3 in_cube(0.5, random); - Iso_cuboid iso_cuboid(-0.5, -0.5, -0.5, 0.5, 0.5, 0.5); + Iso_cuboid iso_cuboid(-0.5, -0.5, -0.5, 0.6, 0.6, 0.6); P3RT3 p3rt3(iso_cuboid); std::vector points;