[Boost-commit] svn:boost r77297 - trunk/libs/geometry/test/multi/algorithms

Subject: [Boost-commit] svn:boost r77297 - trunk/libs/geometry/test/multi/algorithms
From: barend.gehrels_at_[hidden]
Date: 2012-03-10 14:36:20

Author: barendgehrels
Date: 2012-03-10 14:36:19 EST (Sat, 10 Mar 2012)
New Revision: 77297
URL: http://svn.boost.org/trac/boost/changeset/77297

Log:
[geometry] belonging to last commit, multi-unit tests

Text files modified: 
   trunk/libs/geometry/test/multi/algorithms/multi_difference.cpp   |    13 +++++++++++++                           
   trunk/libs/geometry/test/multi/algorithms/multi_intersection.cpp |     1 +                                       
   trunk/libs/geometry/test/multi/algorithms/multi_union.cpp        |     3 ++-                                     
   3 files changed, 16 insertions(+), 1 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	2012-03-10 14:36:19 EST (Sat, 10 Mar 2012)
@@ -13,6 +13,11 @@
 // #define BOOST_GEOMETRY_DEBUG_ASSEMBLE
 //#define BOOST_GEOMETRY_CHECK_WITH_SQLSERVER
 
+//#define BOOST_GEOMETRY_DEBUG_SEGMENT_IDENTIFIER
+//#define BOOST_GEOMETRY_DEBUG_FOLLOW
+//#define BOOST_GEOMETRY_DEBUG_TRAVERSE
+
+
 #include <algorithms/test_difference.hpp>
 #include <algorithms/test_overlay.hpp>
 #include <multi/algorithms/overlay/multi_overlay_cases.hpp>
@@ -163,6 +168,13 @@
     test_one_lp<LineString, LineString, MultiPolygon>("case_mp_ls_3", 
             "LINESTRING(6 6,6 7,7 7,7 6,8 6,8 7,9 7,9 6)", 
             "MULTIPOLYGON(((5 7,5 8,6 8,6 7,5 7)),((6 6,6 7,7 7,7 6,6 6)),((8 8,9 8,9 7,8 7,7 7,7 8,8 8)))", 2, 5, 3.0);
+
+    return;
+
+    // TODO: this case contains collinearities and should still be solved
+    test_one_lp<LineString, LineString, MultiPolygon>("case_mp_ls_4", 
+            "LINESTRING(0 5,0 6,1 6,1 5,2 5,2 6,3 6,3 5,3 4,3 3,2 3,2 4,1 4,1 3,0 3,0 4)", 
+            "MULTIPOLYGON(((0 2,0 3,1 2,0 2)),((2 5,3 6,3 5,2 5)),((1 5,1 6,2 6,2 5,1 5)),((2 3,2 4,3 4,2 3)),((0 3,1 4,1 3,0 3)),((4 3,3 3,3 5,4 5,4 4,4 3)))", 5, 11, 6.0);
 }
 
 
@@ -183,6 +195,7 @@
     test_all<bg::model::d2::point_xy<double> >();
 
 #ifdef HAVE_TTMATH
+    std::cout << "Testing TTMATH" << std::endl;
     test_all<bg::model::d2::point_xy<ttmath_big> >();
 #endif
 

Modified: trunk/libs/geometry/test/multi/algorithms/multi_intersection.cpp
==============================================================================
--- trunk/libs/geometry/test/multi/algorithms/multi_intersection.cpp	(original)
+++ trunk/libs/geometry/test/multi/algorithms/multi_intersection.cpp	2012-03-10 14:36:19 EST (Sat, 10 Mar 2012)
@@ -212,6 +212,7 @@
     test_all<bg::model::d2::point_xy<double> >();
 
 #ifdef HAVE_TTMATH
+    std::cout << "Testing TTMATH" << std::endl;
     test_all<bg::model::d2::point_xy<ttmath_big> >();
 #endif
 

Modified: trunk/libs/geometry/test/multi/algorithms/multi_union.cpp
==============================================================================
--- trunk/libs/geometry/test/multi/algorithms/multi_union.cpp	(original)
+++ trunk/libs/geometry/test/multi/algorithms/multi_union.cpp	2012-03-10 14:36:19 EST (Sat, 10 Mar 2012)
@@ -105,7 +105,7 @@
         1, 0, 14, 100.0); // Area from SQL Server
     test_one<Polygon, MultiPolygon, MultiPolygon>("case_recursive_boxes_3",
         case_recursive_boxes_3[0], case_recursive_boxes_3[1],
-        18, 0, 160, 56.5); // Area from SQL Server
+        17, 0, 159, 56.5); // Area from SQL Server
 }
 
 template <typename P>
@@ -134,6 +134,7 @@
     test_all<bg::model::d2::point_xy<double> >();
 
 #ifdef HAVE_TTMATH
+    std::cout << "Testing TTMATH" << std::endl;
     test_all<bg::model::d2::point_xy<ttmath_big> >();
 #endif