Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r76470 - trunk/libs/geometry/test_extensions/algorithms/buffer
From: barend.gehrels_at_[hidden]
Date: 2012-01-13 16:12:55


Author: barendgehrels
Date: 2012-01-13 16:12:38 EST (Fri, 13 Jan 2012)
New Revision: 76470
URL: http://svn.boost.org/trac/boost/changeset/76470

Log:
Changes w.r.t. buffer test
Text files modified:
   trunk/libs/geometry/test_extensions/algorithms/buffer/linestring_buffer.vcproj | 4 ++--
   trunk/libs/geometry/test_extensions/algorithms/buffer/polygon_buffer.cpp | 1 -
   trunk/libs/geometry/test_extensions/algorithms/buffer/polygon_buffer.vcproj | 4 ++--
   trunk/libs/geometry/test_extensions/algorithms/buffer/test_buffer.hpp | 13 +++++++++----
   4 files changed, 13 insertions(+), 9 deletions(-)

Modified: trunk/libs/geometry/test_extensions/algorithms/buffer/linestring_buffer.vcproj
==============================================================================
--- trunk/libs/geometry/test_extensions/algorithms/buffer/linestring_buffer.vcproj (original)
+++ trunk/libs/geometry/test_extensions/algorithms/buffer/linestring_buffer.vcproj 2012-01-13 16:12:38 EST (Fri, 13 Jan 2012)
@@ -41,7 +41,7 @@
                         <Tool
                                 Name="VCCLCompilerTool"
                                 Optimization="0"
- AdditionalIncludeDirectories=".;../../../../../..;../../../test"
+ AdditionalIncludeDirectories=".;../../../../..;../../../test"
                                 PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
                                 ExceptionHandling="2"
                                 RuntimeLibrary="1"
@@ -114,7 +114,7 @@
                         />
                         <Tool
                                 Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=".;../../../../../..;../../../test"
+ AdditionalIncludeDirectories=".;../../../../..;../../../test"
                                 PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
                                 ExceptionHandling="2"
                                 UsePrecompiledHeader="0"

Modified: trunk/libs/geometry/test_extensions/algorithms/buffer/polygon_buffer.cpp
==============================================================================
--- trunk/libs/geometry/test_extensions/algorithms/buffer/polygon_buffer.cpp (original)
+++ trunk/libs/geometry/test_extensions/algorithms/buffer/polygon_buffer.cpp 2012-01-13 16:12:38 EST (Fri, 13 Jan 2012)
@@ -53,7 +53,6 @@
     namespace buf = bg::strategy::buffer;
 
     typedef bg::model::polygon<P> polygon_type;
-goto debug;
 
     test_one<polygon_type, buf::join_miter, polygon_type>("L", letter_L, 'm', 14, 0.5);
     test_one<polygon_type, buf::join_round, polygon_type>("L", letter_L, 'r', 13.7254516100806, 0.5);

Modified: trunk/libs/geometry/test_extensions/algorithms/buffer/polygon_buffer.vcproj
==============================================================================
--- trunk/libs/geometry/test_extensions/algorithms/buffer/polygon_buffer.vcproj (original)
+++ trunk/libs/geometry/test_extensions/algorithms/buffer/polygon_buffer.vcproj 2012-01-13 16:12:38 EST (Fri, 13 Jan 2012)
@@ -41,7 +41,7 @@
                         <Tool
                                 Name="VCCLCompilerTool"
                                 Optimization="0"
- AdditionalIncludeDirectories=".;../../../../../..;../../../test"
+ AdditionalIncludeDirectories=".;../../../../..;../../../test"
                                 PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
                                 ExceptionHandling="2"
                                 RuntimeLibrary="1"
@@ -114,7 +114,7 @@
                         />
                         <Tool
                                 Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=".;../../../../../..;../../../test"
+ AdditionalIncludeDirectories=".;../../../../..;../../../test"
                                 PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
                                 ExceptionHandling="2"
                                 UsePrecompiledHeader="0"

Modified: trunk/libs/geometry/test_extensions/algorithms/buffer/test_buffer.hpp
==============================================================================
--- trunk/libs/geometry/test_extensions/algorithms/buffer/test_buffer.hpp (original)
+++ trunk/libs/geometry/test_extensions/algorithms/buffer/test_buffer.hpp 2012-01-13 16:12:38 EST (Fri, 13 Jan 2012)
@@ -122,7 +122,7 @@
         bg::detail::buffer::polygon_buffer
             <
                 Geometry, GeometryOut, join_strategy
- >::apply(geometry, buffered_step1, distance_left, join_strategy(5));
+ >::apply(geometry, buffered_step1, distance_left, join_strategy());
         buffered.push_back(buffered_step1);
     }
 #else
@@ -142,6 +142,14 @@
     }
 #endif
 
+ //std::cout << caseid << std::endl;
+ //std::cout << "INPUT: " << bg::wkt(geometry) << std::endl;
+ //std::cout << "OUTPUT:" << std::endl;
+ //BOOST_FOREACH(GeometryOut const& polygon, buffered)
+ //{
+ // std::cout << bg::wkt(polygon) << std::endl;
+ //}
+
     {
         std::ostringstream filename;
         filename << "buffer_"
@@ -167,12 +175,9 @@
         {
             mapper.map(polygon, "opacity:0.8;fill:none;stroke:rgb(0,0,0);stroke-width:2");
             post_map(polygon, mapper);
- std::cout << bg::wkt(polygon) << std::endl;
         }
-
     }
 
-
 }
 
 #ifdef BOOST_GEOMETRY_CHECK_WITH_POSTGIS


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