From d7439bfa8f99aaa198b3e58c0629daee170e35e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mael=20Rouxel-Labb=C3=A9?= Date: Fri, 3 Feb 2017 19:01:46 +0100 Subject: [PATCH] Updated examples -- Removing CGAL/Regular_triangulation_euclidean_traits_3.h -- Using Regular_triangulation_vertex_base_3 --- .../p3rt3_hidden_points.cpp | 30 ++++++-------- .../p3rt3_insert_only.cpp | 41 +++++++++---------- .../p3rt3_insert_point_with_bad_weight.cpp | 31 +++++++------- .../p3rt3_insert_remove.cpp | 24 +++++------ 4 files changed, 57 insertions(+), 69 deletions(-) diff --git a/Periodic_3_triangulation_3/examples/Periodic_3_triangulation_3/p3rt3_hidden_points.cpp b/Periodic_3_triangulation_3/examples/Periodic_3_triangulation_3/p3rt3_hidden_points.cpp index e45997636c1..03eee23579d 100644 --- a/Periodic_3_triangulation_3/examples/Periodic_3_triangulation_3/p3rt3_hidden_points.cpp +++ b/Periodic_3_triangulation_3/examples/Periodic_3_triangulation_3/p3rt3_hidden_points.cpp @@ -1,35 +1,29 @@ #include -#include #include #include #include +typedef CGAL::Epick K; +typedef CGAL::Periodic_3_regular_triangulation_traits_3 Gt; +typedef CGAL::Periodic_3_regular_triangulation_3 P3RT3; -typedef CGAL::Epick K; -typedef K::FT FT; - -typedef CGAL::Regular_triangulation_euclidean_traits_3 RT; -typedef CGAL::Periodic_3_regular_triangulation_traits_3 Traits; -typedef CGAL::Periodic_3_regular_triangulation_3 P3RT3; - -typedef Traits::Iso_cuboid_3 Iso_cuboid; -typedef Traits::Weighted_point Weighted_point; -typedef Traits::Bare_point Bare_point; - -typedef P3RT3::Vertex_handle Vertex_handle; +typedef Gt::Iso_cuboid_3 Iso_cuboid; +typedef Gt::Point_3 Point_3; +typedef Gt::Weighted_point_3 Weighted_point_3; +typedef P3RT3::Vertex_handle Vertex_handle; int main () { P3RT3 p3rt3(P3RT3::Iso_cuboid(0,0,0, 1,1,1)); - p3rt3.insert(Weighted_point(Bare_point(0.1,0.1,0.1),0.01)); - p3rt3.insert(Weighted_point(Bare_point(0.9,0.1,0.1),0.01)); - p3rt3.insert(Weighted_point(Bare_point(0.1,0.91,0.1),0.01)); - p3rt3.insert(Weighted_point(Bare_point(0.1,0.1,0.89),0.01)); - p3rt3.insert(Weighted_point(Bare_point(0.101, 0.101, 0.101), 0.001)); + p3rt3.insert(Weighted_point_3(Point_3(0.1,0.1,0.1), 0.01)); + p3rt3.insert(Weighted_point_3(Point_3(0.9,0.1,0.1), 0.01)); + p3rt3.insert(Weighted_point_3(Point_3(0.1,0.91,0.1), 0.01)); + p3rt3.insert(Weighted_point_3(Point_3(0.1,0.1,0.89), 0.01)); + p3rt3.insert(Weighted_point_3(Point_3(0.101,0.101,0.101), 0.001)); assert(p3rt3.is_valid()); std::cout << "Number of vertices : " << p3rt3.number_of_vertices() << std::endl; diff --git a/Periodic_3_triangulation_3/examples/Periodic_3_triangulation_3/p3rt3_insert_only.cpp b/Periodic_3_triangulation_3/examples/Periodic_3_triangulation_3/p3rt3_insert_only.cpp index cead0818e58..1908e5415f6 100644 --- a/Periodic_3_triangulation_3/examples/Periodic_3_triangulation_3/p3rt3_insert_only.cpp +++ b/Periodic_3_triangulation_3/examples/Periodic_3_triangulation_3/p3rt3_insert_only.cpp @@ -1,30 +1,29 @@ #include -#include +#include +#include #include #include #include +typedef CGAL::Epick K; +typedef CGAL::Periodic_3_regular_triangulation_traits_3 Gt; -typedef CGAL::Epick K; -typedef K::FT FT; - -typedef CGAL::Regular_triangulation_euclidean_traits_3 RT; -typedef CGAL::Periodic_3_regular_triangulation_traits_3 Traits; - -/* If remove() isn't called in our program, we can use a triangulation data structure more appropriate - * which saves some memory resources. +/* If remove() isn't called in our program, we can use a triangulation data structure + * more appropriate, which saves some memory resources. */ -typedef CGAL::Triangulation_vertex_base_3 > Vb; -typedef CGAL::Triangulation_cell_base_3 > Cb; -typedef CGAL::Triangulation_data_structure_3 Tds; +typedef CGAL::Regular_triangulation_vertex_base_3 > Vb; +typedef CGAL::Regular_triangulation_cell_base_3 > Cb; +typedef CGAL::Triangulation_data_structure_3 Tds; -typedef CGAL::Periodic_3_regular_triangulation_3 P3RT3; +typedef CGAL::Periodic_3_regular_triangulation_3 P3RT3; -typedef Traits::Iso_cuboid_3 Iso_cuboid; -typedef Traits::Weighted_point Weighted_point; -typedef Traits::Bare_point Bare_point; +typedef Gt::Iso_cuboid_3 Iso_cuboid; +typedef Gt::Weighted_point_3 Weighted_point_3; +typedef Gt::Point_3 Point_3; typedef P3RT3::Vertex_handle Vertex_handle; @@ -32,11 +31,11 @@ int main () { P3RT3 p3rt3(P3RT3::Iso_cuboid(0,0,0, 1,1,1)); - p3rt3.insert(Weighted_point(Bare_point(0.1,0.1,0.1),0.01)); - p3rt3.insert(Weighted_point(Bare_point(0.9,0.1,0.1),0.01)); - p3rt3.insert(Weighted_point(Bare_point(0.1,0.9,0.1),0.01)); - p3rt3.insert(Weighted_point(Bare_point(0.1,0.1,0.9),0.01)); - p3rt3.insert(Weighted_point(Bare_point(0.4, 0.4, 0.4), 0.001)); + p3rt3.insert(Weighted_point_3(Point_3(0.1,0.1,0.1), 0.01)); + p3rt3.insert(Weighted_point_3(Point_3(0.9,0.1,0.1), 0.01)); + p3rt3.insert(Weighted_point_3(Point_3(0.1,0.9,0.1), 0.01)); + p3rt3.insert(Weighted_point_3(Point_3(0.1,0.1,0.9), 0.01)); + p3rt3.insert(Weighted_point_3(Point_3(0.4,0.4,0.4), 0.001)); std::cout << "EXIT SUCCESS" << std::endl; return 0; diff --git a/Periodic_3_triangulation_3/examples/Periodic_3_triangulation_3/p3rt3_insert_point_with_bad_weight.cpp b/Periodic_3_triangulation_3/examples/Periodic_3_triangulation_3/p3rt3_insert_point_with_bad_weight.cpp index 0fa884963e6..ae29136c01c 100644 --- a/Periodic_3_triangulation_3/examples/Periodic_3_triangulation_3/p3rt3_insert_point_with_bad_weight.cpp +++ b/Periodic_3_triangulation_3/examples/Periodic_3_triangulation_3/p3rt3_insert_point_with_bad_weight.cpp @@ -1,37 +1,36 @@ #include -#include +#include +#include #include #include #include - -typedef CGAL::Epick K; -typedef K::FT FT; - -typedef CGAL::Regular_triangulation_euclidean_traits_3 RT; -typedef CGAL::Periodic_3_regular_triangulation_traits_3 Traits; +typedef CGAL::Epick K; +typedef CGAL::Periodic_3_regular_triangulation_traits_3 Gt; /* If remove() isn't called in our program, we can use a triangulation data structure more appropriate * which saves some memory resources. */ -typedef CGAL::Triangulation_vertex_base_3 > Vb; -typedef CGAL::Triangulation_cell_base_3 > Cb; -typedef CGAL::Triangulation_data_structure_3 Tds; +typedef CGAL::Regular_triangulation_vertex_base_3 > Vb; +typedef CGAL::Regular_triangulation_cell_base_3 > Cb; +typedef CGAL::Triangulation_data_structure_3 Tds; -typedef CGAL::Periodic_3_regular_triangulation_3 P3RT3; - -typedef Traits::Iso_cuboid_3 Iso_cuboid; -typedef Traits::Weighted_point Weighted_point; -typedef Traits::Bare_point Bare_point; +typedef CGAL::Periodic_3_regular_triangulation_3 P3RT3; +typedef Gt::Iso_cuboid_3 Iso_cuboid; +typedef Gt::Weighted_point_3 Weighted_point_3; +typedef Gt::Point_3 Point_3; int main () { P3RT3 p3rt3(P3RT3::Iso_cuboid(0,0,0, 1,1,1)); -// p3rt3.insert(Weighted_point(Bare_point(0.5,0.5,0.5),1.)); // Here, we insert a point with a bad weight. + // Here, we insert a point with a bad weight. +// p3rt3.insert(Weighted_point_3(Point_3(0.5,0.5,0.5), 1.)); // In debug mode, if we uncomment the previous instruction, the program displays the following error message : // terminate called after throwing an instance of 'CGAL::Precondition_exception' diff --git a/Periodic_3_triangulation_3/examples/Periodic_3_triangulation_3/p3rt3_insert_remove.cpp b/Periodic_3_triangulation_3/examples/Periodic_3_triangulation_3/p3rt3_insert_remove.cpp index d7eb6147143..f83e0189a95 100644 --- a/Periodic_3_triangulation_3/examples/Periodic_3_triangulation_3/p3rt3_insert_remove.cpp +++ b/Periodic_3_triangulation_3/examples/Periodic_3_triangulation_3/p3rt3_insert_remove.cpp @@ -1,6 +1,5 @@ #include -#include #include #include @@ -10,26 +9,23 @@ typedef CGAL::Epick K; typedef K::FT FT; -typedef CGAL::Regular_triangulation_euclidean_traits_3 RT; -typedef CGAL::Periodic_3_regular_triangulation_traits_3 Traits; -typedef CGAL::Periodic_3_regular_triangulation_3 P3RT3; +typedef CGAL::Periodic_3_regular_triangulation_traits_3 Gt; +typedef CGAL::Periodic_3_regular_triangulation_3 P3RT3; -typedef Traits::Iso_cuboid_3 Iso_cuboid; -typedef Traits::Weighted_point Weighted_point; -typedef Traits::Bare_point Bare_point; - -typedef P3RT3::Vertex_handle Vertex_handle; +typedef Gt::Weighted_point_3 Weighted_point_3; +typedef Gt::Point_3 Point_3; +typedef P3RT3::Vertex_handle Vertex_handle; int main () { P3RT3 p3rt3(P3RT3::Iso_cuboid(0,0,0, 1,1,1)); - p3rt3.insert(Weighted_point(Bare_point(0.1,0.1,0.1),0.01)); - p3rt3.insert(Weighted_point(Bare_point(0.9,0.1,0.1),0.01)); - p3rt3.insert(Weighted_point(Bare_point(0.1,0.9,0.1),0.01)); - p3rt3.insert(Weighted_point(Bare_point(0.1,0.1,0.9),0.01)); - p3rt3.insert(Weighted_point(Bare_point(0.4, 0.4, 0.4), 0.001)); + p3rt3.insert(Weighted_point_3(Point_3(0.1,0.1,0.1), 0.01)); + p3rt3.insert(Weighted_point_3(Point_3(0.9,0.1,0.1), 0.01)); + p3rt3.insert(Weighted_point_3(Point_3(0.1,0.9,0.1), 0.01)); + p3rt3.insert(Weighted_point_3(Point_3(0.1,0.1,0.9), 0.01)); + p3rt3.insert(Weighted_point_3(Point_3(0.4,0.4,0.4), 0.001)); while (p3rt3.number_of_vertices()) p3rt3.remove(p3rt3.vertices_begin());