Subject: [Boost-commit] svn:boost r85380 - in trunk: boost/geometry/algorithms/detail/overlay libs/geometry/test/algorithms/overlay/robustness
From: barend.gehrels_at_[hidden]
Date: 2013-08-17 13:10:35
Author: barendgehrels
Date: 2013-08-17 13:10:35 EDT (Sat, 17 Aug 2013)
New Revision: 85380
URL: http://svn.boost.org/trac/boost/changeset/85380
Log:
[geometry] robustness-tests added Jamfile and fixed gcc compilation errors
Added:
trunk/libs/geometry/test/algorithms/overlay/robustness/Jamfile.v2 (contents, props changed)
Text files modified:
trunk/boost/geometry/algorithms/detail/overlay/assign_parents.hpp | 4 ++++
trunk/boost/geometry/algorithms/detail/overlay/overlay.hpp | 4 ++++
trunk/libs/geometry/test/algorithms/overlay/robustness/Jamfile.v2 | 26 ++++++++++++++++++++++++++
trunk/libs/geometry/test/algorithms/overlay/robustness/interior_triangles.cpp | 3 +--
trunk/libs/geometry/test/algorithms/overlay/robustness/intersects.cpp | 3 +--
trunk/libs/geometry/test/algorithms/overlay/robustness/star_comb.cpp | 2 --
6 files changed, 36 insertions(+), 6 deletions(-)
Modified: trunk/boost/geometry/algorithms/detail/overlay/assign_parents.hpp
==============================================================================
--- trunk/boost/geometry/algorithms/detail/overlay/assign_parents.hpp Sat Aug 17 13:03:07 2013 (r85379)
+++ trunk/boost/geometry/algorithms/detail/overlay/assign_parents.hpp 2013-08-17 13:10:35 EDT (Sat, 17 Aug 2013) (r85380)
@@ -18,6 +18,10 @@
#include <boost/geometry/geometries/box.hpp>
+#ifdef BOOST_GEOMETRY_TIME_OVERLAY
+# include <boost/timer.hpp>
+#endif
+
namespace boost { namespace geometry
{
Modified: trunk/boost/geometry/algorithms/detail/overlay/overlay.hpp
==============================================================================
--- trunk/boost/geometry/algorithms/detail/overlay/overlay.hpp Sat Aug 17 13:03:07 2013 (r85379)
+++ trunk/boost/geometry/algorithms/detail/overlay/overlay.hpp 2013-08-17 13:10:35 EDT (Sat, 17 Aug 2013) (r85380)
@@ -40,6 +40,10 @@
# include <boost/geometry/io/dsv/write.hpp>
#endif
+#ifdef BOOST_GEOMETRY_TIME_OVERLAY
+# include <boost/timer.hpp>
+#endif
+
namespace boost { namespace geometry
{
Added: trunk/libs/geometry/test/algorithms/overlay/robustness/Jamfile.v2
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/libs/geometry/test/algorithms/overlay/robustness/Jamfile.v2 2013-08-17 13:10:35 EDT (Sat, 17 Aug 2013) (r85380)
@@ -0,0 +1,26 @@
+# Boost.Geometry (aka GGL, Generic Geometry Library)
+#
+# Copyright (c) 2007-2013 Barend Gehrels, Amsterdam, the Netherlands.
+# Copyright (c) 2008-2013 Bruno Lalande, Paris, France.
+# Copyright (c) 2009-2013 Mateusz Loskot, London, UK.
+# Copyright (c) 2013 Adam Wulkiewicz, Lodz, Poland.
+#
+# Use, modification and distribution is 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)
+
+project boost-geometry-algorithms-overlay-robustness
+ :
+ requirements
+ <include>.
+ <library>/boost/program_options//boost_program_options
+ ;
+
+exe interior_triangles : interior_triangles.cpp ;
+exe intersection_pies : intersection_pies.cpp ;
+exe intersection_stars : intersection_stars.cpp ;
+exe intersects : intersects.cpp ;
+exe random_ellipses_stars : random_ellipses_stars.cpp ;
+exe recursive_polygons : recursive_polygons.cpp ;
+exe star_comb : star_comb.cpp ;
+
Modified: trunk/libs/geometry/test/algorithms/overlay/robustness/interior_triangles.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/overlay/robustness/interior_triangles.cpp Sat Aug 17 13:03:07 2013 (r85379)
+++ trunk/libs/geometry/test/algorithms/overlay/robustness/interior_triangles.cpp 2013-08-17 13:10:35 EDT (Sat, 17 Aug 2013) (r85380)
@@ -40,7 +40,7 @@
{
for(int k = 0; k < count_y; ++k)
{
- polygon.inners().push_back(Polygon::inner_container_type::value_type());
+ polygon.inners().push_back(typename Polygon::inner_container_type::value_type());
polygon.inners().back().push_back(point_type(offset + j * 10 + 1, k * 10 + 1));
polygon.inners().back().push_back(point_type(offset + j * 10 + 7, k * 10 + 5 + index));
polygon.inners().back().push_back(point_type(offset + j * 10 + 5 + index, k * 10 + 7));
@@ -81,7 +81,6 @@
> polygon;
- int index = 0;
for(int i = 0; i < count; i++)
{
test_star_comb<polygon>(count_x, count_y, offset, settings);
Modified: trunk/libs/geometry/test/algorithms/overlay/robustness/intersects.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/overlay/robustness/intersects.cpp Sat Aug 17 13:03:07 2013 (r85379)
+++ trunk/libs/geometry/test/algorithms/overlay/robustness/intersects.cpp 2013-08-17 13:10:35 EDT (Sat, 17 Aug 2013) (r85380)
@@ -36,7 +36,7 @@
{
for(int k = 0; k < count_y; ++k)
{
- mp.push_back(MultiPolygon::value_type());
+ mp.push_back(typename MultiPolygon::value_type());
mp.back().outer().push_back(point_type(width_x + j * 10 + 1, k * 10 + 1));
mp.back().outer().push_back(point_type(width_x + j * 10 + width_x, k * 10 + 5 + index));
mp.back().outer().push_back(point_type(width_x + j * 10 + 5 + index, k * 10 + 7));
@@ -93,7 +93,6 @@
> multi_polygon;
- int index = 0;
for(int i = 0; i < count; i++)
{
test_intersects<multi_polygon>(count_x, count_y, width_x, settings);
Modified: trunk/libs/geometry/test/algorithms/overlay/robustness/star_comb.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/overlay/robustness/star_comb.cpp Sat Aug 17 13:03:07 2013 (r85379)
+++ trunk/libs/geometry/test/algorithms/overlay/robustness/star_comb.cpp 2013-08-17 13:10:35 EDT (Sat, 17 Aug 2013) (r85380)
@@ -60,8 +60,6 @@
bg::model::d2::point_xy<T>, Clockwise, Closed
> polygon;
-
- int index = 0;
for(int i = 0; i < count; i++)
{
test_star_comb<polygon>(star_point_count, comb_comb_count, factor1, factor2, do_union, settings);