diff --git a/Partition_2/include/CGAL/Partition_2/partition_approx_convex_2.h b/Partition_2/include/CGAL/Partition_2/partition_approx_convex_2.h index 076e78cee57..88d756d243a 100644 --- a/Partition_2/include/CGAL/Partition_2/partition_approx_convex_2.h +++ b/Partition_2/include/CGAL/Partition_2/partition_approx_convex_2.h @@ -29,7 +29,7 @@ _Pragma("GCC diagnostic ignored \"-Wmaybe-uninitialized\"") #include #include #include -#include +#include #include #include #include @@ -138,7 +138,7 @@ OutputIterator partition_approx_convex_2(InputIterator first, P_Polygon_2 polygon(first, beyond,traits); - CGAL_partition_precondition( + CGAL_precondition( orientation_2(polygon.begin(), polygon.end(), traits) == COUNTERCLOCKWISE); Circulator first_c(polygon.begin(), polygon.end(), polygon.begin()); @@ -238,7 +238,7 @@ OutputIterator partition_approx_convex_2(InputIterator first, #endif // no postconditions polygon.partition(res, 0); - CGAL_partition_postcondition( + CGAL_postcondition( convex_partition_is_valid_2(polygon.begin(), polygon.end(), res.output_so_far_begin(), res.output_so_far_end(), traits)); diff --git a/Partition_2/include/CGAL/Partition_2/partition_assertions.h b/Partition_2/include/CGAL/Partition_2/partition_assertions.h deleted file mode 100644 index 6d0f0288b3e..00000000000 --- a/Partition_2/include/CGAL/Partition_2/partition_assertions.h +++ /dev/null @@ -1,341 +0,0 @@ -// Copyright (c) 1997 Max-Planck-Institute Saarbruecken (Germany). -// All rights reserved. -// -// This file is part of CGAL (www.cgal.org). -// -// $URL$ -// $Id$ -// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-Commercial -// -// -// Author(s) : Geert-Jan Giezeman, Sven Schoenherr -// -// Generated from script create_assertions.sh - - -// Note that this header file is intentionnaly not protected with a -// macro (as ). Calling it a second time with another value -// for CGAL_NO_ASSERTIONS for example must make a difference. - -#include - -// macro definitions -// ================= -// assertions -// ---------- - -#undef CGAL_partition_assertion -#undef CGAL_partition_assertion_msg -#undef CGAL_partition_assertion_code - -#if defined(CGAL_PARTITION_NO_ASSERTIONS) || defined(CGAL_NO_ASSERTIONS) -# define CGAL_partition_assertion(EX) (static_cast(0)) - -#include - -# define CGAL_partition_assertion_msg(EX,MSG) (static_cast(0)) -# define CGAL_partition_assertion_code(CODE) -#else -# define CGAL_partition_assertion(EX) \ - (CGAL::possibly(EX)?(static_cast(0)): ::CGAL::assertion_fail( # EX , __FILE__, __LINE__)) -# define CGAL_partition_assertion_msg(EX,MSG) \ - (CGAL::possibly(EX)?(static_cast(0)): ::CGAL::assertion_fail( # EX , __FILE__, __LINE__, MSG)) -# define CGAL_partition_assertion_code(CODE) CODE -# define CGAL_partition_assertions 1 -#endif // CGAL_PARTITION_NO_ASSERTIONS - - -#undef CGAL_partition_exactness_assertion -#undef CGAL_partition_exactness_assertion_msg -#undef CGAL_partition_exactness_assertion_code - -#if defined(CGAL_PARTITION_NO_ASSERTIONS) || defined(CGAL_NO_ASSERTIONS) \ - || (!defined(CGAL_PARTITION_CHECK_EXACTNESS) && !defined(CGAL_CHECK_EXACTNESS)) -# define CGAL_partition_exactness_assertion(EX) (static_cast(0)) -# define CGAL_partition_exactness_assertion_msg(EX,MSG) (static_cast(0)) -# define CGAL_partition_exactness_assertion_code(CODE) -#else -# define CGAL_partition_exactness_assertion(EX) \ - (CGAL::possibly(EX)?(static_cast(0)): ::CGAL::assertion_fail( # EX , __FILE__, __LINE__)) -# define CGAL_partition_exactness_assertion_msg(EX,MSG) \ - (CGAL::possibly(EX)?(static_cast(0)): ::CGAL::assertion_fail( # EX , __FILE__, __LINE__, MSG)) -# define CGAL_partition_exactness_assertion_code(CODE) CODE -# define CGAL_partition_exactness_assertions 1 -#endif // CGAL_PARTITION_NO_ASSERTIONS - - -#undef CGAL_partition_expensive_assertion -#undef CGAL_partition_expensive_assertion_msg -#undef CGAL_partition_expensive_assertion_code - -#if defined(CGAL_PARTITION_NO_ASSERTIONS) \ - || defined(CGAL_NO_ASSERTIONS) \ - || (!defined(CGAL_PARTITION_CHECK_EXPENSIVE) && !defined(CGAL_CHECK_EXPENSIVE)) -# define CGAL_partition_expensive_assertion(EX) (static_cast(0)) -# define CGAL_partition_expensive_assertion_msg(EX,MSG) (static_cast(0)) -# define CGAL_partition_expensive_assertion_code(CODE) -#else -# define CGAL_partition_expensive_assertion(EX) \ - (CGAL::possibly(EX)?(static_cast(0)): ::CGAL::assertion_fail( # EX , __FILE__, __LINE__)) -# define CGAL_partition_expensive_assertion_msg(EX,MSG) \ - (CGAL::possibly(EX)?(static_cast(0)): ::CGAL::assertion_fail( # EX , __FILE__, __LINE__, MSG)) -# define CGAL_partition_expensive_assertion_code(CODE) CODE -# define CGAL_partition_expensive_assertions 1 -#endif // CGAL_PARTITION_NO_ASSERTIONS - - -#undef CGAL_partition_expensive_exactness_assertion -#undef CGAL_partition_expensive_exactness_assertion_msg -#undef CGAL_partition_expensive_exactness_assertion_code - -#if defined(CGAL_PARTITION_NO_ASSERTIONS) || defined(CGAL_NO_ASSERTIONS) \ - || (!defined(CGAL_PARTITION_CHECK_EXACTNESS) && !defined(CGAL_CHECK_EXACTNESS))\ - || (!defined(CGAL_PARTITION_CHECK_EXPENSIVE) && !defined(CGAL_CHECK_EXPENSIVE)) -# define CGAL_partition_expensive_exactness_assertion(EX) (static_cast(0)) -# define CGAL_partition_expensive_exactness_assertion_msg(EX,MSG) (static_cast(0)) -# define CGAL_partition_expensive_exactness_assertion_code(CODE) -#else -# define CGAL_partition_expensive_exactness_assertion(EX) \ - (CGAL::possibly(EX)?(static_cast(0)): ::CGAL::assertion_fail( # EX , __FILE__, __LINE__)) -# define CGAL_partition_expensive_exactness_assertion_msg(EX,MSG) \ - (CGAL::possibly(EX)?(static_cast(0)): ::CGAL::assertion_fail( # EX , __FILE__, __LINE__, MSG)) -# define CGAL_partition_expensive_exactness_assertion_code(CODE) CODE -# define CGAL_partition_expensive_exactness_assertions 1 -#endif // CGAL_PARTITION_NO_ASSERTIONS - - -// preconditions -// ------------- - -#undef CGAL_partition_precondition -#undef CGAL_partition_precondition_msg -#undef CGAL_partition_precondition_code - -#if defined(CGAL_PARTITION_NO_PRECONDITIONS) || defined(CGAL_NO_PRECONDITIONS) -# define CGAL_partition_precondition(EX) (static_cast(0)) -# define CGAL_partition_precondition_msg(EX,MSG) (static_cast(0)) -# define CGAL_partition_precondition_code(CODE) -#else -# define CGAL_partition_precondition(EX) \ - (CGAL::possibly(EX)?(static_cast(0)): ::CGAL::precondition_fail( # EX , __FILE__, __LINE__)) -# define CGAL_partition_precondition_msg(EX,MSG) \ - (CGAL::possibly(EX)?(static_cast(0)): ::CGAL::precondition_fail( # EX , __FILE__, __LINE__, MSG)) -# define CGAL_partition_precondition_code(CODE) CODE -# define CGAL_partition_preconditions 1 -#endif // CGAL_PARTITION_NO_PRECONDITIONS - - -#undef CGAL_partition_exactness_precondition -#undef CGAL_partition_exactness_precondition_msg -#undef CGAL_partition_exactness_precondition_code - -#if defined(CGAL_PARTITION_NO_PRECONDITIONS) || defined(CGAL_NO_PRECONDITIONS) \ - || (!defined(CGAL_PARTITION_CHECK_EXACTNESS) && !defined(CGAL_CHECK_EXACTNESS)) -# define CGAL_partition_exactness_precondition(EX) (static_cast(0)) -# define CGAL_partition_exactness_precondition_msg(EX,MSG) (static_cast(0)) -# define CGAL_partition_exactness_precondition_code(CODE) -#else -# define CGAL_partition_exactness_precondition(EX) \ - (CGAL::possibly(EX)?(static_cast(0)): ::CGAL::precondition_fail( # EX , __FILE__, __LINE__)) -# define CGAL_partition_exactness_precondition_msg(EX,MSG) \ - (CGAL::possibly(EX)?(static_cast(0)): ::CGAL::precondition_fail( # EX , __FILE__, __LINE__, MSG)) -# define CGAL_partition_exactness_precondition_code(CODE) CODE -# define CGAL_partition_exactness_preconditions 1 -#endif // CGAL_PARTITION_NO_PRECONDITIONS - - -#undef CGAL_partition_expensive_precondition -#undef CGAL_partition_expensive_precondition_msg -#undef CGAL_partition_expensive_precondition_code - -#if defined(CGAL_PARTITION_NO_PRECONDITIONS) || defined(CGAL_NO_PRECONDITIONS) \ - || (!defined(CGAL_PARTITION_CHECK_EXPENSIVE) && !defined(CGAL_CHECK_EXPENSIVE)) -# define CGAL_partition_expensive_precondition(EX) (static_cast(0)) -# define CGAL_partition_expensive_precondition_msg(EX,MSG) (static_cast(0)) -# define CGAL_partition_expensive_precondition_code(CODE) -#else -# define CGAL_partition_expensive_precondition(EX) \ - (CGAL::possibly(EX)?(static_cast(0)): ::CGAL::precondition_fail( # EX , __FILE__, __LINE__)) -# define CGAL_partition_expensive_precondition_msg(EX,MSG) \ - (CGAL::possibly(EX)?(static_cast(0)): ::CGAL::precondition_fail( # EX , __FILE__, __LINE__, MSG)) -# define CGAL_partition_expensive_precondition_code(CODE) CODE -# define CGAL_partition_expensive_preconditions 1 -#endif // CGAL_PARTITION_NO_PRECONDITIONS - - -#undef CGAL_partition_expensive_exactness_precondition -#undef CGAL_partition_expensive_exactness_precondition_msg -#undef CGAL_partition_expensive_exactness_precondition_code - -#if defined(CGAL_PARTITION_NO_PRECONDITIONS) || defined(CGAL_NO_PRECONDITIONS) \ - || (!defined(CGAL_PARTITION_CHECK_EXACTNESS) && !defined(CGAL_CHECK_EXACTNESS))\ - || (!defined(CGAL_PARTITION_CHECK_EXPENSIVE) && !defined(CGAL_CHECK_EXPENSIVE)) -# define CGAL_partition_expensive_exactness_precondition(EX) (static_cast(0)) -# define CGAL_partition_expensive_exactness_precondition_msg(EX,MSG) (static_cast(0)) -# define CGAL_partition_expensive_exactness_precondition_code(CODE) -#else -# define CGAL_partition_expensive_exactness_precondition(EX) \ - (CGAL::possibly(EX)?(static_cast(0)): ::CGAL::precondition_fail( # EX , __FILE__, __LINE__)) -# define CGAL_partition_expensive_exactness_precondition_msg(EX,MSG) \ - (CGAL::possibly(EX)?(static_cast(0)): ::CGAL::precondition_fail( # EX , __FILE__, __LINE__, MSG)) -# define CGAL_partition_expensive_exactness_precondition_code(CODE) CODE -# define CGAL_partition_expensive_exactness_preconditions 1 -#endif // CGAL_PARTITION_NO_PRECONDITIONS - - -// postconditions -// -------------- - -#undef CGAL_partition_postcondition -#undef CGAL_partition_postcondition_msg -#undef CGAL_partition_postcondition_code - -#if defined(CGAL_PARTITION_NO_POSTCONDITIONS) || defined(CGAL_NO_POSTCONDITIONS) -# define CGAL_partition_postcondition(EX) (static_cast(0)) -# define CGAL_partition_postcondition_msg(EX,MSG) (static_cast(0)) -# define CGAL_partition_postcondition_code(CODE) -#else -# define CGAL_partition_postcondition(EX) \ - (CGAL::possibly(EX)?(static_cast(0)): ::CGAL::postcondition_fail( # EX , __FILE__, __LINE__)) -# define CGAL_partition_postcondition_msg(EX,MSG) \ - (CGAL::possibly(EX)?(static_cast(0)): ::CGAL::postcondition_fail( # EX , __FILE__, __LINE__, MSG)) -# define CGAL_partition_postcondition_code(CODE) CODE -# define CGAL_partition_postconditions 1 -#endif // CGAL_PARTITION_NO_POSTCONDITIONS - - -#undef CGAL_partition_exactness_postcondition -#undef CGAL_partition_exactness_postcondition_msg -#undef CGAL_partition_exactness_postcondition_code - -#if defined(CGAL_PARTITION_NO_POSTCONDITIONS) || defined(CGAL_NO_POSTCONDITIONS) \ - || (!defined(CGAL_PARTITION_CHECK_EXACTNESS) && !defined(CGAL_CHECK_EXACTNESS)) -# define CGAL_partition_exactness_postcondition(EX) (static_cast(0)) -# define CGAL_partition_exactness_postcondition_msg(EX,MSG) (static_cast(0)) -# define CGAL_partition_exactness_postcondition_code(CODE) -#else -# define CGAL_partition_exactness_postcondition(EX) \ - (CGAL::possibly(EX)?(static_cast(0)): ::CGAL::postcondition_fail( # EX , __FILE__, __LINE__)) -# define CGAL_partition_exactness_postcondition_msg(EX,MSG) \ - (CGAL::possibly(EX)?(static_cast(0)): ::CGAL::postcondition_fail( # EX , __FILE__, __LINE__, MSG)) -# define CGAL_partition_exactness_postcondition_code(CODE) CODE -# define CGAL_partition_exactness_postconditions 1 -#endif // CGAL_PARTITION_NO_POSTCONDITIONS - - -#undef CGAL_partition_expensive_postcondition -#undef CGAL_partition_expensive_postcondition_msg -#undef CGAL_partition_expensive_postcondition_code - -#if defined(CGAL_PARTITION_NO_POSTCONDITIONS) || defined(CGAL_NO_POSTCONDITIONS) \ - || (!defined(CGAL_PARTITION_CHECK_EXPENSIVE) && !defined(CGAL_CHECK_EXPENSIVE)) -# define CGAL_partition_expensive_postcondition(EX) (static_cast(0)) -# define CGAL_partition_expensive_postcondition_msg(EX,MSG) (static_cast(0)) -# define CGAL_partition_expensive_postcondition_code(CODE) -#else -# define CGAL_partition_expensive_postcondition(EX) \ - (CGAL::possibly(EX)?(static_cast(0)): ::CGAL::postcondition_fail( # EX , __FILE__, __LINE__)) -# define CGAL_partition_expensive_postcondition_msg(EX,MSG) \ - (CGAL::possibly(EX)?(static_cast(0)): ::CGAL::postcondition_fail( # EX , __FILE__, __LINE__, MSG)) -# define CGAL_partition_expensive_postcondition_code(CODE) CODE -# define CGAL_partition_expensive_postconditions 1 -#endif // CGAL_PARTITION_NO_POSTCONDITIONS - - -#undef CGAL_partition_expensive_exactness_postcondition -#undef CGAL_partition_expensive_exactness_postcondition_msg -#undef CGAL_partition_expensive_exactness_postcondition_code - -#if defined(CGAL_PARTITION_NO_POSTCONDITIONS) || defined(CGAL_NO_POSTCONDITIONS) \ - || (!defined(CGAL_PARTITION_CHECK_EXACTNESS) && !defined(CGAL_CHECK_EXACTNESS))\ - || (!defined(CGAL_PARTITION_CHECK_EXPENSIVE) && !defined(CGAL_CHECK_EXPENSIVE)) -# define CGAL_partition_expensive_exactness_postcondition(EX) (static_cast(0)) -# define CGAL_partition_expensive_exactness_postcondition_msg(EX,MSG) (static_cast(0)) -# define CGAL_partition_expensive_exactness_postcondition_code(CODE) -#else -# define CGAL_partition_expensive_exactness_postcondition(EX) \ - (CGAL::possibly(EX)?(static_cast(0)): ::CGAL::postcondition_fail( # EX , __FILE__, __LINE__)) -# define CGAL_partition_expensive_exactness_postcondition_msg(EX,MSG) \ - (CGAL::possibly(EX)?(static_cast(0)): ::CGAL::postcondition_fail( # EX , __FILE__, __LINE__, MSG)) -# define CGAL_partition_expensive_exactness_postcondition_code(CODE) CODE -# define CGAL_partition_expensive_exactness_postconditions 1 -#endif // CGAL_PARTITION_NO_POSTCONDITIONS - - -// warnings -// -------- - -#undef CGAL_partition_warning -#undef CGAL_partition_warning_msg -#undef CGAL_partition_warning_code - -#if defined(CGAL_PARTITION_NO_WARNINGS) || defined(CGAL_NO_WARNINGS) -# define CGAL_partition_warning(EX) (static_cast(0)) -# define CGAL_partition_warning_msg(EX,MSG) (static_cast(0)) -# define CGAL_partition_warning_code(CODE) -#else -# define CGAL_partition_warning(EX) \ - (CGAL::possibly(EX)?(static_cast(0)): ::CGAL::warning_fail( # EX , __FILE__, __LINE__)) -# define CGAL_partition_warning_msg(EX,MSG) \ - (CGAL::possibly(EX)?(static_cast(0)): ::CGAL::warning_fail( # EX , __FILE__, __LINE__, MSG)) -# define CGAL_partition_warning_code(CODE) CODE -# define CGAL_partition_warnings 1 -#endif // CGAL_PARTITION_NO_WARNINGS - - -#undef CGAL_partition_exactness_warning -#undef CGAL_partition_exactness_warning_msg -#undef CGAL_partition_exactness_warning_code - -#if defined(CGAL_PARTITION_NO_WARNINGS) || defined(CGAL_NO_WARNINGS) \ - || (!defined(CGAL_PARTITION_CHECK_EXACTNESS) && !defined(CGAL_CHECK_EXACTNESS)) -# define CGAL_partition_exactness_warning(EX) (static_cast(0)) -# define CGAL_partition_exactness_warning_msg(EX,MSG) (static_cast(0)) -# define CGAL_partition_exactness_warning_code(CODE) -#else -# define CGAL_partition_exactness_warning(EX) \ - (CGAL::possibly(EX)?(static_cast(0)): ::CGAL::warning_fail( # EX , __FILE__, __LINE__)) -# define CGAL_partition_exactness_warning_msg(EX,MSG) \ - (CGAL::possibly(EX)?(static_cast(0)): ::CGAL::warning_fail( # EX , __FILE__, __LINE__, MSG)) -# define CGAL_partition_exactness_warning_code(CODE) CODE -# define CGAL_partition_exactness_warnings 1 -#endif // CGAL_PARTITION_NO_WARNINGS - - -#undef CGAL_partition_expensive_warning -#undef CGAL_partition_expensive_warning_msg -#undef CGAL_partition_expensive_warning_code - -#if defined(CGAL_PARTITION_NO_WARNINGS) || defined(CGAL_NO_WARNINGS) \ - || (!defined(CGAL_PARTITION_CHECK_EXPENSIVE) && !defined(CGAL_CHECK_EXPENSIVE)) -# define CGAL_partition_expensive_warning(EX) (static_cast(0)) -# define CGAL_partition_expensive_warning_msg(EX,MSG) (static_cast(0)) -# define CGAL_partition_expensive_warning_code(CODE) -#else -# define CGAL_partition_expensive_warning(EX) \ - (CGAL::possibly(EX)?(static_cast(0)): ::CGAL::warning_fail( # EX , __FILE__, __LINE__)) -# define CGAL_partition_expensive_warning_msg(EX,MSG) \ - (CGAL::possibly(EX)?(static_cast(0)): ::CGAL::warning_fail( # EX , __FILE__, __LINE__, MSG)) -# define CGAL_partition_expensive_warning_code(CODE) CODE -# define CGAL_partition_expensive_warnings 1 -#endif // CGAL_PARTITION_NO_WARNINGS - - -#undef CGAL_partition_expensive_exactness_warning -#undef CGAL_partition_expensive_exactness_warning_msg -#undef CGAL_partition_expensive_exactness_warning_code - -#if defined(CGAL_PARTITION_NO_WARNINGS) || defined(CGAL_NO_WARNINGS) \ - || (!defined(CGAL_PARTITION_CHECK_EXACTNESS) && !defined(CGAL_CHECK_EXACTNESS))\ - || (!defined(CGAL_PARTITION_CHECK_EXPENSIVE) && !defined(CGAL_CHECK_EXPENSIVE)) -# define CGAL_partition_expensive_exactness_warning(EX) (static_cast(0)) -# define CGAL_partition_expensive_exactness_warning_msg(EX,MSG) (static_cast(0)) -# define CGAL_partition_expensive_exactness_warning_code(CODE) -#else -# define CGAL_partition_expensive_exactness_warning(EX) \ - (CGAL::possibly(EX)?(static_cast(0)): ::CGAL::warning_fail( # EX , __FILE__, __LINE__)) -# define CGAL_partition_expensive_exactness_warning_msg(EX,MSG) \ - (CGAL::possibly(EX)?(static_cast(0)): ::CGAL::warning_fail( # EX , __FILE__, __LINE__, MSG)) -# define CGAL_partition_expensive_exactness_warning_code(CODE) CODE -# define CGAL_partition_expensive_exactness_warnings 1 -#endif // CGAL_PARTITION_NO_WARNINGS diff --git a/Partition_2/include/CGAL/Partition_2/partition_greene_approx_convex_2.h b/Partition_2/include/CGAL/Partition_2/partition_greene_approx_convex_2.h index 8f3d54ce5dd..194e777a188 100644 --- a/Partition_2/include/CGAL/Partition_2/partition_greene_approx_convex_2.h +++ b/Partition_2/include/CGAL/Partition_2/partition_greene_approx_convex_2.h @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include @@ -90,7 +90,7 @@ void erase_vertices(BidirectionalCirculator first, #endif it = first.current_iterator(); - CGAL_partition_assertion (it != polygon.end()); + CGAL_assertion (it != polygon.end()); while ( (it != polygon.end()) && (*it != *last) ) { @@ -692,9 +692,9 @@ void ga_convex_decomposition(ForwardIterator first, ForwardIterator beyond, Vertex_list polygon(first, beyond); - CGAL_partition_precondition( + CGAL_precondition( orientation_2(polygon.begin(), polygon.end(), traits) == COUNTERCLOCKWISE); - CGAL_partition_precondition( + CGAL_precondition( is_y_monotone_2(polygon.begin(), polygon.end(), traits)); Vertex_circulator point_ref(&polygon); @@ -806,7 +806,7 @@ OutputIterator partition_greene_approx_convex_2(InputIterator first, #endif // no postconditions Polygon_2 polygon(first, beyond); - CGAL_partition_precondition( + CGAL_precondition( orientation_2(polygon.vertices_begin(), polygon.vertices_end(), traits) == COUNTERCLOCKWISE); @@ -822,7 +822,7 @@ OutputIterator partition_greene_approx_convex_2(InputIterator first, (*MP_it).vertices_end(), res, traits); } - CGAL_partition_postcondition( + CGAL_postcondition( convex_partition_is_valid_2(polygon.vertices_begin(), polygon.vertices_end(), res.output_so_far_begin(), diff --git a/Partition_2/include/CGAL/Partition_2/partition_optimal_convex_2.h b/Partition_2/include/CGAL/Partition_2/partition_optimal_convex_2.h index 0b87e73eb84..f5f500720a4 100644 --- a/Partition_2/include/CGAL/Partition_2/partition_optimal_convex_2.h +++ b/Partition_2/include/CGAL/Partition_2/partition_optimal_convex_2.h @@ -67,7 +67,7 @@ #include #include #include -#include +#include #include #include #include @@ -520,7 +520,7 @@ OutputIterator partition_optimal_convex_2(InputIterator first, #endif // no postconditions P_Polygon_2 polygon(first, beyond,traits); - CGAL_partition_precondition( + CGAL_precondition( orientation_2(polygon.begin(), polygon.end(), traits) == COUNTERCLOCKWISE); #ifdef CGAL_PARTITION_OPTIMAL_CONVEX_DEBUG @@ -559,7 +559,7 @@ OutputIterator partition_optimal_convex_2(InputIterator first, // be pruned away. These crop up when there are collinear vertices. // See explanation at top of file. polygon.partition(res, 1); - CGAL_partition_postcondition( + CGAL_postcondition( convex_partition_is_valid_2(polygon.begin(), polygon.end(), res.output_so_far_begin(), res.output_so_far_end(), traits) diff --git a/Partition_2/include/CGAL/Partition_2/partition_y_monotone_2.h b/Partition_2/include/CGAL/Partition_2/partition_y_monotone_2.h index a4918e5548f..d74bc9b9db8 100644 --- a/Partition_2/include/CGAL/Partition_2/partition_y_monotone_2.h +++ b/Partition_2/include/CGAL/Partition_2/partition_y_monotone_2.h @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include #include #include @@ -426,7 +426,7 @@ OutputIterator partition_y_monotone_2(InputIterator first, #endif // no postcondition P_Polygon_2 polygon(first, beyond, traits); - CGAL_partition_precondition( + CGAL_precondition( orientation_2(polygon.begin(), polygon.end(), traits) == COUNTERCLOCKWISE); Circulator circ(polygon.begin(), polygon.end()), done = circ; @@ -484,7 +484,7 @@ OutputIterator partition_y_monotone_2(InputIterator first, #endif polygon.partition(res, 0); - CGAL_partition_postcondition( + CGAL_postcondition( y_monotone_partition_is_valid_2(polygon.begin(), polygon.end(), res.output_so_far_begin(), res.output_so_far_end(), traits)); diff --git a/Partition_2/include/CGAL/partition_is_valid_2.h b/Partition_2/include/CGAL/partition_is_valid_2.h index 71ddd0d66e3..f6a5f2bbd7f 100644 --- a/Partition_2/include/CGAL/partition_is_valid_2.h +++ b/Partition_2/include/CGAL/partition_is_valid_2.h @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include #include @@ -147,8 +147,8 @@ partition_is_valid_2 (InputIterator point_first, InputIterator point_last, for (;point_first != point_last; point_first++) orig_poly.push_back(*point_first); - CGAL_partition_precondition(orientation_2(orig_poly.begin(),orig_poly.end(), - traits) == COUNTERCLOCKWISE); + CGAL_precondition(orientation_2(orig_poly.begin(),orig_poly.end(), + traits) == COUNTERCLOCKWISE); P_Vertex_map output_vertex_set(poly_first, poly_last, traits); @@ -163,7 +163,7 @@ partition_is_valid_2 (InputIterator point_first, InputIterator point_last, std::cout << "Polygon " << poly_num << " is " << std::endl; std::cout << *poly_first << std::endl; #endif - CGAL_partition_assertion ( + CGAL_assertion ( orientation_2(vtx_begin, vtx_end, traits) == COUNTERCLOCKWISE); if (!is_valid(vtx_begin, vtx_end)) {