songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Partition_2

This commit is contained in:
Andreas Fabri 2022-09-27 08:32:49 +01:00
parent bdd2fb8e4b
commit 1ad69e0432
6 changed files with 19 additions and 360 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Partition_2/include/CGAL/Partition_2/partition_approx_convex_2.h
View File

@ -29,7 +29,7 @@ _Pragma("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
#include <CGAL/IO/Tee_for_output_iterator.h> #include <CGAL/IO/Tee_for_output_iterator.h>
#include <CGAL/Partition_traits_2.h> #include <CGAL/Partition_traits_2.h>
#include <CGAL/partition_is_valid_2.h> #include <CGAL/partition_is_valid_2.h>
#include <CGAL/Partition_2/partition_assertions.h> #include <CGAL/assertions.h>
#include <CGAL/Circulator/Safe_circulator_from_iterator.h> #include <CGAL/Circulator/Safe_circulator_from_iterator.h>
#include <utility> #include <utility>
#include <iterator> #include <iterator>
@ -138,7 +138,7 @@ OutputIterator partition_approx_convex_2(InputIterator first,
P_Polygon_2 polygon(first, beyond,traits); P_Polygon_2 polygon(first, beyond,traits);
CGAL_partition_precondition( CGAL_precondition(
orientation_2(polygon.begin(), polygon.end(), traits) == COUNTERCLOCKWISE); orientation_2(polygon.begin(), polygon.end(), traits) == COUNTERCLOCKWISE);
Circulator first_c(polygon.begin(), polygon.end(), polygon.begin()); Circulator first_c(polygon.begin(), polygon.end(), polygon.begin());
@ -238,7 +238,7 @@ OutputIterator partition_approx_convex_2(InputIterator first,
#endif // no postconditions #endif // no postconditions
polygon.partition(res, 0); polygon.partition(res, 0);
CGAL_partition_postcondition( CGAL_postcondition(
convex_partition_is_valid_2(polygon.begin(), polygon.end(), convex_partition_is_valid_2(polygon.begin(), polygon.end(),
res.output_so_far_begin(), res.output_so_far_begin(),
res.output_so_far_end(), traits)); res.output_so_far_end(), traits));

341
Partition_2/include/CGAL/Partition_2/partition_assertions.h
View File

@ -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 <cassert>). Calling it a second time with another value
// for CGAL_NO_ASSERTIONS for example must make a difference.
#include <CGAL/assertions.h>
// 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<void>(0))
#include <CGAL/license/Partition_2.h>
# define CGAL_partition_assertion_msg(EX,MSG) (static_cast<void>(0))
# define CGAL_partition_assertion_code(CODE)
#else
# define CGAL_partition_assertion(EX) \
(CGAL::possibly(EX)?(static_cast<void>(0)): ::CGAL::assertion_fail( # EX , __FILE__, __LINE__))
# define CGAL_partition_assertion_msg(EX,MSG) \
(CGAL::possibly(EX)?(static_cast<void>(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<void>(0))
# define CGAL_partition_exactness_assertion_msg(EX,MSG) (static_cast<void>(0))
# define CGAL_partition_exactness_assertion_code(CODE)
#else
# define CGAL_partition_exactness_assertion(EX) \
(CGAL::possibly(EX)?(static_cast<void>(0)): ::CGAL::assertion_fail( # EX , __FILE__, __LINE__))
# define CGAL_partition_exactness_assertion_msg(EX,MSG) \
(CGAL::possibly(EX)?(static_cast<void>(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<void>(0))
# define CGAL_partition_expensive_assertion_msg(EX,MSG) (static_cast<void>(0))
# define CGAL_partition_expensive_assertion_code(CODE)
#else
# define CGAL_partition_expensive_assertion(EX) \
(CGAL::possibly(EX)?(static_cast<void>(0)): ::CGAL::assertion_fail( # EX , __FILE__, __LINE__))
# define CGAL_partition_expensive_assertion_msg(EX,MSG) \
(CGAL::possibly(EX)?(static_cast<void>(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<void>(0))
# define CGAL_partition_expensive_exactness_assertion_msg(EX,MSG) (static_cast<void>(0))
# define CGAL_partition_expensive_exactness_assertion_code(CODE)
#else
# define CGAL_partition_expensive_exactness_assertion(EX) \
(CGAL::possibly(EX)?(static_cast<void>(0)): ::CGAL::assertion_fail( # EX , __FILE__, __LINE__))
# define CGAL_partition_expensive_exactness_assertion_msg(EX,MSG) \
(CGAL::possibly(EX)?(static_cast<void>(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<void>(0))
# define CGAL_partition_precondition_msg(EX,MSG) (static_cast<void>(0))
# define CGAL_partition_precondition_code(CODE)
#else
# define CGAL_partition_precondition(EX) \
(CGAL::possibly(EX)?(static_cast<void>(0)): ::CGAL::precondition_fail( # EX , __FILE__, __LINE__))
# define CGAL_partition_precondition_msg(EX,MSG) \
(CGAL::possibly(EX)?(static_cast<void>(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<void>(0))
# define CGAL_partition_exactness_precondition_msg(EX,MSG) (static_cast<void>(0))
# define CGAL_partition_exactness_precondition_code(CODE)
#else
# define CGAL_partition_exactness_precondition(EX) \
(CGAL::possibly(EX)?(static_cast<void>(0)): ::CGAL::precondition_fail( # EX , __FILE__, __LINE__))
# define CGAL_partition_exactness_precondition_msg(EX,MSG) \
(CGAL::possibly(EX)?(static_cast<void>(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<void>(0))
# define CGAL_partition_expensive_precondition_msg(EX,MSG) (static_cast<void>(0))
# define CGAL_partition_expensive_precondition_code(CODE)
#else
# define CGAL_partition_expensive_precondition(EX) \
(CGAL::possibly(EX)?(static_cast<void>(0)): ::CGAL::precondition_fail( # EX , __FILE__, __LINE__))
# define CGAL_partition_expensive_precondition_msg(EX,MSG) \
(CGAL::possibly(EX)?(static_cast<void>(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<void>(0))
# define CGAL_partition_expensive_exactness_precondition_msg(EX,MSG) (static_cast<void>(0))
# define CGAL_partition_expensive_exactness_precondition_code(CODE)
#else
# define CGAL_partition_expensive_exactness_precondition(EX) \
(CGAL::possibly(EX)?(static_cast<void>(0)): ::CGAL::precondition_fail( # EX , __FILE__, __LINE__))
# define CGAL_partition_expensive_exactness_precondition_msg(EX,MSG) \
(CGAL::possibly(EX)?(static_cast<void>(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<void>(0))
# define CGAL_partition_postcondition_msg(EX,MSG) (static_cast<void>(0))
# define CGAL_partition_postcondition_code(CODE)
#else
# define CGAL_partition_postcondition(EX) \
(CGAL::possibly(EX)?(static_cast<void>(0)): ::CGAL::postcondition_fail( # EX , __FILE__, __LINE__))
# define CGAL_partition_postcondition_msg(EX,MSG) \
(CGAL::possibly(EX)?(static_cast<void>(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<void>(0))
# define CGAL_partition_exactness_postcondition_msg(EX,MSG) (static_cast<void>(0))
# define CGAL_partition_exactness_postcondition_code(CODE)
#else
# define CGAL_partition_exactness_postcondition(EX) \
(CGAL::possibly(EX)?(static_cast<void>(0)): ::CGAL::postcondition_fail( # EX , __FILE__, __LINE__))
# define CGAL_partition_exactness_postcondition_msg(EX,MSG) \
(CGAL::possibly(EX)?(static_cast<void>(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<void>(0))
# define CGAL_partition_expensive_postcondition_msg(EX,MSG) (static_cast<void>(0))
# define CGAL_partition_expensive_postcondition_code(CODE)
#else
# define CGAL_partition_expensive_postcondition(EX) \
(CGAL::possibly(EX)?(static_cast<void>(0)): ::CGAL::postcondition_fail( # EX , __FILE__, __LINE__))
# define CGAL_partition_expensive_postcondition_msg(EX,MSG) \
(CGAL::possibly(EX)?(static_cast<void>(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<void>(0))
# define CGAL_partition_expensive_exactness_postcondition_msg(EX,MSG) (static_cast<void>(0))
# define CGAL_partition_expensive_exactness_postcondition_code(CODE)
#else
# define CGAL_partition_expensive_exactness_postcondition(EX) \
(CGAL::possibly(EX)?(static_cast<void>(0)): ::CGAL::postcondition_fail( # EX , __FILE__, __LINE__))
# define CGAL_partition_expensive_exactness_postcondition_msg(EX,MSG) \
(CGAL::possibly(EX)?(static_cast<void>(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<void>(0))
# define CGAL_partition_warning_msg(EX,MSG) (static_cast<void>(0))
# define CGAL_partition_warning_code(CODE)
#else
# define CGAL_partition_warning(EX) \
(CGAL::possibly(EX)?(static_cast<void>(0)): ::CGAL::warning_fail( # EX , __FILE__, __LINE__))
# define CGAL_partition_warning_msg(EX,MSG) \
(CGAL::possibly(EX)?(static_cast<void>(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<void>(0))
# define CGAL_partition_exactness_warning_msg(EX,MSG) (static_cast<void>(0))
# define CGAL_partition_exactness_warning_code(CODE)
#else
# define CGAL_partition_exactness_warning(EX) \
(CGAL::possibly(EX)?(static_cast<void>(0)): ::CGAL::warning_fail( # EX , __FILE__, __LINE__))
# define CGAL_partition_exactness_warning_msg(EX,MSG) \
(CGAL::possibly(EX)?(static_cast<void>(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<void>(0))
# define CGAL_partition_expensive_warning_msg(EX,MSG) (static_cast<void>(0))
# define CGAL_partition_expensive_warning_code(CODE)
#else
# define CGAL_partition_expensive_warning(EX) \
(CGAL::possibly(EX)?(static_cast<void>(0)): ::CGAL::warning_fail( # EX , __FILE__, __LINE__))
# define CGAL_partition_expensive_warning_msg(EX,MSG) \
(CGAL::possibly(EX)?(static_cast<void>(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<void>(0))
# define CGAL_partition_expensive_exactness_warning_msg(EX,MSG) (static_cast<void>(0))
# define CGAL_partition_expensive_exactness_warning_code(CODE)
#else
# define CGAL_partition_expensive_exactness_warning(EX) \
(CGAL::possibly(EX)?(static_cast<void>(0)): ::CGAL::warning_fail( # EX , __FILE__, __LINE__))
# define CGAL_partition_expensive_exactness_warning_msg(EX,MSG) \
(CGAL::possibly(EX)?(static_cast<void>(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

12
Partition_2/include/CGAL/Partition_2/partition_greene_approx_convex_2.h
View File

@ -23,7 +23,7 @@
#include<CGAL/Partition_2/partition_y_monotone_2.h> #include<CGAL/Partition_2/partition_y_monotone_2.h>
#include<CGAL/Partition_2/Turn_reverser.h> #include<CGAL/Partition_2/Turn_reverser.h>
#include<CGAL/IO/Tee_for_output_iterator.h> #include<CGAL/IO/Tee_for_output_iterator.h>
#include<CGAL/Partition_2/partition_assertions.h> #include<CGAL/assertions.h>
#include<CGAL/partition_is_valid_2.h> #include<CGAL/partition_is_valid_2.h>
#include<CGAL/Partition_traits_2.h> #include<CGAL/Partition_traits_2.h>
#include<CGAL/is_y_monotone_2.h> #include<CGAL/is_y_monotone_2.h>
@ -90,7 +90,7 @@ void erase_vertices(BidirectionalCirculator first,
#endif #endif
it = first.current_iterator(); it = first.current_iterator();
CGAL_partition_assertion (it != polygon.end()); CGAL_assertion (it != polygon.end());
while ( (it != polygon.end()) && (*it != *last) ) while ( (it != polygon.end()) && (*it != *last) )
{ {
@ -692,9 +692,9 @@ void ga_convex_decomposition(ForwardIterator first, ForwardIterator beyond,
Vertex_list polygon(first, beyond); Vertex_list polygon(first, beyond);
CGAL_partition_precondition( CGAL_precondition(
orientation_2(polygon.begin(), polygon.end(), traits) == COUNTERCLOCKWISE); orientation_2(polygon.begin(), polygon.end(), traits) == COUNTERCLOCKWISE);
CGAL_partition_precondition( CGAL_precondition(
is_y_monotone_2(polygon.begin(), polygon.end(), traits)); is_y_monotone_2(polygon.begin(), polygon.end(), traits));
Vertex_circulator point_ref(&polygon); Vertex_circulator point_ref(&polygon);
@ -806,7 +806,7 @@ OutputIterator partition_greene_approx_convex_2(InputIterator first,
#endif // no postconditions #endif // no postconditions
Polygon_2 polygon(first, beyond); Polygon_2 polygon(first, beyond);
CGAL_partition_precondition( CGAL_precondition(
orientation_2(polygon.vertices_begin(), polygon.vertices_end(), orientation_2(polygon.vertices_begin(), polygon.vertices_end(),
traits) == COUNTERCLOCKWISE); traits) == COUNTERCLOCKWISE);
@ -822,7 +822,7 @@ OutputIterator partition_greene_approx_convex_2(InputIterator first,
(*MP_it).vertices_end(), res, traits); (*MP_it).vertices_end(), res, traits);
} }
CGAL_partition_postcondition( CGAL_postcondition(
convex_partition_is_valid_2(polygon.vertices_begin(), convex_partition_is_valid_2(polygon.vertices_begin(),
polygon.vertices_end(), polygon.vertices_end(),
res.output_so_far_begin(), res.output_so_far_begin(),

6
Partition_2/include/CGAL/Partition_2/partition_optimal_convex_2.h
View File

@ -67,7 +67,7 @@
#include<CGAL/Partition_2/Partitioned_polygon_2.h> #include<CGAL/Partition_2/Partitioned_polygon_2.h>
#include<CGAL/partition_is_valid_2.h> #include<CGAL/partition_is_valid_2.h>
#include<CGAL/Partition_traits_2.h> #include<CGAL/Partition_traits_2.h>
#include<CGAL/Partition_2/partition_assertions.h> #include<CGAL/assertions.h>
#include<CGAL/Partition_2/Vertex_visibility_graph_2.h> #include<CGAL/Partition_2/Vertex_visibility_graph_2.h>
#include<utility> #include<utility>
#include<vector> #include<vector>
@ -520,7 +520,7 @@ OutputIterator partition_optimal_convex_2(InputIterator first,
#endif // no postconditions #endif // no postconditions
P_Polygon_2 polygon(first, beyond,traits); P_Polygon_2 polygon(first, beyond,traits);
CGAL_partition_precondition( CGAL_precondition(
orientation_2(polygon.begin(), polygon.end(), traits) == COUNTERCLOCKWISE); orientation_2(polygon.begin(), polygon.end(), traits) == COUNTERCLOCKWISE);
#ifdef CGAL_PARTITION_OPTIMAL_CONVEX_DEBUG #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. // be pruned away. These crop up when there are collinear vertices.
// See explanation at top of file. // See explanation at top of file.
polygon.partition(res, 1); polygon.partition(res, 1);
CGAL_partition_postcondition( CGAL_postcondition(
convex_partition_is_valid_2(polygon.begin(), polygon.end(), convex_partition_is_valid_2(polygon.begin(), polygon.end(),
res.output_so_far_begin(), res.output_so_far_begin(),
res.output_so_far_end(), traits) res.output_so_far_end(), traits)

6
Partition_2/include/CGAL/Partition_2/partition_y_monotone_2.h
View File

@ -39,7 +39,7 @@
#include <CGAL/Partition_2/Partitioned_polygon_2.h> #include <CGAL/Partition_2/Partitioned_polygon_2.h>
#include <CGAL/ch_selected_extreme_points_2.h> #include <CGAL/ch_selected_extreme_points_2.h>
#include <CGAL/IO/Tee_for_output_iterator.h> #include <CGAL/IO/Tee_for_output_iterator.h>
#include <CGAL/Partition_2/partition_assertions.h> #include <CGAL/assertions.h>
#include <CGAL/partition_is_valid_2.h> #include <CGAL/partition_is_valid_2.h>
#include <CGAL/Partition_traits_2.h> #include <CGAL/Partition_traits_2.h>
#include <map> #include <map>
@ -426,7 +426,7 @@ OutputIterator partition_y_monotone_2(InputIterator first,
#endif // no postcondition #endif // no postcondition
P_Polygon_2 polygon(first, beyond, traits); P_Polygon_2 polygon(first, beyond, traits);
CGAL_partition_precondition( CGAL_precondition(
orientation_2(polygon.begin(), polygon.end(), traits) == COUNTERCLOCKWISE); orientation_2(polygon.begin(), polygon.end(), traits) == COUNTERCLOCKWISE);
Circulator circ(polygon.begin(), polygon.end()), done = circ; Circulator circ(polygon.begin(), polygon.end()), done = circ;
@ -484,7 +484,7 @@ OutputIterator partition_y_monotone_2(InputIterator first,
#endif #endif
polygon.partition(res, 0); polygon.partition(res, 0);
CGAL_partition_postcondition( CGAL_postcondition(
y_monotone_partition_is_valid_2(polygon.begin(), polygon.end(), y_monotone_partition_is_valid_2(polygon.begin(), polygon.end(),
res.output_so_far_begin(), res.output_so_far_begin(),
res.output_so_far_end(), traits)); res.output_so_far_end(), traits));

8
Partition_2/include/CGAL/partition_is_valid_2.h
View File

@ -19,7 +19,7 @@
#include <list> #include <list>
#include <utility> #include <utility>
#include <iterator> #include <iterator>
#include <CGAL/Partition_2/partition_assertions.h> #include <CGAL/assertions.h>
#include <CGAL/Partition_2/Partitioned_polygon_2.h> #include <CGAL/Partition_2/Partitioned_polygon_2.h>
#include <CGAL/Partition_2/Partition_vertex_map.h> #include <CGAL/Partition_2/Partition_vertex_map.h>
#include <CGAL/ch_selected_extreme_points_2.h> #include <CGAL/ch_selected_extreme_points_2.h>
@ -147,8 +147,8 @@ partition_is_valid_2 (InputIterator point_first, InputIterator point_last,
for (;point_first != point_last; point_first++) for (;point_first != point_last; point_first++)
orig_poly.push_back(*point_first); orig_poly.push_back(*point_first);
CGAL_partition_precondition(orientation_2(orig_poly.begin(),orig_poly.end(), CGAL_precondition(orientation_2(orig_poly.begin(),orig_poly.end(),
traits) == COUNTERCLOCKWISE); traits) == COUNTERCLOCKWISE);
P_Vertex_map output_vertex_set(poly_first, poly_last, traits); 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 << "Polygon " << poly_num << " is " << std::endl;
std::cout << *poly_first << std::endl; std::cout << *poly_first << std::endl;
#endif #endif
CGAL_partition_assertion ( CGAL_assertion (
orientation_2(vtx_begin, vtx_end, traits) == COUNTERCLOCKWISE); orientation_2(vtx_begin, vtx_end, traits) == COUNTERCLOCKWISE);
if (!is_valid(vtx_begin, vtx_end)) if (!is_valid(vtx_begin, vtx_end))
{ {