From 25983e68bb8bed144b4da89a28a07c19f4d58b07 Mon Sep 17 00:00:00 2001 From: Pedro Machado Manhaes de Castro Date: Wed, 1 Oct 2008 15:12:54 +0000 Subject: [PATCH] only one global function file --- .../global_functions_on_circular_arcs_2.h | 197 ------------------ .../CGAL/global_functions_on_line_arcs_2.h | 117 ----------- 2 files changed, 314 deletions(-) delete mode 100644 Circular_kernel_2/include/CGAL/global_functions_on_circular_arcs_2.h delete mode 100644 Circular_kernel_2/include/CGAL/global_functions_on_line_arcs_2.h diff --git a/Circular_kernel_2/include/CGAL/global_functions_on_circular_arcs_2.h b/Circular_kernel_2/include/CGAL/global_functions_on_circular_arcs_2.h deleted file mode 100644 index 55bb3aa37be..00000000000 --- a/Circular_kernel_2/include/CGAL/global_functions_on_circular_arcs_2.h +++ /dev/null @@ -1,197 +0,0 @@ -// Copyright (c) 2003-2008 INRIA Sophia-Antipolis (France). -// 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) : Monique Teillaud, Sylvain Pion, Pedro Machado - -// Partially supported by the IST Programme of the EU as a Shared-cost -// RTD (FET Open) Project under Contract No IST-2000-26473 -// (ECG - Effective Computational Geometry for Curves and Surfaces) -// and a STREP (FET Open) Project under Contract No IST-006413 -// (ACS -- Algorithms for Complex Shapes) - -#ifndef CGAL_CIRCULAR_KERNEL_GLOBAL_FUNCTIONS_ON_CIRCULAR_ARCS_2_H -#define CGAL_CIRCULAR_KERNEL_GLOBAL_FUNCTIONS_ON_CIRCULAR_ARCS_2_H - -// global functions - -#include -#include -#include - -CGAL_BEGIN_NAMESPACE - -template -typename CK::Circular_arc_point_2 -x_extremal_point(const Circle_2 & c, bool i) -{ - return CircularFunctors::x_extremal_point(c,i); -} - -template -OutputIterator -x_extremal_points(const Circle_2 & c, OutputIterator res) -{ - return CircularFunctors::x_extremal_points(c,res); -} - -template -typename CK::Circular_arc_point_2 -y_extremal_point(const Circle_2 & c, bool i) -{ - return CircularFunctors::y_extremal_point(c,i); -} - -template -OutputIterator -y_extremal_points(const Circle_2 & c, OutputIterator res) -{ - return CircularFunctors::y_extremal_points(c,res); -} - -// Not Documented -template< class CK > -inline -CGAL::Comparison_result -compare_x(const Circular_arc_2 &A1, const bool b1, - const Circular_arc_2 &A2, const bool b2) -{ - return CK().compare_x_2_object()(A1, b1, A2, b2); -} - -template< class CK > -inline -CGAL::Comparison_result -compare_x(const Circular_arc_point_2 &p, const Circular_arc_point_2 &q) -{ - return CK().compare_x_2_object()(p, q); -} - - -template< class CK > -inline -CGAL::Comparison_result -compare_x(const Circular_arc_point_2 &p, const Point_2 &q) -{ - return CK().compare_x_2_object()(p, q); -} - -template< class CK > -inline -CGAL::Comparison_result -compare_x(const Point_2 &p, const Circular_arc_point_2 &q) -{ - return CK().compare_x_2_object()(p, q); -} - -template< class CK > -inline -CGAL::Comparison_result -compare_y(const Circular_arc_point_2 &p, const Circular_arc_point_2 &q) -{ - return CK().compare_y_2_object()(p, q); -} - -template< class CK > -inline -CGAL::Comparison_result -compare_y(const Circular_arc_point_2 &p, const Point_2 &q) -{ - return CK().compare_y_2_object()(p, q); -} - -template< class CK > -inline -CGAL::Comparison_result -compare_y(const Point_2 &p, const Circular_arc_point_2 &q) -{ - return CK().compare_y_2_object()(p, q); -} - - -template< class CK > -inline -CGAL::Comparison_result -compare_xy(const Circular_arc_point_2 &p, const Circular_arc_point_2 &q) -{ - return CK().compare_xy_2_object()(p, q); -} - -template< class CK > -inline -CGAL::Comparison_result -compare_xy(const Circular_arc_point_2 &p, const Point_2 &q) -{ - return CK().compare_xy_2_object()(p, q); -} - -template< class CK > -inline -CGAL::Comparison_result -compare_xy(const Point_2 &p, const Circular_arc_point_2 &q) -{ - return CK().compare_xy_2_object()(p, q); -} - -template< class CK > -inline -CGAL::Comparison_result -compare_y_to_right(const Circular_arc_2 &A1, - const Circular_arc_2 &A2, - const Circular_arc_point_2 &p) -{ - return CK().compare_y_to_right_2_object()(A1, A2, p); -} - -template < class CK > -inline -bool -point_in_x_range(const Circular_arc_2 &A, const Circular_arc_point_2 &p) -{ - return CK().in_x_range_2_object()(A, p); -} - -template < class CK > -CGAL::Comparison_result -compare_y_at_x(const Circular_arc_point_2 &p, const Circular_arc_2 &a) -{ - return CK().compare_y_at_x_2_object()(p, a); -} - -template < class CK, class OutputIterator > -OutputIterator -make_x_monotone(const Circular_arc_2 &A, OutputIterator it) -{ - return CK().make_x_monotone_2_object()(A, it); -} - -template < class CK, class OutputIterator > -OutputIterator -make_xy_monotone(const Circular_arc_2 &A, OutputIterator it) -{ - return CK().make_xy_monotone_2_object()(A, it); -} - -template< class CK > -inline -bool -has_on(const Circle_2 &c, const Circular_arc_point_2 &p) -{ - return CK().has_on_2_object()(c, p); -} - -CGAL_END_NAMESPACE - -#endif // CGAL_CIRCULAR_KERNEL_GLOBAL_FUNCTIONS_ON_CIRCULAR_ARCS_2_H diff --git a/Circular_kernel_2/include/CGAL/global_functions_on_line_arcs_2.h b/Circular_kernel_2/include/CGAL/global_functions_on_line_arcs_2.h deleted file mode 100644 index 5a2d61af5a9..00000000000 --- a/Circular_kernel_2/include/CGAL/global_functions_on_line_arcs_2.h +++ /dev/null @@ -1,117 +0,0 @@ -// Copyright (c) 2003-2008 INRIA Sophia-Antipolis (France). -// 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) : Monique Teillaud, Sylvain Pion, Julien Hazebrouck, Pedro Machado - -// Partially supported by the IST Programme of the EU as a Shared-cost -// RTD (FET Open) Project under Contract No IST-2000-26473 -// (ECG - Effective Computational Geometry for Curves and Surfaces) -// and a STREP (FET Open) Project under Contract No IST-006413 -// (ACS -- Algorithms for Complex Shapes) - - -#ifndef CGAL_CIRCULAR_KERNEL_GLOBAL_FUNCTIONS_ON_LINE_ARCS_2_H -#define CGAL_CIRCULAR_KERNEL_GLOBAL_FUNCTIONS_ON_LINE_ARCS_2_H - -// global functions - -#include -#include -#include - -CGAL_BEGIN_NAMESPACE - -// TODO : Add the other ones... - -//Circles - -//template< class CK > -//inline -//CGAL::Comparison_result -//compare_x(const Line_arc_2 &A1, const bool b1, -// const Line_arc_2 &A2, const bool b2) -//{ -// return CK().compare_x_2_object()(A1, b1, A2, b2); -//} - -//template< class CK > -//inline -//CGAL::Comparison_result -//compare_x(const Circular_arc_point_2 &p, const Circular_arc_point_2 &q) -//{ -// return CK().compare_x_2_object()(p, q); -//} -// -//template< class CK > -//inline -//CGAL::Comparison_result -//compare_y(const Circular_arc_point_2 &p, const Circular_arc_point_2 &q) -//{ -// return CK().compare_y_2_object()(p, q); -//} -// -//template< class CK > -//inline -//CGAL::Comparison_result -//compare_xy(const Circular_arc_point_2 &p, const Circular_arc_point_2 &q) -//{ -// return CK().compare_xy_2_object()(p, q); -//} - -// Not Documented -template< class CK > -inline -CGAL::Comparison_result -compare_y_to_right(const Line_arc_2 &A1, - const Line_arc_2 &A2, - const Circular_arc_point_2 &p) -{ - return CK().compare_y_to_right_2_object()(A1, A2, p); -} - -template < class CK > -inline -bool -point_in_x_range(const Line_arc_2 &A, const Circular_arc_point_2 &p) -{ - return CK().in_x_range_2_object()(A, p); -} - -template < class CK > -CGAL::Comparison_result -compare_y_at_x(const Circular_arc_point_2 &p, const Line_arc_2 &a) -{ - return CK().compare_y_at_x_2_object()(p, a); -} - -// Not Documented -template < class CK, class OutputIterator > -OutputIterator -make_x_monotone(const Line_arc_2 &A, OutputIterator it) -{ - return CK().make_x_monotone_2_object()(A, it); -} - -template < class CK, class OutputIterator > -OutputIterator -make_xy_monotone(const Line_arc_2 &A, OutputIterator it) -{ - return CK().make_xy_monotone_2_object()(A, it); -} - -CGAL_END_NAMESPACE - -#endif // CGAL_CIRCULAR_KERNEL_GLOBAL_FUNCTIONS_ON_LINE_ARCS_2_H