diff --git a/Triangulation_2/include/CGAL/Triangulation_face_base_2.h b/Triangulation_2/include/CGAL/Triangulation_face_base_2.h index a3ebc0c6428..f2af9d5607a 100644 --- a/Triangulation_2/include/CGAL/Triangulation_face_base_2.h +++ b/Triangulation_2/include/CGAL/Triangulation_face_base_2.h @@ -15,7 +15,7 @@ // $URL$ // $Id$ // SPDX-License-Identifier: GPL-3.0+ -// +// // // Author(s) : Mariette Yvinec @@ -29,10 +29,10 @@ #include #include -namespace CGAL { +namespace CGAL { template < typename Gt, typename Fb = Triangulation_ds_face_base_2<> > -class Triangulation_face_base_2 +class Triangulation_face_base_2 : public Fb { public: @@ -50,17 +50,17 @@ public: Triangulation_face_base_2() : Fb() {} - Triangulation_face_base_2(Vertex_handle v0, - Vertex_handle v1, - Vertex_handle v2) + Triangulation_face_base_2(Vertex_handle v0, + Vertex_handle v1, + Vertex_handle v2) : Fb(v0,v1,v2) {} - Triangulation_face_base_2(Vertex_handle v0, - Vertex_handle v1, - Vertex_handle v2, - Face_handle n0, - Face_handle n1, - Face_handle n2) + Triangulation_face_base_2(Vertex_handle v0, + Vertex_handle v1, + Vertex_handle v2, + Face_handle n0, + Face_handle n1, + Face_handle n2) : Fb(v0,v1,v2,n0,n1,n2) {} static int ccw(int i) {return Triangulation_cw_ccw_2::ccw(i);} diff --git a/Triangulation_3/examples/Triangulation_3/adding_handles_3.cpp b/Triangulation_3/examples/Triangulation_3/adding_handles_3.cpp index 51e2700e4cb..d67300be228 100644 --- a/Triangulation_3/examples/Triangulation_3/adding_handles_3.cpp +++ b/Triangulation_3/examples/Triangulation_3/adding_handles_3.cpp @@ -20,12 +20,8 @@ public: }; My_vertex_base() {} - - My_vertex_base(const Point& p) - : Vb(p) {} - - My_vertex_base(const Point& p, Cell_handle c) - : Vb(p, c) {} + My_vertex_base(const Point& p) : Vb(p) {} + My_vertex_base(const Point& p, Cell_handle c) : Vb(p, c) {} Vertex_handle vh; Cell_handle ch; diff --git a/Triangulation_3/examples/Triangulation_3/fast_location_3.cpp b/Triangulation_3/examples/Triangulation_3/fast_location_3.cpp index 169f0ef6e03..ec632f73d03 100644 --- a/Triangulation_3/examples/Triangulation_3/fast_location_3.cpp +++ b/Triangulation_3/examples/Triangulation_3/fast_location_3.cpp @@ -17,19 +17,18 @@ int main() for (int z=0 ; z<20 ; z++) for (int y=0 ; y<20 ; y++) for (int x=0 ; x<20 ; x++) - P.push_back(Point(x,y,z)); + P.push_back(Point(x,y,z)); // building their Delaunay triangulation. Delaunay T(P.begin(), P.end()); - assert( T.number_of_vertices() == 8000 ); // performing nearest vertex queries to a series of random points, // which is a case where the Fast_location policy is beneficial. for (int i=0; i<10000; ++i) T.nearest_vertex(Point(CGAL::get_default_random().get_double(0, 20), - CGAL::get_default_random().get_double(0, 20), - CGAL::get_default_random().get_double(0, 20))); + CGAL::get_default_random().get_double(0, 20), + CGAL::get_default_random().get_double(0, 20))); return 0; } diff --git a/Triangulation_3/examples/Triangulation_3/info_insert_with_transform_iterator.cpp b/Triangulation_3/examples/Triangulation_3/info_insert_with_transform_iterator.cpp index 907f50bebba..ed90de5d873 100644 --- a/Triangulation_3/examples/Triangulation_3/info_insert_with_transform_iterator.cpp +++ b/Triangulation_3/examples/Triangulation_3/info_insert_with_transform_iterator.cpp @@ -35,12 +35,11 @@ int main() points.push_back(Point(2,2,2)); points.push_back(Point(-1,0,1)); - Delaunay T( boost::make_transform_iterator(points.begin(),Auto_count()), boost::make_transform_iterator(points.end(), Auto_count() ) ); CGAL_assertion( T.number_of_vertices() == 6 ); - + // check that the info was correctly set. Delaunay::Finite_vertices_iterator vit; for (vit = T.finite_vertices_begin(); vit != T.finite_vertices_end(); ++vit) @@ -49,6 +48,6 @@ int main() exit(EXIT_FAILURE); } std::cout << "OK" << std::endl; - + return 0; } diff --git a/Triangulation_3/examples/Triangulation_3/info_insert_with_zip_iterator.cpp b/Triangulation_3/examples/Triangulation_3/info_insert_with_zip_iterator.cpp index 22b3c564e20..6282291f91a 100644 --- a/Triangulation_3/examples/Triangulation_3/info_insert_with_zip_iterator.cpp +++ b/Triangulation_3/examples/Triangulation_3/info_insert_with_zip_iterator.cpp @@ -18,15 +18,14 @@ typedef Delaunay::Point Point; int main() { - std::vector indices; indices.push_back(0); indices.push_back(1); indices.push_back(2); indices.push_back(3); indices.push_back(4); - indices.push_back(5); - + indices.push_back(5); + std::vector points; points.push_back(Point(0,0,0)); points.push_back(Point(1,0,0)); @@ -35,21 +34,18 @@ int main() points.push_back(Point(2,2,2)); points.push_back(Point(-1,0,1)); - - Delaunay T( boost::make_zip_iterator(boost::make_tuple( points.begin(),indices.begin() )), boost::make_zip_iterator(boost::make_tuple( points.end(),indices.end() ) ) ); CGAL_assertion( T.number_of_vertices() == 6 ); - - + // check that the info was correctly set. Delaunay::Finite_vertices_iterator vit; for (vit = T.finite_vertices_begin(); vit != T.finite_vertices_end(); ++vit) if( points[ vit->info() ] != vit->point() ){ std::cerr << "Error different info" << std::endl; exit(EXIT_FAILURE); - } + } return 0; } diff --git a/Triangulation_3/examples/Triangulation_3/parallel_insertion_in_delaunay_3.cpp b/Triangulation_3/examples/Triangulation_3/parallel_insertion_in_delaunay_3.cpp index bd4a660786a..6b75d0a0879 100644 --- a/Triangulation_3/examples/Triangulation_3/parallel_insertion_in_delaunay_3.cpp +++ b/Triangulation_3/examples/Triangulation_3/parallel_insertion_in_delaunay_3.cpp @@ -32,13 +32,13 @@ int main() V.reserve(NUM_INSERTED_POINTS); for (int i = 0; i != NUM_INSERTED_POINTS; ++i) V.push_back(*rnd++); - + // Construct the locking data-structure, using the bounding-box of the points Triangulation::Lock_data_structure locking_ds( CGAL::Bbox_3(-1., -1., -1., 1., 1., 1.), 50); + // Construct the triangulation in parallel Triangulation T(V.begin(), V.end(), &locking_ds); - assert(T.is_valid()); #endif //CGAL_LINKED_WITH_TBB diff --git a/Triangulation_3/examples/Triangulation_3/regular_3.cpp b/Triangulation_3/examples/Triangulation_3/regular_3.cpp index 3c29cb1e0e3..8f37f2cf20f 100644 --- a/Triangulation_3/examples/Triangulation_3/regular_3.cpp +++ b/Triangulation_3/examples/Triangulation_3/regular_3.cpp @@ -1,5 +1,7 @@ #include + #include + #include #include @@ -24,10 +26,10 @@ int main() for (int z=0 ; z<5 ; z++) for (int y=0 ; y<5 ; y++) for (int x=0 ; x<5 ; x++) { - Point p(x, y, z); - Weight w = (x+y-z*y*x)*2.0; // let's say this is the weight. - P.push_back(Weighted_point(p, w)); - ++number_of_points; + Point p(x, y, z); + Weight w = (x+y-z*y*x)*2.0; // let's say this is the weight. + P.push_back(Weighted_point(p, w)); + ++number_of_points; } Rt T; @@ -43,8 +45,8 @@ int main() // removal of all vertices int count = 0; while (T.number_of_vertices() > 0) { - T.remove (T.finite_vertices_begin()); - ++count; + T.remove (T.finite_vertices_begin()); + ++count; } assert( count == number_of_points ); diff --git a/Triangulation_3/examples/Triangulation_3/simplex.cpp b/Triangulation_3/examples/Triangulation_3/simplex.cpp index eed05980d79..67e1e99d9f0 100644 --- a/Triangulation_3/examples/Triangulation_3/simplex.cpp +++ b/Triangulation_3/examples/Triangulation_3/simplex.cpp @@ -1,4 +1,5 @@ #include + #include #include