diff options
Diffstat (limited to 'boost/polygon/rectangle_concept.hpp')
| -rw-r--r-- | boost/polygon/rectangle_concept.hpp | 458 |
1 files changed, 230 insertions, 228 deletions
diff --git a/boost/polygon/rectangle_concept.hpp b/boost/polygon/rectangle_concept.hpp index e302b99c90..e82431907b 100644 --- a/boost/polygon/rectangle_concept.hpp +++ b/boost/polygon/rectangle_concept.hpp @@ -1,6 +1,6 @@ /* Copyright 2008 Intel Corporation - + Use, modification and distribution are subject to the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt). @@ -25,7 +25,7 @@ namespace boost { namespace polygon{ struct rectangle_concept {}; - + template <typename T> struct is_rectangle_concept { typedef gtl_no type; }; template <> @@ -62,8 +62,8 @@ namespace boost { namespace polygon{ template <typename T, typename CT> struct rectangle_difference_type_by_concept { typedef void type; }; template <typename T> - struct rectangle_difference_type_by_concept<T, gtl_yes> { - typedef typename coordinate_traits<typename rectangle_traits<T>::coordinate_type>::coordinate_difference type; }; + struct rectangle_difference_type_by_concept<T, gtl_yes> { + typedef typename coordinate_traits<typename rectangle_traits<T>::coordinate_type>::coordinate_difference type; }; template <typename T> struct rectangle_difference_type { @@ -74,8 +74,8 @@ namespace boost { namespace polygon{ template <typename T, typename CT> struct rectangle_distance_type_by_concept { typedef void type; }; template <typename T> - struct rectangle_distance_type_by_concept<T, gtl_yes> { - typedef typename coordinate_traits<typename rectangle_traits<T>::coordinate_type>::coordinate_distance type; }; + struct rectangle_distance_type_by_concept<T, gtl_yes> { + typedef typename coordinate_traits<typename rectangle_coordinate_type<T>::type>::coordinate_distance type; }; template <typename T> struct rectangle_distance_type { @@ -83,91 +83,92 @@ namespace boost { namespace polygon{ T, typename is_rectangle_concept<typename geometry_concept<T>::type>::type>::type type; }; + struct y_r_get_interval : gtl_yes {}; + template <typename T> - typename rectangle_interval_type<T>::type - get(const T& rectangle, orientation_2d orient, - typename enable_if< typename gtl_if<typename is_rectangle_concept<typename geometry_concept<T>::type>::type>::type>::type * = 0 - ) { - return rectangle_traits<T>::get(rectangle, orient); + typename enable_if< typename gtl_and<y_r_get_interval, typename is_rectangle_concept<typename geometry_concept<T>::type>::type>::type, + typename rectangle_interval_type<T>::type>::type + get(const T& rectangle, orientation_2d orient) { + return rectangle_traits<T>::get(rectangle, orient); } struct y_r_h : gtl_yes {}; template <typename T> - typename enable_if< typename gtl_and<y_r_h, typename gtl_if<typename is_rectangle_concept<typename geometry_concept<T>::type>::type>::type>::type, - typename rectangle_traits<T>::interval_type>::type + typename enable_if< typename gtl_and<y_r_h, typename is_rectangle_concept<typename geometry_concept<T>::type>::type>::type, + typename rectangle_interval_type<T>::type>::type horizontal(const T& rectangle) { - return rectangle_traits<T>::get(rectangle, HORIZONTAL); + return rectangle_traits<T>::get(rectangle, HORIZONTAL); } struct y_r_v : gtl_yes {}; template <typename T> - typename enable_if< typename gtl_and<y_r_v, typename gtl_if<typename is_rectangle_concept<typename geometry_concept<T>::type>::type>::type>::type, - typename rectangle_traits<T>::interval_type>::type + typename enable_if< typename gtl_and<y_r_v, typename is_rectangle_concept<typename geometry_concept<T>::type>::type>::type, + typename rectangle_interval_type<T>::type>::type vertical(const T& rectangle) { - return rectangle_traits<T>::get(rectangle, VERTICAL); + return rectangle_traits<T>::get(rectangle, VERTICAL); } struct y_r_set : gtl_yes {}; template <orientation_2d_enum orient, typename T, typename T2> - typename enable_if< typename gtl_and_3<y_r_set, typename is_mutable_rectangle_concept<typename geometry_concept<T>::type>::type, + typename enable_if< typename gtl_and_3<y_r_set, typename is_mutable_rectangle_concept<typename geometry_concept<T>::type>::type, typename is_interval_concept<typename geometry_concept<T2>::type>::type>::type, - void>::type + void>::type set(T& rectangle, const T2& interval) { - rectangle_mutable_traits<T>::set(rectangle, orient, interval); + rectangle_mutable_traits<T>::set(rectangle, orient, interval); } struct y_r_set2 : gtl_yes {}; template <typename T, typename T2> - typename enable_if< typename gtl_and_3<y_r_set2, typename is_mutable_rectangle_concept<typename geometry_concept<T>::type>::type, + typename enable_if< typename gtl_and_3<y_r_set2, typename is_mutable_rectangle_concept<typename geometry_concept<T>::type>::type, typename is_interval_concept<typename geometry_concept<T2>::type>::type>::type, - void>::type + void>::type set(T& rectangle, orientation_2d orient, const T2& interval) { - rectangle_mutable_traits<T>::set(rectangle, orient, interval); + rectangle_mutable_traits<T>::set(rectangle, orient, interval); } struct y_r_h2 : gtl_yes {}; template <typename T, typename T2> - typename enable_if< typename gtl_and_3<y_r_h2, typename is_mutable_rectangle_concept<typename geometry_concept<T>::type>::type, + typename enable_if< typename gtl_and_3<y_r_h2, typename is_mutable_rectangle_concept<typename geometry_concept<T>::type>::type, typename is_interval_concept<typename geometry_concept<T2>::type>::type>::type, - void>::type + void>::type horizontal(T& rectangle, const T2& interval) { - rectangle_mutable_traits<T>::set(rectangle, HORIZONTAL, interval); + rectangle_mutable_traits<T>::set(rectangle, HORIZONTAL, interval); } struct y_r_v2 : gtl_yes {}; template <typename T, typename T2> - typename enable_if< - typename gtl_and_3<y_r_v2, typename is_mutable_rectangle_concept<typename geometry_concept<T>::type>::type, - typename is_interval_concept<typename geometry_concept<T2>::type>::type>::type, void>::type + typename enable_if< + typename gtl_and_3<y_r_v2, typename is_mutable_rectangle_concept<typename geometry_concept<T>::type>::type, + typename is_interval_concept<typename geometry_concept<T2>::type>::type>::type, void>::type vertical(T& rectangle, const T2& interval) { - rectangle_mutable_traits<T>::set(rectangle, VERTICAL, interval); + rectangle_mutable_traits<T>::set(rectangle, VERTICAL, interval); } struct y_r_construct : gtl_yes {}; template <typename T, typename T2, typename T3> typename enable_if< typename gtl_and<y_r_construct, typename is_mutable_rectangle_concept<typename geometry_concept<T>::type>::type>::type, - T>::type + T>::type construct(const T2& interval_horizontal, const T3& interval_vertical) { return rectangle_mutable_traits<T>::construct(interval_horizontal, interval_vertical); } - + struct y_r_construct2 : gtl_yes {}; template <typename T, typename coord_type> typename enable_if< typename gtl_and<y_r_construct2, typename is_mutable_rectangle_concept<typename geometry_concept<T>::type>::type>::type, - T>::type + T>::type construct(coord_type xl, coord_type yl, coord_type xh, coord_type yh) { - return rectangle_mutable_traits<T>::construct(interval_data<coord_type>(xl, xh), - interval_data<coord_type>(yl, yh)); + return rectangle_mutable_traits<T>::construct(interval_data<coord_type>(xl, xh), + interval_data<coord_type>(yl, yh)); } - + struct y_r_cconstruct : gtl_yes {}; template <typename T, typename T2> @@ -179,11 +180,11 @@ namespace boost { namespace polygon{ copy_construct(const T2& rectangle) { return construct<T> (get(rectangle, HORIZONTAL), get(rectangle, VERTICAL)); } - + struct y_r_assign : gtl_yes {}; template <typename rectangle_type_1, typename rectangle_type_2> - typename enable_if< + typename enable_if< typename gtl_and_3< y_r_assign, typename is_mutable_rectangle_concept<typename geometry_concept<rectangle_type_1>::type>::type, typename is_rectangle_concept<typename geometry_concept<rectangle_type_2>::type>::type>::type, @@ -193,36 +194,36 @@ namespace boost { namespace polygon{ set(lvalue, VERTICAL, get(rvalue, VERTICAL)); return lvalue; } - + struct y_r_equiv : gtl_yes {}; template <typename T, typename T2> - typename enable_if< + typename enable_if< typename gtl_and_3< y_r_equiv, typename is_rectangle_concept<typename geometry_concept<T>::type>::type, typename is_rectangle_concept<typename geometry_concept<T2>::type>::type>::type, - bool>::type + bool>::type equivalence(const T& rect1, const T2& rect2) { return equivalence(get(rect1, HORIZONTAL), get(rect2, HORIZONTAL)) && equivalence(get(rect1, VERTICAL), get(rect2, VERTICAL)); } - + struct y_r_get : gtl_yes {}; template <typename rectangle_type> - typename enable_if< typename gtl_and<y_r_get, typename gtl_if< typename is_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type>::type>::type, + typename enable_if< typename gtl_and<y_r_get, typename is_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type>::type, typename rectangle_coordinate_type<rectangle_type>::type>::type get(const rectangle_type& rectangle, orientation_2d orient, direction_1d dir) { - return get(rectangle_traits<rectangle_type>::get(rectangle, orient), dir); + return get(rectangle_traits<rectangle_type>::get(rectangle, orient), dir); } - + struct y_r_set3 : gtl_yes {}; template <typename rectangle_type> - typename enable_if<typename gtl_and<y_r_set3, typename is_mutable_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type>::type, void>::type - set(rectangle_type& rectangle, orientation_2d orient, direction_1d dir, - typename rectangle_traits<rectangle_type>::coordinate_type value) { - typename rectangle_traits<rectangle_type>::interval_type ivl = get(rectangle, orient); + typename enable_if<typename gtl_and<y_r_set3, typename is_mutable_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type>::type, void>::type + set(rectangle_type& rectangle, orientation_2d orient, direction_1d dir, + typename rectangle_coordinate_type<rectangle_type>::type value) { + typename rectangle_interval_type<rectangle_type>::type ivl = get(rectangle, orient); set(ivl, dir, value); set(rectangle, orient, ivl); } @@ -230,7 +231,7 @@ namespace boost { namespace polygon{ struct y_r_xl : gtl_yes {}; template <typename rectangle_type> - typename enable_if< typename gtl_and<y_r_xl, typename gtl_if< typename is_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type>::type>::type, + typename enable_if< typename gtl_and<y_r_xl, typename is_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type>::type, typename rectangle_coordinate_type<rectangle_type>::type>::type xl(const rectangle_type& rectangle) { return get(rectangle, HORIZONTAL, LOW); @@ -239,15 +240,15 @@ namespace boost { namespace polygon{ struct y_r_xl2 : gtl_yes {}; template <typename rectangle_type> - typename enable_if<typename gtl_and<y_r_xl2, typename is_mutable_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type>::type, void>::type - xl(rectangle_type& rectangle, typename rectangle_traits<rectangle_type>::coordinate_type value) { + typename enable_if<typename gtl_and<y_r_xl2, typename is_mutable_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type>::type, void>::type + xl(rectangle_type& rectangle, typename rectangle_coordinate_type<rectangle_type>::type value) { return set(rectangle, HORIZONTAL, LOW, value); } struct y_r_xh : gtl_yes {}; template <typename rectangle_type> - typename enable_if< typename gtl_and<y_r_xh, typename gtl_if< typename is_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type>::type>::type, + typename enable_if< typename gtl_and<y_r_xh, typename is_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type>::type, typename rectangle_coordinate_type<rectangle_type>::type>::type xh(const rectangle_type& rectangle) { return get(rectangle, HORIZONTAL, HIGH); @@ -256,32 +257,32 @@ namespace boost { namespace polygon{ struct y_r_xh2 : gtl_yes {}; template <typename rectangle_type> - typename enable_if<typename gtl_and<y_r_xh2, typename is_mutable_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type>::type, void>::type - xh(rectangle_type& rectangle, typename rectangle_traits<rectangle_type>::coordinate_type value) { + typename enable_if<typename gtl_and<y_r_xh2, typename is_mutable_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type>::type, void>::type + xh(rectangle_type& rectangle, typename rectangle_coordinate_type<rectangle_type>::type value) { return set(rectangle, HORIZONTAL, HIGH, value); } struct y_r_yl : gtl_yes {}; template <typename rectangle_type> - typename enable_if< typename gtl_and<y_r_yl, typename gtl_if< typename is_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type>::type>::type, + typename enable_if< typename gtl_and<y_r_yl, typename is_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type>::type, typename rectangle_coordinate_type<rectangle_type>::type>::type yl(const rectangle_type& rectangle) { return get(rectangle, VERTICAL, LOW); } - + struct y_r_yl2 : gtl_yes {}; template <typename rectangle_type> - typename enable_if<typename gtl_and<y_r_yl2, typename is_mutable_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type>::type, void>::type - yl(rectangle_type& rectangle, typename rectangle_traits<rectangle_type>::coordinate_type value) { + typename enable_if<typename gtl_and<y_r_yl2, typename is_mutable_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type>::type, void>::type + yl(rectangle_type& rectangle, typename rectangle_coordinate_type<rectangle_type>::type value) { return set(rectangle, VERTICAL, LOW, value); } struct y_r_yh : gtl_yes {}; template <typename rectangle_type> - typename enable_if< typename gtl_and<y_r_yh, typename gtl_if< typename is_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type>::type>::type, + typename enable_if< typename gtl_and<y_r_yh, typename is_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type>::type, typename rectangle_coordinate_type<rectangle_type>::type>::type yh(const rectangle_type& rectangle) { return get(rectangle, VERTICAL, HIGH); @@ -290,45 +291,45 @@ namespace boost { namespace polygon{ struct y_r_yh2 : gtl_yes {}; template <typename rectangle_type> - typename enable_if<typename gtl_and<y_r_yh2, typename is_mutable_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type>::type, void>::type - yh(rectangle_type& rectangle, typename rectangle_traits<rectangle_type>::coordinate_type value) { + typename enable_if<typename gtl_and<y_r_yh2, typename is_mutable_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type>::type, void>::type + yh(rectangle_type& rectangle, typename rectangle_coordinate_type<rectangle_type>::type value) { return set(rectangle, VERTICAL, HIGH, value); } struct y_r_ll : gtl_yes {}; template <typename rectangle_type> - typename enable_if<typename gtl_and<y_r_ll, typename gtl_if< typename is_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type>::type>::type, - point_data<typename rectangle_traits<rectangle_type>::coordinate_type> >::type + typename enable_if<typename gtl_and<y_r_ll, typename is_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type>::type, + point_data<typename rectangle_coordinate_type<rectangle_type>::type> >::type ll(const rectangle_type& rectangle) { - return point_data<typename rectangle_traits<rectangle_type>::coordinate_type> (xl(rectangle), yl(rectangle)); + return point_data<typename rectangle_coordinate_type<rectangle_type>::type> (xl(rectangle), yl(rectangle)); } struct y_r_lr : gtl_yes {}; template <typename rectangle_type> - typename enable_if<typename gtl_and<y_r_lr, typename gtl_if< typename is_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type>::type>::type, - point_data<typename rectangle_traits<rectangle_type>::coordinate_type> >::type + typename enable_if<typename gtl_and<y_r_lr, typename is_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type>::type, + point_data<typename rectangle_coordinate_type<rectangle_type>::type> >::type lr(const rectangle_type& rectangle) { - return point_data<typename rectangle_traits<rectangle_type>::coordinate_type> (xh(rectangle), yl(rectangle)); + return point_data<typename rectangle_coordinate_type<rectangle_type>::type> (xh(rectangle), yl(rectangle)); } struct y_r_ul : gtl_yes {}; template <typename rectangle_type> - typename enable_if<typename gtl_and<y_r_ul, typename gtl_if< typename is_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type>::type>::type, - point_data<typename rectangle_traits<rectangle_type>::coordinate_type> >::type + typename enable_if<typename gtl_and<y_r_ul, typename is_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type>::type, + point_data<typename rectangle_coordinate_type<rectangle_type>::type> >::type ul(const rectangle_type& rectangle) { - return point_data<typename rectangle_traits<rectangle_type>::coordinate_type> (xl(rectangle), yh(rectangle)); + return point_data<typename rectangle_coordinate_type<rectangle_type>::type> (xl(rectangle), yh(rectangle)); } struct y_r_ur : gtl_yes {}; template <typename rectangle_type> - typename enable_if<typename gtl_and<y_r_ur, typename gtl_if< typename is_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type>::type>::type, - point_data<typename rectangle_traits<rectangle_type>::coordinate_type> >::type + typename enable_if<typename gtl_and<y_r_ur, typename is_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type>::type, + point_data<typename rectangle_coordinate_type<rectangle_type>::type> >::type ur(const rectangle_type& rectangle) { - return point_data<typename rectangle_traits<rectangle_type>::coordinate_type> (xh(rectangle), yh(rectangle)); + return point_data<typename rectangle_coordinate_type<rectangle_type>::type> (xh(rectangle), yh(rectangle)); } struct y_r_contains : gtl_yes {}; @@ -336,8 +337,8 @@ namespace boost { namespace polygon{ template <typename rectangle_type, typename rectangle_type_2> typename enable_if< typename gtl_and_3<y_r_contains, typename is_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type, typename is_rectangle_concept<typename geometry_concept<rectangle_type_2>::type>::type>::type, - bool>::type - contains(const rectangle_type& rectangle, const rectangle_type_2 rectangle_contained, + bool>::type + contains(const rectangle_type& rectangle, const rectangle_type_2 rectangle_contained, bool consider_touch = true) { return contains(horizontal(rectangle), horizontal(rectangle_contained), consider_touch) && contains(vertical(rectangle), vertical(rectangle_contained), consider_touch); @@ -347,8 +348,8 @@ namespace boost { namespace polygon{ template <typename rectangle_type, typename point_type> typename enable_if< typename gtl_and_3<y_r_contains2, typename is_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type, - typename is_point_concept<typename geometry_concept<point_type>::type>::type>::type, bool>::type - contains(const rectangle_type& rectangle, const point_type point_contained, + typename is_point_concept<typename geometry_concept<point_type>::type>::type>::type, bool>::type + contains(const rectangle_type& rectangle, const point_type point_contained, bool consider_touch = true) { return contains(horizontal(rectangle), x(point_contained), consider_touch) && contains(vertical(rectangle), y(point_contained), consider_touch); @@ -359,30 +360,31 @@ namespace boost { namespace polygon{ // set all four coordinates based upon two points template <typename rectangle_type, typename point_type_1, typename point_type_2> typename enable_if< typename gtl_and_4< y_r_set_points, - typename is_mutable_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type, - typename is_point_concept<typename geometry_concept<point_type_1>::type>::type, - typename is_point_concept<typename geometry_concept<point_type_2>::type>::type>::type, + typename is_mutable_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type, + typename is_point_concept<typename geometry_concept<point_type_1>::type>::type, + typename is_point_concept<typename geometry_concept<point_type_2>::type>::type>::type, rectangle_type>::type & set_points(rectangle_type& rectangle, const point_type_1& p1, const point_type_2& p2) { - typedef typename rectangle_traits<rectangle_type>::coordinate_type Unit; + typedef typename rectangle_coordinate_type<rectangle_type>::type Unit; Unit x1(x(p1)); Unit x2(x(p2)); Unit y1(y(p1)); Unit y2(y(p2)); - horizontal(rectangle, construct<typename rectangle_traits<rectangle_type>::interval_type>(x1, x2)); - vertical(rectangle, construct<typename rectangle_traits<rectangle_type>::interval_type>(y1, y2)); + horizontal(rectangle, construct<typename rectangle_interval_type<rectangle_type>::type>(x1, x2)); + vertical(rectangle, construct<typename rectangle_interval_type<rectangle_type>::type>(y1, y2)); return rectangle; } - + + struct y_r_move : gtl_yes {}; + // move rectangle by delta in orient template <typename rectangle_type> - rectangle_type& - move(rectangle_type& rectangle, orientation_2d orient, - typename coordinate_traits<typename rectangle_traits<rectangle_type>::coordinate_type>::coordinate_difference delta, - typename enable_if<typename is_mutable_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type>::type * = 0 - ) { - typename rectangle_traits<rectangle_type>::interval_type ivl = get(rectangle, orient); + typename enable_if< typename gtl_and<y_r_move, typename is_mutable_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type>::type, + rectangle_type>::type & + move(rectangle_type& rectangle, orientation_2d orient, + typename coordinate_traits<typename rectangle_coordinate_type<rectangle_type>::type>::coordinate_difference delta) { + typename rectangle_interval_type<rectangle_type>::type ivl = get(rectangle, orient); move(ivl, delta); set(rectangle, orient, ivl); return rectangle; @@ -394,18 +396,18 @@ namespace boost { namespace polygon{ template <typename rectangle_type_1, typename rectangle_type_2> typename enable_if< typename gtl_and_3< y_r_convolve, - typename is_mutable_rectangle_concept<typename geometry_concept<rectangle_type_1>::type>::type, - typename is_rectangle_concept<typename geometry_concept<rectangle_type_2>::type>::type>::type, + typename is_mutable_rectangle_concept<typename geometry_concept<rectangle_type_1>::type>::type, + typename is_rectangle_concept<typename geometry_concept<rectangle_type_2>::type>::type>::type, rectangle_type_1>::type & convolve(rectangle_type_1& rectangle, const rectangle_type_2& convolution_rectangle) { - typename rectangle_traits<rectangle_type_1>::interval_type ivl = horizontal(rectangle); + typename rectangle_interval_type<rectangle_type_1>::type ivl = horizontal(rectangle); horizontal(rectangle, convolve(ivl, horizontal(convolution_rectangle))); ivl = vertical(rectangle); vertical(rectangle, convolve(ivl, vertical(convolution_rectangle))); return rectangle; } - + struct y_r_deconvolve : gtl_yes {}; // deconvolve this with b @@ -415,13 +417,13 @@ namespace boost { namespace polygon{ typename is_rectangle_concept<typename geometry_concept<rectangle_type_2>::type>::type>::type, rectangle_type_1>::type & deconvolve(rectangle_type_1& rectangle, const rectangle_type_2& convolution_rectangle) { - typename rectangle_traits<rectangle_type_1>::interval_type ivl = horizontal(rectangle); + typename rectangle_interval_type<rectangle_type_1>::type ivl = horizontal(rectangle); horizontal(rectangle, deconvolve(ivl, horizontal(convolution_rectangle))); ivl = vertical(rectangle); vertical(rectangle, deconvolve(ivl, vertical(convolution_rectangle))); return rectangle; } - + struct y_r_reconvolve : gtl_yes {}; // reflectedConvolve this with b @@ -431,13 +433,13 @@ namespace boost { namespace polygon{ typename is_rectangle_concept<typename geometry_concept<rectangle_type_2>::type>::type>::type, rectangle_type_1>::type & reflected_convolve(rectangle_type_1& rectangle, const rectangle_type_2& convolution_rectangle) { - typename rectangle_traits<rectangle_type_1>::interval_type ivl = horizontal(rectangle); + typename rectangle_interval_type<rectangle_type_1>::type ivl = horizontal(rectangle); horizontal(rectangle, reflected_convolve(ivl, horizontal(convolution_rectangle))); ivl = vertical(rectangle); vertical(rectangle, reflected_convolve(ivl, vertical(convolution_rectangle))); return rectangle; } - + struct y_r_redeconvolve : gtl_yes {}; // reflectedDeconvolve this with b @@ -448,13 +450,13 @@ namespace boost { namespace polygon{ typename is_rectangle_concept<typename geometry_concept<rectangle_type_2>::type>::type>::type, rectangle_type_1>::type & reflected_deconvolve(rectangle_type_1& rectangle, const rectangle_type_2& convolution_rectangle) { - typename rectangle_traits<rectangle_type_1>::interval_type ivl = horizontal(rectangle); + typename rectangle_interval_type<rectangle_type_1>::type ivl = horizontal(rectangle); horizontal(rectangle, reflected_deconvolve(ivl, horizontal(convolution_rectangle))); ivl = vertical(rectangle); vertical(rectangle, reflected_deconvolve(ivl, vertical(convolution_rectangle))); return rectangle; } - + struct y_r_convolve2 : gtl_yes {}; // convolve with point @@ -463,7 +465,7 @@ namespace boost { namespace polygon{ typename is_point_concept<typename geometry_concept<point_type>::type>::type>::type, rectangle_type>::type & convolve(rectangle_type& rectangle, const point_type& convolution_point) { - typename rectangle_traits<rectangle_type>::interval_type ivl = horizontal(rectangle); + typename rectangle_interval_type<rectangle_type>::type ivl = horizontal(rectangle); horizontal(rectangle, convolve(ivl, x(convolution_point))); ivl = vertical(rectangle); vertical(rectangle, convolve(ivl, y(convolution_point))); @@ -474,11 +476,11 @@ namespace boost { namespace polygon{ // deconvolve with point template <typename rectangle_type, typename point_type> - typename enable_if< + typename enable_if< typename gtl_and_3<y_r_deconvolve2, typename is_mutable_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type, typename is_point_concept<typename geometry_concept<point_type>::type>::type>::type, rectangle_type>::type & deconvolve(rectangle_type& rectangle, const point_type& convolution_point) { - typename rectangle_traits<rectangle_type>::interval_type ivl = horizontal(rectangle); + typename rectangle_interval_type<rectangle_type>::type ivl = horizontal(rectangle); horizontal(rectangle, deconvolve(ivl, x(convolution_point))); ivl = vertical(rectangle); vertical(rectangle, deconvolve(ivl, y(convolution_point))); @@ -489,7 +491,7 @@ namespace boost { namespace polygon{ // get the magnitude of the interval range depending on orient template <typename rectangle_type> - typename enable_if< typename gtl_and<y_r_delta, typename gtl_if<typename is_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type>::type>::type, + typename enable_if< typename gtl_and<y_r_delta, typename is_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type>::type, typename rectangle_difference_type<rectangle_type>::type>::type delta(const rectangle_type& rectangle, orientation_2d orient) { return delta(get(rectangle, orient)); @@ -500,9 +502,9 @@ namespace boost { namespace polygon{ // get the area of the rectangle template <typename rectangle_type> typename enable_if< typename gtl_and<y_r_area, typename is_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type>::type, - typename coordinate_traits<typename rectangle_traits<rectangle_type>::coordinate_type>::manhattan_area_type>::type + typename coordinate_traits<typename rectangle_coordinate_type<rectangle_type>::type>::manhattan_area_type>::type area(const rectangle_type& rectangle) { - typedef typename coordinate_traits<typename rectangle_traits<rectangle_type>::coordinate_type>::manhattan_area_type area_type; + typedef typename coordinate_traits<typename rectangle_coordinate_type<rectangle_type>::type>::manhattan_area_type area_type; return (area_type)delta(rectangle, HORIZONTAL) * (area_type)delta(rectangle, VERTICAL); } @@ -510,8 +512,8 @@ namespace boost { namespace polygon{ // returns the orientation of the longest side template <typename rectangle_type> - typename enable_if<typename gtl_and<y_r_go, typename is_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type>::type, - orientation_2d>::type + typename enable_if<typename gtl_and<y_r_go, typename is_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type>::type, + orientation_2d>::type guess_orientation(const rectangle_type& rectangle) { return delta(rectangle, HORIZONTAL) >= delta(rectangle, VERTICAL) ? HORIZONTAL : VERTICAL; @@ -521,18 +523,19 @@ namespace boost { namespace polygon{ // get the half perimeter of the rectangle template <typename rectangle_type> - typename enable_if< typename gtl_and<y_r_half_p, typename gtl_if<typename is_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type>::type>::type, + typename enable_if< typename gtl_and<y_r_half_p, typename is_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type>::type, typename rectangle_difference_type<rectangle_type>::type>::type half_perimeter(const rectangle_type& rectangle) { return delta(rectangle, HORIZONTAL) + delta(rectangle, VERTICAL); } - + + struct y_r_perimeter : gtl_yes {}; + // get the perimeter of the rectangle template <typename rectangle_type> - typename rectangle_difference_type<rectangle_type>::type - perimeter(const rectangle_type& rectangle, - typename enable_if< typename is_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type>::type * = 0 - ) { + typename enable_if< typename gtl_and<y_r_perimeter, typename is_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type>::type, + typename rectangle_difference_type<rectangle_type>::type>::type + perimeter(const rectangle_type& rectangle) { return 2 * half_perimeter(rectangle); } @@ -543,10 +546,10 @@ namespace boost { namespace polygon{ // [in] considerTouch If true, return true even if b touches the boundary // [ret] . true if `t` intersects b template <typename rectangle_type_1, typename rectangle_type_2> - typename enable_if< + typename enable_if< typename gtl_and_3<y_r_intersects, typename is_rectangle_concept<typename geometry_concept<rectangle_type_1>::type>::type, typename is_rectangle_concept<typename geometry_concept<rectangle_type_2>::type>::type>::type, - bool>::type + bool>::type intersects(const rectangle_type_1& rectangle, const rectangle_type_2& b, bool consider_touch = true) { return intersects(horizontal(rectangle), horizontal(b), consider_touch) && intersects(vertical(rectangle), vertical(b), consider_touch); @@ -559,44 +562,44 @@ namespace boost { namespace polygon{ // [in] considerTouch If true, return true even if p is on the foundary // [ret] . true if `t` contains p template <typename rectangle_type_1, typename rectangle_type_2> - typename enable_if< + typename enable_if< typename gtl_and_3<y_r_b_intersect, typename is_rectangle_concept<typename geometry_concept<rectangle_type_1>::type>::type, typename is_rectangle_concept<typename geometry_concept<rectangle_type_2>::type>::type>::type, - bool>::type + bool>::type boundaries_intersect(const rectangle_type_1& rectangle, const rectangle_type_2& b, bool consider_touch = true) { return (intersects(rectangle, b, consider_touch) && !(contains(rectangle, b, !consider_touch)) && !(contains(b, rectangle, !consider_touch))); } - + struct y_r_b_abuts : gtl_yes {}; // check if b is touching 'this' on the end specified by dir template <typename rectangle_type_1, typename rectangle_type_2> typename enable_if< typename gtl_and_3<y_r_b_abuts, typename is_rectangle_concept<typename geometry_concept<rectangle_type_1>::type>::type, typename is_rectangle_concept<typename geometry_concept<rectangle_type_2>::type>::type>::type, - bool>::type + bool>::type abuts(const rectangle_type_1& rectangle, const rectangle_type_2& b, direction_2d dir) { - return + return abuts(get(rectangle, orientation_2d(dir)), get(b, orientation_2d(dir)), direction_1d(dir)) && intersects(get(rectangle, orientation_2d(dir).get_perpendicular()), get(b, orientation_2d(dir).get_perpendicular()), true); } - + struct y_r_b_abuts2 : gtl_yes {}; // check if they are touching in the given orientation template <typename rectangle_type_1, typename rectangle_type_2> typename enable_if< typename gtl_and_3<y_r_b_abuts2, typename is_rectangle_concept<typename geometry_concept<rectangle_type_1>::type>::type, typename is_rectangle_concept<typename geometry_concept<rectangle_type_2>::type>::type>::type, - bool>::type + bool>::type abuts(const rectangle_type_1& rectangle, const rectangle_type_2& b, orientation_2d orient) { - return + return abuts(get(rectangle, orient), get(b, orient)) && intersects(get(rectangle, orient.get_perpendicular()), get(b, orient.get_perpendicular()), true); @@ -608,7 +611,7 @@ namespace boost { namespace polygon{ template <typename rectangle_type_1, typename rectangle_type_2> typename enable_if< typename gtl_and_3<y_r_b_abuts3, typename is_rectangle_concept<typename geometry_concept<rectangle_type_1>::type>::type, typename is_rectangle_concept<typename geometry_concept<rectangle_type_2>::type>::type>::type, - bool>::type + bool>::type abuts(const rectangle_type_1& rectangle, const rectangle_type_2& b) { return abuts(rectangle, b, HORIZONTAL) || abuts(rectangle, b, VERTICAL); } @@ -617,13 +620,13 @@ namespace boost { namespace polygon{ // intersect rectangle with interval on orient template <typename rectangle_type, typename interval_type> - typename enable_if< + typename enable_if< typename gtl_and_3<y_r_b_intersect2, typename is_mutable_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type, typename is_interval_concept<typename geometry_concept<interval_type>::type>::type>::type, - bool>::type + bool>::type intersect(rectangle_type& rectangle, const interval_type& b, orientation_2d orient, bool consider_touch = true) { - typename rectangle_traits<rectangle_type>::interval_type ivl = get(rectangle, orient); + typename rectangle_interval_type<rectangle_type>::type ivl = get(rectangle, orient); if(intersect(ivl, b, consider_touch)) { set(rectangle, orient, ivl); return true; @@ -637,7 +640,7 @@ namespace boost { namespace polygon{ template <typename rectangle_type_1, typename rectangle_type_2> typename enable_if< typename gtl_and_3<y_r_b_intersect3, typename is_mutable_rectangle_concept<typename geometry_concept<rectangle_type_1>::type>::type, typename is_rectangle_concept<typename geometry_concept<rectangle_type_2>::type>::type>::type, - bool>::type + bool>::type intersect(rectangle_type_1& rectangle, const rectangle_type_2& b, bool consider_touch = true) { if(intersects(rectangle, b)) { intersect(rectangle, horizontal(b), HORIZONTAL, consider_touch); @@ -656,7 +659,7 @@ namespace boost { namespace polygon{ typename is_rectangle_concept<typename geometry_concept<rectangle_type_2>::type>::type>::type, rectangle_type_1>::type & generalized_intersect(rectangle_type_1& rectangle, const rectangle_type_2& b) { - typename rectangle_traits<rectangle_type_1>::interval_type ivl = get(rectangle, HORIZONTAL); + typename rectangle_interval_type<rectangle_type_1>::type ivl = get(rectangle, HORIZONTAL); generalized_intersect(ivl, horizontal(b)); horizontal(rectangle, ivl); ivl = vertical(rectangle); @@ -669,11 +672,11 @@ namespace boost { namespace polygon{ // bloat the interval specified by orient by bloating template <typename rectangle_type> - typename enable_if<typename gtl_and<y_r_bloat, typename is_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type>::type, + typename enable_if<typename gtl_and<y_r_bloat, typename is_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type>::type, rectangle_type>::type & - bloat(rectangle_type& rectangle, orientation_2d orient, - typename rectangle_traits<rectangle_type>::coordinate_type bloating) { - typename rectangle_traits<rectangle_type>::interval_type ivl = get(rectangle, orient); + bloat(rectangle_type& rectangle, orientation_2d orient, + typename rectangle_coordinate_type<rectangle_type>::type bloating) { + typename rectangle_interval_type<rectangle_type>::type ivl = get(rectangle, orient); bloat(ivl, bloating); set(rectangle, orient, ivl); return rectangle; @@ -683,10 +686,10 @@ namespace boost { namespace polygon{ // bloat the Rectangle by bloating template <typename rectangle_type> - typename enable_if<typename gtl_and<y_r_bloat2, typename is_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type>::type, + typename enable_if<typename gtl_and<y_r_bloat2, typename is_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type>::type, rectangle_type>::type & bloat(rectangle_type& rectangle, - typename rectangle_traits<rectangle_type>::coordinate_type bloating) { + typename rectangle_coordinate_type<rectangle_type>::type bloating) { bloat(rectangle, HORIZONTAL, bloating); return bloat(rectangle, VERTICAL, bloating); } @@ -695,11 +698,11 @@ namespace boost { namespace polygon{ // bloat the interval cooresponding to orient by bloating in dir direction template <typename rectangle_type> - typename enable_if<typename gtl_and<y_r_bloat3, typename is_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type>::type, + typename enable_if<typename gtl_and<y_r_bloat3, typename is_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type>::type, rectangle_type>::type & bloat(rectangle_type& rectangle, direction_2d dir, - typename rectangle_traits<rectangle_type>::coordinate_type bloating) { - typename rectangle_traits<rectangle_type>::interval_type ivl = get(rectangle, orientation_2d(dir)); + typename rectangle_coordinate_type<rectangle_type>::type bloating) { + typename rectangle_interval_type<rectangle_type>::type ivl = get(rectangle, orientation_2d(dir)); bloat(ivl, direction_1d(dir), bloating); set(rectangle, orientation_2d(dir), ivl); return rectangle; @@ -709,10 +712,10 @@ namespace boost { namespace polygon{ // shrink the interval specified by orient by bloating template <typename rectangle_type> - typename enable_if<typename gtl_and<y_r_shrink, typename is_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type>::type, + typename enable_if<typename gtl_and<y_r_shrink, typename is_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type>::type, rectangle_type>::type & - shrink(rectangle_type& rectangle, orientation_2d orient, - typename rectangle_traits<rectangle_type>::coordinate_type shrinking) { + shrink(rectangle_type& rectangle, orientation_2d orient, + typename rectangle_coordinate_type<rectangle_type>::type shrinking) { return bloat(rectangle, orient, -shrinking); } @@ -720,10 +723,10 @@ namespace boost { namespace polygon{ // shrink the Rectangle by bloating template <typename rectangle_type> - typename enable_if<typename gtl_and<y_r_shrink2, typename is_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type>::type, + typename enable_if<typename gtl_and<y_r_shrink2, typename is_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type>::type, rectangle_type>::type & - shrink(rectangle_type& rectangle, - typename rectangle_traits<rectangle_type>::coordinate_type shrinking) { + shrink(rectangle_type& rectangle, + typename rectangle_coordinate_type<rectangle_type>::type shrinking) { return bloat(rectangle, -shrinking); } @@ -731,10 +734,10 @@ namespace boost { namespace polygon{ // shrink the interval cooresponding to orient by bloating in dir direction template <typename rectangle_type> - typename enable_if<typename gtl_and<y_r_shrink3, typename is_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type>::type, + typename enable_if<typename gtl_and<y_r_shrink3, typename is_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type>::type, rectangle_type>::type & shrink(rectangle_type& rectangle, direction_2d dir, - typename rectangle_traits<rectangle_type>::coordinate_type shrinking) { + typename rectangle_coordinate_type<rectangle_type>::type shrinking) { return bloat(rectangle, dir, -shrinking); } @@ -742,13 +745,13 @@ namespace boost { namespace polygon{ // encompass interval on orient template <typename rectangle_type, typename interval_type> - typename enable_if< - typename gtl_and_3<y_r_encompass, typename is_mutable_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type, - typename is_interval_concept<typename geometry_concept<interval_type>::type>::type>::type, - bool>::type - encompass(rectangle_type& rectangle, const interval_type& b, - orientation_2d orient) { - typename rectangle_traits<rectangle_type>::interval_type ivl = get(rectangle, orient); + typename enable_if<typename gtl_and_3< + y_r_encompass, + typename is_mutable_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type, + typename is_interval_concept<typename geometry_concept<interval_type>::type>::type>::type, + bool>::type + encompass(rectangle_type& rectangle, const interval_type& b, orientation_2d orient) { + typename rectangle_interval_type<rectangle_type>::type ivl = get(rectangle, orient); if(encompass(ivl, b)) { set(rectangle, orient, ivl); return true; @@ -760,12 +763,12 @@ namespace boost { namespace polygon{ // enlarge rectangle to encompass the Rectangle b template <typename rectangle_type_1, typename rectangle_type_2> - bool - encompass(rectangle_type_1& rectangle, const rectangle_type_2& b, - typename enable_if< typename gtl_and_3<y_r_encompass2, - typename is_mutable_rectangle_concept<typename geometry_concept<rectangle_type_1>::type>::type, - typename is_rectangle_concept<typename geometry_concept<rectangle_type_2>::type>::type >::type>::type * = 0 - ) { + typename enable_if< typename gtl_and_3< + y_r_encompass2, + typename is_mutable_rectangle_concept<typename geometry_concept<rectangle_type_1>::type>::type, + typename is_rectangle_concept<typename geometry_concept<rectangle_type_2>::type>::type >::type, + bool>::type + encompass(rectangle_type_1& rectangle, const rectangle_type_2& b) { //note that operator | is intentional because both should be called regardless return encompass(rectangle, horizontal(b), HORIZONTAL) | encompass(rectangle, vertical(b), VERTICAL); @@ -775,16 +778,13 @@ namespace boost { namespace polygon{ // enlarge rectangle to encompass the point b template <typename rectangle_type_1, typename point_type> - typename enable_if< - typename gtl_and_3<y_r_encompass3, typename is_mutable_rectangle_concept<typename geometry_concept<rectangle_type_1>::type>::type, - typename is_point_concept<typename geometry_concept<point_type>::type>::type>::type, - bool>::type - encompass(rectangle_type_1& rectangle, const point_type& b, - typename enable_if< - typename gtl_and< typename is_mutable_rectangle_concept<typename geometry_concept<rectangle_type_1>::type>::type, - typename is_point_concept<typename geometry_concept<point_type>::type>::type>::type>::type * = 0 - ) { - typename rectangle_traits<rectangle_type_1>::interval_type hivl, vivl; + typename enable_if<typename gtl_and_3< + y_r_encompass3, + typename is_mutable_rectangle_concept<typename geometry_concept<rectangle_type_1>::type>::type, + typename is_point_concept<typename geometry_concept<point_type>::type>::type>::type, + bool>::type + encompass(rectangle_type_1& rectangle, const point_type& b) { + typename rectangle_interval_type<rectangle_type_1>::type hivl, vivl; hivl = horizontal(rectangle); vivl = vertical(rectangle); //note that operator | is intentional because both should be called regardless @@ -803,7 +803,7 @@ namespace boost { namespace polygon{ typename enable_if< typename gtl_and_3<y_r_center, typename is_mutable_point_concept<typename geometry_concept<point_type>::type>::type, typename is_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type>::type, - bool>::type + bool>::type center(point_type& center_point, const rectangle_type& rectangle) { center_point = construct<point_type>(center(horizontal(rectangle)), center(vertical(rectangle))); @@ -816,9 +816,9 @@ namespace boost { namespace polygon{ typename enable_if< typename gtl_and_3<y_r_get_corner, typename is_mutable_point_concept<typename geometry_concept<point_type>::type>::type, typename is_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type>::type, - bool>::type + bool>::type get_corner(point_type& corner_point, const rectangle_type& rectangle, direction_2d direction_facing, direction_1d direction_turning) { - typedef typename rectangle_traits<rectangle_type>::coordinate_type Unit; + typedef typename rectangle_coordinate_type<rectangle_type>::type Unit; Unit u1 = get(rectangle, direction_facing); Unit u2 = get(rectangle, direction_facing.turn(direction_turning)); if(orientation_2d(direction_facing).to_int()) std::swap(u1, u2); @@ -829,8 +829,8 @@ namespace boost { namespace polygon{ struct y_r_get_half : gtl_yes {}; template <typename rectangle_type> - typename enable_if<typename gtl_and<y_r_get_half, typename is_mutable_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type>::type, - rectangle_type>::type + typename enable_if<typename gtl_and<y_r_get_half, typename is_mutable_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type>::type, + rectangle_type>::type get_half(const rectangle_type& rectangle, direction_2d dir) { rectangle_type retval(rectangle); set(retval, orientation_2d(dir), get_half(get(rectangle, orientation_2d(dir)), direction_1d(dir))); @@ -842,10 +842,10 @@ namespace boost { namespace polygon{ template <typename rectangle_type_1, typename rectangle_type_2> typename enable_if< typename gtl_and_3<y_r_join_with, typename is_mutable_rectangle_concept<typename geometry_concept<rectangle_type_1>::type>::type, typename is_rectangle_concept<typename geometry_concept<rectangle_type_2>::type>::type>::type, - bool>::type + bool>::type join_with(rectangle_type_1& rectangle, const rectangle_type_2& b) { - typedef typename rectangle_traits<rectangle_type_1>::interval_type Interval1; - typedef typename rectangle_traits<rectangle_type_2>::interval_type Interval2; + typedef typename rectangle_interval_type<rectangle_type_1>::type Interval1; + typedef typename rectangle_interval_type<rectangle_type_2>::type Interval2; Interval1 hi1 = get(rectangle, HORIZONTAL); Interval1 vi1 = get(rectangle, VERTICAL); Interval2 hi2 = get(b, HORIZONTAL), vi2 = get(b, VERTICAL); @@ -860,7 +860,7 @@ namespace boost { namespace polygon{ } return false; } - + struct y_r_eda2 : gtl_yes {}; template <typename rectangle_type, typename point_type> @@ -875,8 +875,8 @@ namespace boost { namespace polygon{ struct y_r_eda : gtl_yes {}; template <typename rectangle_type, typename rectangle_type_2> - typename enable_if< - typename gtl_and_3<y_r_eda, + typename enable_if< + typename gtl_and_3<y_r_eda, typename is_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type, typename is_rectangle_concept<typename geometry_concept<rectangle_type_2>::type>::type>::type, typename rectangle_difference_type<rectangle_type>::type>::type @@ -887,12 +887,12 @@ namespace boost { namespace polygon{ struct y_r_sed : gtl_yes {}; template <typename rectangle_type, typename point_type> - typename enable_if< typename gtl_if< typename gtl_and_3<y_r_sed, + typename enable_if< typename gtl_and_3<y_r_sed, typename is_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type, - typename is_point_concept<typename geometry_concept<point_type>::type>::type>::type>::type, + typename is_point_concept<typename geometry_concept<point_type>::type>::type>::type, typename rectangle_difference_type<rectangle_type>::type>::type square_euclidean_distance(rectangle_type& lvalue, const point_type& rvalue) { - typename coordinate_traits<typename rectangle_traits<rectangle_type>::coordinate_type>::coordinate_difference xdist, ydist; + typename coordinate_traits<typename rectangle_coordinate_type<rectangle_type>::type>::coordinate_difference xdist, ydist; xdist = euclidean_distance(lvalue, rvalue, HORIZONTAL); ydist = euclidean_distance(lvalue, rvalue, VERTICAL); return (xdist * xdist) + (ydist * ydist); @@ -901,12 +901,12 @@ namespace boost { namespace polygon{ struct y_r_sed2 : gtl_yes {}; template <typename rectangle_type, typename rectangle_type_2> - typename enable_if< - typename gtl_and_3<y_r_sed2, typename is_rectangle_concept< typename geometry_concept<rectangle_type>::type>::type, - typename is_rectangle_concept< typename geometry_concept<rectangle_type_2>::type>::type>::type, + typename enable_if< + typename gtl_and_3<y_r_sed2, typename is_rectangle_concept< typename geometry_concept<rectangle_type>::type>::type, + typename is_rectangle_concept< typename geometry_concept<rectangle_type_2>::type>::type>::type, typename rectangle_difference_type<rectangle_type>::type>::type square_euclidean_distance(const rectangle_type& lvalue, const rectangle_type_2& rvalue) { - typename coordinate_traits<typename rectangle_traits<rectangle_type>::coordinate_type>::coordinate_difference xdist, ydist; + typename coordinate_traits<typename rectangle_coordinate_type<rectangle_type>::type>::coordinate_difference xdist, ydist; xdist = euclidean_distance(lvalue, rvalue, HORIZONTAL); ydist = euclidean_distance(lvalue, rvalue, VERTICAL); return (xdist * xdist) + (ydist * ydist); @@ -917,10 +917,9 @@ namespace boost { namespace polygon{ template <typename rectangle_type, typename point_type> typename enable_if< typename gtl_and_3<y_r_edist, typename is_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type, typename is_point_concept<typename geometry_concept<point_type>::type>::type>::type, - typename rectangle_distance_type<rectangle_type>::type>::type + typename rectangle_distance_type<rectangle_type>::type>::type euclidean_distance(rectangle_type& lvalue, const point_type& rvalue) { - return sqrt((double) - (square_euclidean_distance(lvalue, rvalue))); + return std::sqrt((double)(square_euclidean_distance(lvalue, rvalue))); } struct y_r_edist2 : gtl_yes {}; @@ -928,21 +927,21 @@ namespace boost { namespace polygon{ template <typename rectangle_type, typename rectangle_type_2> typename enable_if< typename gtl_and_3<y_r_edist2, typename is_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type, typename is_rectangle_concept<typename geometry_concept<rectangle_type_2>::type>::type>::type, - typename rectangle_distance_type<rectangle_type>::type>::type + typename rectangle_distance_type<rectangle_type>::type>::type euclidean_distance(const rectangle_type& lvalue, const rectangle_type_2& rvalue) { double val = (int)square_euclidean_distance(lvalue, rvalue); - return sqrt(val); + return std::sqrt(val); } struct y_r_mdist : gtl_yes {}; template <typename rectangle_type, typename point_type> - typename enable_if< + typename enable_if< typename gtl_and_3<y_r_mdist, typename is_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type, typename is_point_concept<typename geometry_concept<point_type>::type>::type>::type, typename rectangle_difference_type<rectangle_type>::type>::type manhattan_distance(rectangle_type& lvalue, const point_type& rvalue) { - typename coordinate_traits<typename rectangle_traits<rectangle_type>::coordinate_type>::coordinate_difference xdist, ydist; + typename coordinate_traits<typename rectangle_coordinate_type<rectangle_type>::type>::coordinate_difference xdist, ydist; xdist = euclidean_distance(lvalue, rvalue, HORIZONTAL); ydist = euclidean_distance(lvalue, rvalue, VERTICAL); return xdist + ydist; @@ -951,12 +950,12 @@ namespace boost { namespace polygon{ struct y_r_mdist2 : gtl_yes {}; template <typename rectangle_type, typename rectangle_type_2> - typename enable_if< + typename enable_if< typename gtl_and_3<y_r_mdist2, typename is_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type, typename is_rectangle_concept<typename geometry_concept<rectangle_type_2>::type>::type>::type, typename rectangle_difference_type<rectangle_type>::type>::type manhattan_distance(const rectangle_type& lvalue, const rectangle_type_2& rvalue) { - typename coordinate_traits<typename rectangle_traits<rectangle_type>::coordinate_type>::coordinate_difference xdist, ydist; + typename coordinate_traits<typename rectangle_coordinate_type<rectangle_type>::type>::coordinate_difference xdist, ydist; xdist = euclidean_distance(lvalue, rvalue, HORIZONTAL); ydist = euclidean_distance(lvalue, rvalue, VERTICAL); return xdist + ydist; @@ -965,55 +964,59 @@ namespace boost { namespace polygon{ struct y_r_scale_up : gtl_yes {}; template <typename rectangle_type> - typename enable_if<typename gtl_and<y_r_scale_up, typename is_mutable_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type>::type, + typename enable_if<typename gtl_and<y_r_scale_up, typename is_mutable_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type>::type, rectangle_type>::type & - scale_up(rectangle_type& rectangle, - typename coordinate_traits<typename rectangle_traits<rectangle_type>::coordinate_type>::unsigned_area_type factor) { - horizontal(rectangle, scale_up(horizontal(rectangle), factor)); - vertical(rectangle, scale_up(vertical(rectangle), factor)); + scale_up(rectangle_type& rectangle, + typename coordinate_traits<typename rectangle_coordinate_type<rectangle_type>::type>::unsigned_area_type factor) { + typename rectangle_interval_type<rectangle_type>::type h = horizontal(rectangle); + horizontal(rectangle, scale_up(h, factor)); + typename rectangle_interval_type<rectangle_type>::type v = vertical(rectangle); + vertical(rectangle, scale_up(v, factor)); return rectangle; } - + struct y_r_scale_down : gtl_yes {}; - + template <typename rectangle_type> - typename enable_if<typename gtl_and<y_r_scale_down, typename is_mutable_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type>::type, + typename enable_if<typename gtl_and<y_r_scale_down, typename is_mutable_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type>::type, rectangle_type>::type & - scale_down(rectangle_type& rectangle, - typename coordinate_traits<typename rectangle_traits<rectangle_type>::coordinate_type>::unsigned_area_type factor) { - horizontal(rectangle, scale_down(horizontal(rectangle), factor)); - vertical(rectangle, scale_down(vertical(rectangle), factor)); + scale_down(rectangle_type& rectangle, + typename coordinate_traits<typename rectangle_coordinate_type<rectangle_type>::type>::unsigned_area_type factor) { + typename rectangle_interval_type<rectangle_type>::type h = horizontal(rectangle); + horizontal(rectangle, scale_down(h, factor)); + typename rectangle_interval_type<rectangle_type>::type v = vertical(rectangle); + vertical(rectangle, scale_down(v, factor)); return rectangle; } struct y_r_scale : gtl_yes {}; template <typename rectangle_type, typename scaling_type> - typename enable_if<typename gtl_and<y_r_scale, typename is_mutable_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type>::type, + typename enable_if<typename gtl_and<y_r_scale, typename is_mutable_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type>::type, rectangle_type>::type & scale(rectangle_type& rectangle, const scaling_type& scaling) { - point_data<typename rectangle_traits<rectangle_type>::coordinate_type> llp(xl(rectangle), yl(rectangle)); - point_data<typename rectangle_traits<rectangle_type>::coordinate_type> urp(xl(rectangle), yl(rectangle)); + point_data<typename rectangle_coordinate_type<rectangle_type>::type> llp(xl(rectangle), yl(rectangle)); + point_data<typename rectangle_coordinate_type<rectangle_type>::type> urp(xl(rectangle), yl(rectangle)); scale(llp, scaling); scale(urp, scaling); set_points(rectangle, llp, urp); return rectangle; } - + struct y_r_transform : gtl_yes {}; - + template <typename rectangle_type, typename transformation_type> - typename enable_if<typename gtl_and<y_r_transform, typename is_mutable_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type>::type, + typename enable_if<typename gtl_and<y_r_transform, typename is_mutable_rectangle_concept<typename geometry_concept<rectangle_type>::type>::type>::type, rectangle_type>::type & transform(rectangle_type& rectangle, const transformation_type& transformation) { - point_data<typename rectangle_traits<rectangle_type>::coordinate_type> llp(xl(rectangle), yl(rectangle)); - point_data<typename rectangle_traits<rectangle_type>::coordinate_type> urp(xh(rectangle), yh(rectangle)); + point_data<typename rectangle_coordinate_type<rectangle_type>::type> llp(xl(rectangle), yl(rectangle)); + point_data<typename rectangle_coordinate_type<rectangle_type>::type> urp(xh(rectangle), yh(rectangle)); transform(llp, transformation); transform(urp, transformation); set_points(rectangle, llp, urp); return rectangle; } - + template <typename rectangle_type_1, typename rectangle_type_2> class less_rectangle_concept { private: @@ -1023,12 +1026,12 @@ namespace boost { namespace polygon{ typename enable_if< typename gtl_and< typename is_rectangle_concept<typename geometry_concept<rectangle_type_1>::type>::type, typename is_rectangle_concept<typename geometry_concept<rectangle_type_2>::type>::type>::type, - bool>::type + bool>::type operator () (const rectangle_type_1& a, const rectangle_type_2& b) const { - typedef typename rectangle_traits<rectangle_type_1>::coordinate_type Unit; - Unit vl1 = get(get(a, orient_), LOW); - Unit vl2 = get(get(b, orient_), LOW); + typedef typename rectangle_coordinate_type<rectangle_type_1>::type Unit; + Unit vl1 = get(get(a, orient_), LOW); + Unit vl2 = get(get(b, orient_), LOW); if(vl1 > vl2) return false; if(vl1 == vl2) { orientation_2d perp = orient_.get_perpendicular(); @@ -1036,8 +1039,8 @@ namespace boost { namespace polygon{ Unit hl2 = get(get(b, perp), LOW); if(hl1 > hl2) return false; if(hl1 == hl2) { - Unit vh1 = get(get(a, orient_), HIGH); - Unit vh2 = get(get(b, orient_), HIGH); + Unit vh1 = get(get(a, orient_), HIGH); + Unit vh2 = get(get(b, orient_), HIGH); if(vh1 > vh2) return false; if(vh1 == vh2) { Unit hh1 = get(get(a, perp), HIGH); @@ -1048,7 +1051,7 @@ namespace boost { namespace polygon{ } return true; } - + }; template <typename T> @@ -1063,7 +1066,7 @@ namespace boost { namespace polygon{ assign(*this, rvalue); return *this; } - + template <class T> template <class T2> bool rectangle_data<T>::operator==(const T2& rvalue) const { @@ -1077,4 +1080,3 @@ namespace boost { namespace polygon{ } } #endif - |