boost_mirror/geometry
1
0
Fork 0
mirror of https://github.com/boostorg/geometry.git synced 2025-05-11 13:34:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

[simplify] prepare test for distance object instead of always value, and

Browse Source 
added overload accepting a strategy
This commit is contained in:
Barend Gehrels 2014-07-09 11:24:50 +02:00
parent 0315125492
commit 999ba36e06
1 changed files with 33 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
test/algorithms/test_simplify.hpp
View File

@ -30,7 +30,10 @@ struct test_inserter
template <typename Geometry> template <typename Geometry>
struct test_inserter<bg::linestring_tag, Geometry> struct test_inserter<bg::linestring_tag, Geometry>
{ {
static void apply(Geometry& geometry, std::string const& expected, double distance) template <typename DistanceMeasure>
static void apply(Geometry& geometry,
std::string const& expected,
DistanceMeasure const& distance)
{ {
Geometry simplified; Geometry simplified;
bg::detail::simplify::simplify_insert(geometry, bg::detail::simplify::simplify_insert(geometry,
@ -45,10 +48,10 @@ struct test_inserter<bg::linestring_tag, Geometry>
}; };
template <typename Geometry> template <typename Geometry, typename DistanceMeasure>
void check_geometry(Geometry const& geometry, void check_geometry(Geometry const& geometry,
std::string const& expected, std::string const& expected,
double distance) DistanceMeasure const& distance)
{ {
Geometry simplified; Geometry simplified;
bg::simplify(geometry, simplified, distance); bg::simplify(geometry, simplified, distance);
@ -58,10 +61,10 @@ void check_geometry(Geometry const& geometry,
BOOST_CHECK_EQUAL(out.str(), expected); BOOST_CHECK_EQUAL(out.str(), expected);
} }
template <typename Geometry, typename Strategy> template <typename Geometry, typename Strategy, typename DistanceMeasure>
void check_geometry(Geometry const& geometry, void check_geometry(Geometry const& geometry,
std::string const& expected, std::string const& expected,
double distance, DistanceMeasure const& distance,
Strategy const& strategy) Strategy const& strategy)
{ {
Geometry simplified; Geometry simplified;
@ -72,11 +75,14 @@ void check_geometry(Geometry const& geometry,
BOOST_CHECK_EQUAL(out.str(), expected); BOOST_CHECK_EQUAL(out.str(), expected);
} }
template <typename Geometry> template <typename Geometry, typename Strategy, typename DistanceMeasure>
void test_geometry(std::string const& wkt, std::string const& expected, double distance) void test_geometry(std::string const& wkt,
std::string const& expected,
DistanceMeasure const& distance,
Strategy const& strategy)
{ {
// Generate polygon using only integer coordinates and obvious results typedef typename bg::point_type<Geometry>::type point_type;
// Polygon is a hexagon, having one extra point (2,1) on a line which should be filtered out.
Geometry geometry; Geometry geometry;
bg::read_wkt(wkt, geometry); bg::read_wkt(wkt, geometry);
boost::variant<Geometry> v(geometry); boost::variant<Geometry> v(geometry);
@ -84,19 +90,11 @@ void test_geometry(std::string const& wkt, std::string const& expected, double d
check_geometry(geometry, expected, distance); check_geometry(geometry, expected, distance);
check_geometry(v, expected, distance); check_geometry(v, expected, distance);
// Check using user-specified strategy
typedef typename bg::point_type<Geometry>::type point_type;
typedef bg::strategy::distance::projected_point<double> strategy;
typedef bg::strategy::simplify::douglas_peucker
<
point_type,
strategy
> simplify_strategy_type;
BOOST_CONCEPT_ASSERT( (bg::concept::SimplifyStrategy<simplify_strategy_type, point_type>) ); //BOOST_CONCEPT_ASSERT( (bg::concept::SimplifyStrategy<Strategy, point_type>) );
check_geometry(geometry, expected, distance, simplify_strategy_type()); check_geometry(geometry, expected, distance, strategy);
check_geometry(v, expected, distance, simplify_strategy_type()); check_geometry(v, expected, distance, strategy);
// Check inserter (if applicable) // Check inserter (if applicable)
test_inserter test_inserter
@ -106,5 +104,20 @@ void test_geometry(std::string const& wkt, std::string const& expected, double d
>::apply(geometry, expected, distance); >::apply(geometry, expected, distance);
} }
template <typename Geometry, typename DistanceMeasure>
void test_geometry(std::string const& wkt,
std::string const& expected,
DistanceMeasure distance)
{
// Define default strategy for testing
typedef bg::strategy::simplify::douglas_peucker
<
typename bg::point_type<Geometry>::type,
bg::strategy::distance::projected_point<double>
> dp;
test_geometry<Geometry>(wkt, expected, distance, dp());
}
#endif #endif