[Boost-commit] svn:boost r78654 - in trunk/libs/geometry/test/algorithms: . overlay

Subject: [Boost-commit] svn:boost r78654 - in trunk/libs/geometry/test/algorithms: . overlay
From: barend.gehrels_at_[hidden]
Date: 2012-05-26 16:48:00

Author: barendgehrels
Date: 2012-05-26 16:48:00 EDT (Sat, 26 May 2012)
New Revision: 78654
URL: http://svn.boost.org/trac/boost/changeset/78654

Log:
[geometry] bugfix for union (unit test - pending commit - change done in april 2012)
Text files modified: 
   trunk/libs/geometry/test/algorithms/overlay/get_turn_info.cpp |     4 ----                                    
   trunk/libs/geometry/test/algorithms/overlay/overlay_cases.hpp |     6 ++++++                                  
   trunk/libs/geometry/test/algorithms/union.cpp                 |     5 +++++                                   
   3 files changed, 11 insertions(+), 4 deletions(-)

Modified: trunk/libs/geometry/test/algorithms/overlay/get_turn_info.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/overlay/get_turn_info.cpp	(original)
+++ trunk/libs/geometry/test/algorithms/overlay/get_turn_info.cpp	2012-05-26 16:48:00 EDT (Sat, 26 May 2012)
@@ -807,14 +807,10 @@
             4, 3,   2, 3,   0, 3, // q
             method_touch, 2, 3, "xx");
 
-    /***
-    TODO, work this out further / check this
-    // Case where
     test_both<P, double>("issue_buffer_mill",
             5.1983614873206241 , 6.7259025813913107 , 5.0499999999999998 , 6.4291796067500622 , 5.1983614873206241 , 6.7259025813913107, // p
             5.0499999999999998 , 6.4291796067500622 , 5.0499999999999998 , 6.4291796067500622 , 5.1983614873206241 , 6.7259025813913107, // q
             method_collinear, 2, 0, "tt");
-    ***/
 
 }
 

Modified: trunk/libs/geometry/test/algorithms/overlay/overlay_cases.hpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/overlay/overlay_cases.hpp	(original)
+++ trunk/libs/geometry/test/algorithms/overlay/overlay_cases.hpp	2012-05-26 16:48:00 EDT (Sat, 26 May 2012)
@@ -648,5 +648,11 @@
     };
 
 
+static std::string buffer_rt_t[2] =
+    {
+        "POLYGON((0.00000000000000000 3.0,0.00000000000000000 4.0,0.00000000000000000 6.4142135623730958,1.7071067811865475 4.7071067811865479,2.7071067811865475 3.7071067811865475,4.4142135623730940 2.0,2.0 2.0,1.0 2.0,-0.00000000000000000 2.0,0.00000000000000000 3.0))",
+        "POLYGON((1.7071067811865475 3.2928932188134525,0.70710678118654746 2.2928932188134525,-1.0 0.58578643762690508,-1.0 3.0,-1.0 4.0,-1.0 4.0,-1.0 5.0,-1.0 7.4142135623730958,0.70710678118654746 5.7071067811865479,1.7071067811865475 4.7071067811865479,2.4142135623730954 4.0,1.7071067811865475 3.2928932188134525))"
+    };
+
 
 #endif // BOOST_GEOMETRY_TEST_OVERLAY_CASES_HPP

Modified: trunk/libs/geometry/test/algorithms/union.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/union.cpp	(original)
+++ trunk/libs/geometry/test/algorithms/union.cpp	2012-05-26 16:48:00 EDT (Sat, 26 May 2012)
@@ -323,6 +323,11 @@
                 1, 0, if_typed<ct, float>(19, 20), 21.07612);
     test_one<Polygon, Polygon, Polygon>("buffer_rt_r_rev", buffer_rt_r[1], buffer_rt_r[0],
                 1, 0, if_typed_tt<ct>(20, 19), 21.07612);
+
+    test_one<Polygon, Polygon, Polygon>("buffer_rt_t", buffer_rt_t[0], buffer_rt_t[1],
+                1, 0, if_typed_tt<ct>(16, 14), 15.6569);
+    test_one<Polygon, Polygon, Polygon>("buffer_rt_t_ref", buffer_rt_t[1], buffer_rt_t[0],
+                1, 0, if_typed_tt<ct>(16, 14), 15.6569);
 }
 
 template <typename P>