From 20e0b0cdb38bac7ed5cea667baca559293c46f3c Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Mon, 23 Jul 2001 14:04:58 +0000 Subject: [PATCH] *** empty log message *** --- .../demo/Alpha_shapes_3/demo_alpha.C | 22 ++++++++---------- .../demo/Alpha_shapes_3/demo_weight.C | 23 ++++++++----------- 2 files changed, 20 insertions(+), 25 deletions(-) diff --git a/Packages/Alpha_shapes_3/demo/Alpha_shapes_3/demo_alpha.C b/Packages/Alpha_shapes_3/demo/Alpha_shapes_3/demo_alpha.C index 4841d7d26a9..ab7bd21274e 100644 --- a/Packages/Alpha_shapes_3/demo/Alpha_shapes_3/demo_alpha.C +++ b/Packages/Alpha_shapes_3/demo/Alpha_shapes_3/demo_alpha.C @@ -7,7 +7,7 @@ correspondant a l'Alpha Shape. -#include +#include #include #include #include @@ -18,8 +18,6 @@ correspondant a l'Alpha Shape. #include #include -#include -#include #include #include @@ -48,15 +46,15 @@ typedef double coord_type; // #endif//CGAL_USE_GMP // #endif//CGAL_USE_LEDA -typedef CGAL::Cartesian CRep; +typedef CGAL::Cartesian K; -typedef CGAL::Point_3 Point; -typedef CGAL::Segment_3 Segment; -typedef CGAL::Ray_3 Ray; -typedef CGAL::Line_3 Line; -typedef CGAL::Triangle_3 Triangle; +typedef K::Point_3 Point; +typedef K::Segment_3 Segment; +typedef K::Ray_3 Ray; +typedef K::Line_3 Line; +typedef K::Triangle_3 Triangle; -typedef CGAL::Alpha_shape_euclidean_traits_3 Gt; +typedef CGAL::Alpha_shape_euclidean_traits_3 Gt; typedef CGAL::Alpha_shape_vertex_base_3 Vb; @@ -89,7 +87,7 @@ typedef Alpha_shape_3::Alpha_iterator Alpha_iterator; //--------------------------------------------------------------------- void -Construct_Alpha_shape(const std::list &V_p, +construct_alpha_shape(const std::list &V_p, Alpha_shape_3::Mode mode, Alpha_shape_3& A) // Generate Alpha Shape @@ -163,7 +161,7 @@ int main() std::list L; file_input(L); - Construct_Alpha_shape(L,Alpha_shape_3::GENERAL,A); + construct_alpha_shape(L,Alpha_shape_3::GENERAL,A); std::cout << "Alpha Shape computed" << std::endl; diff --git a/Packages/Alpha_shapes_3/demo/Alpha_shapes_3/demo_weight.C b/Packages/Alpha_shapes_3/demo/Alpha_shapes_3/demo_weight.C index 024d8d53649..d455cf57d65 100644 --- a/Packages/Alpha_shapes_3/demo/Alpha_shapes_3/demo_weight.C +++ b/Packages/Alpha_shapes_3/demo/Alpha_shapes_3/demo_weight.C @@ -7,7 +7,7 @@ correspondant a l'Alpha Shape. -#include +#include #include #include #include @@ -18,9 +18,6 @@ correspondant a l'Alpha Shape. #include #include -#include -#include - #include #include #include @@ -48,15 +45,15 @@ typedef double coord_type; // #endif//CGAL_USE_GMP // #endif//CGAL_USE_LEDA -typedef CGAL::Cartesian CRep; +typedef CGAL::Cartesian K; -typedef CGAL::Point_3 Point; -typedef CGAL::Segment_3 Segment; -typedef CGAL::Ray_3 Ray; -typedef CGAL::Line_3 Line; -typedef CGAL::Triangle_3 Triangle; +typedef K::Point_3 Point; +typedef K::Segment_3 Segment; +typedef K::Ray_3 Ray; +typedef K::Line_3 Line; +typedef K::Triangle_3 Triangle; -typedef CGAL::Weighted_alpha_shape_euclidean_traits_3 Gt; +typedef CGAL::Weighted_alpha_shape_euclidean_traits_3 Gt; typedef Gt::Point Wpoint; typedef CGAL::Alpha_shape_vertex_base_3 Vb; @@ -90,7 +87,7 @@ typedef Alpha_shape_3::Alpha_iterator Alpha_iterator; //--------------------------------------------------------------------- void -Construct_Alpha_shape(const std::list &V_p, +construct_alpha_shape(const std::list &V_p, Alpha_shape_3::Mode mode, Alpha_shape_3& A) // Generate Alpha Shape @@ -166,7 +163,7 @@ int main() coord_type w; std::cin >> w; file_input(L, w); - Construct_Alpha_shape(L,Alpha_shape_3::GENERAL,A); + construct_alpha_shape(L,Alpha_shape_3::GENERAL,A); std::cout << "Alpha Shape computed" << std::endl;