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

Subject: [Boost-commit] svn:boost r75118 - in trunk/libs/geometry/test/multi/algorithms: . overlay
From: barend.gehrels_at_[hidden]
Date: 2011-10-25 15:56:59

Author: barendgehrels
Date: 2011-10-25 15:56:58 EDT (Tue, 25 Oct 2011)
New Revision: 75118
URL: http://svn.boost.org/trac/boost/changeset/75118

Log:
Fixed order-problem by avoiding argument reversion. See correspondence on GGL mailing list 2011/10/25 --> added testcases for the reported failure
Text files modified: 
   trunk/libs/geometry/test/multi/algorithms/multi_difference.cpp            |    15 +++++++++++++++                         
   trunk/libs/geometry/test/multi/algorithms/overlay/multi_overlay_cases.hpp |    10 ++++++++++                              
   2 files changed, 25 insertions(+), 0 deletions(-)

Modified: trunk/libs/geometry/test/multi/algorithms/multi_difference.cpp
==============================================================================
--- trunk/libs/geometry/test/multi/algorithms/multi_difference.cpp	(original)
+++ trunk/libs/geometry/test/multi/algorithms/multi_difference.cpp	2011-10-25 15:56:58 EDT (Tue, 25 Oct 2011)
@@ -81,6 +81,21 @@
         case_78_multi[0], case_78_multi[1],
             1, 1, 1.0, 1, 1, 1.0);
 
+    // Ticket on GGL list 2011/10/25
+    // to mix polygon/multipolygon in call to difference
+    test_one<Polygon, Polygon, Polygon>("ggl_list_20111025_vd_pp",
+        ggl_list_20111025_vd[0], ggl_list_20111025_vd[1],
+            1, -999, 8.0, 1, -999, 12.5);
+    test_one<Polygon, Polygon, MultiPolygon>("ggl_list_20111025_vd_pm",
+        ggl_list_20111025_vd[0], ggl_list_20111025_vd[3],
+            1, -999, 8.0, 1, -999, 12.5);
+    test_one<Polygon, MultiPolygon, Polygon>("ggl_list_20111025_vd_mp",
+        ggl_list_20111025_vd[2], ggl_list_20111025_vd[1],
+            1, -999, 8.0, 1, -999, 12.5);
+    test_one<Polygon, MultiPolygon, MultiPolygon>("ggl_list_20111025_vd_mm",
+        ggl_list_20111025_vd[2], ggl_list_20111025_vd[3],
+            1, -999, 8.0, 1, -999, 12.5);
+
     /* TODO: fix
     test_one<Polygon, MultiPolygon, MultiPolygon>("case_101_multi",
         case_101_multi[0], case_101_multi[1],

Modified: trunk/libs/geometry/test/multi/algorithms/overlay/multi_overlay_cases.hpp
==============================================================================
--- trunk/libs/geometry/test/multi/algorithms/overlay/multi_overlay_cases.hpp	(original)
+++ trunk/libs/geometry/test/multi/algorithms/overlay/multi_overlay_cases.hpp	2011-10-25 15:56:58 EDT (Tue, 25 Oct 2011)
@@ -410,5 +410,15 @@
     "MULTIPOLYGON(((2500 2500,2791 3586,3062 3474,2500 2500)),((2500 2500,3474 3062,3586 2791,3625 2500,3586 2208,3474 1937,3295 1704,3062 1525,2791 1413,2499 1375,2208 1413,1937 1525,1704 1704,1525 1937,1413 2208,1375 2500,2500 2500)))" 
 };
 
+// Case, not literally on this list but derived, to mix polygon/multipolygon in call to difference
+static std::string ggl_list_20111025_vd[4] =
+    {
+    "POLYGON((0 0,0 4,4 0,0 0))",
+    "POLYGON((10 0,10 5,15 0,10 0))",
+    "MULTIPOLYGON(((0 0,0 4,4 0,0 0)))",
+    "MULTIPOLYGON(((10 0,10 5,15 0,10 0)))"
+    };
+    
+
 
 #endif // BOOST_GEOMETRY_TEST_MULTI_OVERLAY_CASES_HPP