Changed the *.C files to *_impl.h files. Also moved all non-interface include

files under the folder Partition_2.
This commit is contained in:
Ron Wein 2006-05-29 08:30:22 +00:00
parent a3ea8fcdb7
commit 3d2ed6cbb4
31 changed files with 42 additions and 197 deletions

View File

@ -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 <hert@mpi-sb.mpg.de>
#ifndef CGAL_CIRCULATOR_LIST_H
#define CGAL_CIRCULATOR_LIST_H
#include <list>
#include <iostream>
namespace CGAL {
template <class Circulator>
class Circulator_list : public std::list<Circulator>
{
public:
Circulator_list()
{}
Circulator_list(Circulator first)
{
if (first == NULL) return;
Circulator current = first;
do
{
push_back(current);
} while (++current != first);
}
};
template <class C>
std::ostream& operator<<(std::ostream& os, const Circulator_list<C>& c)
{
typename Circulator_list<C>::const_iterator current;
for (current = c.begin(); current != c.end(); current++)
{
os << **current << " ";
}
return os;
}
}
#endif // CGAL_CIRCULATOR_LIST_H

View File

@ -21,7 +21,7 @@
#define CGAL_PARTITION_OPT_CVX_EDGE_H
#include <iostream>
#include <CGAL/Partition_opt_cvx_diagonal_list.h>
#include <CGAL/Partition_2/Partition_opt_cvx_diagonal_list.h>
namespace CGAL {

View File

@ -21,7 +21,7 @@
#define CGAL_PARTITION_OPT_CVX_VERTEX_H
#include <list>
#include <CGAL/Partition_opt_cvx_diagonal_list.h>
#include <CGAL/Partition_2/Partition_opt_cvx_diagonal_list.h>
namespace CGAL {

View File

@ -23,7 +23,7 @@
#include <map>
#include <iostream>
#include <CGAL/circulator.h>
#include <CGAL/Indirect_less_xy_2.h>
#include <CGAL/Partition_2/Indirect_less_xy_2.h>
#include <cassert>
namespace CGAL {

View File

@ -41,7 +41,7 @@
#else
#include <CGAL/vector.h>
#endif // MSVC6
#include <CGAL/Rotation_tree_node_2.h>
#include <CGAL/Partition_2/Rotation_tree_node_2.h>
#include <CGAL/functional.h>
namespace CGAL {
@ -171,9 +171,6 @@ private:
}
#ifdef CGAL_CFG_NO_AUTOMATIC_TEMPLATE_INCLUSION
#include <CGAL/Rotation_tree_2.C>
#endif // CGAL_CFG_NO_AUTOMATIC_TEMPLATE_INCLUSION
#include <CGAL/Partition_2/Rotation_tree_2_impl.h>
#endif // CGAL_ROTATION_TREE_H

View File

@ -21,7 +21,7 @@
#define CGAL_SEGMENT_LESS_YX_2_H
#include <utility>
#include <CGAL/Turn_reverser.h>
#include <CGAL/Partition_2/Turn_reverser.h>
namespace CGAL {

View File

@ -58,13 +58,13 @@
#define CGAL_VERTEX_VISIBILITY_GRAPH_2_H
#include <CGAL/Segment_2.h>
#include <CGAL/Rotation_tree_2.h>
#include <CGAL/Indirect_less_xy_2.h>
#include <CGAL/Iterator_list.h>
#include <CGAL/Turn_reverser.h>
#include <CGAL/Point_pair_less_xy_2.h>
#include <CGAL/Partition_2/Rotation_tree_2.h>
#include <CGAL/Partition_2/Indirect_less_xy_2.h>
#include <CGAL/Partition_2/Iterator_list.h>
#include <CGAL/Partition_2/Turn_reverser.h>
#include <CGAL/Partition_2/Point_pair_less_xy_2.h>
#include <CGAL/Segment_2_Ray_2_intersection.h>
#include <CGAL/Segment_less_yx_2.h>
#include <CGAL/Partition_2/Segment_less_yx_2.h>
#include <cmath>
#include <list>
#include <stack>
@ -446,8 +446,6 @@ Vertex_visibility_graph_2<Traits>::indirect_less_xy_2;
#endif
}
#ifdef CGAL_CFG_NO_AUTOMATIC_TEMPLATE_INCLUSION
#include <CGAL/Vertex_visibility_graph_2.C>
#endif // CGAL_CFG_NO_AUTOMATIC_TEMPLATE_INCLUSION
#include <CGAL/Partition_2/Vertex_visibility_graph_2_impl.h>
#endif // CGAL_VERTEX_VISIBILITY_GRAPH_2_H

View File

@ -21,13 +21,13 @@
#define CGAL_PARTITION_APPROX_CONVEX_H
#include <CGAL/Constrained_triangulation_2.h>
#include <CGAL/Triangulation_indirect_traits_2.h>
#include <CGAL/Turn_reverser.h>
#include <CGAL/Partitioned_polygon_2.h>
#include <CGAL/Partition_2/Triangulation_indirect_traits_2.h>
#include <CGAL/Partition_2/Turn_reverser.h>
#include <CGAL/Partition_2/Partitioned_polygon_2.h>
#include <CGAL/IO/Tee_for_output_iterator.h>
#include <CGAL/Partition_traits_2.h>
#include <CGAL/partition_is_valid_2.h>
#include <CGAL/partition_assertions.h>
#include <CGAL/Partition_2/partition_assertions.h>
#include <utility>
#include <iterator>

View File

@ -23,15 +23,15 @@
#include<vector>
#include<algorithm>
#include<iterator>
#include<CGAL/Circulator_pair.h>
#include<CGAL/partition_y_monotone_2.h>
#include<CGAL/Turn_reverser.h>
#include<CGAL/Partition_2/Circulator_pair.h>
#include<CGAL/Partition_2/partition_y_monotone_2.h>
#include<CGAL/Partition_2/Turn_reverser.h>
#include<CGAL/IO/Tee_for_output_iterator.h>
#include<CGAL/partition_assertions.h>
#include<CGAL/Partition_2/partition_assertions.h>
#include<CGAL/partition_is_valid_2.h>
#include<CGAL/Partition_traits_2.h>
#include<CGAL/is_y_monotone_2.h>
#include<CGAL/is_degenerate_polygon_2.h>
#include<CGAL/Partition_2/is_degenerate_polygon_2.h>
// These things should be constant:
// front is where you add things to a chain

View File

@ -63,16 +63,16 @@
#define CGAL_PARTITION_OPTIMAL_CONVEX_H
#include<CGAL/IO/Tee_for_output_iterator.h>
#include<CGAL/Partition_opt_cvx_edge.h>
#include<CGAL/Partition_opt_cvx_vertex.h>
#include<CGAL/Partition_opt_cvx_diagonal_list.h>
#include<CGAL/Matrix.h>
#include<CGAL/Turn_reverser.h>
#include<CGAL/Partitioned_polygon_2.h>
#include<CGAL/Partition_2/Partition_opt_cvx_edge.h>
#include<CGAL/Partition_2/Partition_opt_cvx_vertex.h>
#include<CGAL/Partition_2/Partition_opt_cvx_diagonal_list.h>
#include<CGAL/Partition_2/Matrix.h>
#include<CGAL/Partition_2/Turn_reverser.h>
#include<CGAL/Partition_2/Partitioned_polygon_2.h>
#include<CGAL/partition_is_valid_2.h>
#include<CGAL/Partition_traits_2.h>
#include<CGAL/partition_assertions.h>
#include<CGAL/Vertex_visibility_graph_2.h>
#include<CGAL/Partition_2/partition_assertions.h>
#include<CGAL/Partition_2/Vertex_visibility_graph_2.h>
#include<utility>
#include<vector>
#include<iterator>

View File

@ -38,14 +38,14 @@
#ifndef CGAL_PARTITION_Y_MONOTONE_H
#define CGAL_PARTITION_Y_MONOTONE_H
#include <CGAL/Indirect_not_less_yx_2.h>
#include <CGAL/Indirect_edge_compare.h>
#include <CGAL/Partition_2/Indirect_not_less_yx_2.h>
#include <CGAL/Partition_2/Indirect_edge_compare.h>
#include <CGAL/Segment_2_Ray_2_intersection.h>
#include <CGAL/Object.h>
#include <CGAL/Partitioned_polygon_2.h>
#include <CGAL/Partition_2/Partitioned_polygon_2.h>
#include <CGAL/ch_selected_extreme_points_2.h>
#include <CGAL/IO/Tee_for_output_iterator.h>
#include <CGAL/partition_assertions.h>
#include <CGAL/Partition_2/partition_assertions.h>
#include <CGAL/partition_is_valid_2.h>
#include <CGAL/Partition_traits_2.h>
#include <map>

View File

@ -21,7 +21,7 @@
#define PARTITION_TRAITS_2_H
#include <CGAL/Polygon_2.h>
#include <CGAL/Partition_traits_2_base.h>
#include <CGAL/Partition_2/Partition_traits_2_base.h>
#include <CGAL/polygon_function_objects.h>
#include <list>

View File

@ -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 <hert@mpi-sb.mpg.de>
#ifndef VERTEX_VISIBILITY_TRAITS_2_H
#define VERTEX_VISIBILITY_TRAITS_2_H
namespace CGAL {
template <class Kernel_>
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

View File

@ -20,11 +20,10 @@
#ifndef CGAL_PARTITION_H
#define CGAL_PARTITION_H
#include <CGAL/partition_greene_approx_convex_2.h>
#include <CGAL/partition_optimal_convex_2.h>
#include <CGAL/partition_approx_convex_2.h>
#include <CGAL/partition_y_monotone_2.h>
#include <CGAL/Partition_2/partition_greene_approx_convex_2.h>
#include <CGAL/Partition_2/partition_optimal_convex_2.h>
#include <CGAL/Partition_2/partition_approx_convex_2.h>
#include <CGAL/Partition_2/partition_y_monotone_2.h>
namespace CGAL {

View File

@ -23,9 +23,9 @@
#include <list>
#include <utility>
#include <iterator>
#include <CGAL/partition_assertions.h>
#include <CGAL/Partitioned_polygon_2.h>
#include <CGAL/Partition_vertex_map.h>
#include <CGAL/Partition_2/partition_assertions.h>
#include <CGAL/Partition_2/Partitioned_polygon_2.h>
#include <CGAL/Partition_2/Partition_vertex_map.h>
#include <CGAL/ch_selected_extreme_points_2.h>
#include <CGAL/Partition_traits_2.h>
#include <CGAL/Partition_is_valid_traits_2.h>