From 3d2ed6cbb4feba0f568d06459e2eb553b7aa03fb Mon Sep 17 00:00:00 2001 From: Ron Wein Date: Mon, 29 May 2006 08:30:22 +0000 Subject: [PATCH] Changed the *.C files to *_impl.h files. Also moved all non-interface include files under the folder Partition_2. --- Partition_2/include/CGAL/Circulator_list.h | 59 ------------ .../CGAL/{ => Partition_2}/Circulator_pair.h | 0 .../{ => Partition_2}/Indirect_edge_compare.h | 0 .../{ => Partition_2}/Indirect_less_xy_2.h | 0 .../Indirect_not_less_yx_2.h | 0 .../CGAL/{ => Partition_2}/Iterator_list.h | 0 .../include/CGAL/{ => Partition_2}/Matrix.h | 0 .../Partition_opt_cvx_diagonal_list.h | 0 .../Partition_opt_cvx_edge.h | 2 +- .../Partition_opt_cvx_vertex.h | 2 +- .../Partition_traits_2_base.h | 0 .../{ => Partition_2}/Partition_vertex_map.h | 2 +- .../{ => Partition_2}/Partitioned_polygon_2.h | 0 .../{ => Partition_2}/Point_pair_less_xy_2.h | 0 .../CGAL/{ => Partition_2}/Rotation_tree_2.h | 7 +- .../Rotation_tree_2_impl.h} | 0 .../{ => Partition_2}/Segment_less_yx_2.h | 2 +- .../Triangulation_indirect_traits_2.h | 0 .../CGAL/{ => Partition_2}/Turn_reverser.h | 0 .../Vertex_visibility_graph_2.h | 16 ++-- .../Vertex_visibility_graph_2_impl.h} | 0 .../is_degenerate_polygon_2.h | 0 .../partition_approx_convex_2.h | 8 +- .../{ => Partition_2}/partition_assertions.h | 0 .../partition_greene_approx_convex_2.h | 10 +-- .../partition_optimal_convex_2.h | 16 ++-- .../partition_y_monotone_2.h | 8 +- Partition_2/include/CGAL/Partition_traits_2.h | 2 +- .../include/CGAL/Vertex_visibility_traits_2.h | 90 ------------------- Partition_2/include/CGAL/partition_2.h | 9 +- .../include/CGAL/partition_is_valid_2.h | 6 +- 31 files changed, 42 insertions(+), 197 deletions(-) delete mode 100644 Partition_2/include/CGAL/Circulator_list.h rename Partition_2/include/CGAL/{ => Partition_2}/Circulator_pair.h (100%) rename Partition_2/include/CGAL/{ => Partition_2}/Indirect_edge_compare.h (100%) rename Partition_2/include/CGAL/{ => Partition_2}/Indirect_less_xy_2.h (100%) rename Partition_2/include/CGAL/{ => Partition_2}/Indirect_not_less_yx_2.h (100%) rename Partition_2/include/CGAL/{ => Partition_2}/Iterator_list.h (100%) rename Partition_2/include/CGAL/{ => Partition_2}/Matrix.h (100%) rename Partition_2/include/CGAL/{ => Partition_2}/Partition_opt_cvx_diagonal_list.h (100%) rename Partition_2/include/CGAL/{ => Partition_2}/Partition_opt_cvx_edge.h (98%) rename Partition_2/include/CGAL/{ => Partition_2}/Partition_opt_cvx_vertex.h (97%) rename Partition_2/include/CGAL/{ => Partition_2}/Partition_traits_2_base.h (100%) rename Partition_2/include/CGAL/{ => Partition_2}/Partition_vertex_map.h (99%) rename Partition_2/include/CGAL/{ => Partition_2}/Partitioned_polygon_2.h (100%) rename Partition_2/include/CGAL/{ => Partition_2}/Point_pair_less_xy_2.h (100%) rename Partition_2/include/CGAL/{ => Partition_2}/Rotation_tree_2.h (96%) rename Partition_2/include/CGAL/{Rotation_tree_2.C => Partition_2/Rotation_tree_2_impl.h} (100%) rename Partition_2/include/CGAL/{ => Partition_2}/Segment_less_yx_2.h (99%) rename Partition_2/include/CGAL/{ => Partition_2}/Triangulation_indirect_traits_2.h (100%) rename Partition_2/include/CGAL/{ => Partition_2}/Turn_reverser.h (100%) rename Partition_2/include/CGAL/{ => Partition_2}/Vertex_visibility_graph_2.h (97%) rename Partition_2/include/CGAL/{Vertex_visibility_graph_2.C => Partition_2/Vertex_visibility_graph_2_impl.h} (100%) rename Partition_2/include/CGAL/{ => Partition_2}/is_degenerate_polygon_2.h (100%) rename Partition_2/include/CGAL/{ => Partition_2}/partition_approx_convex_2.h (97%) rename Partition_2/include/CGAL/{ => Partition_2}/partition_assertions.h (100%) rename Partition_2/include/CGAL/{ => Partition_2}/partition_greene_approx_convex_2.h (99%) rename Partition_2/include/CGAL/{ => Partition_2}/partition_optimal_convex_2.h (98%) rename Partition_2/include/CGAL/{ => Partition_2}/partition_y_monotone_2.h (98%) delete mode 100644 Partition_2/include/CGAL/Vertex_visibility_traits_2.h diff --git a/Partition_2/include/CGAL/Circulator_list.h b/Partition_2/include/CGAL/Circulator_list.h deleted file mode 100644 index ddad6e8d95f..00000000000 --- a/Partition_2/include/CGAL/Circulator_list.h +++ /dev/null @@ -1,59 +0,0 @@ -// Copyright (c) 2000 Max-Planck-Institute Saarbruecken (Germany). -// All rights reserved. -// -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. -// -// Licensees holding a valid commercial license may use this file in -// accordance with the commercial license agreement provided with the software. -// -// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE -// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -// -// $URL$ -// $Id$ -// -// -// Author(s) : Susan Hert -#ifndef CGAL_CIRCULATOR_LIST_H -#define CGAL_CIRCULATOR_LIST_H - -#include -#include - -namespace CGAL { - -template -class Circulator_list : public std::list -{ - -public: - Circulator_list() - {} - - Circulator_list(Circulator first) - { - if (first == NULL) return; - - Circulator current = first; - do - { - push_back(current); - } while (++current != first); - } -}; - -template -std::ostream& operator<<(std::ostream& os, const Circulator_list& c) -{ - typename Circulator_list::const_iterator current; - for (current = c.begin(); current != c.end(); current++) - { - os << **current << " "; - } - return os; -} -} - -#endif // CGAL_CIRCULATOR_LIST_H diff --git a/Partition_2/include/CGAL/Circulator_pair.h b/Partition_2/include/CGAL/Partition_2/Circulator_pair.h similarity index 100% rename from Partition_2/include/CGAL/Circulator_pair.h rename to Partition_2/include/CGAL/Partition_2/Circulator_pair.h diff --git a/Partition_2/include/CGAL/Indirect_edge_compare.h b/Partition_2/include/CGAL/Partition_2/Indirect_edge_compare.h similarity index 100% rename from Partition_2/include/CGAL/Indirect_edge_compare.h rename to Partition_2/include/CGAL/Partition_2/Indirect_edge_compare.h diff --git a/Partition_2/include/CGAL/Indirect_less_xy_2.h b/Partition_2/include/CGAL/Partition_2/Indirect_less_xy_2.h similarity index 100% rename from Partition_2/include/CGAL/Indirect_less_xy_2.h rename to Partition_2/include/CGAL/Partition_2/Indirect_less_xy_2.h diff --git a/Partition_2/include/CGAL/Indirect_not_less_yx_2.h b/Partition_2/include/CGAL/Partition_2/Indirect_not_less_yx_2.h similarity index 100% rename from Partition_2/include/CGAL/Indirect_not_less_yx_2.h rename to Partition_2/include/CGAL/Partition_2/Indirect_not_less_yx_2.h diff --git a/Partition_2/include/CGAL/Iterator_list.h b/Partition_2/include/CGAL/Partition_2/Iterator_list.h similarity index 100% rename from Partition_2/include/CGAL/Iterator_list.h rename to Partition_2/include/CGAL/Partition_2/Iterator_list.h diff --git a/Partition_2/include/CGAL/Matrix.h b/Partition_2/include/CGAL/Partition_2/Matrix.h similarity index 100% rename from Partition_2/include/CGAL/Matrix.h rename to Partition_2/include/CGAL/Partition_2/Matrix.h diff --git a/Partition_2/include/CGAL/Partition_opt_cvx_diagonal_list.h b/Partition_2/include/CGAL/Partition_2/Partition_opt_cvx_diagonal_list.h similarity index 100% rename from Partition_2/include/CGAL/Partition_opt_cvx_diagonal_list.h rename to Partition_2/include/CGAL/Partition_2/Partition_opt_cvx_diagonal_list.h diff --git a/Partition_2/include/CGAL/Partition_opt_cvx_edge.h b/Partition_2/include/CGAL/Partition_2/Partition_opt_cvx_edge.h similarity index 98% rename from Partition_2/include/CGAL/Partition_opt_cvx_edge.h rename to Partition_2/include/CGAL/Partition_2/Partition_opt_cvx_edge.h index 3248684ebe1..55c9d7edcdf 100644 --- a/Partition_2/include/CGAL/Partition_opt_cvx_edge.h +++ b/Partition_2/include/CGAL/Partition_2/Partition_opt_cvx_edge.h @@ -21,7 +21,7 @@ #define CGAL_PARTITION_OPT_CVX_EDGE_H #include -#include +#include namespace CGAL { diff --git a/Partition_2/include/CGAL/Partition_opt_cvx_vertex.h b/Partition_2/include/CGAL/Partition_2/Partition_opt_cvx_vertex.h similarity index 97% rename from Partition_2/include/CGAL/Partition_opt_cvx_vertex.h rename to Partition_2/include/CGAL/Partition_2/Partition_opt_cvx_vertex.h index 7976849fd81..615f1b4cab2 100644 --- a/Partition_2/include/CGAL/Partition_opt_cvx_vertex.h +++ b/Partition_2/include/CGAL/Partition_2/Partition_opt_cvx_vertex.h @@ -21,7 +21,7 @@ #define CGAL_PARTITION_OPT_CVX_VERTEX_H #include -#include +#include namespace CGAL { diff --git a/Partition_2/include/CGAL/Partition_traits_2_base.h b/Partition_2/include/CGAL/Partition_2/Partition_traits_2_base.h similarity index 100% rename from Partition_2/include/CGAL/Partition_traits_2_base.h rename to Partition_2/include/CGAL/Partition_2/Partition_traits_2_base.h diff --git a/Partition_2/include/CGAL/Partition_vertex_map.h b/Partition_2/include/CGAL/Partition_2/Partition_vertex_map.h similarity index 99% rename from Partition_2/include/CGAL/Partition_vertex_map.h rename to Partition_2/include/CGAL/Partition_2/Partition_vertex_map.h index bbbb5009a31..91b6e1a6590 100644 --- a/Partition_2/include/CGAL/Partition_vertex_map.h +++ b/Partition_2/include/CGAL/Partition_2/Partition_vertex_map.h @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include namespace CGAL { diff --git a/Partition_2/include/CGAL/Partitioned_polygon_2.h b/Partition_2/include/CGAL/Partition_2/Partitioned_polygon_2.h similarity index 100% rename from Partition_2/include/CGAL/Partitioned_polygon_2.h rename to Partition_2/include/CGAL/Partition_2/Partitioned_polygon_2.h diff --git a/Partition_2/include/CGAL/Point_pair_less_xy_2.h b/Partition_2/include/CGAL/Partition_2/Point_pair_less_xy_2.h similarity index 100% rename from Partition_2/include/CGAL/Point_pair_less_xy_2.h rename to Partition_2/include/CGAL/Partition_2/Point_pair_less_xy_2.h diff --git a/Partition_2/include/CGAL/Rotation_tree_2.h b/Partition_2/include/CGAL/Partition_2/Rotation_tree_2.h similarity index 96% rename from Partition_2/include/CGAL/Rotation_tree_2.h rename to Partition_2/include/CGAL/Partition_2/Rotation_tree_2.h index e1b56de6ac9..960554cff6a 100644 --- a/Partition_2/include/CGAL/Rotation_tree_2.h +++ b/Partition_2/include/CGAL/Partition_2/Rotation_tree_2.h @@ -41,7 +41,7 @@ #else #include #endif // MSVC6 -#include +#include #include namespace CGAL { @@ -171,9 +171,6 @@ private: } -#ifdef CGAL_CFG_NO_AUTOMATIC_TEMPLATE_INCLUSION -#include -#endif // CGAL_CFG_NO_AUTOMATIC_TEMPLATE_INCLUSION - +#include #endif // CGAL_ROTATION_TREE_H diff --git a/Partition_2/include/CGAL/Rotation_tree_2.C b/Partition_2/include/CGAL/Partition_2/Rotation_tree_2_impl.h similarity index 100% rename from Partition_2/include/CGAL/Rotation_tree_2.C rename to Partition_2/include/CGAL/Partition_2/Rotation_tree_2_impl.h diff --git a/Partition_2/include/CGAL/Segment_less_yx_2.h b/Partition_2/include/CGAL/Partition_2/Segment_less_yx_2.h similarity index 99% rename from Partition_2/include/CGAL/Segment_less_yx_2.h rename to Partition_2/include/CGAL/Partition_2/Segment_less_yx_2.h index 3827734d6ec..8e279744ec3 100644 --- a/Partition_2/include/CGAL/Segment_less_yx_2.h +++ b/Partition_2/include/CGAL/Partition_2/Segment_less_yx_2.h @@ -21,7 +21,7 @@ #define CGAL_SEGMENT_LESS_YX_2_H #include -#include +#include namespace CGAL { diff --git a/Partition_2/include/CGAL/Triangulation_indirect_traits_2.h b/Partition_2/include/CGAL/Partition_2/Triangulation_indirect_traits_2.h similarity index 100% rename from Partition_2/include/CGAL/Triangulation_indirect_traits_2.h rename to Partition_2/include/CGAL/Partition_2/Triangulation_indirect_traits_2.h diff --git a/Partition_2/include/CGAL/Turn_reverser.h b/Partition_2/include/CGAL/Partition_2/Turn_reverser.h similarity index 100% rename from Partition_2/include/CGAL/Turn_reverser.h rename to Partition_2/include/CGAL/Partition_2/Turn_reverser.h diff --git a/Partition_2/include/CGAL/Vertex_visibility_graph_2.h b/Partition_2/include/CGAL/Partition_2/Vertex_visibility_graph_2.h similarity index 97% rename from Partition_2/include/CGAL/Vertex_visibility_graph_2.h rename to Partition_2/include/CGAL/Partition_2/Vertex_visibility_graph_2.h index aaca206e8d5..15c24244f02 100644 --- a/Partition_2/include/CGAL/Vertex_visibility_graph_2.h +++ b/Partition_2/include/CGAL/Partition_2/Vertex_visibility_graph_2.h @@ -58,13 +58,13 @@ #define CGAL_VERTEX_VISIBILITY_GRAPH_2_H #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include -#include +#include #include #include #include @@ -446,8 +446,6 @@ Vertex_visibility_graph_2::indirect_less_xy_2; #endif } -#ifdef CGAL_CFG_NO_AUTOMATIC_TEMPLATE_INCLUSION -#include -#endif // CGAL_CFG_NO_AUTOMATIC_TEMPLATE_INCLUSION +#include #endif // CGAL_VERTEX_VISIBILITY_GRAPH_2_H diff --git a/Partition_2/include/CGAL/Vertex_visibility_graph_2.C b/Partition_2/include/CGAL/Partition_2/Vertex_visibility_graph_2_impl.h similarity index 100% rename from Partition_2/include/CGAL/Vertex_visibility_graph_2.C rename to Partition_2/include/CGAL/Partition_2/Vertex_visibility_graph_2_impl.h diff --git a/Partition_2/include/CGAL/is_degenerate_polygon_2.h b/Partition_2/include/CGAL/Partition_2/is_degenerate_polygon_2.h similarity index 100% rename from Partition_2/include/CGAL/is_degenerate_polygon_2.h rename to Partition_2/include/CGAL/Partition_2/is_degenerate_polygon_2.h diff --git a/Partition_2/include/CGAL/partition_approx_convex_2.h b/Partition_2/include/CGAL/Partition_2/partition_approx_convex_2.h similarity index 97% rename from Partition_2/include/CGAL/partition_approx_convex_2.h rename to Partition_2/include/CGAL/Partition_2/partition_approx_convex_2.h index f5b316f18ca..01b9d540b82 100644 --- a/Partition_2/include/CGAL/partition_approx_convex_2.h +++ b/Partition_2/include/CGAL/Partition_2/partition_approx_convex_2.h @@ -21,13 +21,13 @@ #define CGAL_PARTITION_APPROX_CONVEX_H #include -#include -#include -#include +#include +#include +#include #include #include #include -#include +#include #include #include diff --git a/Partition_2/include/CGAL/partition_assertions.h b/Partition_2/include/CGAL/Partition_2/partition_assertions.h similarity index 100% rename from Partition_2/include/CGAL/partition_assertions.h rename to Partition_2/include/CGAL/Partition_2/partition_assertions.h diff --git a/Partition_2/include/CGAL/partition_greene_approx_convex_2.h b/Partition_2/include/CGAL/Partition_2/partition_greene_approx_convex_2.h similarity index 99% rename from Partition_2/include/CGAL/partition_greene_approx_convex_2.h rename to Partition_2/include/CGAL/Partition_2/partition_greene_approx_convex_2.h index 4f1b66e7580..1f94d46efd0 100644 --- a/Partition_2/include/CGAL/partition_greene_approx_convex_2.h +++ b/Partition_2/include/CGAL/Partition_2/partition_greene_approx_convex_2.h @@ -23,15 +23,15 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include -#include +#include #include #include #include -#include +#include // These things should be constant: // front is where you add things to a chain diff --git a/Partition_2/include/CGAL/partition_optimal_convex_2.h b/Partition_2/include/CGAL/Partition_2/partition_optimal_convex_2.h similarity index 98% rename from Partition_2/include/CGAL/partition_optimal_convex_2.h rename to Partition_2/include/CGAL/Partition_2/partition_optimal_convex_2.h index b97c90ead3b..1c8f32ae0dc 100644 --- a/Partition_2/include/CGAL/partition_optimal_convex_2.h +++ b/Partition_2/include/CGAL/Partition_2/partition_optimal_convex_2.h @@ -63,16 +63,16 @@ #define CGAL_PARTITION_OPTIMAL_CONVEX_H #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include -#include -#include +#include +#include #include #include #include diff --git a/Partition_2/include/CGAL/partition_y_monotone_2.h b/Partition_2/include/CGAL/Partition_2/partition_y_monotone_2.h similarity index 98% rename from Partition_2/include/CGAL/partition_y_monotone_2.h rename to Partition_2/include/CGAL/Partition_2/partition_y_monotone_2.h index 1723d47e0a0..91dc32307c3 100644 --- a/Partition_2/include/CGAL/partition_y_monotone_2.h +++ b/Partition_2/include/CGAL/Partition_2/partition_y_monotone_2.h @@ -38,14 +38,14 @@ #ifndef CGAL_PARTITION_Y_MONOTONE_H #define CGAL_PARTITION_Y_MONOTONE_H -#include -#include +#include +#include #include #include -#include +#include #include #include -#include +#include #include #include #include diff --git a/Partition_2/include/CGAL/Partition_traits_2.h b/Partition_2/include/CGAL/Partition_traits_2.h index f96ad9e5791..7efb002c19a 100644 --- a/Partition_2/include/CGAL/Partition_traits_2.h +++ b/Partition_2/include/CGAL/Partition_traits_2.h @@ -21,7 +21,7 @@ #define PARTITION_TRAITS_2_H #include -#include +#include #include #include diff --git a/Partition_2/include/CGAL/Vertex_visibility_traits_2.h b/Partition_2/include/CGAL/Vertex_visibility_traits_2.h deleted file mode 100644 index 05b5cbe0a52..00000000000 --- a/Partition_2/include/CGAL/Vertex_visibility_traits_2.h +++ /dev/null @@ -1,90 +0,0 @@ -// Copyright (c) 2000 Max-Planck-Institute Saarbruecken (Germany). -// All rights reserved. -// -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. -// -// Licensees holding a valid commercial license may use this file in -// accordance with the commercial license agreement provided with the software. -// -// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE -// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -// -// $URL$ -// $Id$ -// -// -// Author(s) : Susan Hert - -#ifndef VERTEX_VISIBILITY_TRAITS_2_H -#define VERTEX_VISIBILITY_TRAITS_2_H - -namespace CGAL { - -template -class Vertex_visibility_traits_2 -{ - public: - typedef Kernel_ Kernel; - typedef typename Kernel::Point_2 Point_2; - typedef typename Kernel::Segment_2 Segment_2; - typedef typename Kernel::Ray_2 Ray_2; - typedef typename Kernel::Construct_segment_2 Construct_segment_2; - typedef typename Kernel::Construct_ray_2 Construct_ray_2; - typedef typename Kernel::Less_yx_2 Less_yx_2; - typedef typename Kernel::Less_xy_2 Less_xy_2; - typedef typename Kernel::Compare_x_2 Compare_x_2; - typedef typename Kernel::Compare_y_2 Compare_y_2; - typedef typename Kernel::Left_turn_2 Left_turn_2; - typedef typename Kernel::Orientation_2 Orientation_2; - typedef typename Kernel::Collinear_are_ordered_along_line_2 - Collinear_are_ordered_along_line_2; - typedef typename Kernel::Are_strictly_ordered_along_line_2 - Are_strictly_ordered_along_line_2; - - Compare_x_2 - compare_x_2_object() const - { return Compare_x_2(); } - - Compare_y_2 - compare_y_2_object() const - { return Compare_y_2(); } - - Less_yx_2 - less_yx_2_object() const - { return Less_yx_2(); } - - Less_xy_2 - less_xy_2_object() const - { return Less_xy_2(); } - - Left_turn_2 - left_turn_2_object() const - { return Left_turn_2(); } - - Orientation_2 - orientation_2_object() const - { return Orientation_2(); } - - Collinear_are_ordered_along_line_2 - collinear_are_ordered_along_line_2_object() const - { return Collinear_are_ordered_along_line_2(); } - - Are_strictly_ordered_along_line_2 - are_strictly_ordered_along_line_2_object() const - { return Are_strictly_ordered_along_line_2(); } - - Construct_segment_2 - construct_segment_2_object() const - { return Construct_segment_2(); } - - Construct_ray_2 - construct_ray_2_object() const - { return Construct_ray_2(); } - -}; - -} - -#endif // VERTEX_VISIBILITY_TRAITS_2_H diff --git a/Partition_2/include/CGAL/partition_2.h b/Partition_2/include/CGAL/partition_2.h index 5086c203c54..572128fea4f 100644 --- a/Partition_2/include/CGAL/partition_2.h +++ b/Partition_2/include/CGAL/partition_2.h @@ -20,11 +20,10 @@ #ifndef CGAL_PARTITION_H #define CGAL_PARTITION_H -#include -#include -#include -#include - +#include +#include +#include +#include namespace CGAL { diff --git a/Partition_2/include/CGAL/partition_is_valid_2.h b/Partition_2/include/CGAL/partition_is_valid_2.h index 93454343424..7acc5969daa 100644 --- a/Partition_2/include/CGAL/partition_is_valid_2.h +++ b/Partition_2/include/CGAL/partition_is_valid_2.h @@ -23,9 +23,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include