From eeef35e569673477771e974da9f05167b5b42eac Mon Sep 17 00:00:00 2001 From: Barend Gehrels Date: Sat, 20 Feb 2010 16:58:38 +0000 Subject: [PATCH] Renamed GGL/Geometry in some testfiles [SVN r59786] --- test/algorithms/append.cpp | 2 +- test/algorithms/area.cpp | 2 +- test/algorithms/assign.cpp | 2 +- test/algorithms/buffer.cpp | 2 +- test/algorithms/convert.cpp | 2 +- test/algorithms/correct.cpp | 2 +- test/algorithms/disjoint.cpp | 6 +-- test/algorithms/distance.cpp | 2 +- test/algorithms/intersection_segment.cpp | 2 +- test/algorithms/is_convex.cpp | 2 +- test/algorithms/make.cpp | 2 +- test/algorithms/overlay/assemble.cpp | 20 ++++---- test/algorithms/overlay/dissolve.cpp | 8 ++-- .../overlay/enrich_intersection_points.cpp | 4 +- test/algorithms/overlay/get_turn_info.cpp | 2 +- test/algorithms/overlay/get_turns.cpp | 4 +- test/algorithms/overlay/overlay_cases.hpp | 20 ++++---- test/algorithms/overlay/relative_order.cpp | 2 +- .../overlay/robustness/intersection_pies.cpp | 2 +- .../robustness/random_ellipses_stars.cpp | 2 +- .../overlay/robustness/recursive_boxes.cpp | 2 +- .../overlay/robustness/test_overlay_p_q.hpp | 10 ++-- .../overlay/self_intersection_points.cpp | 8 ++-- test/algorithms/overlay/traverse.cpp | 2 +- test/algorithms/overlay/traverse_gmp.cpp | 4 +- test/algorithms/sectionalize.cpp | 2 +- test/algorithms/test_area.hpp | 4 +- test/algorithms/test_centroid.hpp | 2 +- test/algorithms/test_combine.hpp | 2 +- test/algorithms/test_convex_hull.hpp | 2 +- test/algorithms/test_envelope.hpp | 2 +- test/algorithms/test_equals.hpp | 2 +- test/algorithms/test_for_each.hpp | 2 +- test/algorithms/test_intersection.hpp | 2 +- test/algorithms/test_intersects.hpp | 2 +- test/algorithms/test_length.hpp | 4 +- test/algorithms/test_overlaps.hpp | 2 +- test/algorithms/test_perimeter.hpp | 4 +- test/algorithms/test_simplify.hpp | 2 +- test/algorithms/test_union.hpp | 2 +- test/algorithms/test_within.hpp | 2 +- test/algorithms/transform.cpp | 2 +- test/arithmetic/arithmetic.cpp | 2 +- test/arithmetic/cross_product.cpp | 4 +- test/arithmetic/dot_product.cpp | 2 +- test/core/access.cpp | 2 +- test/core/coordinate_dimension.cpp | 2 +- test/core/coordinate_system.cpp | 2 +- test/core/coordinate_type.cpp | 2 +- test/core/geometry_id.cpp | 2 +- test/core/point_type.cpp | 2 +- test/core/radian_access.cpp | 2 +- test/core/reverse_dispatch.cpp | 2 +- test/core/ring.cpp | 2 +- test/core/tag.cpp | 2 +- test/core/topological_dimension.cpp | 2 +- test/extensions/algorithms/midpoints.cpp | 2 +- .../extensions/algorithms/remove_holes_if.cpp | 2 +- test/extensions/algorithms/selected.cpp | 2 +- test/extensions/gis/io/wkt/multi_wkt.cpp | 2 +- test/extensions/gis/io/wkt/wkt.cpp | 4 +- test/extensions/gis/latlong/andoyer.cpp | 2 +- test/extensions/gis/latlong/area_ll.cpp | 2 +- .../extensions/gis/latlong/distance_mixed.cpp | 2 +- test/extensions/gis/latlong/parse.cpp | 2 +- test/extensions/gis/latlong/parse_dms.cpp | 2 +- test/extensions/gis/latlong/point_ll.cpp | 2 +- .../extensions/gis/projections/projection.cpp | 2 +- .../gis/projections/projection_epsg.cpp | 2 +- .../gis/projections/projections.cpp | 5 +- test/extensions/nsphere/access.cpp | 2 +- test/extensions/nsphere/area.cpp | 2 +- test/extensions/nsphere/circle.cpp | 2 +- test/extensions/nsphere/multi_within.cpp | 2 +- test/extensions/nsphere/point_type.cpp | 2 +- test/extensions/nsphere/within.cpp | 2 +- test/geometries/adapted.cpp | 2 +- test/geometries/box.cpp | 2 +- test/geometries/custom_linestring.cpp | 2 +- test/geometries/segment.cpp | 2 +- ...st_common.hpp => geometry_test_common.hpp} | 0 test/iterators/circular_iterator.cpp | 2 +- test/iterators/ever_circling_iterator.cpp | 2 +- test/iterators/segment_iterator.cpp | 2 +- test/multi/algorithms/multi_correct.cpp | 2 +- test/multi/algorithms/multi_distance.cpp | 2 +- test/multi/algorithms/multi_for_each.cpp | 2 +- test/multi/algorithms/multi_perimeter.cpp | 2 +- test/multi/algorithms/multi_simplify.cpp | 2 +- test/multi/algorithms/multi_within.cpp | 2 +- .../overlay/multi_overlay_common.hpp | 6 +-- .../algorithms/overlay/multi_svg_mapper.hpp | 6 +-- .../function_asserting_a_point.hpp | 6 +-- .../function_requiring_a_point.hpp | 6 +-- test/policies/compare.cpp | 2 +- test/strategies/cross_track.cpp | 2 +- test/strategies/haversine.cpp | 2 +- test/strategies/projected_point.cpp | 2 +- test/strategies/pythagoras.cpp | 2 +- test/strategies/segment_intersection.cpp | 2 +- .../segment_intersection_collinear.cpp | 46 +++++++++---------- test/strategies/side_by_cross_track.cpp | 2 +- test/strategies/transformer.cpp | 2 +- test/test_common/test_point.hpp | 6 +-- test/test_common/with_pointer.hpp | 6 +-- test/util/as_range.cpp | 2 +- test/util/copy.cpp | 2 +- test/util/for_each_coordinate.cpp | 2 +- test/util/select_most_precise.cpp | 2 +- test/util/write_dsv.cpp | 4 +- 110 files changed, 185 insertions(+), 182 deletions(-) rename test/{ggl_test_common.hpp => geometry_test_common.hpp} (100%) diff --git a/test/algorithms/append.cpp b/test/algorithms/append.cpp index c5d562268..b4c0bae51 100644 --- a/test/algorithms/append.cpp +++ b/test/algorithms/append.cpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include #include diff --git a/test/algorithms/area.cpp b/test/algorithms/area.cpp index 735e0c6de..737939cb2 100644 --- a/test/algorithms/area.cpp +++ b/test/algorithms/area.cpp @@ -14,7 +14,7 @@ #include #include -//#define GGL_TEST_DEBUG +//#define GEOMETRY_TEST_DEBUG diff --git a/test/algorithms/assign.cpp b/test/algorithms/assign.cpp index aade0293e..a0c8c9f18 100644 --- a/test/algorithms/assign.cpp +++ b/test/algorithms/assign.cpp @@ -6,7 +6,7 @@ // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) -#include +#include #include #include diff --git a/test/algorithms/buffer.cpp b/test/algorithms/buffer.cpp index 5cc9f8ca5..eb349ea50 100644 --- a/test/algorithms/buffer.cpp +++ b/test/algorithms/buffer.cpp @@ -7,7 +7,7 @@ // http://www.boost.org/LICENSE_1_0.txt) -#include +#include #include #include diff --git a/test/algorithms/convert.cpp b/test/algorithms/convert.cpp index 6dd386092..a78f263f3 100644 --- a/test/algorithms/convert.cpp +++ b/test/algorithms/convert.cpp @@ -6,7 +6,7 @@ // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) -#include +#include #include diff --git a/test/algorithms/correct.cpp b/test/algorithms/correct.cpp index c63da8e51..6084a205c 100644 --- a/test/algorithms/correct.cpp +++ b/test/algorithms/correct.cpp @@ -8,7 +8,7 @@ #include -#include +#include #include #include diff --git a/test/algorithms/disjoint.cpp b/test/algorithms/disjoint.cpp index 17de01068..f9959b47a 100644 --- a/test/algorithms/disjoint.cpp +++ b/test/algorithms/disjoint.cpp @@ -10,7 +10,7 @@ #include -#include +#include #include #include @@ -24,8 +24,8 @@ template -void test_disjoint(std::string const& id, - std::string const& wkt1, +void test_disjoint(std::string const& id, + std::string const& wkt1, std::string const& wkt2, bool expected) { G1 g1; diff --git a/test/algorithms/distance.cpp b/test/algorithms/distance.cpp index 64ed8e205..09decc8a3 100644 --- a/test/algorithms/distance.cpp +++ b/test/algorithms/distance.cpp @@ -11,7 +11,7 @@ #include #include -#include +#include #include diff --git a/test/algorithms/intersection_segment.cpp b/test/algorithms/intersection_segment.cpp index e0c81b7f7..b0b703fa7 100644 --- a/test/algorithms/intersection_segment.cpp +++ b/test/algorithms/intersection_segment.cpp @@ -13,7 +13,7 @@ #include #include -#include +#include #include #include diff --git a/test/algorithms/is_convex.cpp b/test/algorithms/is_convex.cpp index b57128a41..28e24f286 100644 --- a/test/algorithms/is_convex.cpp +++ b/test/algorithms/is_convex.cpp @@ -10,7 +10,7 @@ #include -#include +#include #include diff --git a/test/algorithms/make.cpp b/test/algorithms/make.cpp index d01ac13ad..90e50399f 100644 --- a/test/algorithms/make.cpp +++ b/test/algorithms/make.cpp @@ -7,7 +7,7 @@ // http://www.boost.org/LICENSE_1_0.txt) -#include +#include #include diff --git a/test/algorithms/overlay/assemble.cpp b/test/algorithms/overlay/assemble.cpp index 25922c9e4..a22693100 100644 --- a/test/algorithms/overlay/assemble.cpp +++ b/test/algorithms/overlay/assemble.cpp @@ -10,7 +10,7 @@ #include -#include +#include #include @@ -61,7 +61,7 @@ inline void test_assemble(std::string const& id, Geometry const& p, Geometry con BOOST_CHECK_CLOSE(diff, 0.0, 0.0001); if (abs(diff) > 0.001) { - std::cout + std::cout << id << std::endl << bg::wkt(p) << std::endl << bg::wkt(q) << std::endl; @@ -80,12 +80,12 @@ inline void test_assemble(std::string const& id, Geometry const& p, Geometry con mapper.map(q, "fill-opacity:0.6;stroke-opacity:0.9;fill:rgb(0,255,0);stroke:rgb(0,255,0);stroke-width:2"); BOOST_FOREACH(Geometry const& geometry, u) { - mapper.map(geometry, + mapper.map(geometry, "stroke-opacity:0.6;fill:none;stroke:rgb(255,0,255);stroke-width:5"); } BOOST_FOREACH(Geometry const& geometry, i) { - mapper.map(geometry, + mapper.map(geometry, "stroke-opacity:0.6;fill:none;stroke:rgb(255,0,0);stroke-width:5"); } } @@ -97,7 +97,7 @@ inline bool int_ok(Polygon const& poly) { namespace bg = boost::geometry; - typename bg::point_type::type const& pi = + typename bg::point_type::type const& pi = bg::interior_rings(poly)[0].front(); return bg::within(pi, bg::exterior_ring(poly)); @@ -132,21 +132,21 @@ void generate() std::string ps = "POLYGON(" + exteriors[pe] + "," + interiors[pi] + ")"; std::string qs = "POLYGON(" + exteriors[qe] + "," + interiors[qi] + ")"; - bg::polygon_2d p, q; + bg::polygon_2d p, q; bg::read_wkt(ps, p); bg::read_wkt(qs, q); bg::correct(p); bg::correct(q); - if (! intersects(p) + if (! intersects(p) && ! intersects(q) - && int_ok(p) + && int_ok(p) && int_ok(q) ) { std::ostringstream out; out << pe << qe << pi << qi; test_assemble(out.str(), p, q); - + } } } @@ -155,7 +155,7 @@ void generate() } -#if ! defined(GGL_TEST_MULTI) +#if ! defined(GEOMETRY_TEST_MULTI) int test_main(int, char* []) { generate(); diff --git a/test/algorithms/overlay/dissolve.cpp b/test/algorithms/overlay/dissolve.cpp index 880009894..aad9a3b99 100644 --- a/test/algorithms/overlay/dissolve.cpp +++ b/test/algorithms/overlay/dissolve.cpp @@ -10,7 +10,7 @@ #include -#include +#include #include @@ -75,14 +75,14 @@ void test_geometry(std::string const& id, int expected_count, double expected_ar std::string caseid = id; -//#ifdef GGL_DEBUG_INTERSECTION +//#ifdef GEOMETRY_DEBUG_INTERSECTION std::cout << std::endl << std::endl << "# " << caseid << std::endl; //#endif test_dissolve(caseid, expected_count, expected_area, geometry, precision); } -#if ! defined(GGL_TEST_MULTI) +#if ! defined(GEOMETRY_TEST_MULTI) template void test_all() @@ -172,7 +172,7 @@ void test_all() -#if ! defined(GGL_TEST_MULTI) +#if ! defined(GEOMETRY_TEST_MULTI) int test_main(int, char* []) { test_all >(); diff --git a/test/algorithms/overlay/enrich_intersection_points.cpp b/test/algorithms/overlay/enrich_intersection_points.cpp index 487bd61ad..54d402294 100644 --- a/test/algorithms/overlay/enrich_intersection_points.cpp +++ b/test/algorithms/overlay/enrich_intersection_points.cpp @@ -8,7 +8,7 @@ #include -#include +#include #include @@ -18,7 +18,7 @@ #include -#define GGL_TEST_OVERLAY_NOT_REVERSED +#define GEOMETRY_TEST_OVERLAY_NOT_REVERSED #include diff --git a/test/algorithms/overlay/get_turn_info.cpp b/test/algorithms/overlay/get_turn_info.cpp index 2210bc9f8..9150f50f1 100644 --- a/test/algorithms/overlay/get_turn_info.cpp +++ b/test/algorithms/overlay/get_turn_info.cpp @@ -7,7 +7,7 @@ #include -#include +#include #include diff --git a/test/algorithms/overlay/get_turns.cpp b/test/algorithms/overlay/get_turns.cpp index 4229e28a8..3aaa3da79 100644 --- a/test/algorithms/overlay/get_turns.cpp +++ b/test/algorithms/overlay/get_turns.cpp @@ -9,7 +9,7 @@ #include #include -#include +#include #define BOOST_GEOMETRY_DEBUG_SEGMENT_IDENTIFIER @@ -138,7 +138,7 @@ struct test_get_turns }; -#if ! defined(GGL_TEST_MULTI) +#if ! defined(GEOMETRY_TEST_MULTI) template void test_all() { diff --git a/test/algorithms/overlay/overlay_cases.hpp b/test/algorithms/overlay/overlay_cases.hpp index 56b492a0e..e5649d399 100644 --- a/test/algorithms/overlay/overlay_cases.hpp +++ b/test/algorithms/overlay/overlay_cases.hpp @@ -210,12 +210,12 @@ static std::string case_47[2] = { // 50, collinear opposite static std::string case_50[2] = { - "POLYGON((0 0,0 3,2 3,4 3,4 0,0 0))", + "POLYGON((0 0,0 3,2 3,4 3,4 0,0 0))", "POLYGON((0 3,0 5,5 5,5 0,4 0,4 3,2 3,0 3))" }; // 51, fit static std::string case_51[2] = { - "POLYGON((0 0,0 5,5 5,5 0,0 0),(4 1,3 4,1 2,4 1))", + "POLYGON((0 0,0 5,5 5,5 0,0 0),(4 1,3 4,1 2,4 1))", "POLYGON((1 2,3 4,4 1,1 2))" }; // 52, partially equal, touching each other @@ -223,28 +223,28 @@ static std::string case_52[2] = { "POLYGON((0 0,1 4,3 1,4 4,1 4,5 5,5 0,0 0))", "POLYGON((0 0,1 4,3 1,4 4,1 4,5 5,4 1,0 0))" }; -// 53, wrapping a box, self-touching +// 53, wrapping a box, self-touching static std::string case_53[3] = { "POLYGON((2 2,2 3,3 3,3 2,2 2))", // a: self-tangent ext. ring, ST_IsValid=false - "POLYGON((0 2,0 5,5 5,5 0,2 0,2 2,3 2,3 1,4 1,4 4,1 4,1 3,2 3,2 2,0 2))", + "POLYGON((0 2,0 5,5 5,5 0,2 0,2 2,3 2,3 1,4 1,4 4,1 4,1 3,2 3,2 2,0 2))", // b: tangent ext/int ring, ST_IsValid=true - "POLYGON((0 2,0 5,5 5,5 0,2 0,2 2,0 2),(1 3,2 3,2 2,3 2,3 1,4 1,4 4,1 4,1 3))" + "POLYGON((0 2,0 5,5 5,5 0,2 0,2 2,0 2),(1 3,2 3,2 2,3 2,3 1,4 1,4 4,1 4,1 3))" }; static std::string case_54[4] = { // a: self-tangent ext. ring - "POLYGON((2 2,2 3,4 3,4 0,1 0,1 2,2 2,2 1,3 1,3 2,2 2))", + "POLYGON((2 2,2 3,4 3,4 0,1 0,1 2,2 2,2 1,3 1,3 2,2 2))", // b: tangent ext/int ring - "POLYGON((2 2,2 3,4 3,4 0,1 0,1 2,2 2),(2 1,3 1,3 2,2 2,2 1))", + "POLYGON((2 2,2 3,4 3,4 0,1 0,1 2,2 2),(2 1,3 1,3 2,2 2,2 1))", case_53[1], case_53[2] // other like in case53 }; static std::string case_55[2] = { - "POLYGON((2 2,3 3,4 3,4 0,1 0,1 1,2 2),(2 1,3 1,3 2,2 2,2 1))", - "POLYGON((0 2,0 5,5 5,5 0,2 0,2 2,0 2),(1 3,2 2,3 1,4 1,4 4,1 4,1 3))" + "POLYGON((2 2,3 3,4 3,4 0,1 0,1 1,2 2),(2 1,3 1,3 2,2 2,2 1))", + "POLYGON((0 2,0 5,5 5,5 0,2 0,2 2,0 2),(1 3,2 2,3 1,4 1,4 4,1 4,1 3))" }; @@ -319,4 +319,4 @@ static std::string isovist[2] = }; */ -#endif // GGL_TEST_OVERLAY_CASES_HPP +#endif // GEOMETRY_TEST_OVERLAY_CASES_HPP diff --git a/test/algorithms/overlay/relative_order.cpp b/test/algorithms/overlay/relative_order.cpp index f3adb68ed..77232b0a3 100644 --- a/test/algorithms/overlay/relative_order.cpp +++ b/test/algorithms/overlay/relative_order.cpp @@ -8,7 +8,7 @@ #include -#include +#include #include diff --git a/test/algorithms/overlay/robustness/intersection_pies.cpp b/test/algorithms/overlay/robustness/intersection_pies.cpp index 4109bdcf5..9f033fecb 100644 --- a/test/algorithms/overlay/robustness/intersection_pies.cpp +++ b/test/algorithms/overlay/robustness/intersection_pies.cpp @@ -18,7 +18,7 @@ #include #include -#include +#include #include diff --git a/test/algorithms/overlay/robustness/random_ellipses_stars.cpp b/test/algorithms/overlay/robustness/random_ellipses_stars.cpp index 335ff41f9..332f86843 100644 --- a/test/algorithms/overlay/robustness/random_ellipses_stars.cpp +++ b/test/algorithms/overlay/robustness/random_ellipses_stars.cpp @@ -28,7 +28,7 @@ #include #include -#include +#include #include diff --git a/test/algorithms/overlay/robustness/recursive_boxes.cpp b/test/algorithms/overlay/robustness/recursive_boxes.cpp index 11f048837..d080f3117 100644 --- a/test/algorithms/overlay/robustness/recursive_boxes.cpp +++ b/test/algorithms/overlay/robustness/recursive_boxes.cpp @@ -32,7 +32,7 @@ #include #include -#include +#include #include template diff --git a/test/algorithms/overlay/robustness/test_overlay_p_q.hpp b/test/algorithms/overlay/robustness/test_overlay_p_q.hpp index 67d77e285..c2aa94713 100644 --- a/test/algorithms/overlay/robustness/test_overlay_p_q.hpp +++ b/test/algorithms/overlay/robustness/test_overlay_p_q.hpp @@ -14,7 +14,7 @@ #include #include -#include +#include template @@ -65,21 +65,21 @@ static bool test_overlay_p_q(std::string const& caseid, G1 const& p, G2 const& q { result = false; svg = true; - + std::cout << "type: " << string_from_type::name() << " id: " << caseid - << " area i: " << area_i + << " area i: " << area_i << " area u: " << area_u << " area p: " << area_p << " area q: " << area_q - << " diff: " << diff + << " diff: " << diff << std::endl << std::setprecision(20) << " p: " << boost::geometry::wkt(p) << std::endl << " q: " << boost::geometry::wkt(q) << std::endl ; - + } diff --git a/test/algorithms/overlay/self_intersection_points.cpp b/test/algorithms/overlay/self_intersection_points.cpp index 0ce0d0eea..385d8feb2 100644 --- a/test/algorithms/overlay/self_intersection_points.cpp +++ b/test/algorithms/overlay/self_intersection_points.cpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include @@ -118,14 +118,14 @@ void test_self_overlay(std::string const& id, T const& expected, std::string caseid = id; -//#ifdef GGL_DEBUG_INTERSECTION +//#ifdef GEOMETRY_DEBUG_INTERSECTION std::cout << std::endl << std::endl << "# " << caseid << std::endl; //#endif test_self_intersection_points::apply(caseid, expected, geometry, precision); } -#if ! defined(GGL_TEST_MULTI) +#if ! defined(GEOMETRY_TEST_MULTI) template void test_self_all() @@ -225,7 +225,7 @@ void test_self_all() -#if ! defined(GGL_TEST_MULTI) +#if ! defined(GEOMETRY_TEST_MULTI) int test_main(int, char* []) { test_self_all >(); diff --git a/test/algorithms/overlay/traverse.cpp b/test/algorithms/overlay/traverse.cpp index 68a24050b..bb246507a 100644 --- a/test/algorithms/overlay/traverse.cpp +++ b/test/algorithms/overlay/traverse.cpp @@ -13,7 +13,7 @@ #include -#include +#include //#define HAVE_TTMATH #ifdef HAVE_TTMATH diff --git a/test/algorithms/overlay/traverse_gmp.cpp b/test/algorithms/overlay/traverse_gmp.cpp index a72e10711..db99b7926 100644 --- a/test/algorithms/overlay/traverse_gmp.cpp +++ b/test/algorithms/overlay/traverse_gmp.cpp @@ -11,7 +11,7 @@ #pragma warning( disable : 4267 ) #endif -//#define GGL_DEBUG_INTERSECTION +//#define GEOMETRY_DEBUG_INTERSECTION #include @@ -159,7 +159,7 @@ void test_one(std::string const& caseid, std::string const& wkt1, std::string co } -#if ! defined(GGL_TEST_MULTI) +#if ! defined(GEOMETRY_TEST_MULTI) template void test_traverse_gmp(std::string const& caseid) diff --git a/test/algorithms/sectionalize.cpp b/test/algorithms/sectionalize.cpp index 3666e390d..7808999c4 100644 --- a/test/algorithms/sectionalize.cpp +++ b/test/algorithms/sectionalize.cpp @@ -10,7 +10,7 @@ #include -#include +#include #include #include diff --git a/test/algorithms/test_area.hpp b/test/algorithms/test_area.hpp index 4b55b905c..e5cf4e699 100644 --- a/test/algorithms/test_area.hpp +++ b/test/algorithms/test_area.hpp @@ -9,7 +9,7 @@ #define BOOST_GEOMETRY_TEST_AREA_HPP -#include +#include #include #include @@ -22,7 +22,7 @@ void test_area(Geometry const& geometry, long double expected_area) { long double area = boost::geometry::area(geometry); -#ifdef GGL_TEST_DEBUG +#ifdef GEOMETRY_TEST_DEBUG std::ostringstream out; out << typeid(typename boost::geometry::coordinate_type::type).name() << " " diff --git a/test/algorithms/test_centroid.hpp b/test/algorithms/test_centroid.hpp index 2a36666b0..bf5db21dd 100644 --- a/test/algorithms/test_centroid.hpp +++ b/test/algorithms/test_centroid.hpp @@ -10,7 +10,7 @@ // Test-functionality, shared between single and multi tests -#include +#include #include #include diff --git a/test/algorithms/test_combine.hpp b/test/algorithms/test_combine.hpp index 7736659a8..b968ebfff 100644 --- a/test/algorithms/test_combine.hpp +++ b/test/algorithms/test_combine.hpp @@ -9,7 +9,7 @@ #define BOOST_GEOMETRY_TEST_COMBINE_HPP -#include +#include #include #include diff --git a/test/algorithms/test_convex_hull.hpp b/test/algorithms/test_convex_hull.hpp index 97326859e..1f3fa1c49 100644 --- a/test/algorithms/test_convex_hull.hpp +++ b/test/algorithms/test_convex_hull.hpp @@ -8,7 +8,7 @@ #ifndef BOOST_GEOMETRY_TEST_CONVEX_HULL_HPP #define BOOST_GEOMETRY_TEST_CONVEX_HULL_HPP -#include +#include #include #include diff --git a/test/algorithms/test_envelope.hpp b/test/algorithms/test_envelope.hpp index 9733708e0..e4b4b08d1 100644 --- a/test/algorithms/test_envelope.hpp +++ b/test/algorithms/test_envelope.hpp @@ -9,7 +9,7 @@ #define BOOST_GEOMETRY_TEST_ENVELOPE_HPP -#include +#include #include #include diff --git a/test/algorithms/test_equals.hpp b/test/algorithms/test_equals.hpp index d2559178f..996c96dcd 100644 --- a/test/algorithms/test_equals.hpp +++ b/test/algorithms/test_equals.hpp @@ -9,7 +9,7 @@ #define BOOST_GEOMETRY_TEST_EQUALS_HPP -#include +#include #include #include diff --git a/test/algorithms/test_for_each.hpp b/test/algorithms/test_for_each.hpp index 6683ae5a4..d2b19457f 100644 --- a/test/algorithms/test_for_each.hpp +++ b/test/algorithms/test_for_each.hpp @@ -8,7 +8,7 @@ #ifndef BOOST_GEOMETRY_TEST_FOR_EACH_HPP #define BOOST_GEOMETRY_TEST_FOR_EACH_HPP -#include +#include #include diff --git a/test/algorithms/test_intersection.hpp b/test/algorithms/test_intersection.hpp index 738abcefc..ed2faa63a 100644 --- a/test/algorithms/test_intersection.hpp +++ b/test/algorithms/test_intersection.hpp @@ -12,7 +12,7 @@ #include #include -#include +#include #include #include diff --git a/test/algorithms/test_intersects.hpp b/test/algorithms/test_intersects.hpp index 1c3519b6e..1ef257c5e 100644 --- a/test/algorithms/test_intersects.hpp +++ b/test/algorithms/test_intersects.hpp @@ -9,7 +9,7 @@ #define BOOST_GEOMETRY_TEST_INTERSECTS_HPP -#include +#include #include #include diff --git a/test/algorithms/test_length.hpp b/test/algorithms/test_length.hpp index 603d28238..d3a6a5081 100644 --- a/test/algorithms/test_length.hpp +++ b/test/algorithms/test_length.hpp @@ -8,7 +8,7 @@ #ifndef BOOST_GEOMETRY_TEST_LENGTH_HPP #define BOOST_GEOMETRY_TEST_LENGTH_HPP -#include +#include #include #include @@ -20,7 +20,7 @@ void test_length(Geometry const& geometry, long double expected_length) { long double length = boost::geometry::length(geometry); -#ifdef GGL_TEST_DEBUG +#ifdef GEOMETRY_TEST_DEBUG std::ostringstream out; out << typeid(typename boost::geometry::coordinate_type::type).name() << std::endl diff --git a/test/algorithms/test_overlaps.hpp b/test/algorithms/test_overlaps.hpp index 85f2fa90b..b43138e8c 100644 --- a/test/algorithms/test_overlaps.hpp +++ b/test/algorithms/test_overlaps.hpp @@ -9,7 +9,7 @@ #define BOOST_GEOMETRY_TEST_OVERLAPS_HPP -#include +#include #include #include diff --git a/test/algorithms/test_perimeter.hpp b/test/algorithms/test_perimeter.hpp index 115563cf8..0a2765c3d 100644 --- a/test/algorithms/test_perimeter.hpp +++ b/test/algorithms/test_perimeter.hpp @@ -9,7 +9,7 @@ #define BOOST_GEOMETRY_TEST_PERIMETER_HPP -#include +#include #include #include @@ -23,7 +23,7 @@ void test_perimeter(Geometry const& geometry, long double expected_perimeter) { long double perimeter = boost::geometry::perimeter(geometry); -#ifdef GGL_TEST_DEBUG +#ifdef GEOMETRY_TEST_DEBUG std::ostringstream out; out << typeid(typename boost::geometry::coordinate_type::type).name() << std::endl diff --git a/test/algorithms/test_simplify.hpp b/test/algorithms/test_simplify.hpp index 1f7c3fc25..0ae2feca1 100644 --- a/test/algorithms/test_simplify.hpp +++ b/test/algorithms/test_simplify.hpp @@ -10,7 +10,7 @@ // Test-functionality, shared between single and multi tests -#include +#include #include #include #include diff --git a/test/algorithms/test_union.hpp b/test/algorithms/test_union.hpp index 2fede88d7..7673b8dac 100644 --- a/test/algorithms/test_union.hpp +++ b/test/algorithms/test_union.hpp @@ -10,7 +10,7 @@ #include -#include +#include #include diff --git a/test/algorithms/test_within.hpp b/test/algorithms/test_within.hpp index 913992f09..0c24d35b2 100644 --- a/test/algorithms/test_within.hpp +++ b/test/algorithms/test_within.hpp @@ -9,7 +9,7 @@ #define BOOST_GEOMETRY_TEST_WITHIN_HPP -#include +#include #include #include diff --git a/test/algorithms/transform.cpp b/test/algorithms/transform.cpp index ae6dd4090..4164fcc85 100644 --- a/test/algorithms/transform.cpp +++ b/test/algorithms/transform.cpp @@ -10,7 +10,7 @@ #include -#include +#include #include #include diff --git a/test/arithmetic/arithmetic.cpp b/test/arithmetic/arithmetic.cpp index a8d54ac4a..78e1338b4 100644 --- a/test/arithmetic/arithmetic.cpp +++ b/test/arithmetic/arithmetic.cpp @@ -7,7 +7,7 @@ // http://www.boost.org/LICENSE_1_0.txt) -#include +#include #include diff --git a/test/arithmetic/cross_product.cpp b/test/arithmetic/cross_product.cpp index f1264a98a..c8bf99e7a 100644 --- a/test/arithmetic/cross_product.cpp +++ b/test/arithmetic/cross_product.cpp @@ -6,7 +6,7 @@ // http://www.boost.org/LICENSE_1_0.txt) -#include +#include #include @@ -40,7 +40,7 @@ void test_3d() P p2; boost::geometry::assign(p2, 45, 70, 20); P c = boost::geometry::cross_product(p1, p2); - + typedef typename boost::geometry::coordinate_type

::type scalar_type; BOOST_CHECK_EQUAL(boost::geometry::get<0>(c), scalar_type(-100)); BOOST_CHECK_EQUAL(boost::geometry::get<1>(c), scalar_type(50)); diff --git a/test/arithmetic/dot_product.cpp b/test/arithmetic/dot_product.cpp index 4770387d7..31c780fe8 100644 --- a/test/arithmetic/dot_product.cpp +++ b/test/arithmetic/dot_product.cpp @@ -7,7 +7,7 @@ // http://www.boost.org/LICENSE_1_0.txt) -#include +#include #include diff --git a/test/core/access.cpp b/test/core/access.cpp index 340b88c0c..74a99d178 100644 --- a/test/core/access.cpp +++ b/test/core/access.cpp @@ -7,7 +7,7 @@ // http://www.boost.org/LICENSE_1_0.txt) -#include +#include #include diff --git a/test/core/coordinate_dimension.cpp b/test/core/coordinate_dimension.cpp index d1059dc52..526768e8e 100644 --- a/test/core/coordinate_dimension.cpp +++ b/test/core/coordinate_dimension.cpp @@ -6,7 +6,7 @@ // http://www.boost.org/LICENSE_1_0.txt) -#include +#include #include diff --git a/test/core/coordinate_system.cpp b/test/core/coordinate_system.cpp index 62b4dcc1b..86ef87570 100644 --- a/test/core/coordinate_system.cpp +++ b/test/core/coordinate_system.cpp @@ -6,7 +6,7 @@ // http://www.boost.org/LICENSE_1_0.txt) -#include +#include #include diff --git a/test/core/coordinate_type.cpp b/test/core/coordinate_type.cpp index 0700c9375..33d0b46ba 100644 --- a/test/core/coordinate_type.cpp +++ b/test/core/coordinate_type.cpp @@ -6,7 +6,7 @@ // http://www.boost.org/LICENSE_1_0.txt) -#include +#include #include diff --git a/test/core/geometry_id.cpp b/test/core/geometry_id.cpp index fc7f52e59..5fcb257a0 100644 --- a/test/core/geometry_id.cpp +++ b/test/core/geometry_id.cpp @@ -6,7 +6,7 @@ // http://www.boost.org/LICENSE_1_0.txt) -#include +#include #include diff --git a/test/core/point_type.cpp b/test/core/point_type.cpp index 59f7dde79..fe2b0673d 100644 --- a/test/core/point_type.cpp +++ b/test/core/point_type.cpp @@ -6,7 +6,7 @@ // http://www.boost.org/LICENSE_1_0.txt) -#include +#include #include diff --git a/test/core/radian_access.cpp b/test/core/radian_access.cpp index 0b44e30e6..a8974b58c 100644 --- a/test/core/radian_access.cpp +++ b/test/core/radian_access.cpp @@ -7,7 +7,7 @@ // http://www.boost.org/LICENSE_1_0.txt) -#include +#include #include diff --git a/test/core/reverse_dispatch.cpp b/test/core/reverse_dispatch.cpp index fb4b2899c..b4de2f4e7 100644 --- a/test/core/reverse_dispatch.cpp +++ b/test/core/reverse_dispatch.cpp @@ -7,7 +7,7 @@ // http://www.boost.org/LICENSE_1_0.txt) -#include +#include #include diff --git a/test/core/ring.cpp b/test/core/ring.cpp index 171c67a0e..bdb73e9c6 100644 --- a/test/core/ring.cpp +++ b/test/core/ring.cpp @@ -7,7 +7,7 @@ // http://www.boost.org/LICENSE_1_0.txt) -#include +#include // To be tested: diff --git a/test/core/tag.cpp b/test/core/tag.cpp index 425926ff2..ff4cfdc68 100644 --- a/test/core/tag.cpp +++ b/test/core/tag.cpp @@ -6,7 +6,7 @@ // http://www.boost.org/LICENSE_1_0.txt) -#include +#include #include diff --git a/test/core/topological_dimension.cpp b/test/core/topological_dimension.cpp index bb97f578e..1247f3f8b 100644 --- a/test/core/topological_dimension.cpp +++ b/test/core/topological_dimension.cpp @@ -6,7 +6,7 @@ // http://www.boost.org/LICENSE_1_0.txt) -#include +#include #include diff --git a/test/extensions/algorithms/midpoints.cpp b/test/extensions/algorithms/midpoints.cpp index 89904918a..9d6a646c0 100644 --- a/test/extensions/algorithms/midpoints.cpp +++ b/test/extensions/algorithms/midpoints.cpp @@ -11,7 +11,7 @@ #include -#include +#include #include #include diff --git a/test/extensions/algorithms/remove_holes_if.cpp b/test/extensions/algorithms/remove_holes_if.cpp index 3411ebfd2..9b00c9fab 100644 --- a/test/extensions/algorithms/remove_holes_if.cpp +++ b/test/extensions/algorithms/remove_holes_if.cpp @@ -11,7 +11,7 @@ #include -#include +#include #include #include diff --git a/test/extensions/algorithms/selected.cpp b/test/extensions/algorithms/selected.cpp index 08330205d..fcc0709f0 100644 --- a/test/extensions/algorithms/selected.cpp +++ b/test/extensions/algorithms/selected.cpp @@ -13,7 +13,7 @@ #include -#include +#include #include #include diff --git a/test/extensions/gis/io/wkt/multi_wkt.cpp b/test/extensions/gis/io/wkt/multi_wkt.cpp index dd9ed3ed1..e7c82c832 100644 --- a/test/extensions/gis/io/wkt/multi_wkt.cpp +++ b/test/extensions/gis/io/wkt/multi_wkt.cpp @@ -38,7 +38,7 @@ void test_all(); // Include the single test -#define GGL_TEST_MULTI +#define GEOMETRY_TEST_MULTI #include "extensions/gis/io/wkt/wkt.cpp" diff --git a/test/extensions/gis/io/wkt/wkt.cpp b/test/extensions/gis/io/wkt/wkt.cpp index d686b91c9..7a7357822 100644 --- a/test/extensions/gis/io/wkt/wkt.cpp +++ b/test/extensions/gis/io/wkt/wkt.cpp @@ -12,7 +12,7 @@ #include -#include +#include #include @@ -114,7 +114,7 @@ void test_wrong_wkt(std::string const& wkt, std::string const& start) } -#ifndef GGL_TEST_MULTI +#ifndef GEOMETRY_TEST_MULTI template void test_all() { diff --git a/test/extensions/gis/latlong/andoyer.cpp b/test/extensions/gis/latlong/andoyer.cpp index 21f43892a..7a3d6199a 100644 --- a/test/extensions/gis/latlong/andoyer.cpp +++ b/test/extensions/gis/latlong/andoyer.cpp @@ -7,7 +7,7 @@ // http://www.boost.org/LICENSE_1_0.txt) -#include +#include #include diff --git a/test/extensions/gis/latlong/area_ll.cpp b/test/extensions/gis/latlong/area_ll.cpp index a88b0155f..ccb1f2e69 100644 --- a/test/extensions/gis/latlong/area_ll.cpp +++ b/test/extensions/gis/latlong/area_ll.cpp @@ -6,7 +6,7 @@ // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) -#include +#include #include diff --git a/test/extensions/gis/latlong/distance_mixed.cpp b/test/extensions/gis/latlong/distance_mixed.cpp index 0287564d5..51b6c0a02 100644 --- a/test/extensions/gis/latlong/distance_mixed.cpp +++ b/test/extensions/gis/latlong/distance_mixed.cpp @@ -7,7 +7,7 @@ // http://www.boost.org/LICENSE_1_0.txt) -#include +#include #include #include diff --git a/test/extensions/gis/latlong/parse.cpp b/test/extensions/gis/latlong/parse.cpp index b4981fec1..27c1bebdb 100644 --- a/test/extensions/gis/latlong/parse.cpp +++ b/test/extensions/gis/latlong/parse.cpp @@ -9,7 +9,7 @@ #include -#include +#include #include #include diff --git a/test/extensions/gis/latlong/parse_dms.cpp b/test/extensions/gis/latlong/parse_dms.cpp index 7740586d6..8655e077f 100644 --- a/test/extensions/gis/latlong/parse_dms.cpp +++ b/test/extensions/gis/latlong/parse_dms.cpp @@ -8,7 +8,7 @@ #include -#include +#include #include diff --git a/test/extensions/gis/latlong/point_ll.cpp b/test/extensions/gis/latlong/point_ll.cpp index 7bcf9c6ac..45499f1de 100644 --- a/test/extensions/gis/latlong/point_ll.cpp +++ b/test/extensions/gis/latlong/point_ll.cpp @@ -7,7 +7,7 @@ // http://www.boost.org/LICENSE_1_0.txt) -#include +#include #include #include diff --git a/test/extensions/gis/projections/projection.cpp b/test/extensions/gis/projections/projection.cpp index 0a08610a5..c9fc5bdc8 100644 --- a/test/extensions/gis/projections/projection.cpp +++ b/test/extensions/gis/projections/projection.cpp @@ -15,7 +15,7 @@ -#include +#include #include #include diff --git a/test/extensions/gis/projections/projection_epsg.cpp b/test/extensions/gis/projections/projection_epsg.cpp index 505d66b44..0b8f394c8 100644 --- a/test/extensions/gis/projections/projection_epsg.cpp +++ b/test/extensions/gis/projections/projection_epsg.cpp @@ -14,7 +14,7 @@ -#include +#include #include #include diff --git a/test/extensions/gis/projections/projections.cpp b/test/extensions/gis/projections/projections.cpp index 643259734..a7a02bbf7 100644 --- a/test/extensions/gis/projections/projections.cpp +++ b/test/extensions/gis/projections/projections.cpp @@ -6,6 +6,9 @@ // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) + // WARNING: this file takes several minutes to quarters to compile on GCC + + #if defined(_MSC_VER) #pragma warning( disable : 4305 ) // truncation double -> float #pragma warning( disable : 4244 ) // loss of data @@ -15,7 +18,7 @@ #include -#include +#include #include #include diff --git a/test/extensions/nsphere/access.cpp b/test/extensions/nsphere/access.cpp index c8517d433..6ace40609 100644 --- a/test/extensions/nsphere/access.cpp +++ b/test/extensions/nsphere/access.cpp @@ -7,7 +7,7 @@ // http://www.boost.org/LICENSE_1_0.txt) -#include +#include #include diff --git a/test/extensions/nsphere/area.cpp b/test/extensions/nsphere/area.cpp index b5f0860f2..ead016bb4 100644 --- a/test/extensions/nsphere/area.cpp +++ b/test/extensions/nsphere/area.cpp @@ -5,7 +5,7 @@ // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) -#include +#include #include #include diff --git a/test/extensions/nsphere/circle.cpp b/test/extensions/nsphere/circle.cpp index 796dd922e..25dbdf083 100644 --- a/test/extensions/nsphere/circle.cpp +++ b/test/extensions/nsphere/circle.cpp @@ -13,7 +13,7 @@ -#include +#include #include #include diff --git a/test/extensions/nsphere/multi_within.cpp b/test/extensions/nsphere/multi_within.cpp index defdaa768..677a36153 100644 --- a/test/extensions/nsphere/multi_within.cpp +++ b/test/extensions/nsphere/multi_within.cpp @@ -5,7 +5,7 @@ // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) -#include +#include #include diff --git a/test/extensions/nsphere/point_type.cpp b/test/extensions/nsphere/point_type.cpp index 728510855..fa6753c8e 100644 --- a/test/extensions/nsphere/point_type.cpp +++ b/test/extensions/nsphere/point_type.cpp @@ -6,7 +6,7 @@ // http://www.boost.org/LICENSE_1_0.txt) -#include +#include #include diff --git a/test/extensions/nsphere/within.cpp b/test/extensions/nsphere/within.cpp index cffd63fdd..a3a65be18 100644 --- a/test/extensions/nsphere/within.cpp +++ b/test/extensions/nsphere/within.cpp @@ -5,7 +5,7 @@ // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) -#include +#include #include diff --git a/test/geometries/adapted.cpp b/test/geometries/adapted.cpp index 8251b375d..a5e389444 100644 --- a/test/geometries/adapted.cpp +++ b/test/geometries/adapted.cpp @@ -8,7 +8,7 @@ #include #include -#include +#include #include #include diff --git a/test/geometries/box.cpp b/test/geometries/box.cpp index 57bcac262..28d1c5b55 100644 --- a/test/geometries/box.cpp +++ b/test/geometries/box.cpp @@ -7,7 +7,7 @@ // http://www.boost.org/LICENSE_1_0.txt) -#include +#include #include diff --git a/test/geometries/custom_linestring.cpp b/test/geometries/custom_linestring.cpp index 89f056bc6..f39297b45 100644 --- a/test/geometries/custom_linestring.cpp +++ b/test/geometries/custom_linestring.cpp @@ -9,7 +9,7 @@ #include #include -#include +#include #include #include diff --git a/test/geometries/segment.cpp b/test/geometries/segment.cpp index 15d29c0c2..62accd4b9 100644 --- a/test/geometries/segment.cpp +++ b/test/geometries/segment.cpp @@ -8,7 +8,7 @@ #include -#include +#include #include diff --git a/test/ggl_test_common.hpp b/test/geometry_test_common.hpp similarity index 100% rename from test/ggl_test_common.hpp rename to test/geometry_test_common.hpp diff --git a/test/iterators/circular_iterator.cpp b/test/iterators/circular_iterator.cpp index 5a61939db..2cca1bfeb 100644 --- a/test/iterators/circular_iterator.cpp +++ b/test/iterators/circular_iterator.cpp @@ -11,7 +11,7 @@ #include #include -#include +#include #include diff --git a/test/iterators/ever_circling_iterator.cpp b/test/iterators/ever_circling_iterator.cpp index 077107c3a..4268974a0 100644 --- a/test/iterators/ever_circling_iterator.cpp +++ b/test/iterators/ever_circling_iterator.cpp @@ -9,7 +9,7 @@ #include #include -#include +#include #include diff --git a/test/iterators/segment_iterator.cpp b/test/iterators/segment_iterator.cpp index 8a8037b89..e73251aea 100644 --- a/test/iterators/segment_iterator.cpp +++ b/test/iterators/segment_iterator.cpp @@ -13,7 +13,7 @@ #include #include -#include +#include #include #include diff --git a/test/multi/algorithms/multi_correct.cpp b/test/multi/algorithms/multi_correct.cpp index 023c5a881..a8d8ecf8a 100644 --- a/test/multi/algorithms/multi_correct.cpp +++ b/test/multi/algorithms/multi_correct.cpp @@ -5,7 +5,7 @@ // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) -#include +#include #include diff --git a/test/multi/algorithms/multi_distance.cpp b/test/multi/algorithms/multi_distance.cpp index 59b46d6aa..c674ff29d 100644 --- a/test/multi/algorithms/multi_distance.cpp +++ b/test/multi/algorithms/multi_distance.cpp @@ -8,7 +8,7 @@ #include -#include +#include #include #include diff --git a/test/multi/algorithms/multi_for_each.cpp b/test/multi/algorithms/multi_for_each.cpp index f7748dd68..368f289a7 100644 --- a/test/multi/algorithms/multi_for_each.cpp +++ b/test/multi/algorithms/multi_for_each.cpp @@ -5,7 +5,7 @@ // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) -#include +#include #include #include diff --git a/test/multi/algorithms/multi_perimeter.cpp b/test/multi/algorithms/multi_perimeter.cpp index 5da7d56de..2b8c908db 100644 --- a/test/multi/algorithms/multi_perimeter.cpp +++ b/test/multi/algorithms/multi_perimeter.cpp @@ -5,7 +5,7 @@ // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) -#include +#include #include #include diff --git a/test/multi/algorithms/multi_simplify.cpp b/test/multi/algorithms/multi_simplify.cpp index 324b0134a..c9c717402 100644 --- a/test/multi/algorithms/multi_simplify.cpp +++ b/test/multi/algorithms/multi_simplify.cpp @@ -5,7 +5,7 @@ // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) -#include +#include #include #include diff --git a/test/multi/algorithms/multi_within.cpp b/test/multi/algorithms/multi_within.cpp index ae0ad927d..c9f8660f6 100644 --- a/test/multi/algorithms/multi_within.cpp +++ b/test/multi/algorithms/multi_within.cpp @@ -5,7 +5,7 @@ // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) -#include +#include #include diff --git a/test/multi/algorithms/overlay/multi_overlay_common.hpp b/test/multi/algorithms/overlay/multi_overlay_common.hpp index 9fcd4662b..312436c60 100644 --- a/test/multi/algorithms/overlay/multi_overlay_common.hpp +++ b/test/multi/algorithms/overlay/multi_overlay_common.hpp @@ -1,5 +1,5 @@ -#ifndef GGL_TEST_MULTI_OVERLAY_COMMON_HPP -#define GGL_TEST_MULTI_OVERLAY_COMMON_HPP +#ifndef GEOMETRY_TEST_MULTI_OVERLAY_COMMON_HPP +#define GEOMETRY_TEST_MULTI_OVERLAY_COMMON_HPP // Boost.Geometry (aka GGL, Generic Geometry Library) test file @@ -36,4 +36,4 @@ void test_all(std::vector const& expected, double precision = 0.01) } -#endif // GGL_TEST_MULTI_OVERLAY_COMMON_HPP +#endif // GEOMETRY_TEST_MULTI_OVERLAY_COMMON_HPP diff --git a/test/multi/algorithms/overlay/multi_svg_mapper.hpp b/test/multi/algorithms/overlay/multi_svg_mapper.hpp index 8a583d6f8..e95800dcf 100644 --- a/test/multi/algorithms/overlay/multi_svg_mapper.hpp +++ b/test/multi/algorithms/overlay/multi_svg_mapper.hpp @@ -7,8 +7,8 @@ // http://www.boost.org/LICENSE_1_0.txt) -#ifndef GGL_TEST_MULTI_UTIL_SVG_MAPPER_HPP -#define GGL_TEST_MULTI_UTIL_SVG_MAPPER_HPP +#ifndef GEOMETRY_TEST_MULTI_UTIL_SVG_MAPPER_HPP +#define GEOMETRY_TEST_MULTI_UTIL_SVG_MAPPER_HPP #include #include @@ -41,4 +41,4 @@ struct svg_map -#endif // GGL_TEST_MULTI_UTIL_SVG_MAPPER_HPP +#endif // GEOMETRY_TEST_MULTI_UTIL_SVG_MAPPER_HPP diff --git a/test/point_concept/function_asserting_a_point.hpp b/test/point_concept/function_asserting_a_point.hpp index dfaadda10..d82183c4f 100644 --- a/test/point_concept/function_asserting_a_point.hpp +++ b/test/point_concept/function_asserting_a_point.hpp @@ -6,8 +6,8 @@ // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) -#ifndef GGL_TEST_POINT_CONCEPT_FUNCTION_ASSERTING_A_POINT_HPP -#define GGL_TEST_POINT_CONCEPT_FUNCTION_ASSERTING_A_POINT_HPP +#ifndef GEOMETRY_TEST_POINT_CONCEPT_FUNCTION_ASSERTING_A_POINT_HPP +#define GEOMETRY_TEST_POINT_CONCEPT_FUNCTION_ASSERTING_A_POINT_HPP #include @@ -25,4 +25,4 @@ namespace test } } -#endif // GGL_TEST_POINT_CONCEPT_FUNCTION_ASSERTING_A_POINT_HPP +#endif // GEOMETRY_TEST_POINT_CONCEPT_FUNCTION_ASSERTING_A_POINT_HPP diff --git a/test/point_concept/function_requiring_a_point.hpp b/test/point_concept/function_requiring_a_point.hpp index d903047fb..a1a7cb632 100644 --- a/test/point_concept/function_requiring_a_point.hpp +++ b/test/point_concept/function_requiring_a_point.hpp @@ -6,8 +6,8 @@ // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) -#ifndef GGL_TEST_POINT_CONCEPT_FUNCTION_REQUIRING_A_POINT_HPP -#define GGL_TEST_POINT_CONCEPT_FUNCTION_REQUIRING_A_POINT_HPP +#ifndef GEOMETRY_TEST_POINT_CONCEPT_FUNCTION_REQUIRING_A_POINT_HPP +#define GEOMETRY_TEST_POINT_CONCEPT_FUNCTION_REQUIRING_A_POINT_HPP #include @@ -27,4 +27,4 @@ namespace test } } -#endif // GGL_TEST_POINT_CONCEPT_FUNCTION_REQUIRING_A_POINT_HPP +#endif // GEOMETRY_TEST_POINT_CONCEPT_FUNCTION_REQUIRING_A_POINT_HPP diff --git a/test/policies/compare.cpp b/test/policies/compare.cpp index 0ac43bf7a..304dd8db2 100644 --- a/test/policies/compare.cpp +++ b/test/policies/compare.cpp @@ -5,7 +5,7 @@ // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) -#include +#include #include diff --git a/test/strategies/cross_track.cpp b/test/strategies/cross_track.cpp index 41ebe1ecb..71af6748b 100644 --- a/test/strategies/cross_track.cpp +++ b/test/strategies/cross_track.cpp @@ -7,7 +7,7 @@ // http://www.boost.org/LICENSE_1_0.txt) -#include +#include #include diff --git a/test/strategies/haversine.cpp b/test/strategies/haversine.cpp index af97adf9e..85b163c4c 100644 --- a/test/strategies/haversine.cpp +++ b/test/strategies/haversine.cpp @@ -7,7 +7,7 @@ // http://www.boost.org/LICENSE_1_0.txt) -#include +#include #include #include diff --git a/test/strategies/projected_point.cpp b/test/strategies/projected_point.cpp index c28a22442..3055c451e 100644 --- a/test/strategies/projected_point.cpp +++ b/test/strategies/projected_point.cpp @@ -7,7 +7,7 @@ // http://www.boost.org/LICENSE_1_0.txt) -#include +#include #include #include diff --git a/test/strategies/pythagoras.cpp b/test/strategies/pythagoras.cpp index a8262b42d..fa3a8f0f7 100644 --- a/test/strategies/pythagoras.cpp +++ b/test/strategies/pythagoras.cpp @@ -7,7 +7,7 @@ // http://www.boost.org/LICENSE_1_0.txt) -#include +#include #include #include diff --git a/test/strategies/segment_intersection.cpp b/test/strategies/segment_intersection.cpp index 730812f8f..369a0dcc9 100644 --- a/test/strategies/segment_intersection.cpp +++ b/test/strategies/segment_intersection.cpp @@ -15,7 +15,7 @@ #define HAVE_MATRIX_AS_STRING -#include +#include #include diff --git a/test/strategies/segment_intersection_collinear.cpp b/test/strategies/segment_intersection_collinear.cpp index 5b42533b7..d0793fa4c 100644 --- a/test/strategies/segment_intersection_collinear.cpp +++ b/test/strategies/segment_intersection_collinear.cpp @@ -7,7 +7,7 @@ // http://www.boost.org/LICENSE_1_0.txt) -#include +#include #include @@ -26,7 +26,7 @@ #include template -static int check(IntersectionPoints const& is, +static int check(IntersectionPoints const& is, std::size_t index, double expected_x, double expected_y) { namespace bg = boost::geometry; @@ -45,7 +45,7 @@ static int check(IntersectionPoints const& is, template static void test_segment_intersection(std::string const& case_id, - int x1, int y1, int x2, int y2, + int x1, int y1, int x2, int y2, int x3, int y3, int x4, int y4, char expected_how, bool expected_opposite, int expected_arrival1, int expected_arrival2, @@ -84,17 +84,17 @@ static void test_segment_intersection(std::string const& case_id, >::apply(s12, s34); // Get just a character for Left/Right/intersects/etc, purpose is more for debugging - bg::policies::relate::direction_type dir + bg::policies::relate::direction_type dir = bg::strategy::intersection::relate_cartesian_segments < bg::policies::relate::segments_direction < - segment_type, + segment_type, segment_type > >::apply(s12, s34); - int expected_count = + int expected_count = check(is, 0, expected_x1, expected_y1) + check(is, 1, expected_x2, expected_y2); @@ -112,7 +112,7 @@ void test_all() // Collinear - non opposite // a1---------->a2 - // b1--->b2 + // b1--->b2 test_segment_intersection

("n1", 2, 0, 6, 0, 0, 0, 2, 0, @@ -120,7 +120,7 @@ void test_all() 2, 0); // a1---------->a2 - // b1--->b2 + // b1--->b2 test_segment_intersection

("n2", 2, 0, 6, 0, 1, 0, 3, 0, @@ -128,7 +128,7 @@ void test_all() 2, 0, 3, 0); // a1---------->a2 - // b1--->b2 + // b1--->b2 test_segment_intersection

("n3", 2, 0, 6, 0, 2, 0, 4, 0, @@ -136,15 +136,15 @@ void test_all() 2, 0, 4, 0); // a1---------->a2 - // b1--->b2 + // b1--->b2 test_segment_intersection

("n4", 2, 0, 6, 0, - 3, 0, 5, 0, + 3, 0, 5, 0, 'c', false, -1, 1, 3, 0, 5, 0); // a1---------->a2 - // b1--->b2 + // b1--->b2 test_segment_intersection

("n5", 2, 0, 6, 0, 4, 0, 6, 0, @@ -152,7 +152,7 @@ void test_all() 4, 0, 6, 0); // a1---------->a2 - // b1--->b2 + // b1--->b2 test_segment_intersection

("n6", 2, 0, 6, 0, 5, 0, 7, 0, @@ -160,7 +160,7 @@ void test_all() 5, 0, 6, 0); // a1---------->a2 - // b1--->b2 + // b1--->b2 test_segment_intersection

("n7", 2, 0, 6, 0, 6, 0, 8, 0, @@ -169,7 +169,7 @@ void test_all() // Collinear - opposite // a1---------->a2 - // b2<---b1 + // b2<---b1 test_segment_intersection

("o1", 2, 0, 6, 0, 2, 0, 0, 0, @@ -177,7 +177,7 @@ void test_all() 2, 0); // a1---------->a2 - // b2<---b1 + // b2<---b1 test_segment_intersection

("o2", 2, 0, 6, 0, 3, 0, 1, 0, @@ -185,7 +185,7 @@ void test_all() 2, 0, 3, 0); // a1---------->a2 - // b2<---b1 + // b2<---b1 test_segment_intersection

("o3", 2, 0, 6, 0, 4, 0, 2, 0, @@ -193,7 +193,7 @@ void test_all() 2, 0, 4, 0); // a1---------->a2 - // b2<---b1 + // b2<---b1 test_segment_intersection

("o4", 2, 0, 6, 0, 5, 0, 3, 0, @@ -201,7 +201,7 @@ void test_all() 3, 0, 5, 0); // a1---------->a2 - // b2<---b1 + // b2<---b1 test_segment_intersection

("o5", 2, 0, 6, 0, 6, 0, 4, 0, @@ -209,7 +209,7 @@ void test_all() 4, 0, 6, 0); // a1---------->a2 - // b2<---b1 + // b2<---b1 test_segment_intersection

("o6", 2, 0, 6, 0, 7, 0, 5, 0, @@ -217,7 +217,7 @@ void test_all() 5, 0, 6, 0); // a1---------->a2 - // b2<---b1 + // b2<---b1 test_segment_intersection

("o7", 2, 0, 6, 0, 8, 0, 6, 0, @@ -225,7 +225,7 @@ void test_all() 6, 0); // a1---------->a2 - // b1---------->b2 + // b1---------->b2 test_segment_intersection

("e1", 2, 0, 6, 0, 2, 0, 6, 0, @@ -233,7 +233,7 @@ void test_all() 2, 0, 6, 0); // a1---------->a2 - // b2<----------b1 + // b2<----------b1 test_segment_intersection

("e1", 2, 0, 6, 0, 6, 0, 2, 0, diff --git a/test/strategies/side_by_cross_track.cpp b/test/strategies/side_by_cross_track.cpp index b8ffee4ff..0d04f7513 100644 --- a/test/strategies/side_by_cross_track.cpp +++ b/test/strategies/side_by_cross_track.cpp @@ -6,7 +6,7 @@ // http://www.boost.org/LICENSE_1_0.txt) -#include +#include #include diff --git a/test/strategies/transformer.cpp b/test/strategies/transformer.cpp index ce4162896..c45ae58ef 100644 --- a/test/strategies/transformer.cpp +++ b/test/strategies/transformer.cpp @@ -7,7 +7,7 @@ // http://www.boost.org/LICENSE_1_0.txt) -#include +#include #include #include diff --git a/test/test_common/test_point.hpp b/test/test_common/test_point.hpp index f0e78ef48..eb2f5e910 100644 --- a/test/test_common/test_point.hpp +++ b/test/test_common/test_point.hpp @@ -7,8 +7,8 @@ // http://www.boost.org/LICENSE_1_0.txt) -#ifndef GGL_TEST_TEST_COMMON_TEST_POINT_HPP -#define GGL_TEST_TEST_COMMON_TEST_POINT_HPP +#ifndef GEOMETRY_TEST_TEST_COMMON_TEST_POINT_HPP +#define GEOMETRY_TEST_TEST_COMMON_TEST_POINT_HPP #include #include @@ -87,4 +87,4 @@ template<> struct access }}} // namespace boost::geometry::traits -#endif // GGL_TEST_TEST_COMMON_TEST_POINT_HPP +#endif // GEOMETRY_TEST_TEST_COMMON_TEST_POINT_HPP diff --git a/test/test_common/with_pointer.hpp b/test/test_common/with_pointer.hpp index 96c1a6afa..8cbb4c4f5 100644 --- a/test/test_common/with_pointer.hpp +++ b/test/test_common/with_pointer.hpp @@ -7,8 +7,8 @@ // http://www.boost.org/LICENSE_1_0.txt) -#ifndef GGL_TEST_COMMON_WITH_POINTER_HPP -#define GGL_TEST_COMMON_WITH_POINTER_HPP +#ifndef GEOMETRY_TEST_COMMON_WITH_POINTER_HPP +#define GEOMETRY_TEST_COMMON_WITH_POINTER_HPP #include @@ -78,4 +78,4 @@ struct access }}} // namespace boost::geometry::traits -#endif // #ifndef GGL_TEST_COMMON_WITH_POINTER_HPP +#endif // #ifndef GEOMETRY_TEST_COMMON_WITH_POINTER_HPP diff --git a/test/util/as_range.cpp b/test/util/as_range.cpp index 18d2187ce..a1940c118 100644 --- a/test/util/as_range.cpp +++ b/test/util/as_range.cpp @@ -7,7 +7,7 @@ // http://www.boost.org/LICENSE_1_0.txt) -#include +#include #include diff --git a/test/util/copy.cpp b/test/util/copy.cpp index bcbe4f76d..627f7e0c3 100644 --- a/test/util/copy.cpp +++ b/test/util/copy.cpp @@ -6,7 +6,7 @@ // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) -#include +#include #include diff --git a/test/util/for_each_coordinate.cpp b/test/util/for_each_coordinate.cpp index ddfca5300..666c7bc70 100644 --- a/test/util/for_each_coordinate.cpp +++ b/test/util/for_each_coordinate.cpp @@ -7,7 +7,7 @@ // http://www.boost.org/LICENSE_1_0.txt) -#include +#include #include diff --git a/test/util/select_most_precise.cpp b/test/util/select_most_precise.cpp index 2903060d2..70a00e9ea 100644 --- a/test/util/select_most_precise.cpp +++ b/test/util/select_most_precise.cpp @@ -7,7 +7,7 @@ // http://www.boost.org/LICENSE_1_0.txt) -#include +#include #include diff --git a/test/util/write_dsv.cpp b/test/util/write_dsv.cpp index 45b7da97e..c2a6d3da2 100644 --- a/test/util/write_dsv.cpp +++ b/test/util/write_dsv.cpp @@ -9,7 +9,7 @@ #include -#include +#include #include @@ -33,7 +33,7 @@ void test_dsv(std::string const& wkt, std::string const& dsv) } -#ifndef GGL_TEST_MULTI +#ifndef GEOMETRY_TEST_MULTI template void test_all() {