mirror of
https://github.com/boostorg/geometry.git
synced 2025-05-09 23:24:02 +00:00
test: Remove extensions dependency from tests
This commit is contained in:
parent
19f22c2475
commit
a4f52ea95e
@ -28,7 +28,7 @@
|
|||||||
#include <boost/geometry/algorithms/envelope.hpp>
|
#include <boost/geometry/algorithms/envelope.hpp>
|
||||||
#include <boost/geometry/algorithms/within.hpp>
|
#include <boost/geometry/algorithms/within.hpp>
|
||||||
|
|
||||||
#include <boost/geometry/extensions/algorithms/midpoints.hpp>
|
//#include <boost/geometry/extensions/algorithms/midpoints.hpp>
|
||||||
|
|
||||||
#include <boost/geometry/geometries/geometries.hpp>
|
#include <boost/geometry/geometries/geometries.hpp>
|
||||||
#include <boost/geometry/geometries/point_xy.hpp>
|
#include <boost/geometry/geometries/point_xy.hpp>
|
||||||
@ -213,14 +213,9 @@ public :
|
|||||||
bg::convert(segment, seg2);
|
bg::convert(segment, seg2);
|
||||||
|
|
||||||
bg::strategy::intersection::cartesian_segments<> strategy;
|
bg::strategy::intersection::cartesian_segments<> strategy;
|
||||||
bg::policies::relate::segments_intersection_points
|
|
||||||
<
|
|
||||||
bg::segment_intersection_points<point_t>
|
|
||||||
> policy;
|
|
||||||
|
|
||||||
bg::detail::segment_as_subrange<segment_t> subrange1(seg1);
|
bg::detail::segment_as_subrange<segment_t> subrange1(seg1);
|
||||||
bg::detail::segment_as_subrange<segment_t> subrange2(seg2);
|
bg::detail::segment_as_subrange<segment_t> subrange2(seg2);
|
||||||
bg::segment_intersection_points<point_t> is
|
bg::segment_intersection_points<point_t> is
|
||||||
= strategy.apply(subrange1, subrange2, policy_t());
|
= strategy.apply(subrange1, subrange2, policy_t());
|
||||||
|
|
||||||
if (is.count == 2)
|
if (is.count == 2)
|
||||||
@ -307,6 +302,7 @@ bool verify(std::string const& caseid, MultiPolygon const& mp, Linestring const&
|
|||||||
border_check<MultiPolygon> bc(mp, result);
|
border_check<MultiPolygon> bc(mp, result);
|
||||||
bg::for_each_segment(difference, bc);
|
bg::for_each_segment(difference, bc);
|
||||||
|
|
||||||
|
/* commented out since it needs extensions, tests are passing without that part
|
||||||
// 3) check also the mid-points from the difference to remove false positives
|
// 3) check also the mid-points from the difference to remove false positives
|
||||||
for (Linestring const& d : difference)
|
for (Linestring const& d : difference)
|
||||||
{
|
{
|
||||||
@ -315,11 +311,11 @@ bool verify(std::string const& caseid, MultiPolygon const& mp, Linestring const&
|
|||||||
outside_check<MultiPolygon> ocm(mp, result);
|
outside_check<MultiPolygon> ocm(mp, result);
|
||||||
bg::for_each_point(difference_midpoints, ocm);
|
bg::for_each_point(difference_midpoints, ocm);
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
if (settings.verbose)
|
if (settings.verbose)
|
||||||
{
|
{
|
||||||
std::cout << " [" << bg::area(mp) << " " << bg::length(ls) <<
|
std::cout << " [" << bg::area(mp) << " " << bg::length(ls) <<
|
||||||
" " << bg::length(intersection) <<
|
" " << bg::length(intersection) <<
|
||||||
" " << bg::length(difference) << "]";
|
" " << bg::length(difference) << "]";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user