boost/geometry
2
0
Fork 0
mirror of https://github.com/boostorg/geometry.git synced 2026-02-20 14:52:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #66 from mkaravel/feature/debug_macro

Browse Source 
Feature/debug macro
This commit is contained in:
Adam Wulkiewicz
2014-06-22 15:29:16 +02:00
parent 19a8455f54 b58dfe57c8
commit 17f08e3ac4
49 changed files with 248 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/algorithms/area.cpp
View File

@@ -23,7 +23,7 @@
#include <test_geometries/all_custom_ring.hpp>
#include <test_geometries/all_custom_polygon.hpp>
//#define GEOMETRY_TEST_DEBUG
//#define BOOST_GEOMETRY_TEST_DEBUG
#include <boost/variant/variant.hpp>

14
test/algorithms/difference_linear_linear.cpp
View File

@@ -13,7 +13,7 @@
#define BOOST_TEST_MODULE test_difference_linear_linear
#endif
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
#define BOOST_GEOMETRY_DEBUG_TURNS
#define BOOST_GEOMETRY_DEBUG_SEGMENT_IDENTIFIER
#endif
@@ -40,7 +40,7 @@ typedef bg::model::multi_linestring<linestring_type> multi_linestring_type;
BOOST_AUTO_TEST_CASE( test_difference_linestring_linestring )
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl << std::endl << std::endl;
std::cout << "*** LINESTRING / LINESTRING DIFFERENCE ***" << std::endl;
std::cout << std::endl;
@@ -422,7 +422,7 @@ BOOST_AUTO_TEST_CASE( test_difference_linestring_linestring )
BOOST_AUTO_TEST_CASE( test_difference_linestring_multilinestring )
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl << std::endl << std::endl;
std::cout << "*** LINESTRING / MULTILINESTRING DIFFERENCE ***"
<< std::endl;
@@ -646,7 +646,7 @@ BOOST_AUTO_TEST_CASE( test_difference_linestring_multilinestring )
BOOST_AUTO_TEST_CASE( test_difference_multilinestring_linestring )
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl << std::endl << std::endl;
std::cout << "*** MULTILINESTRING / LINESTRING DIFFERENCE ***"
<< std::endl;
@@ -706,7 +706,7 @@ BOOST_AUTO_TEST_CASE( test_difference_multilinestring_linestring )
BOOST_AUTO_TEST_CASE( test_difference_multilinestring_multilinestring )
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl << std::endl << std::endl;
std::cout << "*** MULTILINESTRING / MULTILINESTRING DIFFERENCE ***"
<< std::endl;
@@ -945,7 +945,7 @@ BOOST_AUTO_TEST_CASE( test_difference_multilinestring_multilinestring )
#ifndef BOOST_GEOMETRY_TEST_NO_DEGENERATE
BOOST_AUTO_TEST_CASE( test_difference_ml_ml_degenerate )
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl << std::endl << std::endl;
std::cout << "*** MULTILINESTRING / MULTILINESTRING DIFFERENCE"
<< " (DEGENERATE) ***"
@@ -1032,7 +1032,7 @@ BOOST_AUTO_TEST_CASE( test_difference_ml_ml_degenerate )
BOOST_AUTO_TEST_CASE( test_difference_ml_ml_spikes )
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl << std::endl << std::endl;
std::cout << "*** MULTILINESTRING / MULTILINESTRING DIFFERENCE"
<< " (WITH SPIKES) ***"

10
test/algorithms/difference_pl_pl.cpp
View File

@@ -13,7 +13,7 @@
#define BOOST_TEST_MODULE test_difference_pointlike_pointlike
#endif
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
#define BOOST_GEOMETRY_DEBUG_TURNS
#define BOOST_GEOMETRY_DEBUG_SEGMENT_IDENTIFIER
#endif
@@ -36,7 +36,7 @@ typedef bg::model::multi_point<point_type> multi_point_type;
BOOST_AUTO_TEST_CASE( test_difference_point_point )
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl << std::endl << std::endl;
std::cout << "*** POINT / POINT DIFFERENCE ***" << std::endl;
std::cout << std::endl;
@@ -67,7 +67,7 @@ BOOST_AUTO_TEST_CASE( test_difference_point_point )
BOOST_AUTO_TEST_CASE( test_difference_multipoint_point )
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl << std::endl << std::endl;
std::cout << "*** MULTIPOINT / POINT DIFFERENCE ***" << std::endl;
std::cout << std::endl;
@@ -139,7 +139,7 @@ BOOST_AUTO_TEST_CASE( test_difference_multipoint_point )
BOOST_AUTO_TEST_CASE( test_difference_point_multipoint )
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl << std::endl << std::endl;
std::cout << "*** POINT / MULTIPOINT DIFFERENCE ***" << std::endl;
std::cout << std::endl;
@@ -178,7 +178,7 @@ BOOST_AUTO_TEST_CASE( test_difference_point_multipoint )
BOOST_AUTO_TEST_CASE( test_difference_multipoint_multipoint )
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl << std::endl << std::endl;
std::cout << "*** MULTIPOINT / MULTIPOINT DIFFERENCE ***" << std::endl;
std::cout << std::endl;

2
test/algorithms/disjoint_coverage.cpp
View File

@@ -107,7 +107,7 @@ struct test_disjoint
result = bg::disjoint(geometry2, geometry1);
BOOST_CHECK( result == expected_result );
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << "G1 - G2: ";
pretty_print_geometry<Geometry1>::apply(geometry1) << " - ";
pretty_print_geometry<Geometry2>::apply(geometry2) << std::endl;

16
test/algorithms/distance_areal_areal.cpp
View File

@@ -37,7 +37,7 @@ typedef bg::strategy::distance::pythagoras_box_box<> box_box_strategy;
template <typename Strategy>
void test_distance_polygon_polygon(Strategy const& strategy)
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl;
std::cout << "polygon/polygon distance tests" << std::endl;
#endif
@@ -66,7 +66,7 @@ void test_distance_polygon_polygon(Strategy const& strategy)
template <typename Strategy>
void test_distance_polygon_multipolygon(Strategy const& strategy)
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl;
std::cout << "polygon/multipolygon distance tests" << std::endl;
#endif
@@ -91,7 +91,7 @@ void test_distance_polygon_multipolygon(Strategy const& strategy)
template <typename Strategy>
void test_distance_multipolygon_multipolygon(Strategy const& strategy)
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl;
std::cout << "multipolygon/multipolygon distance tests" << std::endl;
#endif
@@ -118,7 +118,7 @@ void test_distance_multipolygon_multipolygon(Strategy const& strategy)
template <typename Strategy>
void test_distance_box_box(Strategy const& strategy)
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl;
std::cout << "box/box distance tests" << std::endl;
#endif
@@ -155,7 +155,7 @@ void test_distance_box_box(Strategy const& strategy)
template <typename Strategy>
void test_distance_polygon_box(Strategy const& strategy)
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl;
std::cout << "polygon/box distance tests" << std::endl;
#endif
@@ -187,7 +187,7 @@ void test_distance_polygon_box(Strategy const& strategy)
template <typename Strategy>
void test_distance_multipolygon_box(Strategy const& strategy)
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl;
std::cout << "multipolygon/box distance tests" << std::endl;
#endif
@@ -214,7 +214,7 @@ void test_distance_multipolygon_box(Strategy const& strategy)
template <typename Point, typename Strategy>
void test_more_empty_input_areal_areal(Strategy const& strategy)
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl;
std::cout << "testing on empty inputs... " << std::flush;
#endif
@@ -238,7 +238,7 @@ void test_more_empty_input_areal_areal(Strategy const& strategy)
test_empty_input(multipolygon_empty, polygon_empty, strategy);
test_empty_input(multipolygon_empty, multipolygon_empty, strategy);
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << "done!" << std::endl;
#endif
}

22
test/algorithms/distance_linear_areal.cpp
View File

@@ -41,7 +41,7 @@ typedef bg::strategy::distance::projected_point<> point_segment_strategy;
template <typename Strategy>
void test_distance_segment_polygon(Strategy const& strategy)
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl;
std::cout << "segment/polygon distance tests" << std::endl;
#endif
@@ -69,7 +69,7 @@ void test_distance_segment_polygon(Strategy const& strategy)
template <typename Strategy>
void test_distance_linestring_polygon(Strategy const& strategy)
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl;
std::cout << "linestring/polygon distance tests" << std::endl;
#endif
@@ -93,7 +93,7 @@ void test_distance_linestring_polygon(Strategy const& strategy)
template <typename Strategy>
void test_distance_multilinestring_polygon(Strategy const& strategy)
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl;
std::cout << "multilinestring/polygon distance tests" << std::endl;
#endif
@@ -120,7 +120,7 @@ void test_distance_multilinestring_polygon(Strategy const& strategy)
template <typename Strategy>
void test_distance_segment_multipolygon(Strategy const& strategy)
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl;
std::cout << "segment/multipolygon distance tests" << std::endl;
#endif
@@ -155,7 +155,7 @@ void test_distance_segment_multipolygon(Strategy const& strategy)
template <typename Strategy>
void test_distance_linestring_multipolygon(Strategy const& strategy)
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl;
std::cout << "linestring/multipolygon distance tests" << std::endl;
#endif
@@ -190,7 +190,7 @@ void test_distance_linestring_multipolygon(Strategy const& strategy)
template <typename Strategy>
void test_distance_multilinestring_multipolygon(Strategy const& strategy)
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl;
std::cout << "multilinestring/multipolygon distance tests" << std::endl;
#endif
@@ -215,7 +215,7 @@ void test_distance_multilinestring_multipolygon(Strategy const& strategy)
template <typename Strategy>
void test_distance_segment_box(Strategy const& strategy)
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl;
std::cout << "2D segment/box distance tests" << std::endl;
#endif
@@ -653,7 +653,7 @@ void test_distance_segment_box(Strategy const& strategy)
template <typename Strategy>
void test_distance_linestring_box(Strategy const& strategy)
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl;
std::cout << "linestring/box distance tests" << std::endl;
#endif
@@ -683,7 +683,7 @@ void test_distance_linestring_box(Strategy const& strategy)
template <typename Strategy>
void test_distance_multilinestring_box(Strategy const& strategy)
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl;
std::cout << "multilinestring/box distance tests" << std::endl;
#endif
@@ -710,7 +710,7 @@ void test_distance_multilinestring_box(Strategy const& strategy)
template <typename Point, typename Strategy>
void test_more_empty_input_linear_areal(Strategy const& strategy)
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl;
std::cout << "testing on empty inputs... " << std::flush;
#endif
@@ -739,7 +739,7 @@ void test_more_empty_input_linear_areal(Strategy const& strategy)
test_empty_input(multiline_empty, polygon_empty, strategy);
test_empty_input(multiline_empty, multipolygon_empty, strategy);
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << "done!" << std::endl;
#endif
}

16
test/algorithms/distance_linear_linear.cpp
View File

@@ -34,7 +34,7 @@ typedef bg::strategy::distance::projected_point<> point_segment_strategy;
template <typename Strategy>
void test_distance_segment_segment(Strategy const& strategy)
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl;
std::cout << "segment/segment distance tests" << std::endl;
#endif
@@ -62,7 +62,7 @@ void test_distance_segment_segment(Strategy const& strategy)
template <typename Strategy>
void test_distance_segment_linestring(Strategy const& strategy)
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl;
std::cout << "segment/linestring distance tests" << std::endl;
#endif
@@ -82,7 +82,7 @@ void test_distance_segment_linestring(Strategy const& strategy)
template <typename Strategy>
void test_distance_linestring_linestring(Strategy const& strategy)
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl;
std::cout << "linestring/linestring distance tests" << std::endl;
#endif
@@ -139,7 +139,7 @@ void test_distance_linestring_linestring(Strategy const& strategy)
template <typename Strategy>
void test_distance_segment_multilinestring(Strategy const& strategy)
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl;
std::cout << "segment/multilinestring distance tests" << std::endl;
#endif
@@ -162,7 +162,7 @@ void test_distance_segment_multilinestring(Strategy const& strategy)
template <typename Strategy>
void test_distance_linestring_multilinestring(Strategy const& strategy)
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl;
std::cout << "linestring/multilinestring distance tests" << std::endl;
#endif
@@ -186,7 +186,7 @@ void test_distance_linestring_multilinestring(Strategy const& strategy)
template <typename Strategy>
void test_distance_multilinestring_multilinestring(Strategy const& strategy)
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl;
std::cout << "multilinestring/multilinestring distance tests" << std::endl;
#endif
@@ -214,7 +214,7 @@ void test_distance_multilinestring_multilinestring(Strategy const& strategy)
template <typename Point, typename Strategy>
void test_more_empty_input_linear_linear(Strategy const& strategy)
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl;
std::cout << "testing on empty inputs... " << std::flush;
#endif
@@ -237,7 +237,7 @@ void test_more_empty_input_linear_linear(Strategy const& strategy)
test_empty_input(line_empty, multiline_empty, strategy);
test_empty_input(multiline_empty, multiline_empty, strategy);
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << "done!" << std::endl;
#endif
}

22
test/algorithms/distance_pointlike_areal.cpp
View File

@@ -40,7 +40,7 @@ typedef bg::strategy::distance::pythagoras_point_box<> point_box_strategy;
template <typename Strategy>
void test_distance_point_polygon(Strategy const& strategy)
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl;
std::cout << "point/polygon distance tests" << std::endl;
#endif
@@ -69,7 +69,7 @@ void test_distance_point_polygon(Strategy const& strategy)
template <typename Strategy>
void test_distance_point_multipolygon(Strategy const& strategy)
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl;
std::cout << "point/multipolygon distance tests" << std::endl;
#endif
@@ -102,7 +102,7 @@ void test_distance_point_multipolygon(Strategy const& strategy)
template <typename Strategy>
void test_distance_multipoint_polygon(Strategy const& strategy)
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl;
std::cout << "multipoint/polygon distance tests" << std::endl;
#endif
@@ -131,7 +131,7 @@ void test_distance_multipoint_polygon(Strategy const& strategy)
template <typename Strategy>
void test_distance_multipoint_multipolygon(Strategy const& strategy)
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl;
std::cout << "multipoint/multipolygon distance tests" << std::endl;
#endif
@@ -167,7 +167,7 @@ void test_distance_multipoint_multipolygon(Strategy const& strategy)
template <typename Strategy>
void test_distance_point_box_2d(Strategy const& strategy)
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl;
std::cout << "2D point/box distance tests" << std::endl;
#endif
@@ -223,7 +223,7 @@ void test_distance_point_box_2d(Strategy const& strategy)
template <typename Strategy>
void test_distance_point_box_different_point_types(Strategy const& strategy)
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl;
std::cout << "2D point/box distance tests with different points"
<< std::endl;
@@ -281,7 +281,7 @@ void test_distance_point_box_different_point_types(Strategy const& strategy)
template <typename Strategy>
void test_distance_point_box_3d(Strategy const& strategy)
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl;
std::cout << "3D point/box distance tests" << std::endl;
#endif
@@ -418,7 +418,7 @@ void test_distance_point_box_3d(Strategy const& strategy)
template <typename Strategy>
void test_distance_multipoint_box_2d(Strategy const& strategy)
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl;
std::cout << "2D multipoint/box distance tests" << std::endl;
#endif
@@ -452,7 +452,7 @@ void test_distance_multipoint_box_2d(Strategy const& strategy)
template <typename Strategy>
void test_distance_multipoint_box_3d(Strategy const& strategy)
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl;
std::cout << "3D multipoint/box distance tests" << std::endl;
#endif
@@ -489,7 +489,7 @@ void test_distance_multipoint_box_3d(Strategy const& strategy)
template <typename Point, typename Strategy>
void test_more_empty_input_pointlike_areal(Strategy const& strategy)
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl;
std::cout << "testing on empty inputs... " << std::flush;
#endif
@@ -512,7 +512,7 @@ void test_more_empty_input_pointlike_areal(Strategy const& strategy)
test_empty_input(multipoint_empty, polygon_empty, strategy);
test_empty_input(multipoint_empty, multipolygon_empty, strategy);
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << "done!" << std::endl;
#endif
}

16
test/algorithms/distance_pointlike_linear.cpp
View File

@@ -38,7 +38,7 @@ typedef bg::strategy::distance::projected_point<> point_segment_strategy;
template <typename Strategy>
void test_distance_point_segment(Strategy const& strategy)
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl;
std::cout << "point/segment distance tests" << std::endl;
#endif
@@ -56,7 +56,7 @@ void test_distance_point_segment(Strategy const& strategy)
template <typename Strategy>
void test_distance_point_linestring(Strategy const& strategy)
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl;
std::cout << "point/linestring distance tests" << std::endl;
#endif
@@ -75,7 +75,7 @@ void test_distance_point_linestring(Strategy const& strategy)
template <typename Strategy>
void test_distance_point_multilinestring(Strategy const& strategy)
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl;
std::cout << "point/multilinestring distance tests" << std::endl;
#endif
@@ -106,7 +106,7 @@ void test_distance_point_multilinestring(Strategy const& strategy)
template <typename Strategy>
void test_distance_linestring_multipoint(Strategy const& strategy)
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl;
std::cout << "linestring/multipoint distance tests" << std::endl;
#endif
@@ -134,7 +134,7 @@ void test_distance_linestring_multipoint(Strategy const& strategy)
template <typename Strategy>
void test_distance_multipoint_multilinestring(Strategy const& strategy)
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl;
std::cout << "multipoint/multilinestring distance tests" << std::endl;
#endif
@@ -162,7 +162,7 @@ void test_distance_multipoint_multilinestring(Strategy const& strategy)
template <typename Strategy>
void test_distance_multipoint_segment(Strategy const& strategy)
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl;
std::cout << "multipoint/segment distance tests" << std::endl;
#endif
@@ -187,7 +187,7 @@ void test_distance_multipoint_segment(Strategy const& strategy)
template <typename Point, typename Strategy>
void test_more_empty_input_pointlike_linear(Strategy const& strategy)
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl;
std::cout << "testing on empty inputs... " << std::flush;
#endif
@@ -210,7 +210,7 @@ void test_more_empty_input_pointlike_linear(Strategy const& strategy)
test_empty_input(multipoint_empty, line_empty, strategy);
test_empty_input(multipoint_empty, multiline_empty, strategy);
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << "done!" << std::endl;
#endif
}

10
test/algorithms/distance_pointlike_pointlike.cpp
View File

@@ -32,7 +32,7 @@ typedef bg::strategy::distance::pythagoras<> point_point_strategy;
template <typename Strategy>
void test_distance_point_point(Strategy const& strategy)
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl;
std::cout << "point/point distance tests" << std::endl;
#endif
@@ -51,7 +51,7 @@ void test_distance_point_point(Strategy const& strategy)
template <typename Strategy>
void test_distance_point_multipoint(Strategy const& strategy)
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl;
std::cout << "point/multipoint distance tests" << std::endl;
#endif
@@ -73,7 +73,7 @@ void test_distance_point_multipoint(Strategy const& strategy)
template <typename Strategy>
void test_distance_multipoint_multipoint(Strategy const& strategy)
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl;
std::cout << "multipoint/multipoint distance tests" << std::endl;
#endif
@@ -95,7 +95,7 @@ void test_distance_multipoint_multipoint(Strategy const& strategy)
template <typename Point, typename Strategy>
void test_more_empty_input_pointlike_pointlike(Strategy const& strategy)
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl;
std::cout << "testing on empty inputs... " << std::flush;
#endif
@@ -112,7 +112,7 @@ void test_more_empty_input_pointlike_pointlike(Strategy const& strategy)
// both geometries are empty
test_empty_input(multipoint_empty, multipoint_empty, strategy);
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << "done!" << std::endl;
#endif
}

16
test/algorithms/intersection_linear_linear.cpp
View File

@@ -13,7 +13,7 @@
#define BOOST_TEST_MODULE test_intersection_linear_linear
#endif
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
#define BOOST_GEOMETRY_DEBUG_TURNS
#define BOOST_GEOMETRY_DEBUG_SEGMENT_IDENTIFIER
#endif
@@ -40,7 +40,7 @@ typedef bg::model::multi_linestring<linestring_type> multi_linestring_type;
BOOST_AUTO_TEST_CASE( test_intersection_linestring_linestring )
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl << std::endl << std::endl;
std::cout << "*** LINESTRING / LINESTRING INTERSECTION ***" << std::endl;
std::cout << std::endl;
@@ -483,7 +483,7 @@ BOOST_AUTO_TEST_CASE( test_intersection_linestring_linestring )
BOOST_AUTO_TEST_CASE( test_intersection_linestring_multilinestring )
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl << std::endl << std::endl;
std::cout << "*** LINESTRING / MULTILINESTRING INTERSECTION ***"
<< std::endl;
@@ -692,7 +692,7 @@ BOOST_AUTO_TEST_CASE( test_intersection_linestring_multilinestring )
#ifndef BOOST_GEOMETRY_TEST_NO_DEGENERATE
BOOST_AUTO_TEST_CASE( test_intersection_l_ml_degenerate )
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl << std::endl << std::endl;
std::cout << "*** LINESTRING / MULTILINESTRING INTERSECTION"
<< " (DEGENERATE) ***"
@@ -779,7 +779,7 @@ BOOST_AUTO_TEST_CASE( test_intersection_l_ml_degenerate )
BOOST_AUTO_TEST_CASE( test_intersection_multilinestring_linestring )
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl << std::endl << std::endl;
std::cout << "*** MULTILINESTRING / LINESTRING INTERSECTION ***"
<< std::endl;
@@ -836,7 +836,7 @@ BOOST_AUTO_TEST_CASE( test_intersection_multilinestring_linestring )
BOOST_AUTO_TEST_CASE( test_intersection_multilinestring_multilinestring )
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl << std::endl << std::endl;
std::cout << "*** MULTILINESTRING / MULTILINESTRING INTERSECTION ***"
<< std::endl;
@@ -1134,7 +1134,7 @@ BOOST_AUTO_TEST_CASE( test_intersection_multilinestring_multilinestring )
#ifndef BOOST_GEOMETRY_TEST_NO_DEGENERATE
BOOST_AUTO_TEST_CASE( test_intersection_ml_ml_degenerate )
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl << std::endl << std::endl;
std::cout << "*** MULTILINESTRING / MULTILINESTRING INTERSECTION"
<< " (DEGENERATE) ***"
@@ -1275,7 +1275,7 @@ BOOST_AUTO_TEST_CASE( test_intersection_ml_ml_degenerate )
BOOST_AUTO_TEST_CASE( test_intersection_ml_ml_spikes )
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl << std::endl << std::endl;
std::cout << "*** MULTILINESTRING / MULTILINESTRING INTERSECTION"
<< " (WITH SPIKES) ***"

8
test/algorithms/intersection_pl_pl.cpp
View File

@@ -13,7 +13,7 @@
#define BOOST_TEST_MODULE test_intersection_pointlike_pointlike
#endif
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
#define BOOST_GEOMETRY_DEBUG_TURNS
#define BOOST_GEOMETRY_DEBUG_SEGMENT_IDENTIFIER
#endif
@@ -36,7 +36,7 @@ typedef bg::model::multi_point<point_type> multi_point_type;
BOOST_AUTO_TEST_CASE( test_intersection_point_point )
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl << std::endl << std::endl;
std::cout << "*** POINT / POINT INTERSECTION ***" << std::endl;
std::cout << std::endl;
@@ -66,7 +66,7 @@ BOOST_AUTO_TEST_CASE( test_intersection_point_point )
BOOST_AUTO_TEST_CASE( test_intersection_multipoint_point )
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl << std::endl << std::endl;
std::cout << "*** MULTIPOINT / POINT INTERSECTION ***" << std::endl;
std::cout << std::endl;
@@ -132,7 +132,7 @@ BOOST_AUTO_TEST_CASE( test_intersection_multipoint_point )
BOOST_AUTO_TEST_CASE( test_intersection_multipoint_multipoint )
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl << std::endl << std::endl;
std::cout << "*** MULTIPOINT / MULTIPOINT INTERSECTION ***" << std::endl;
std::cout << std::endl;

18
test/algorithms/is_simple.cpp
View File

@@ -38,7 +38,7 @@
#include "from_wkt.hpp"
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
#include "pretty_print_geometry.hpp"
#endif
@@ -65,7 +65,7 @@ typedef bg::model::box<point_type> box_type;
template <typename Geometry>
void test_simple(Geometry const& geometry, bool expected_result)
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << "=======" << std::endl;
#endif
@@ -76,7 +76,7 @@ void test_simple(Geometry const& geometry, bool expected_result)
<< " detected: " << simple
<< " wkt: " << bg::wkt(geometry) );
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << "Geometry: ";
pretty_print_geometry<Geometry>::apply(std::cout, geometry);
std::cout << std::endl;
@@ -95,7 +95,7 @@ void test_simple(Geometry const& geometry, bool expected_result)
BOOST_AUTO_TEST_CASE( test_is_simple_point )
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl << std::endl;
std::cout << "************************************" << std::endl;
std::cout << " is_simple: POINT " << std::endl;
@@ -109,7 +109,7 @@ BOOST_AUTO_TEST_CASE( test_is_simple_point )
BOOST_AUTO_TEST_CASE( test_is_simple_multipoint )
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl << std::endl;
std::cout << "************************************" << std::endl;
std::cout << " is_simple: MULTIPOINT " << std::endl;
@@ -125,7 +125,7 @@ BOOST_AUTO_TEST_CASE( test_is_simple_multipoint )
BOOST_AUTO_TEST_CASE( test_is_simple_segment )
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl << std::endl;
std::cout << "************************************" << std::endl;
std::cout << " is_simple: SEGMENT " << std::endl;
@@ -139,7 +139,7 @@ BOOST_AUTO_TEST_CASE( test_is_simple_segment )
BOOST_AUTO_TEST_CASE( test_is_simple_linestring )
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl << std::endl;
std::cout << "************************************" << std::endl;
std::cout << " is_simple: LINESTRING " << std::endl;
@@ -177,7 +177,7 @@ BOOST_AUTO_TEST_CASE( test_is_simple_linestring )
BOOST_AUTO_TEST_CASE( test_is_simple_multilinestring )
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl << std::endl;
std::cout << "************************************" << std::endl;
std::cout << " is_simple: MULTILINESTRING " << std::endl;
@@ -274,7 +274,7 @@ BOOST_AUTO_TEST_CASE( test_is_simple_areal )
BOOST_AUTO_TEST_CASE( test_is_simple_variant )
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl << std::endl;
std::cout << "************************************" << std::endl;
std::cout << " is_simple: variant support" << std::endl;

40
test/algorithms/is_valid.cpp
View File

@@ -52,7 +52,7 @@
#include "from_wkt.hpp"
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
#include "pretty_print_geometry.hpp"
#endif
@@ -241,14 +241,14 @@ struct test_valid
template <typename G>
static inline void base_test(G const& g, bool expected_result)
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << "=======" << std::endl;
#endif
bool valid = ValidityTester::apply(g, expected_result);
boost::ignore_unused(valid);
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << "Geometry: ";
pretty_print_geometry<G>::apply(std::cout, g);
std::cout << std::endl;
@@ -267,7 +267,7 @@ struct test_valid
if ( is_convertible_to_closed<Geometry>::apply(geometry) )
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << "...checking closed geometry..."
<< std::endl;
#endif
@@ -277,7 +277,7 @@ struct test_valid
}
if ( is_convertible_to_cw<Geometry>::apply(geometry) )
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << "...checking cw open geometry..."
<< std::endl;
#endif
@@ -286,7 +286,7 @@ struct test_valid
base_test(cw_geometry, expected_result);
if ( is_convertible_to_closed<CWGeometry>::apply(cw_geometry) )
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << "...checking cw closed geometry..."
<< std::endl;
#endif
@@ -296,7 +296,7 @@ struct test_valid
}
}
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl << std::endl << std::endl;
#endif
}
@@ -324,7 +324,7 @@ struct test_valid_variant
BOOST_AUTO_TEST_CASE( test_is_valid_point )
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl << std::endl;
std::cout << "************************************" << std::endl;
std::cout << " is_valid: POINT " << std::endl;
@@ -340,7 +340,7 @@ BOOST_AUTO_TEST_CASE( test_is_valid_point )
BOOST_AUTO_TEST_CASE( test_is_valid_multipoint )
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl << std::endl;
std::cout << "************************************" << std::endl;
std::cout << " is_valid: MULTIPOINT " << std::endl;
@@ -359,7 +359,7 @@ BOOST_AUTO_TEST_CASE( test_is_valid_multipoint )
BOOST_AUTO_TEST_CASE( test_is_valid_segment )
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl << std::endl;
std::cout << "************************************" << std::endl;
std::cout << " is_valid: SEGMENT " << std::endl;
@@ -376,7 +376,7 @@ BOOST_AUTO_TEST_CASE( test_is_valid_segment )
BOOST_AUTO_TEST_CASE( test_is_valid_box )
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl << std::endl;
std::cout << "************************************" << std::endl;
std::cout << " is_valid: BOX " << std::endl;
@@ -403,7 +403,7 @@ BOOST_AUTO_TEST_CASE( test_is_valid_box )
template <typename G, bool AllowSpikes>
void test_linestrings()
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << "SPIKES ALLOWED? "
<< std::boolalpha
<< AllowSpikes
@@ -473,7 +473,7 @@ void test_linestrings()
BOOST_AUTO_TEST_CASE( test_is_valid_linestring )
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl << std::endl;
std::cout << "************************************" << std::endl;
std::cout << " is_valid: LINESTRING " << std::endl;
@@ -490,7 +490,7 @@ BOOST_AUTO_TEST_CASE( test_is_valid_linestring )
template <typename G, bool AllowSpikes>
void test_multilinestrings()
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << "SPIKES ALLOWED? "
<< std::boolalpha
<< AllowSpikes
@@ -535,7 +535,7 @@ void test_multilinestrings()
BOOST_AUTO_TEST_CASE( test_is_valid_multilinestring )
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl << std::endl;
std::cout << "************************************" << std::endl;
std::cout << " is_valid: MULTILINESTRING " << std::endl;
@@ -553,7 +553,7 @@ BOOST_AUTO_TEST_CASE( test_is_valid_multilinestring )
template <typename Point, bool AllowDuplicates>
void test_open_rings()
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl << std::endl;
std::cout << "************************************" << std::endl;
std::cout << " is_valid: RING (open) " << std::endl;
@@ -644,7 +644,7 @@ void test_open_rings()
template <typename Point, bool AllowDuplicates>
void test_closed_rings()
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl << std::endl;
std::cout << "************************************" << std::endl;
std::cout << " is_valid: RING (closed) " << std::endl;
@@ -693,7 +693,7 @@ BOOST_AUTO_TEST_CASE( test_is_valid_ring )
template <typename Point, bool AllowDuplicates>
void test_open_polygons()
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl << std::endl;
std::cout << "************************************" << std::endl;
std::cout << " is_valid: POLYGON (open) " << std::endl;
@@ -902,7 +902,7 @@ BOOST_AUTO_TEST_CASE( test_is_valid_polygon )
template <typename Point, bool AllowDuplicates>
void test_open_multipolygons()
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl << std::endl;
std::cout << "************************************" << std::endl;
std::cout << " is_valid: MULTIPOLYGON (open) " << std::endl;
@@ -948,7 +948,7 @@ BOOST_AUTO_TEST_CASE( test_is_valid_multipolygon )
BOOST_AUTO_TEST_CASE( test_is_valid_variant )
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl << std::endl;
std::cout << "************************************" << std::endl;
std::cout << " is_valid: variant support" << std::endl;

10
test/algorithms/sym_difference_linear_linear.cpp
View File

@@ -13,7 +13,7 @@
#define BOOST_TEST_MODULE test_sym_difference_linear_linear
#endif
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
#define BOOST_GEOMETRY_DEBUG_TURNS
#define BOOST_GEOMETRY_DEBUG_SEGMENT_IDENTIFIER
#endif
@@ -40,7 +40,7 @@ typedef bg::model::multi_linestring<linestring_type> multi_linestring_type;
BOOST_AUTO_TEST_CASE( test_sym_difference_linestring_linestring )
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl << std::endl << std::endl;
std::cout << "*** LINESTRING / LINESTRING SYMMETRIC DIFFERENCE ***" << std::endl;
std::cout << std::endl;
@@ -382,7 +382,7 @@ BOOST_AUTO_TEST_CASE( test_sym_difference_linestring_linestring )
BOOST_AUTO_TEST_CASE( test_sym_difference_linestring_multilinestring )
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl << std::endl << std::endl;
std::cout << "*** LINESTRING / MULTILINESTRING SYMMETRIC DIFFERENCE ***"
<< std::endl;
@@ -624,7 +624,7 @@ BOOST_AUTO_TEST_CASE( test_sym_difference_linestring_multilinestring )
BOOST_AUTO_TEST_CASE( test_sym_difference_multilinestring_linestring )
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl << std::endl << std::endl;
std::cout << "*** MULTILINESTRING / LINESTRING SYMMETRIC DIFFERENCE ***"
<< std::endl;
@@ -678,7 +678,7 @@ BOOST_AUTO_TEST_CASE( test_sym_difference_multilinestring_linestring )
BOOST_AUTO_TEST_CASE( test_sym_difference_multilinestring_multilinestring )
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl << std::endl << std::endl;
std::cout << "*** MULTILINESTRING / MULTILINESTRING SYMMETRIC DIFFERENCE ***"
<< std::endl;

2
test/algorithms/test_area.hpp
View File

@@ -26,7 +26,7 @@ void test_area(Geometry const& geometry,
{
typename bg::default_area_result<Geometry>::type area = bg::area(geometry);
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::ostringstream out;
out << typeid(typename bg::coordinate_type<Geometry>::type).name()
<< " "

2
test/algorithms/test_crosses.hpp
View File

@@ -46,7 +46,7 @@ void test_geometry(std::string const& wkt1,
<< " -> Expected: " << expected
<< " detected: " << detected);
#if !defined(GEOMETRY_TEST_DEBUG)
#if !defined(BOOST_GEOMETRY_TEST_DEBUG)
detected = bg::crosses(
geometry1,
boost::variant<Geometry2>(geometry2));

12
test/algorithms/test_difference_linear_linear.hpp
View File

@@ -67,7 +67,7 @@ private:
if ( !vector_deque_already_tested && test_vector_and_deque )
{
vector_deque_already_tested = true;
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl;
std::cout << "Testing with vector and deque as output container..."
<< std::endl;
@@ -81,12 +81,12 @@ private:
BOOST_CHECK(multilinestring_equals<false>::apply(mls_diff,
ls_deque_output));
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << "Done!" << std::endl << std::endl;
#endif
}
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << "Geometry #1: " << bg::wkt(geometry1) << std::endl;
std::cout << "Geometry #2: " << bg::wkt(geometry2) << std::endl;
std::cout << "difference : " << bg::wkt(mls_output) << std::endl;
@@ -105,7 +105,7 @@ public:
MultiLineString const& mls_diff,
std::string const& case_id)
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << "test case: " << case_id << std::endl;
std::stringstream sstr;
sstr << "svgs/" << case_id << ".svg";
@@ -121,7 +121,7 @@ public:
bg::reverse<Geometry2>(rg2);
test_get_turns_ll_invariance<>::apply(geometry1, geometry2);
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl
<< "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%"
<< std::endl << std::endl;
@@ -133,7 +133,7 @@ public:
base_test(rg1, geometry2, mls_diff, case_id, false, true);
base_test(rg1, rg2, mls_diff, case_id, false, true);
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl;
std::cout << std::endl;
#endif

2
test/algorithms/test_distance.hpp
View File

@@ -95,7 +95,7 @@ void test_distance(Geometry1 const& geometry1,
{
typename bg::default_distance_result<Geometry1>::type distance = bg::distance(geometry1, geometry2);
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::ostringstream out;
out << typeid(typename bg::coordinate_type<Geometry1>::type).name()
<< std::endl

14
test/algorithms/test_distance_common.hpp
View File

@@ -70,7 +70,7 @@ void test_empty_input(Geometry1 const& geometry1, Geometry2 const& geometry2)
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
// pretty print geometry -- START
template <typename Geometry, typename GeometryTag>
struct pretty_print_geometry_dispatch
@@ -119,7 +119,7 @@ struct pretty_print_geometry
}
};
// pretty print geometry -- END
#endif // GEOMETRY_TEST_DEBUG
#endif // BOOST_GEOMETRY_TEST_DEBUG
//========================================================================
@@ -197,7 +197,7 @@ struct test_distance_of_geometries<Geometry1, Geometry2, 0, 0>
Strategy const& strategy,
bool test_reversed = true)
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
typedef pretty_print_geometry<Geometry1> PPG1;
typedef pretty_print_geometry<Geometry2> PPG2;
PPG1::apply(geometry1, std::cout);
@@ -286,7 +286,7 @@ struct test_distance_of_geometries<Geometry1, Geometry2, 0, 0>
default_comparable_distance_result
>::apply(cdist, expected_comparable_distance);
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << string_from_type<typename bg::coordinate_type<Geometry1>::type>::name()
<< string_from_type<typename bg::coordinate_type<Geometry2>::type>::name()
<< " -> "
@@ -342,7 +342,7 @@ struct test_distance_of_geometries<Geometry1, Geometry2, 0, 0>
default_comparable_distance_result
>::apply(cdist, expected_comparable_distance);
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << "distance[reversed args] (def. startegy) = "
<< dist_def << " ; "
<< "distance[reversed args] (passed startegy) = "
@@ -411,7 +411,7 @@ struct test_distance_of_geometries
base::apply(segment, polygon, expected_distance,
expected_comparable_distance, strategy);
if ( bg::num_interior_rings(polygon) == 0 ) {
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << "... testing also exterior ring ..." << std::endl;
#endif
test_distance_of_geometries
@@ -554,7 +554,7 @@ struct test_distance_of_geometries
comparable_distance_result_type
>::apply(comparable_distance_generic, expected_comparable_distance);
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << "... testing with naive seg-box distance algorithm..."
<< std::endl;
std::cout << "distance (generic algorithm) = "

4
test/algorithms/test_expand.hpp
View File

@@ -41,7 +41,7 @@ void test_expand(Box& box,
BOOST_CHECK_EQUAL(to_dsv(box), expected);
#if !defined(GEOMETRY_TEST_DEBUG)
#if !defined(BOOST_GEOMETRY_TEST_DEBUG)
bg::expand(box, boost::variant<Geometry>(geometry));
BOOST_CHECK_EQUAL(to_dsv(box), expected);
@@ -60,7 +60,7 @@ void test_expand_other_strategy(Box& box,
BOOST_CHECK_EQUAL(to_dsv(box), expected);
#if !defined(GEOMETRY_TEST_DEBUG)
#if !defined(BOOST_GEOMETRY_TEST_DEBUG)
bg::expand(box, boost::variant<Geometry>(geometry));
BOOST_CHECK_EQUAL(to_dsv(box), expected);

2
test/algorithms/test_get_turns_ll_invariance.hpp
View File

@@ -138,7 +138,7 @@ public:
remove_duplicate_turns::apply(rturns_all);
remove_duplicate_turns::apply(rturns_wo_cont);
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl << std::endl;
std::cout << "### ORIGINAL TURNS ###" << std::endl;
bg_turns::print_turns(linear1, linear2, turns_all);

16
test/algorithms/test_intersection_linear_linear.hpp
View File

@@ -61,7 +61,7 @@ private:
set_operation_output("intersection", case_id,
geometry1, geometry2, mls_output);
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << "Geometry #1: " << bg::wkt(geometry1) << std::endl;
std::cout << "Geometry #2: " << bg::wkt(geometry2) << std::endl;
std::cout << "intersection : " << bg::wkt(mls_output) << std::endl;
@@ -76,7 +76,7 @@ private:
if ( !vector_deque_already_tested && test_vector_and_deque )
{
vector_deque_already_tested = true;
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl;
std::cout << "Testing with vector and deque as output container..."
<< std::endl;
@@ -90,7 +90,7 @@ private:
BOOST_CHECK(multilinestring_equals<false>::apply(mls_int1,
ls_deque_output));
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << "Done!" << std::endl << std::endl;
#endif
}
@@ -108,7 +108,7 @@ private:
<< " or: " << bg::wkt(mls_int2)
<< " computed: " << bg::wkt(mls_output) );
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << "Geometry #1: " << bg::wkt(geometry2) << std::endl;
std::cout << "Geometry #2: " << bg::wkt(geometry1) << std::endl;
std::cout << "intersection : " << bg::wkt(mls_output) << std::endl;
@@ -136,7 +136,7 @@ private:
bg::intersection(geometry2, geometry1, mls21_output);
bg::intersection(geometry2, geometry1, mp21_output);
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << "************************************" << std::endl;
std::cout << "Geometry #1: " << bg::wkt(geometry1) << std::endl;
std::cout << "Geometry #2: " << bg::wkt(geometry2) << std::endl;
@@ -164,7 +164,7 @@ public:
MultiLineString const& mls_int2,
std::string const& case_id)
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << "test case: " << case_id << std::endl;
std::stringstream sstr;
sstr << "svgs/" << case_id << ".svg";
@@ -180,7 +180,7 @@ public:
bg::reverse<Geometry2>(rg2);
test_get_turns_ll_invariance<>::apply(geometry1, geometry2);
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl
<< "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%"
<< std::endl << std::endl;
@@ -192,7 +192,7 @@ public:
// base_test(rg1, rg2, mls_int1, mls_int2);
base_test_all(geometry1, geometry2);
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl;
std::cout << std::endl;
#endif

4
test/algorithms/test_length.hpp
View File

@@ -23,7 +23,7 @@ void test_length(Geometry const& geometry, long double expected_length)
{
BOOST_AUTO(length, bg::length(geometry));
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::ostringstream out;
out << typeid(typename bg::coordinate_type<Geometry>::type).name()
<< std::endl
@@ -44,7 +44,7 @@ void test_geometry(std::string const& wkt, double expected_length)
Geometry geometry;
bg::read_wkt(wkt, geometry);
test_length(geometry, expected_length);
#if !defined(GEOMETRY_TEST_DEBUG)
#if !defined(BOOST_GEOMETRY_TEST_DEBUG)
test_length(boost::variant<Geometry>(geometry), expected_length);
#endif
}

4
test/algorithms/test_perimeter.hpp
View File

@@ -25,7 +25,7 @@ void test_perimeter(Geometry const& geometry, long double expected_perimeter)
{
BOOST_AUTO(perimeter, bg::perimeter(geometry));
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::ostringstream out;
out << typeid(typename bg::coordinate_type<Geometry>::type).name()
<< std::endl
@@ -48,7 +48,7 @@ void test_geometry(std::string const& wkt, double expected_perimeter)
boost::variant<Geometry> v(geometry);
test_perimeter(geometry, expected_perimeter);
#if !defined(GEOMETRY_TEST_DEBUG)
#if !defined(BOOST_GEOMETRY_TEST_DEBUG)
test_perimeter(v, expected_perimeter);
#endif
}

6
test/algorithms/test_set_ops_pl_pl.hpp
View File

@@ -205,7 +205,7 @@ private:
set_operation_output(op_name, case_id,
geometry1, geometry2, mp_output);
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << "Geometry #1: " << bg::wkt(geometry1) << std::endl;
std::cout << "Geometry #2: " << bg::wkt(geometry2) << std::endl;
std::cout << "expected " << op_name << " : "
@@ -226,14 +226,14 @@ public:
MultiPoint const& mp_expected21,
std::string const& case_id)
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << "test case: " << case_id << std::endl;
#endif
base_test(geometry1, geometry2, mp_expected12, case_id);
base_test(geometry2, geometry1, mp_expected21, case_id);
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl;
std::cout << std::endl;
#endif

14
test/algorithms/test_sym_difference_linear_linear.hpp
View File

@@ -59,7 +59,7 @@ private:
set_operation_output("sym_difference", case_id,
geometry1, geometry2, mls_output);
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << "Geometry #1: " << bg::wkt(geometry1) << std::endl;
std::cout << "Geometry #2: " << bg::wkt(geometry2) << std::endl;
std::cout << "sym_difference : " << bg::wkt(mls_output) << std::endl;
@@ -74,7 +74,7 @@ private:
if ( !vector_deque_already_tested && test_vector_and_deque )
{
vector_deque_already_tested = true;
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl;
std::cout << "Testing with vector and deque as output container..."
<< std::endl;
@@ -88,7 +88,7 @@ private:
BOOST_CHECK(multilinestring_equals<false>::apply(mls_sym_diff,
ls_deque_output));
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << "Done!" << std::endl << std::endl;
#endif
}
@@ -104,7 +104,7 @@ private:
<< " -> Expected: " << bg::wkt(mls_sym_diff)
<< " computed: " << bg::wkt(mls_output) );
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << "Geometry #1: " << bg::wkt(geometry2) << std::endl;
std::cout << "Geometry #2: " << bg::wkt(geometry1) << std::endl;
std::cout << "sym_difference : " << bg::wkt(mls_output) << std::endl;
@@ -124,7 +124,7 @@ public:
MultiLineString const& mls_sym_diff,
std::string const& case_id)
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << "test case: " << case_id << std::endl;
std::stringstream sstr;
sstr << "svgs/" << case_id << ".svg";
@@ -140,7 +140,7 @@ public:
bg::reverse<Geometry2>(rg2);
test_get_turns_ll_invariance<>::apply(geometry1, geometry2);
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl
<< "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%"
<< std::endl << std::endl;
@@ -152,7 +152,7 @@ public:
// base_test(rg1, geometry2, mls_sym_diff);
base_test(rg1, rg2, mls_sym_diff, case_id);
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl;
std::cout << std::endl;
#endif

14
test/algorithms/test_union_linear_linear.hpp
View File

@@ -59,7 +59,7 @@ private:
set_operation_output("union", case_id,
geometry1, geometry2, mls_output);
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << "Geometry #1: " << bg::wkt(geometry1) << std::endl;
std::cout << "Geometry #2: " << bg::wkt(geometry2) << std::endl;
std::cout << "union : " << bg::wkt(mls_output) << std::endl;
@@ -74,7 +74,7 @@ private:
if ( !vector_deque_already_tested && test_vector_and_deque )
{
vector_deque_already_tested = true;
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl;
std::cout << "Testing with vector and deque as output container..."
<< std::endl;
@@ -88,7 +88,7 @@ private:
BOOST_CHECK(multilinestring_equals<false>::apply(mls_union1,
ls_deque_output));
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << "Done!" << std::endl << std::endl;
#endif
}
@@ -104,7 +104,7 @@ private:
<< " -> Expected: " << bg::wkt(mls_union2)
<< " computed: " << bg::wkt(mls_output) );
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << "Geometry #1: " << bg::wkt(geometry2) << std::endl;
std::cout << "Geometry #2: " << bg::wkt(geometry1) << std::endl;
std::cout << "union : " << bg::wkt(mls_output) << std::endl;
@@ -125,7 +125,7 @@ public:
MultiLineString const& mls_union2,
std::string const& case_id)
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << "test case: " << case_id << std::endl;
std::stringstream sstr;
sstr << "svgs/" << case_id << ".svg";
@@ -139,7 +139,7 @@ public:
bg::reverse<Geometry2>(rg2);
test_get_turns_ll_invariance<>::apply(geometry1, geometry2);
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl
<< "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%"
<< std::endl << std::endl;
@@ -151,7 +151,7 @@ public:
// base_test(rg1, geometry2, mls_sym_diff);
base_test(rg1, rg2, mls_union1, mls_union2, case_id);
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl;
std::cout << std::endl;
#endif

10
test/algorithms/union_linear_linear.cpp
View File

@@ -13,7 +13,7 @@
#define BOOST_TEST_MODULE test_union_linear_linear
#endif
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
#define BOOST_GEOMETRY_DEBUG_TURNS
#define BOOST_GEOMETRY_DEBUG_SEGMENT_IDENTIFIER
#endif
@@ -40,7 +40,7 @@ typedef bg::model::multi_linestring<linestring_type> multi_linestring_type;
BOOST_AUTO_TEST_CASE( test_union_linestring_linestring )
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl << std::endl << std::endl;
std::cout << "*** LINESTRING / LINESTRING UNION ***" << std::endl;
std::cout << std::endl;
@@ -467,7 +467,7 @@ BOOST_AUTO_TEST_CASE( test_union_linestring_linestring )
BOOST_AUTO_TEST_CASE( test_union_linestring_multilinestring )
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl << std::endl << std::endl;
std::cout << "*** LINESTRING / MULTILINESTRING UNION ***"
<< std::endl;
@@ -697,7 +697,7 @@ BOOST_AUTO_TEST_CASE( test_union_linestring_multilinestring )
BOOST_AUTO_TEST_CASE( test_union_multilinestring_linestring )
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl << std::endl << std::endl;
std::cout << "*** MULTILINESTRING / LINESTRING UNION ***"
<< std::endl;
@@ -751,7 +751,7 @@ BOOST_AUTO_TEST_CASE( test_union_multilinestring_linestring )
BOOST_AUTO_TEST_CASE( test_union_multilinestring_multilinestring )
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl << std::endl << std::endl;
std::cout << "*** MULTILINESTRING / MULTILINESTRING UNION ***"
<< std::endl;

8
test/algorithms/union_pl_pl.cpp
View File

@@ -13,7 +13,7 @@
#define BOOST_TEST_MODULE test_union_pointlike_pointlike
#endif
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
#define BOOST_GEOMETRY_DEBUG_TURNS
#define BOOST_GEOMETRY_DEBUG_SEGMENT_IDENTIFIER
#endif
@@ -36,7 +36,7 @@ typedef bg::model::multi_point<point_type> multi_point_type;
BOOST_AUTO_TEST_CASE( test_union_point_point )
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl << std::endl << std::endl;
std::cout << "*** POINT / POINT UNION ***" << std::endl;
std::cout << std::endl;
@@ -66,7 +66,7 @@ BOOST_AUTO_TEST_CASE( test_union_point_point )
BOOST_AUTO_TEST_CASE( test_union_multipoint_point )
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl << std::endl << std::endl;
std::cout << "*** MULTIPOINT / POINT UNION ***" << std::endl;
std::cout << std::endl;
@@ -132,7 +132,7 @@ BOOST_AUTO_TEST_CASE( test_union_multipoint_point )
BOOST_AUTO_TEST_CASE( test_union_multipoint_multipoint )
{
#ifdef GEOMETRY_TEST_DEBUG
#ifdef BOOST_GEOMETRY_TEST_DEBUG
std::cout << std::endl << std::endl << std::endl;
std::cout << "*** MULTIPOINT / MULTIPOINT UNION ***" << std::endl;
std::cout << std::endl;