[Boost-commit] svn:boost r85552 - in trunk: boost/geometry/strategies libs/geometry/doc libs/geometry/test/algorithms libs/geometry/test/algorithms/overlay

Subject: [Boost-commit] svn:boost r85552 - in trunk: boost/geometry/strategies libs/geometry/doc libs/geometry/test/algorithms libs/geometry/test/algorithms/overlay
From: barend.gehrels_at_[hidden]
Date: 2013-09-03 14:45:19

Author: barendgehrels
Date: 2013-09-03 14:45:18 EDT (Tue, 03 Sep 2013)
New Revision: 85552
URL: http://svn.boost.org/trac/boost/changeset/85552

Log:
[geometry] Fixed ticket 9047 (recursive inclusion) and unit test for ticket 8652

Text files modified: 
   trunk/boost/geometry/strategies/intersection.hpp              |     1 -                                       
   trunk/libs/geometry/doc/release_notes.qbk                     |     4 +++-                                    
   trunk/libs/geometry/test/algorithms/intersection.cpp          |     3 +++                                     
   trunk/libs/geometry/test/algorithms/overlay/overlay_cases.hpp |     6 ++++++                                  
   4 files changed, 12 insertions(+), 2 deletions(-)

Modified: trunk/boost/geometry/strategies/intersection.hpp
==============================================================================
--- trunk/boost/geometry/strategies/intersection.hpp	Tue Sep  3 14:12:59 2013	(r85551)
+++ trunk/boost/geometry/strategies/intersection.hpp	2013-09-03 14:45:18 EDT (Tue, 03 Sep 2013)	(r85552)
@@ -17,7 +17,6 @@
 #include <boost/geometry/policies/relate/tupled.hpp>
 
 #include <boost/geometry/strategies/side.hpp>
-#include <boost/geometry/strategies/intersection.hpp>
 #include <boost/geometry/strategies/intersection_result.hpp>
 
 #include <boost/geometry/strategies/cartesian/cart_intersect.hpp>

Modified: trunk/libs/geometry/doc/release_notes.qbk
==============================================================================
--- trunk/libs/geometry/doc/release_notes.qbk	Tue Sep  3 14:12:59 2013	(r85551)
+++ trunk/libs/geometry/doc/release_notes.qbk	2013-09-03 14:45:18 EDT (Tue, 03 Sep 2013)	(r85552)
@@ -27,11 +27,13 @@
 
 [*Solved tickets]
 
-* [@https://svn.boost.org/trac/boost/ticket/6958 6958] Intersection generates self-intersection. Caused by spikes, fixed
+* [@https://svn.boost.org/trac/boost/ticket/6958 6958] Intersection generates self-intersection. Caused by spike, fixed
 * [@https://svn.boost.org/trac/boost/ticket/8364 8364] Invalid input exception, caused by spikes in previous steps, fixed
 * [@https://svn.boost.org/trac/boost/ticket/8365 8365] Invalid input exception, caused by spikes in previous steps, fixed
 * [@https://svn.boost.org/trac/boost/ticket/8969 8969] boost::geometry::model::point single argument constructor should be explicit
 * [@https://svn.boost.org/trac/boost/ticket/8825 8825] Patch adding member variable documentation to doxygen_xml2qbk
+* [@https://svn.boost.org/trac/boost/ticket/8652 8652] Intersection fails for triangle-triangle intersection. Caused by spike, fixed
+* [@https://svn.boost.org/trac/boost/ticket/9047 9047] Boost files that include themselves (strategies/intersection.hpp), fixed
 
 [*Internal changes]
 

Modified: trunk/libs/geometry/test/algorithms/intersection.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/intersection.cpp	Tue Sep  3 14:12:59 2013	(r85551)
+++ trunk/libs/geometry/test/algorithms/intersection.cpp	2013-09-03 14:45:18 EDT (Tue, 03 Sep 2013)	(r85552)
@@ -220,6 +220,9 @@
     test_one<Polygon, Polygon, Polygon>("ticket_6958", ticket_6958[0], ticket_6958[1],
                 1, 4, 4.34355e-05, 0.01);
 
+    test_one<Polygon, Polygon, Polygon>("ticket_8652", ticket_8652[0], ticket_8652[1],
+                1, 4, 0.0003, 0.00001);
+
     test_one<Polygon, Polygon, Polygon>("buffer_mp1", buffer_mp1[0], buffer_mp1[1],
                 1, 31, 2.271707796);
 

Modified: trunk/libs/geometry/test/algorithms/overlay/overlay_cases.hpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/overlay/overlay_cases.hpp	Tue Sep  3 14:12:59 2013	(r85551)
+++ trunk/libs/geometry/test/algorithms/overlay/overlay_cases.hpp	2013-09-03 14:45:18 EDT (Tue, 03 Sep 2013)	(r85552)
@@ -579,6 +579,12 @@
     "POLYGON((-0.27224111308522286334 0.57751061210314269534,-0.27201435369399112885 0.57735026899999997152,-0.27224111308522280783 0.57718992589685735872,-0.27224111308522286334 0.57751061210314269534))"
     };
 
+static std::string ticket_8652[2] =
+    {
+    "POLYGON((0 0, 0.05 0.04, 0.05 0, 0 0))",
+    "POLYGON((0.02 -2.77556e-17, 0.05 0.02, 0.05 -2.77556e-17, 0.02 -2.77556e-17))"
+    };
+
 static std::string ggl_list_20120229_volker[3] =
     {
     "POLYGON((1716 1554,2076 2250,2436 2352,2796 1248,3156 2484,3516 2688,3516 2688,3156 2484,2796 1248,2436 2352,2076 2250, 1716 1554))",