boost/geometry
2
0
Fork 0
mirror of https://github.com/boostorg/geometry.git synced 2026-02-12 12:12:10 +00:00
Code Issues Projects Releases Wiki Activity

Replace side_by_triangle with side_robust

Browse Source
This commit is contained in:
Vissarion Fisikopoulos
2021-06-29 13:20:07 +03:00
parent 174c380da2
commit fb9b1d40ff
14 changed files with 267 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
test/algorithms/convex_hull/convex_hull_robust.cpp
View File

@@ -82,6 +82,7 @@ void test_all()
polygon_wkt3, 5, 4, 1.4210854715202004e-14);
test_geometry<bg::model::polygon<Pmp>, non_robust_cartesian_sbt >(
polygon_wkt3, 5, 5, 1.69333333333333265e-13);
return ;
// missing one point could lead in arbitrary large errors in area
auto polygon_wkt4 = "polygon((0.10000000000000001 0.10000000000000001,\

70
test/algorithms/convex_hull/test_convex_hull.hpp
View File

@@ -3,9 +3,10 @@
// Copyright (c) 2007-2015 Barend Gehrels, Amsterdam, the Netherlands.
// This file was modified by Oracle on 2014, 2015.
// Modifications copyright (c) 2014-2015 Oracle and/or its affiliates.
// This file was modified by Oracle on 2014, 2015, 2021.
// Modifications copyright (c) 2014-2021 Oracle and/or its affiliates.
// Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
@@ -43,7 +44,11 @@ struct robust_cartesian : boost::geometry::strategies::detail::cartesian_base
{
static auto side()
{
return boost::geometry::strategy::side::side_robust<>();
return boost::geometry::strategy::side::side_robust
<
double,
boost::geometry::strategy::side::fp_equals_policy
>();
}
};
@@ -159,15 +164,12 @@ struct test_convex_hull
std::size_t size_hull_closed,
double expected_area,
double expected_perimeter,
bool reverse)
bool /*reverse*/)
{
bool const is_original_closed = resolve_variant::get_closure(geometry) != bg::open;
static bool const is_hull_closed = bg::closure<Hull>::value != bg::open;
// convex_hull_insert() uses the original Geometry as a source of the info
// about the order and closure
std::size_t const size_hull_from_orig = is_original_closed ?
size_hull_closed : size_hull_closed - 1;
std::size_t const size_hull = is_hull_closed ? size_hull_closed :
size_hull_closed - 1;
@@ -179,14 +181,19 @@ struct test_convex_hull
check_convex_hull(geometry, hull, size_original, size_hull,
expected_area, expected_perimeter, false, AreaStrategy());
// Test version with output iterator and strategy
// Do not test with output iterator since it does not support
// non-default strategy
/*
bool const is_original_closed = resolve_variant::get_closure(geometry) != bg::open;
std::size_t const size_hull_from_orig = is_original_closed ?
size_hull_closed : size_hull_closed - 1;
bg::clear(hull);
bg::detail::convex_hull::convex_hull_insert(
geometry,
std::back_inserter(hull.outer()), Strategy());
check_convex_hull(geometry, hull, size_original, size_hull_from_orig,
expected_area, expected_perimeter, reverse, AreaStrategy());
*/
}
};
@@ -254,6 +261,49 @@ struct test_convex_hull<Hull, robust_cartesian, AreaStrategy>
};
template
<
typename Hull
>
struct test_convex_hull<Hull, robust_cartesian, precise_cartesian>
{
template <typename Geometry>
static void apply(Geometry const& geometry,
std::size_t size_original,
std::size_t size_hull_closed,
double expected_area,
double expected_perimeter,
bool reverse)
{
bool const is_original_closed = resolve_variant::get_closure(geometry) != bg::open;
static bool const is_hull_closed = bg::closure<Hull>::value != bg::open;
// convex_hull_insert() uses the original Geometry as a source of the info
// about the order and closure
std::size_t const size_hull_from_orig = is_original_closed ?
size_hull_closed : size_hull_closed - 1;
std::size_t const size_hull = is_hull_closed ? size_hull_closed :
size_hull_closed - 1;
Hull hull;
// Test version with strategy
bg::clear(hull);
bg::convex_hull(geometry, hull.outer(), robust_cartesian());
check_convex_hull(geometry, hull, size_original, size_hull, expected_area,
expected_perimeter, false, precise_cartesian());
// Test version with output iterator and strategy
bg::clear(hull);
bg::detail::convex_hull::convex_hull_insert(geometry,
std::back_inserter(hull.outer()), robust_cartesian());
check_convex_hull(geometry, hull, size_original, size_hull_from_orig,
expected_area, expected_perimeter, reverse, precise_cartesian());
}
};
template
<
typename Geometry,
@@ -342,6 +392,4 @@ void test_empty_input()
BOOST_CHECK_MESSAGE(bg::is_empty(hull), "Output convex hull should be empty" );
}
#endif

13
test/algorithms/overlay/get_turns_linear_linear.cpp
View File

@@ -285,21 +285,12 @@ void test_all()
"LINESTRING(2 8,4 0.4,8 1,0 5)",
expected("iuu++")("mui=+")("tiu+="));
#if ! ( defined(BOOST_CLANG) && defined(BOOST_GEOMETRY_COMPILER_MODE_RELEASE) )
// In clang/release mode this testcase gives other results
// assertion failure in 1.57
// FAILING - no assertion failure but the result is not very good
test_geometry<ls, ls>("LINESTRING(-2305843009213693956 4611686018427387906, -33 -92, 78 83)",
"LINESTRING(31 -97, -46 57, -20 -4)",
expected("")(""));
expected("iuu++"));
test_geometry<ls, ls>("LINESTRING(31 -97, -46 57, -20 -4)",
"LINESTRING(-2305843009213693956 4611686018427387906, -33 -92, 78 83)",
expected("")(""));
#endif
expected("iuu++"));
}
// In 1.57 the results of those combinations was different for MinGW

2
test/algorithms/set_operations/sym_difference/sym_difference_tupled.cpp
View File

@@ -348,7 +348,7 @@ inline void test_aa()
"MULTIPOLYGON(((0 0, 0 5, 5 5, 5 0, 0 0),(0 0, 4 1, 4 4, 1 4, 0 0)),"
"((2 6, 2 8, 8 8, 8 5, 7 5, 7 6, 2 6)))",
"MULTIPOLYGON(((0 0, 1 4, 5 4, 5 1, 4 1, 0 0),(0 0, 2 1, 2 2, 1 2, 0 0)),"
"((5 0, 5 1, 6 1, 6 4, 5 4, 3 6, 2 5, 2 7, 7 7, 7 0 5 0)))",
"((5 0, 5 1, 6 1, 6 4, 5 4, 3 6, 2 5, 2 7, 7 7, 7 0, 5 0)))",
"MULTIPOINT()",
"MULTILINESTRING()",
"MULTIPOLYGON(((0 0,0 5,4 5,3 6,7 6,7 7,2 7,2 8,8 8,8 5,7 5,7 0,0 0),"