From fac18376642c5047d3c52465178b2a404d3d3f07 Mon Sep 17 00:00:00 2001 From: Panagiotis Cheilaris Date: Fri, 20 Jun 2014 20:13:21 +0200 Subject: [PATCH] Linf hierarchy: include L2 hier., remove constants This change allows to use both hierarchies at the same time. Signed-off-by: Panagiotis Cheilaris --- .../Segment_Delaunay_graph_Linf_hierarchy_2.h | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/Segment_Delaunay_graph_Linf_2/include/CGAL/Segment_Delaunay_graph_Linf_hierarchy_2.h b/Segment_Delaunay_graph_Linf_2/include/CGAL/Segment_Delaunay_graph_Linf_hierarchy_2.h index 52c0f9e2579..583f5e42845 100644 --- a/Segment_Delaunay_graph_Linf_2/include/CGAL/Segment_Delaunay_graph_Linf_hierarchy_2.h +++ b/Segment_Delaunay_graph_Linf_2/include/CGAL/Segment_Delaunay_graph_Linf_hierarchy_2.h @@ -37,26 +37,13 @@ #include #include +#include namespace CGAL { //-------------------------------------------------------------------- //-------------------------------------------------------------------- -// parameterization of the hierarchy -#ifdef CGAL_SDG_HIERARCHY_DEMO -const unsigned int sdg_hierarchy_2__ratio = 3; -const unsigned int sdg_hierarchy_2__minsize = 5; -#else -const unsigned int sdg_hierarchy_2__ratio = 30; -const unsigned int sdg_hierarchy_2__minsize = 20; -#endif -const unsigned int sdg_hierarchy_2__maxlevel = 5; -// maximal number of points is 30^5 = 24 millions ! - -//-------------------------------------------------------------------- -//-------------------------------------------------------------------- - template < class Gt, class ST = Segment_Delaunay_graph_storage_traits_2, class STag = Tag_false,