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

[test][densify] Rename complexify in tests to densify.

Browse Source
This commit is contained in:
Adam Wulkiewicz 2017-12-06 16:15:51 +01:00
parent b04a0b97b7
commit 7fa4d05735
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/algorithms/Jamfile.v2
View File

@ -22,7 +22,6 @@ test-suite boost-geometry-algorithms
[ run centroid.cpp : : : : algorithms_centroid ]
[ run centroid_multi.cpp : : : : algorithms_centroid_multi ]
[ run comparable_distance.cpp : : : : algorithms_comparable_distance ]
[ run complexify.cpp : : : : algorithms_complexify ]
[ run convert.cpp : : : : algorithms_convert ]
[ run convert_multi.cpp : : : : algorithms_convert_multi ]
[ run convex_hull.cpp : : : : algorithms_convex_hull ]
@ -30,6 +29,7 @@ test-suite boost-geometry-algorithms
[ run correct.cpp : : : : algorithms_correct ]
[ run correct_multi.cpp : : : : algorithms_correct_multi ]
[ run correct_closure.cpp : : : : algorithms_correct_closure ]
[ run densify.cpp : : : : algorithms_densify ]
[ run for_each.cpp : : : : algorithms_for_each ]
[ run for_each_multi.cpp : : : : algorithms_for_each_multi ]
[ run is_convex.cpp : : : : algorithms_is_convex ]

19
test/algorithms/complexify.cpp → test/algorithms/densify.cpp
View File

@ -13,20 +13,19 @@
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/algorithms/complexify.hpp>
#include <boost/geometry/strategies/cartesian/complexify.hpp>
#include <boost/geometry/strategies/geographic/complexify.hpp>
#include <boost/geometry/strategies/spherical/complexify.hpp>
#include <boost/geometry/algorithms/densify.hpp>
#include <boost/geometry/algorithms/length.hpp>
#include <boost/geometry/algorithms/num_points.hpp>
#include <boost/geometry/algorithms/perimeter.hpp>
#include <boost/geometry/iterators/segment_iterator.hpp>
#include <boost/geometry/strategies/cartesian/densify.hpp>
#include <boost/geometry/strategies/cartesian/distance_pythagoras.hpp>
#include <boost/geometry/strategies/spherical/distance_haversine.hpp>
#include <boost/geometry/strategies/geographic/densify.hpp>
#include <boost/geometry/strategies/geographic/distance.hpp>
#include <boost/geometry/strategies/spherical/densify.hpp>
#include <boost/geometry/strategies/spherical/distance_haversine.hpp>
#include <boost/geometry/io/wkt/wkt.hpp>
@ -88,7 +87,7 @@ struct cs_data
template <typename G>
struct cs_data<G, bg::cartesian_tag>
{
bg::strategy::complexify::cartesian<> compl_s;
bg::strategy::densify::cartesian<> compl_s;
bg::strategy::distance::pythagoras<> dist_s;
};
@ -102,7 +101,7 @@ struct cs_data<G, bg::spherical_equatorial_tag>
{}
bg::srs::sphere<double> model;
bg::strategy::complexify::spherical<> compl_s;
bg::strategy::densify::spherical<> compl_s;
bg::strategy::distance::haversine<double> dist_s;
};
@ -116,7 +115,7 @@ struct cs_data<G, bg::geographic_tag>
{}
bg::srs::spheroid<double> model;
bg::strategy::complexify::geographic<> compl_s;
bg::strategy::densify::geographic<> compl_s;
bg::strategy::distance::geographic<> dist_s;
};
@ -131,7 +130,7 @@ inline void test_geometry(std::string const& wkt, Check const& check)
double max_distance = shortest_length(g, d.dist_s) / 3.0;
G o;
bg::complexify(g, o, max_distance, d.compl_s);
bg::densify(g, o, max_distance, d.compl_s);
// geometry was indeed complexified
std::size_t g_count = bg::num_points(g);