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

It now works for all partitions. 

Somebody should check if the change in
Partition_2/include/CGAL/Partition_2/Rotation_tree_2.h
is ok.
This commit is contained in:
Andreas Fabri 2019-04-02 15:55:45 +02:00
parent 4eeb1fa37f
commit 7127fa32ad
2 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Partition_2/examples/Partition_2/y_monotone_partition_with_info_2.cpp
View File

@ -45,7 +45,7 @@ int main( )
//CGAL::y_monotone_partition_2 //CGAL::y_monotone_partition_2
CGAL::optimal_convex_partition_2 CGAL::greene_approx_convex_partition_2
(polygon.vertices_begin(), (polygon.vertices_begin(),
polygon.vertices_end(), polygon.vertices_end(),
std::back_inserter(partition_polys), std::back_inserter(partition_polys),

34
Partition_2/include/CGAL/Pair_partition_traits_2.h
View File

@ -1,4 +1,4 @@
// Copyright (c) 2000 Max-Planck-Institute Saarbruecken (Germany). // Copyright (c) 2019 Max-Planck-Institute Saarbruecken (Germany).
// All rights reserved. // All rights reserved.
// //
// This file is part of CGAL (www.cgal.org). // This file is part of CGAL (www.cgal.org).
@ -17,7 +17,7 @@
// SPDX-License-Identifier: GPL-3.0+ // SPDX-License-Identifier: GPL-3.0+
// //
// //
// Author(s) : Susan Hert <hert@mpi-sb.mpg.de> // Author(s) : Andreas Fabri
#ifndef CGAL_PAIR_PARTITION_TRAITS_2_H #ifndef CGAL_PAIR_PARTITION_TRAITS_2_H
#define CGAL_PAIR_PARTITION_TRAITS_2_H #define CGAL_PAIR_PARTITION_TRAITS_2_H
@ -72,6 +72,31 @@ namespace CGAL {
} }
}; };
template <typename Pair, typename K>
struct Pair_collinear_are_ordered_along_line_2 {
Pair_collinear_are_ordered_along_line_2()
{}
typename K::Collinear_are_ordered_along_line_2 fct;
Pair_collinear_are_ordered_along_line_2(typename K::Collinear_are_ordered_along_line_2 fct)
: fct(fct)
{}
typename K::Collinear_are_ordered_along_line_2::result_type
operator()(const Pair& p, const Pair& q, const typename K::Point_2& r) const
{
return fct(p.first, q.first, r);
}
typename K::Collinear_are_ordered_along_line_2::result_type
operator()(const Pair& p, const Pair& q, const Pair& r) const
{
return fct(p.first, q.first, r.first);
}
};
template <class Kernel_> template <class Kernel_>
class Pair_partition_traits_2 class Pair_partition_traits_2
@ -110,14 +135,13 @@ public:
// needed by Indirect_edge_compare, used in y_monotone and greene_approx // needed by Indirect_edge_compare, used in y_monotone and greene_approx
typedef typename Kernel::Line_2 Line_2; typedef typename Kernel::Line_2 Line_2;
typedef Pair_functor<Point_2, typename Kernel::Construct_line_2> Construct_line_2; typedef Pair_functor<Point_2, typename Kernel::Construct_line_2> Construct_line_2;
typedef Pair_compare_x_at_y_2<Point_2,typename Kernel> Compare_x_at_y_2; typedef Pair_compare_x_at_y_2<Point_2,Kernel> Compare_x_at_y_2;
typedef typename Kernel::Is_horizontal_2 Is_horizontal_2; typedef typename Kernel::Is_horizontal_2 Is_horizontal_2;
#if 1 #if 1
// needed by visibility graph and thus by optimal convex // needed by visibility graph and thus by optimal convex
typedef typename Kernel::Ray_2 Ray_2; typedef typename Kernel::Ray_2 Ray_2;
typedef Pair_functor<Point_2,typename Kernel::Collinear_are_ordered_along_line_2> typedef Pair_collinear_are_ordered_along_line_2<Point_2,Kernel> Collinear_are_ordered_along_line_2;
Collinear_are_ordered_along_line_2;
typedef Pair_functor<Point_2,typename Kernel::Are_strictly_ordered_along_line_2> typedef Pair_functor<Point_2,typename Kernel::Are_strictly_ordered_along_line_2>
Are_strictly_ordered_along_line_2; Are_strictly_ordered_along_line_2;
typedef typename Kernel::Intersect_2 Intersect_2; typedef typename Kernel::Intersect_2 Intersect_2;