Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r69947 - trunk/libs/geometry/test/multi/algorithms/overlay
From: barend.gehrels_at_[hidden]
Date: 2011-03-13 11:20:42


Author: barendgehrels
Date: 2011-03-13 11:20:37 EDT (Sun, 13 Mar 2011)
New Revision: 69947
URL: http://svn.boost.org/trac/boost/changeset/69947

Log:
Updates in test for partition addition, and cleanup

Removed:
   trunk/libs/geometry/test/multi/algorithms/overlay/multi_svg_mapper.hpp
Text files modified:
   trunk/libs/geometry/test/multi/algorithms/overlay/multi_traverse.cpp | 5 +----
   1 files changed, 1 insertions(+), 4 deletions(-)

Deleted: trunk/libs/geometry/test/multi/algorithms/overlay/multi_svg_mapper.hpp
==============================================================================
--- trunk/libs/geometry/test/multi/algorithms/overlay/multi_svg_mapper.hpp 2011-03-13 11:20:37 EDT (Sun, 13 Mar 2011)
+++ (empty file)
@@ -1,49 +0,0 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
-// Use, modification and distribution is subject to the Boost Software License,
-// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-
-
-#ifndef GEOMETRY_TEST_MULTI_UTIL_SVG_MAPPER_HPP
-#define GEOMETRY_TEST_MULTI_UTIL_SVG_MAPPER_HPP
-
-#include <boost/geometry/multi/algorithms/envelope.hpp>
-#include <boost/geometry/multi/algorithms/transform.hpp>
-
-#include <boost/geometry/extensions/io/svg/write_svg_multi.hpp>
-
-namespace boost { namespace geometry
-{
-
-#ifndef DOXYGEN_NO_DISPATCH
-namespace dispatch
-{
-
-
-template <typename MultiPolygon>
-struct svg_map<bg::multi_polygon_tag, true, MultiPolygon>
-{
- template <typename TransformStrategy>
- static inline void apply(std::ostream& stream,
- std::string const& style, int size,
- MultiPolygon const& multi_polygon,
- TransformStrategy const& strategy)
- {
- bg::model::multi_polygon<bg::model::polygon<bg::model::d2::point_xy<int> > > impoly;
- bg::transform(multi_polygon, impoly, strategy);
- stream << bg::svg(impoly, style, size) << std::endl;
- }
-};
-
-
-} // namespace dispatch
-#endif
-
-
-}} // namespace boost::geometry
-
-
-#endif // GEOMETRY_TEST_MULTI_UTIL_SVG_MAPPER_HPP

Modified: trunk/libs/geometry/test/multi/algorithms/overlay/multi_traverse.cpp
==============================================================================
--- trunk/libs/geometry/test/multi/algorithms/overlay/multi_traverse.cpp (original)
+++ trunk/libs/geometry/test/multi/algorithms/overlay/multi_traverse.cpp 2011-03-13 11:20:37 EDT (Sun, 13 Mar 2011)
@@ -37,9 +37,6 @@
 
 #include "multi_overlay_cases.hpp"
 
-#if defined(TEST_WITH_SVG)
-# include "multi_svg_mapper.hpp"
-#endif
 
 
 // Because multi-intersections are similar to single,
@@ -133,7 +130,7 @@
     test_overlay<MultiPolygon, MultiPolygon,
         test_traverse<ov::operation_intersection, Reverse, Reverse>, Tuple>
         (
- "case_78_multi", boost::make_tuple(3, 22),
+ "case_78_multi", boost::make_tuple(2, 22), // Went from 3 to 2 by get_turns / partition
             case_78_multi[0], case_78_multi[1]
         );
 


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