From 78cd266d014afcc2bfa165fdd1cd6587ac68cd15 Mon Sep 17 00:00:00 2001 From: Sylvain Pion Date: Mon, 27 May 2002 11:46:33 +0000 Subject: [PATCH] - Replace max2 by maxless. --- Packages/Triangulation_3/changes.txt | 5 +++++ .../include/CGAL/Delaunay_triangulation_3.h | 17 +---------------- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/Packages/Triangulation_3/changes.txt b/Packages/Triangulation_3/changes.txt index 69e8205a590..6109867e950 100644 --- a/Packages/Triangulation_3/changes.txt +++ b/Packages/Triangulation_3/changes.txt @@ -1,3 +1,8 @@ +Version 1.115 (?? ??? 02) +- Replace max2 by maxless. + +----------------------- CGAL 2.4 ------------------------ + Version 1.114 (15 May 02) - bug fix in the doc of the Delaunay traits concept - use of Lazy_exact_nt in demo_voronoi diff --git a/Packages/Triangulation_3/include/CGAL/Delaunay_triangulation_3.h b/Packages/Triangulation_3/include/CGAL/Delaunay_triangulation_3.h index 31aa7959851..354e8e6b9b8 100644 --- a/Packages/Triangulation_3/include/CGAL/Delaunay_triangulation_3.h +++ b/Packages/Triangulation_3/include/CGAL/Delaunay_triangulation_3.h @@ -328,7 +328,6 @@ private: Vertex_handle v3, Vertex_handle v) const; - int max2(int i0, int i1, int i2, int i3, int i4, int m) const; int maxless(int i0, int i1, int i2, int i3, int i4, int m) const; void make_hole_3D_ear( Vertex_handle v, @@ -726,20 +725,6 @@ side_of_sphere_inf_perturb(Vertex_handle v0, return bs; } -template < class Gt, class Tds > -int -Delaunay_triangulation_3:: -max2(int i0, int i1, int i2, int i3, int i4, int m) const - // m supposed to be the maximum of the i's - // could be replaced by maxless -{ - if (m == i0) return std::max(i1,std::max(i2,std::max(i3,i4))); - if (m == i1) return std::max(i0,std::max(i2,std::max(i3,i4))); - if (m == i2) return std::max(i0,std::max(i1,std::max(i3,i4))); - if (m == i3) return std::max(i0,std::max(i1,std::max(i2,i4))); - return std::max(i0,std::max(i1,std::max(i2,i3))); -} - template < class Gt, class Tds > int Delaunay_triangulation_3:: @@ -821,7 +806,7 @@ side_of_sphere_finite_perturb(Vertex_handle v0, // if not yet returned, then the leading monomial of the determinant // has null coefficient // we look whether the 2nd monomial has non null coefficient - m = max2(i0,i1,i2,i3,i,m); + m = maxless(i0,i1,i2,i3,i,m); if (m == i) return ON_UNBOUNDED_SIDE; if (m == i3 && (o = orientation(p0,p1,p2,p)) != ZERO )