[Boost-commit] svn:boost r70708 - in trunk/libs/geometry/test: extensions extensions/iterators iterators

Subject: [Boost-commit] svn:boost r70708 - in trunk/libs/geometry/test: extensions extensions/iterators iterators
From: barend.gehrels_at_[hidden]
Date: 2011-03-29 17:06:29

Author: barendgehrels
Date: 2011-03-29 17:06:28 EDT (Tue, 29 Mar 2011)
New Revision: 70708
URL: http://svn.boost.org/trac/boost/changeset/70708

Log:
Moved experimental segment_returning_iterator to extension
Added:
   trunk/libs/geometry/test/extensions/iterators/
   trunk/libs/geometry/test/extensions/iterators/Jamfile.v2   (contents, props changed)
   trunk/libs/geometry/test/extensions/iterators/segment_returning_iterator.cpp
      - copied, changed from r70560, /trunk/libs/geometry/test/iterators/segment_returning_iterator.cpp
   trunk/libs/geometry/test/extensions/iterators/segment_returning_iterator.vcproj
      - copied unchanged from r70560, /trunk/libs/geometry/test/iterators/segment_returning_iterator.vcproj
Removed:
   trunk/libs/geometry/test/iterators/segment_returning_iterator.cpp
   trunk/libs/geometry/test/iterators/segment_returning_iterator.vcproj
Text files modified: 
   trunk/libs/geometry/test/extensions/Jamfile.v2                               |     1 +                                       
   trunk/libs/geometry/test/extensions/iterators/segment_returning_iterator.cpp |     2 +-                                      
   trunk/libs/geometry/test/iterators/Jamfile.v2                                |     3 +--                                     
   3 files changed, 3 insertions(+), 3 deletions(-)

Modified: trunk/libs/geometry/test/extensions/Jamfile.v2
==============================================================================
--- trunk/libs/geometry/test/extensions/Jamfile.v2	(original)
+++ trunk/libs/geometry/test/extensions/Jamfile.v2	2011-03-29 17:06:28 EDT (Tue, 29 Mar 2011)
@@ -8,4 +8,5 @@
 
 build-project algorithms ;
 build-project gis ;
+build-project iterators ;
 

Added: trunk/libs/geometry/test/extensions/iterators/Jamfile.v2
==============================================================================
--- (empty file)
+++ trunk/libs/geometry/test/extensions/iterators/Jamfile.v2	2011-03-29 17:06:28 EDT (Tue, 29 Mar 2011)
@@ -0,0 +1,12 @@
+# ggl/test/iterators/Jamfile.v2 
+#
+# Copyright (c) 2009 Mateusz Loskot <mateusz_at_[hidden]>
+#
+# 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)
+
+test-suite boost-geometry-test-extensions-iterators
+    :
+    [ run segment_returning_iterator.cpp ]
+    ;

Copied: trunk/libs/geometry/test/extensions/iterators/segment_returning_iterator.cpp (from r70560, /trunk/libs/geometry/test/iterators/segment_returning_iterator.cpp)
==============================================================================
--- /trunk/libs/geometry/test/iterators/segment_returning_iterator.cpp	(original)
+++ trunk/libs/geometry/test/extensions/iterators/segment_returning_iterator.cpp	2011-03-29 17:06:28 EDT (Tue, 29 Mar 2011)
@@ -19,7 +19,7 @@
 #include <boost/geometry/geometries/geometries.hpp>
 #include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/geometries/segment.hpp>
-#include <boost/geometry/iterators/segment_returning_iterator.hpp>
+#include <boost/geometry/extensions/iterators/segment_returning_iterator.hpp>
 #include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
 
 template <typename C>

Modified: trunk/libs/geometry/test/iterators/Jamfile.v2
==============================================================================
--- trunk/libs/geometry/test/iterators/Jamfile.v2	(original)
+++ trunk/libs/geometry/test/iterators/Jamfile.v2	2011-03-29 17:06:28 EDT (Tue, 29 Mar 2011)
@@ -6,12 +6,11 @@
 # Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 # http://www.boost.org/LICENSE_1_0.txt)
 
-test-suite ggl-iterators
+test-suite boost-geometry-iterators
     :
     [ run box_iterator.cpp ]
     [ run circular_iterator.cpp ] 
     [ run closing_iterator.cpp ] 
     [ run ever_circling_iterator.cpp ]
-    [ run segment_returning_iterator.cpp ]
     [ run segment_range_iterator.cpp ]
     ;

Deleted: trunk/libs/geometry/test/iterators/segment_returning_iterator.cpp
==============================================================================
--- trunk/libs/geometry/test/iterators/segment_returning_iterator.cpp	2011-03-29 17:06:28 EDT (Tue, 29 Mar 2011)
+++ (empty file)
@@ -1,77 +0,0 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library)
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
-// Copyright Mateusz Loskot 2009, mateusz_at_[hidden]
-// 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)
-
-#include <algorithm>
-#include <list>
-#include <sstream>
-#include <string>
-#include <vector>
-
-#include <geometry_test_common.hpp>
-
-#include <boost/geometry/core/coordinate_type.hpp>
-#include <boost/geometry/geometries/geometries.hpp>
-#include <boost/geometry/geometries/point_xy.hpp>
-#include <boost/geometry/geometries/segment.hpp>
-#include <boost/geometry/iterators/segment_returning_iterator.hpp>
-#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
-
-template <typename C>
-void test_linestring(std::string const& wkt, std::string const& expected)
-{
-    typedef C point_list;
-    typedef typename C::value_type point;
-    typedef typename C::iterator base_iterator;
-    typedef bg::segment_returning_iterator<base_iterator, point> segment_returning_iterator;
-    typedef typename segment_returning_iterator::value_type segment;
-    typedef bg::model::linestring<point> linestring;
-
-    linestring g;
-    bg::read_wkt(wkt, g);
-
-    point_list v;
-    std::copy(g.begin(), g.end(), std::back_insert_iterator<point_list>(v));
-    BOOST_CHECK_EQUAL(g.size(), v.size());
-
-    segment_returning_iterator it(v.begin(), v.end());
-    segment_returning_iterator end(v.end());
-
-    std::ostringstream oss;
-    while (it != end)
-    {
-        segment const& s = *it;
-        oss << bg::get<0>(s.first) << bg::get<1>(s.first)
-            << bg::get<0>(s.second) << bg::get<1>(s.second);
-        ++it;
-    }
-    BOOST_CHECK_EQUAL(oss.str(), expected);
-}
-
-int test_main(int, char* [])
-{
-    // Test std::vector
-    typedef std::vector<bg::model::d2::point_xy<double> > points_v;
-    test_linestring<points_v>("linestring empty", "");
-    test_linestring<points_v>("linestring ()", "");
-    test_linestring<points_v>("linestring (1 1)", "");
-    test_linestring<points_v>("linestring (1 1, 2 2, 3 3)", "11222233");
-    test_linestring<points_v>("linestring (1 1, 2 2, 3 3, 4 4)", "112222333344");
-    test_linestring<points_v>("linestring (1 1, 2 2, 3 3, 4 4, 5 5, 6 6)", "11222233334444555566");
-
-    // Test std::list
-    typedef std::list<bg::model::d2::point_xy<double> > points_l;
-    test_linestring<points_l>("linestring empty", "");
-    test_linestring<points_l>("linestring ()", "");
-    test_linestring<points_l>("linestring (1 1)", "");
-    test_linestring<points_l>("linestring (1 1, 2 2, 3 3)", "11222233");
-    test_linestring<points_l>("linestring (1 1, 2 2, 3 3, 4 4)", "112222333344");
-    test_linestring<points_l>("linestring (1 1, 2 2, 3 3, 4 4, 5 5, 6 6)", "11222233334444555566");
-
-    return 0;
-}

Deleted: trunk/libs/geometry/test/iterators/segment_returning_iterator.vcproj
==============================================================================
--- trunk/libs/geometry/test/iterators/segment_returning_iterator.vcproj	2011-03-29 17:06:28 EDT (Tue, 29 Mar 2011)
+++ (empty file)
@@ -1,176 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="segment_returning_iterator"
-	ProjectGUID="{A38B1CA8-5194-4FAD-B85E-55697BEECCB7}"
-	RootNamespace="segment_returning_iterator"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)\segment_returning_iterator"
-			ConfigurationType="1"
-			InheritedPropertySheets="..\boost.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../../..;.."
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				ExceptionHandling="2"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="0"
-				DebugInformationFormat="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="false"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)\segment_returning_iterator"
-			ConfigurationType="1"
-			InheritedPropertySheets="..\boost.vsprops"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="../../../..;.."
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				ExceptionHandling="2"
-				UsePrecompiledHeader="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="false"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath=".\segment_returning_iterator.cpp"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>