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][test] splitted tests such that test with strategy does not

Browse Source 
test the version without strategy, to avoid mixing strategy types
This commit is contained in:
Barend Gehrels 2014-07-09 12:00:20 +02:00
parent 64303076dc
commit 0c8f953ee9
1 changed files with 36 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
test/algorithms/test_simplify.hpp
View File

@ -75,6 +75,42 @@ void check_geometry(Geometry const& geometry,
BOOST_CHECK_EQUAL(out.str(), expected); BOOST_CHECK_EQUAL(out.str(), expected);
} }
template <typename Geometry, typename DistanceMeasure>
void test_geometry(std::string const& wkt,
std::string const& expected,
DistanceMeasure distance)
{
typedef typename bg::point_type<Geometry>::type point_type;
Geometry geometry;
bg::read_wkt(wkt, geometry);
boost::variant<Geometry> v(geometry);
// Define default strategy for testing
typedef bg::strategy::simplify::douglas_peucker
<
typename bg::point_type<Geometry>::type,
bg::strategy::distance::projected_point<double>
> dp;
check_geometry(geometry, expected, distance);
check_geometry(v, expected, distance);
BOOST_CONCEPT_ASSERT( (bg::concept::SimplifyStrategy<dp, point_type>) );
check_geometry(geometry, expected, distance, dp());
check_geometry(v, expected, distance, dp());
// Check inserter (if applicable)
test_inserter
<
typename bg::tag<Geometry>::type,
Geometry
>::apply(geometry, expected, distance);
}
template <typename Geometry, typename Strategy, typename DistanceMeasure> template <typename Geometry, typename Strategy, typename DistanceMeasure>
void test_geometry(std::string const& wkt, void test_geometry(std::string const& wkt,
std::string const& expected, std::string const& expected,
@ -87,37 +123,10 @@ void test_geometry(std::string const& wkt,
bg::read_wkt(wkt, geometry); bg::read_wkt(wkt, geometry);
boost::variant<Geometry> v(geometry); boost::variant<Geometry> v(geometry);
check_geometry(geometry, expected, distance);
check_geometry(v, expected, distance);
//BOOST_CONCEPT_ASSERT( (bg::concept::SimplifyStrategy<Strategy, point_type>) ); //BOOST_CONCEPT_ASSERT( (bg::concept::SimplifyStrategy<Strategy, point_type>) );
check_geometry(geometry, expected, distance, strategy); check_geometry(geometry, expected, distance, strategy);
check_geometry(v, expected, distance, strategy); check_geometry(v, expected, distance, strategy);
// Check inserter (if applicable)
test_inserter
<
typename bg::tag<Geometry>::type,
Geometry
>::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