|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r73544 - trunk/libs/geometry/test_extensions/algorithms
From: barend.gehrels_at_[hidden]
Date: 2011-08-05 08:51:43
Author: barendgehrels
Date: 2011-08-05 08:51:41 EDT (Fri, 05 Aug 2011)
New Revision: 73544
URL: http://svn.boost.org/trac/boost/changeset/73544
Log:
Fixed unit test projects for test_extensions. Most test run again (offset does not compile yet, mark_spikes does not run yet)
Text files modified:
trunk/libs/geometry/test_extensions/algorithms/connect.vcproj | 8 ++++----
trunk/libs/geometry/test_extensions/algorithms/dissolve.cpp | 8 ++++----
trunk/libs/geometry/test_extensions/algorithms/dissolve.vcproj | 8 ++++----
trunk/libs/geometry/test_extensions/algorithms/mark_spikes.cpp | 6 ++++++
trunk/libs/geometry/test_extensions/algorithms/mark_spikes.vcproj | 8 ++++----
trunk/libs/geometry/test_extensions/algorithms/midpoints.cpp | 2 --
trunk/libs/geometry/test_extensions/algorithms/midpoints.vcproj | 8 ++++----
trunk/libs/geometry/test_extensions/algorithms/offset.cpp | 1 +
trunk/libs/geometry/test_extensions/algorithms/offset.vcproj | 8 ++++----
trunk/libs/geometry/test_extensions/algorithms/remove_holes_if.cpp | 1 -
trunk/libs/geometry/test_extensions/algorithms/remove_holes_if.vcproj | 8 ++++----
trunk/libs/geometry/test_extensions/algorithms/selected.cpp | 2 --
trunk/libs/geometry/test_extensions/algorithms/selected.vcproj | 8 ++++----
13 files changed, 39 insertions(+), 37 deletions(-)
Modified: trunk/libs/geometry/test_extensions/algorithms/connect.vcproj
==============================================================================
--- trunk/libs/geometry/test_extensions/algorithms/connect.vcproj (original)
+++ trunk/libs/geometry/test_extensions/algorithms/connect.vcproj 2011-08-05 08:51:41 EDT (Fri, 05 Aug 2011)
@@ -20,7 +20,7 @@
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)\connect"
ConfigurationType="1"
- InheritedPropertySheets="..\..\boost.vsprops"
+ InheritedPropertySheets="..\boost.vsprops"
CharacterSet="1"
>
<Tool
@@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../../../../..;../..;."
+ AdditionalIncludeDirectories="../../../..;..;."
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_GEOMETRY_TEST_MULTI_PERMUTATIONS___disabled"
ExceptionHandling="2"
RuntimeLibrary="1"
@@ -93,7 +93,7 @@
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)\connect"
ConfigurationType="1"
- InheritedPropertySheets="..\..\boost.vsprops"
+ InheritedPropertySheets="..\boost.vsprops"
CharacterSet="1"
WholeProgramOptimization="1"
>
@@ -114,7 +114,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../../../..;../..;."
+ AdditionalIncludeDirectories="../../../..;..;."
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
ExceptionHandling="2"
UsePrecompiledHeader="0"
Modified: trunk/libs/geometry/test_extensions/algorithms/dissolve.cpp
==============================================================================
--- trunk/libs/geometry/test_extensions/algorithms/dissolve.cpp (original)
+++ trunk/libs/geometry/test_extensions/algorithms/dissolve.cpp 2011-08-05 08:51:41 EDT (Fri, 05 Aug 2011)
@@ -307,12 +307,12 @@
1, 18, 19.5206);
// GGL mailing list - report Javier - 2011, March 7
- test_one<multi_polygon, polygon>("ggl_list_20110307_javier_01",
+ test_one<multi_polygon, polygon>("ggl_list_20110307_javier_01_a",
"MULTIPOLYGON(((560 -400, 600 -400, 600 -440, 560 -440, 560 -400)), ((480 -400, 520 -400, 520 -440, 480 -440, 480 -400)), ((600 -320, 640 -320, 640 -360, 600 -360, 600 -320)), ((520 -400, 560 -400, 560 -440, 520 -440, 520 -400)))",
- 1, 18, 19.5206);
- test_one<polygon, polygon>("ggl_list_20110307_javier_01",
+ 1, 14, 6400);
+ test_one<polygon, polygon>("ggl_list_20110307_javier_01_b",
"POLYGON((0 0, 2000 0, 2000 -2000, 0 -2000, 0 0), (560 -400, 560 -440, 600 -440, 600 -400, 560 -400), (480 -400, 480 -440, 520 -440, 520 -400, 480 -400), (600 -320, 600 -360, 640 -360, 640 -320, 600 -320), (520 -400, 520 -440, 560 -440, 560 -400, 520 -400))",
- 1, 18, 19.5206);
+ 1, 19, 3993600);
}
Modified: trunk/libs/geometry/test_extensions/algorithms/dissolve.vcproj
==============================================================================
--- trunk/libs/geometry/test_extensions/algorithms/dissolve.vcproj (original)
+++ trunk/libs/geometry/test_extensions/algorithms/dissolve.vcproj 2011-08-05 08:51:41 EDT (Fri, 05 Aug 2011)
@@ -20,7 +20,7 @@
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)\dissolve"
ConfigurationType="1"
- InheritedPropertySheets="..\..\boost.vsprops"
+ InheritedPropertySheets="..\boost.vsprops"
CharacterSet="1"
>
<Tool
@@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../../../../..;../..;."
+ AdditionalIncludeDirectories="../../../..;..;."
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
ExceptionHandling="2"
RuntimeLibrary="1"
@@ -93,7 +93,7 @@
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)\dissolve"
ConfigurationType="1"
- InheritedPropertySheets="..\..\boost.vsprops"
+ InheritedPropertySheets="..\boost.vsprops"
CharacterSet="1"
WholeProgramOptimization="1"
>
@@ -114,7 +114,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../../../..;../..;."
+ AdditionalIncludeDirectories="../../../..;..;."
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
ExceptionHandling="2"
UsePrecompiledHeader="0"
Modified: trunk/libs/geometry/test_extensions/algorithms/mark_spikes.cpp
==============================================================================
--- trunk/libs/geometry/test_extensions/algorithms/mark_spikes.cpp (original)
+++ trunk/libs/geometry/test_extensions/algorithms/mark_spikes.cpp 2011-08-05 08:51:41 EDT (Fri, 05 Aug 2011)
@@ -18,6 +18,7 @@
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/multi/multi.hpp>
+#include <boost/geometry/multi/geometries/multi_polygon.hpp>
#include <boost/geometry/strategies/strategies.hpp>
#include <boost/geometry/extensions/algorithms/mark_spikes.hpp>
@@ -31,6 +32,11 @@
# include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
#endif
+// BSG 2011/08/05
+// Note: this unit test currently does give errors
+
+
+
template <typename Geometry, typename Policy>
inline void test_remove_indentations(std::string const& id,
Geometry const& geometry,
Modified: trunk/libs/geometry/test_extensions/algorithms/mark_spikes.vcproj
==============================================================================
--- trunk/libs/geometry/test_extensions/algorithms/mark_spikes.vcproj (original)
+++ trunk/libs/geometry/test_extensions/algorithms/mark_spikes.vcproj 2011-08-05 08:51:41 EDT (Fri, 05 Aug 2011)
@@ -20,7 +20,7 @@
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)\mark_spikes"
ConfigurationType="1"
- InheritedPropertySheets="..\..\boost.vsprops"
+ InheritedPropertySheets="..\boost.vsprops"
CharacterSet="1"
>
<Tool
@@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=".;../../../../..;../.."
+ AdditionalIncludeDirectories=".;../../../..;.."
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
ExceptionHandling="2"
RuntimeLibrary="1"
@@ -93,7 +93,7 @@
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)\mark_spikes"
ConfigurationType="1"
- InheritedPropertySheets="..\..\boost.vsprops"
+ InheritedPropertySheets="..\boost.vsprops"
CharacterSet="1"
WholeProgramOptimization="1"
>
@@ -114,7 +114,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=".;../../../../..;../.."
+ AdditionalIncludeDirectories=".;../../../..;.."
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
ExceptionHandling="2"
UsePrecompiledHeader="0"
Modified: trunk/libs/geometry/test_extensions/algorithms/midpoints.cpp
==============================================================================
--- trunk/libs/geometry/test_extensions/algorithms/midpoints.cpp (original)
+++ trunk/libs/geometry/test_extensions/algorithms/midpoints.cpp 2011-08-05 08:51:41 EDT (Fri, 05 Aug 2011)
@@ -30,8 +30,6 @@
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
-#include <test_common/test_point.hpp>
-
template <typename G>
void test_midpoints(G const& g, bool start_and_end)
{
Modified: trunk/libs/geometry/test_extensions/algorithms/midpoints.vcproj
==============================================================================
--- trunk/libs/geometry/test_extensions/algorithms/midpoints.vcproj (original)
+++ trunk/libs/geometry/test_extensions/algorithms/midpoints.vcproj 2011-08-05 08:51:41 EDT (Fri, 05 Aug 2011)
@@ -21,7 +21,7 @@
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)\midpoints"
ConfigurationType="1"
- InheritedPropertySheets="..\..\boost.vsprops"
+ InheritedPropertySheets="..\boost.vsprops"
CharacterSet="1"
>
<Tool
@@ -42,7 +42,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../../../../..;../.."
+ AdditionalIncludeDirectories="../../../..;.."
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
RuntimeLibrary="1"
ExceptionHandling="2"
@@ -91,7 +91,7 @@
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)\midpoints"
ConfigurationType="1"
- InheritedPropertySheets="..\..\boost.vsprops"
+ InheritedPropertySheets="..\boost.vsprops"
CharacterSet="1"
WholeProgramOptimization="1"
>
@@ -112,7 +112,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../../../..;../.."
+ AdditionalIncludeDirectories="../../../..;.."
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
ExceptionHandling="2"
UsePrecompiledHeader="0"
Modified: trunk/libs/geometry/test_extensions/algorithms/offset.cpp
==============================================================================
--- trunk/libs/geometry/test_extensions/algorithms/offset.cpp (original)
+++ trunk/libs/geometry/test_extensions/algorithms/offset.cpp 2011-08-05 08:51:41 EDT (Fri, 05 Aug 2011)
@@ -23,6 +23,7 @@
#include <boost/geometry/strategies/strategies.hpp>
+NOTE: this unit test currently does not compile, it should be updated first.
#include <boost/geometry/strategies/buffer.hpp>
Modified: trunk/libs/geometry/test_extensions/algorithms/offset.vcproj
==============================================================================
--- trunk/libs/geometry/test_extensions/algorithms/offset.vcproj (original)
+++ trunk/libs/geometry/test_extensions/algorithms/offset.vcproj 2011-08-05 08:51:41 EDT (Fri, 05 Aug 2011)
@@ -20,7 +20,7 @@
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)\offset"
ConfigurationType="1"
- InheritedPropertySheets="..\..\boost.vsprops"
+ InheritedPropertySheets="..\boost.vsprops"
CharacterSet="1"
>
<Tool
@@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../../../../..;../..;."
+ AdditionalIncludeDirectories="../../../..;..;."
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
ExceptionHandling="2"
RuntimeLibrary="1"
@@ -93,7 +93,7 @@
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)\offset"
ConfigurationType="1"
- InheritedPropertySheets="..\..\boost.vsprops"
+ InheritedPropertySheets="..\boost.vsprops"
CharacterSet="1"
WholeProgramOptimization="1"
>
@@ -114,7 +114,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../../../..;../..;."
+ AdditionalIncludeDirectories="../../../..;..;."
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
ExceptionHandling="2"
UsePrecompiledHeader="0"
Modified: trunk/libs/geometry/test_extensions/algorithms/remove_holes_if.cpp
==============================================================================
--- trunk/libs/geometry/test_extensions/algorithms/remove_holes_if.cpp (original)
+++ trunk/libs/geometry/test_extensions/algorithms/remove_holes_if.cpp 2011-08-05 08:51:41 EDT (Fri, 05 Aug 2011)
@@ -28,7 +28,6 @@
#include <boost/geometry/strategies/strategies.hpp>
-#include <test_common/test_point.hpp>
template <typename G, typename Predicate>
Modified: trunk/libs/geometry/test_extensions/algorithms/remove_holes_if.vcproj
==============================================================================
--- trunk/libs/geometry/test_extensions/algorithms/remove_holes_if.vcproj (original)
+++ trunk/libs/geometry/test_extensions/algorithms/remove_holes_if.vcproj 2011-08-05 08:51:41 EDT (Fri, 05 Aug 2011)
@@ -20,7 +20,7 @@
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)\remove_holes_if"
ConfigurationType="1"
- InheritedPropertySheets="..\..\boost.vsprops"
+ InheritedPropertySheets="..\boost.vsprops"
CharacterSet="1"
>
<Tool
@@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../../../../..;../.."
+ AdditionalIncludeDirectories="../../../..;.."
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
ExceptionHandling="2"
RuntimeLibrary="1"
@@ -93,7 +93,7 @@
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)\remove_holes_if"
ConfigurationType="1"
- InheritedPropertySheets="..\..\boost.vsprops"
+ InheritedPropertySheets="..\boost.vsprops"
CharacterSet="1"
WholeProgramOptimization="1"
>
@@ -114,7 +114,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../../../..;../.."
+ AdditionalIncludeDirectories="../../../..;.."
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
ExceptionHandling="2"
UsePrecompiledHeader="0"
Modified: trunk/libs/geometry/test_extensions/algorithms/selected.cpp
==============================================================================
--- trunk/libs/geometry/test_extensions/algorithms/selected.cpp (original)
+++ trunk/libs/geometry/test_extensions/algorithms/selected.cpp 2011-08-05 08:51:41 EDT (Fri, 05 Aug 2011)
@@ -27,8 +27,6 @@
#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
-#include <test_common/test_point.hpp>
-
template <typename G, typename P>
void test_selected(G const& g, P const& point, bool result, double dist)
{
Modified: trunk/libs/geometry/test_extensions/algorithms/selected.vcproj
==============================================================================
--- trunk/libs/geometry/test_extensions/algorithms/selected.vcproj (original)
+++ trunk/libs/geometry/test_extensions/algorithms/selected.vcproj 2011-08-05 08:51:41 EDT (Fri, 05 Aug 2011)
@@ -21,7 +21,7 @@
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)\selected"
ConfigurationType="1"
- InheritedPropertySheets="..\..\boost.vsprops"
+ InheritedPropertySheets="..\boost.vsprops"
CharacterSet="1"
>
<Tool
@@ -42,7 +42,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../../../../..;../.."
+ AdditionalIncludeDirectories="../../../..;.."
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
RuntimeLibrary="1"
ExceptionHandling="2"
@@ -91,7 +91,7 @@
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)\selected"
ConfigurationType="1"
- InheritedPropertySheets="..\..\boost.vsprops"
+ InheritedPropertySheets="..\boost.vsprops"
CharacterSet="1"
WholeProgramOptimization="1"
>
@@ -112,7 +112,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../../../..;../.."
+ AdditionalIncludeDirectories="../../../..;.."
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
ExceptionHandling="2"
UsePrecompiledHeader="0"
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