Boost logo

Boost-Commit :

Date view Thread view Subject view Author view

Subject: [Boost-commit] svn:boost r76016 - in trunk/libs/geometry/test: algorithms algorithms/detail multi/algorithms
From: barend.gehrels_at_[hidden]
Date: 2011-12-17 07:34:41

Author: barendgehrels
Date: 2011-12-17 07:34:39 EST (Sat, 17 Dec 2011)
New Revision: 76016
URL: http://svn.boost.org/trac/boost/changeset/76016

Log:
Fixed (mostly multi)tests for wkt update
Text files modified:
   trunk/libs/geometry/test/algorithms/detail/partition.cpp | 1 +
   trunk/libs/geometry/test/algorithms/difference.cpp | 1 +
   trunk/libs/geometry/test/algorithms/distance.cpp | 1 +
   trunk/libs/geometry/test/multi/algorithms/multi_area.cpp | 1 +
   trunk/libs/geometry/test/multi/algorithms/multi_convert.cpp | 3 +++
   trunk/libs/geometry/test/multi/algorithms/multi_convex_hull.cpp | 1 +
   trunk/libs/geometry/test/multi/algorithms/multi_correct.cpp | 1 +
   trunk/libs/geometry/test/multi/algorithms/multi_covered_by.cpp | 5 +++--
   trunk/libs/geometry/test/multi/algorithms/multi_for_each.cpp | 1 +
   trunk/libs/geometry/test/multi/algorithms/multi_length.cpp | 1 +
   trunk/libs/geometry/test/multi/algorithms/multi_num_geometries.cpp | 1 +
   trunk/libs/geometry/test/multi/algorithms/multi_num_interior_rings.cpp | 1 +
   trunk/libs/geometry/test/multi/algorithms/multi_num_points.cpp | 1 +
   trunk/libs/geometry/test/multi/algorithms/multi_perimeter.cpp | 1 +
   trunk/libs/geometry/test/multi/algorithms/multi_reverse.cpp | 1 +
   trunk/libs/geometry/test/multi/algorithms/multi_simplify.cpp | 1 +
   trunk/libs/geometry/test/multi/algorithms/multi_transform.cpp | 2 +-
   trunk/libs/geometry/test/multi/algorithms/multi_unique.cpp | 1 +
   trunk/libs/geometry/test/multi/algorithms/multi_within.cpp | 1 +
   19 files changed, 23 insertions(+), 3 deletions(-)

Modified: trunk/libs/geometry/test/algorithms/detail/partition.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/detail/partition.cpp (original)
+++ trunk/libs/geometry/test/algorithms/detail/partition.cpp 2011-12-17 07:34:39 EST (Sat, 17 Dec 2011)
@@ -18,6 +18,7 @@
 #include <boost/geometry/algorithms/detail/partition.hpp>
 
 #include <boost/geometry/io/wkt/wkt.hpp>
+#include <boost/geometry/multi/io/wkt/wkt.hpp>
 
 #if defined(TEST_WITH_SVG)
 # include <boost/geometry/extensions/io/svg/svg_mapper.hpp>

Modified: trunk/libs/geometry/test/algorithms/difference.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/difference.cpp (original)
+++ trunk/libs/geometry/test/algorithms/difference.cpp 2011-12-17 07:34:39 EST (Sat, 17 Dec 2011)
@@ -27,6 +27,7 @@
 #include <boost/geometry/multi/algorithms/correct.hpp>
 #include <boost/geometry/multi/algorithms/intersection.hpp>
 #include <boost/geometry/multi/algorithms/within.hpp>
+#include <boost/geometry/multi/io/wkt/wkt.hpp>
 
 #include <boost/geometry/geometries/point_xy.hpp>
 

Modified: trunk/libs/geometry/test/algorithms/distance.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/distance.cpp (original)
+++ trunk/libs/geometry/test/algorithms/distance.cpp 2011-12-17 07:34:39 EST (Sat, 17 Dec 2011)
@@ -221,6 +221,7 @@
     // open
     test_geometry<P, bg::model::polygon<P, true, false> >("POINT(2 2)", "POLYGON ((0 0,1 9,8 1),(1 1,4 1,1 4))", 0.5 * sqrt(2.0));
 
+ test_geometry<bg::model::polygon<P>, bg::model::polygon<P> >(donut, donut, 0.5 * sqrt(2.0));
 
     // DOES NOT COMPILE - cannot do read_wkt (because boost::array is not variably sized)
     // test_geometry<P, boost::array<P, 2> >("POINT(3 1)", "LINESTRING(1 1,4 4)", sqrt(2.0));

Modified: trunk/libs/geometry/test/multi/algorithms/multi_area.cpp
==============================================================================
--- trunk/libs/geometry/test/multi/algorithms/multi_area.cpp (original)
+++ trunk/libs/geometry/test/multi/algorithms/multi_area.cpp 2011-12-17 07:34:39 EST (Sat, 17 Dec 2011)
@@ -15,6 +15,7 @@
 #include <boost/geometry/multi/geometries/multi_polygon.hpp>
 
 #include <boost/geometry/io/wkt/wkt.hpp>
+#include <boost/geometry/multi/io/wkt/wkt.hpp>
 
 
 

Modified: trunk/libs/geometry/test/multi/algorithms/multi_convert.cpp
==============================================================================
--- trunk/libs/geometry/test/multi/algorithms/multi_convert.cpp (original)
+++ trunk/libs/geometry/test/multi/algorithms/multi_convert.cpp 2011-12-17 07:34:39 EST (Sat, 17 Dec 2011)
@@ -13,6 +13,9 @@
 #include <boost/geometry/multi/geometries/multi_linestring.hpp>
 #include <boost/geometry/multi/geometries/multi_polygon.hpp>
 
+#include <boost/geometry/io/wkt/wkt.hpp>
+#include <boost/geometry/multi/io/wkt/wkt.hpp>
+
 
 template <typename Point1, typename Point2>
 void test_mixed_point_types()

Modified: trunk/libs/geometry/test/multi/algorithms/multi_convex_hull.cpp
==============================================================================
--- trunk/libs/geometry/test/multi/algorithms/multi_convex_hull.cpp (original)
+++ trunk/libs/geometry/test/multi/algorithms/multi_convex_hull.cpp 2011-12-17 07:34:39 EST (Sat, 17 Dec 2011)
@@ -32,6 +32,7 @@
 #include <boost/geometry/multi/algorithms/detail/for_each_range.hpp>
 
 #include <boost/geometry/io/wkt/wkt.hpp>
+#include <boost/geometry/multi/io/wkt/wkt.hpp>
 
 #include <boost/geometry/multi/geometries/multi_point.hpp>
 #include <boost/geometry/multi/geometries/multi_linestring.hpp>

Modified: trunk/libs/geometry/test/multi/algorithms/multi_correct.cpp
==============================================================================
--- trunk/libs/geometry/test/multi/algorithms/multi_correct.cpp (original)
+++ trunk/libs/geometry/test/multi/algorithms/multi_correct.cpp 2011-12-17 07:34:39 EST (Sat, 17 Dec 2011)
@@ -14,6 +14,7 @@
 #include <boost/geometry/multi/algorithms/correct.hpp>
 
 #include <boost/geometry/io/wkt/wkt.hpp>
+#include <boost/geometry/multi/io/wkt/wkt.hpp>
 
 #include <boost/geometry/geometries/box.hpp>
 #include <boost/geometry/geometries/ring.hpp>

Modified: trunk/libs/geometry/test/multi/algorithms/multi_covered_by.cpp
==============================================================================
--- trunk/libs/geometry/test/multi/algorithms/multi_covered_by.cpp (original)
+++ trunk/libs/geometry/test/multi/algorithms/multi_covered_by.cpp 2011-12-17 07:34:39 EST (Sat, 17 Dec 2011)
@@ -7,8 +7,6 @@
 
 #include <geometry_test_common.hpp>
 
-#include <boost/geometry/io/wkt/wkt.hpp>
-
 #include <boost/geometry/algorithms/correct.hpp>
 #include <boost/geometry/algorithms/covered_by.hpp>
 
@@ -21,6 +19,9 @@
 #include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/multi/geometries/multi_polygon.hpp>
 
+#include <boost/geometry/io/wkt/wkt.hpp>
+#include <boost/geometry/multi/io/wkt/wkt.hpp>
+
 #include <algorithms/test_covered_by.hpp>
 
 

Modified: trunk/libs/geometry/test/multi/algorithms/multi_for_each.cpp
==============================================================================
--- trunk/libs/geometry/test/multi/algorithms/multi_for_each.cpp (original)
+++ trunk/libs/geometry/test/multi/algorithms/multi_for_each.cpp 2011-12-17 07:34:39 EST (Sat, 17 Dec 2011)
@@ -11,6 +11,7 @@
 #include <boost/geometry/multi/algorithms/for_each.hpp>
 
 #include <boost/geometry/io/wkt/wkt.hpp>
+#include <boost/geometry/multi/io/wkt/wkt.hpp>
 
 #include <boost/geometry/geometries/box.hpp>
 #include <boost/geometry/geometries/ring.hpp>

Modified: trunk/libs/geometry/test/multi/algorithms/multi_length.cpp
==============================================================================
--- trunk/libs/geometry/test/multi/algorithms/multi_length.cpp (original)
+++ trunk/libs/geometry/test/multi/algorithms/multi_length.cpp 2011-12-17 07:34:39 EST (Sat, 17 Dec 2011)
@@ -15,6 +15,7 @@
 #include <boost/geometry/multi/geometries/multi_linestring.hpp>
 
 #include <boost/geometry/io/wkt/wkt.hpp>
+#include <boost/geometry/multi/io/wkt/wkt.hpp>
 
 
 

Modified: trunk/libs/geometry/test/multi/algorithms/multi_num_geometries.cpp
==============================================================================
--- trunk/libs/geometry/test/multi/algorithms/multi_num_geometries.cpp (original)
+++ trunk/libs/geometry/test/multi/algorithms/multi_num_geometries.cpp 2011-12-17 07:34:39 EST (Sat, 17 Dec 2011)
@@ -11,6 +11,7 @@
 #include <boost/geometry/multi/algorithms/num_geometries.hpp>
 
 #include <boost/geometry/io/wkt/wkt.hpp>
+#include <boost/geometry/multi/io/wkt/wkt.hpp>
 
 #include <boost/geometry/geometries/geometries.hpp>
 #include <boost/geometry/geometries/point_xy.hpp>

Modified: trunk/libs/geometry/test/multi/algorithms/multi_num_interior_rings.cpp
==============================================================================
--- trunk/libs/geometry/test/multi/algorithms/multi_num_interior_rings.cpp (original)
+++ trunk/libs/geometry/test/multi/algorithms/multi_num_interior_rings.cpp 2011-12-17 07:34:39 EST (Sat, 17 Dec 2011)
@@ -11,6 +11,7 @@
 #include <boost/geometry/multi/algorithms/num_interior_rings.hpp>
 
 #include <boost/geometry/io/wkt/wkt.hpp>
+#include <boost/geometry/multi/io/wkt/wkt.hpp>
 
 #include <boost/geometry/geometries/geometries.hpp>
 #include <boost/geometry/geometries/point_xy.hpp>

Modified: trunk/libs/geometry/test/multi/algorithms/multi_num_points.cpp
==============================================================================
--- trunk/libs/geometry/test/multi/algorithms/multi_num_points.cpp (original)
+++ trunk/libs/geometry/test/multi/algorithms/multi_num_points.cpp 2011-12-17 07:34:39 EST (Sat, 17 Dec 2011)
@@ -11,6 +11,7 @@
 #include <boost/geometry/multi/algorithms/num_points.hpp>
 
 #include <boost/geometry/io/wkt/wkt.hpp>
+#include <boost/geometry/multi/io/wkt/wkt.hpp>
 
 #include <boost/geometry/geometries/geometries.hpp>
 #include <boost/geometry/geometries/point_xy.hpp>

Modified: trunk/libs/geometry/test/multi/algorithms/multi_perimeter.cpp
==============================================================================
--- trunk/libs/geometry/test/multi/algorithms/multi_perimeter.cpp (original)
+++ trunk/libs/geometry/test/multi/algorithms/multi_perimeter.cpp 2011-12-17 07:34:39 EST (Sat, 17 Dec 2011)
@@ -11,6 +11,7 @@
 #include <boost/geometry/multi/algorithms/perimeter.hpp>
 
 #include <boost/geometry/io/wkt/wkt.hpp>
+#include <boost/geometry/multi/io/wkt/wkt.hpp>
 
 #include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/geometries/polygon.hpp>

Modified: trunk/libs/geometry/test/multi/algorithms/multi_reverse.cpp
==============================================================================
--- trunk/libs/geometry/test/multi/algorithms/multi_reverse.cpp (original)
+++ trunk/libs/geometry/test/multi/algorithms/multi_reverse.cpp 2011-12-17 07:34:39 EST (Sat, 17 Dec 2011)
@@ -11,6 +11,7 @@
 #include <boost/geometry/multi/algorithms/reverse.hpp>
 
 #include <boost/geometry/io/wkt/wkt.hpp>
+#include <boost/geometry/multi/io/wkt/wkt.hpp>
 
 #include <boost/geometry/geometries/geometries.hpp>
 #include <boost/geometry/geometries/point_xy.hpp>

Modified: trunk/libs/geometry/test/multi/algorithms/multi_simplify.cpp
==============================================================================
--- trunk/libs/geometry/test/multi/algorithms/multi_simplify.cpp (original)
+++ trunk/libs/geometry/test/multi/algorithms/multi_simplify.cpp 2011-12-17 07:34:39 EST (Sat, 17 Dec 2011)
@@ -10,6 +10,7 @@
 #include <boost/geometry/multi/algorithms/simplify.hpp>
 
 #include <boost/geometry/io/wkt/wkt.hpp>
+#include <boost/geometry/multi/io/wkt/wkt.hpp>
 
 #include <boost/geometry/geometries/box.hpp>
 #include <boost/geometry/geometries/ring.hpp>

Modified: trunk/libs/geometry/test/multi/algorithms/multi_transform.cpp
==============================================================================
--- trunk/libs/geometry/test/multi/algorithms/multi_transform.cpp (original)
+++ trunk/libs/geometry/test/multi/algorithms/multi_transform.cpp 2011-12-17 07:34:39 EST (Sat, 17 Dec 2011)
@@ -29,7 +29,7 @@
 #include <boost/geometry/multi/geometries/multi_polygon.hpp>
 
 #include <boost/geometry/io/wkt/wkt.hpp>
-#include <boost/geometry/multi/io/wkt/read.hpp>
+#include <boost/geometry/multi/io/wkt/wkt.hpp>
 
 
 // This test is a little different from transform.cpp test.

Modified: trunk/libs/geometry/test/multi/algorithms/multi_unique.cpp
==============================================================================
--- trunk/libs/geometry/test/multi/algorithms/multi_unique.cpp (original)
+++ trunk/libs/geometry/test/multi/algorithms/multi_unique.cpp 2011-12-17 07:34:39 EST (Sat, 17 Dec 2011)
@@ -11,6 +11,7 @@
 #include <boost/geometry/multi/algorithms/unique.hpp>
 
 #include <boost/geometry/io/wkt/wkt.hpp>
+#include <boost/geometry/multi/io/wkt/wkt.hpp>
 
 #include <boost/geometry/geometries/geometries.hpp>
 #include <boost/geometry/geometries/point_xy.hpp>

Modified: trunk/libs/geometry/test/multi/algorithms/multi_within.cpp
==============================================================================
--- trunk/libs/geometry/test/multi/algorithms/multi_within.cpp (original)
+++ trunk/libs/geometry/test/multi/algorithms/multi_within.cpp 2011-12-17 07:34:39 EST (Sat, 17 Dec 2011)
@@ -8,6 +8,7 @@
 #include <geometry_test_common.hpp>
 
 #include <boost/geometry/io/wkt/wkt.hpp>
+#include <boost/geometry/multi/io/wkt/wkt.hpp>
 
 #include <boost/geometry/algorithms/correct.hpp>
 #include <boost/geometry/algorithms/within.hpp>

Date view Thread view Subject view Author view

Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk