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

[overlay] fix ux/ux cases by sort order

Browse Source 
(instead of handle tangencies)
This commit is contained in:
Barend Gehrels
2015-11-11 16:18:19 +01:00
parent 6b0be79ff3
commit 529b8e804c
6 changed files with 33 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/algorithms/buffer/buffer_multi_point.cpp
View File

@@ -62,11 +62,9 @@ void test_all()
{
bg::strategy::buffer::point_square point_strategy;
#ifdef BOOST_GEOMETRY_TEST_FAIL_TANGENCIES
test_with_custom_strategies<multi_point_type, polygon>("grid_a50",
grid_a, join, end_flat,
distance_strategy(0.5), side_strategy, point_strategy, 7.0);
#endif
#if defined(BOOST_GEOMETRY_BUFFER_USE_SIDE_OF_INTERSECTION)
test_with_custom_strategies<multi_point_type, polygon>("grid_a54",

2
test/algorithms/buffer/buffer_multi_polygon.cpp
View File

@@ -441,9 +441,7 @@ void test_all()
test_one<multi_polygon_type, polygon_type>("rt_p22", rt_p22, join_miter, end_flat, 26.5711, 1.0);
#ifdef BOOST_GEOMETRY_TEST_FAIL_TANGENCIES
test_one<multi_polygon_type, polygon_type>("rt_q1", rt_q1, join_miter, end_flat, 27, 1.0);
#endif
test_one<multi_polygon_type, polygon_type>("rt_q2", rt_q2, join_miter, end_flat, 26.4853, 1.0);
test_one<multi_polygon_type, polygon_type>("rt_q2", rt_q2, join_miter, end_flat, 0.9697, -0.25);

2
test/algorithms/buffer/buffer_polygon.cpp
View File

@@ -358,9 +358,7 @@ void test_all()
test_one<polygon_type, polygon_type>("gammagate1", gammagate, join_miter, end_flat, 88, 1);
test_one<polygon_type, polygon_type>("fork_a1", fork_a, join_miter, end_flat, 88, 1);
test_one<polygon_type, polygon_type>("fork_b1", fork_b, join_miter, end_flat, 154, 1);
#ifdef BOOST_GEOMETRY_TEST_FAIL_TANGENCIES
test_one<polygon_type, polygon_type>("fork_c1", fork_c, join_miter, end_flat, 152, 1);
#endif
test_one<polygon_type, polygon_type>("triangle", triangle, join_miter, end_flat, 14.6569, 1.0);
test_one<polygon_type, polygon_type>("degenerate0", degenerate0, join_round, end_round, 0.0, 1.0);

2
test/algorithms/set_operations/union/union.cpp
View File

@@ -179,10 +179,8 @@ void test_areal()
test_one<Polygon, Polygon, Polygon>("58_iet",
case_58[0], case_58[2], 1, 3, 20, 12.16666);
#ifdef BOOST_GEOMETRY_TEST_FAIL_TANGENCIES
test_one<Polygon, Polygon, Polygon>("59_iet",
case_59[0], case_59[2], 1, 1, 14, 17.20833);
#endif
test_one<Polygon, Polygon, Polygon>("80",
case_80[0], case_80[1], 2, 2, 18, 129.0);

6
test/algorithms/set_operations/union/union_multi.cpp
View File

@@ -67,11 +67,9 @@ void test_areal()
1, 3, 17, 48.333333);
// Constructed cases for multi/touch/equal/etc
#ifdef BOOST_GEOMETRY_TEST_FAIL_TANGENCIES
test_one<Polygon, MultiPolygon, MultiPolygon>("case_61_multi",
case_61_multi[0], case_61_multi[1],
1, 0, 11, 4.0);
#endif
test_one<Polygon, MultiPolygon, MultiPolygon>("case_62_multi",
case_62_multi[0], case_62_multi[1],
2, 0, 10, 2.0);
@@ -120,20 +118,18 @@ void test_areal()
test_one<Polygon, MultiPolygon, MultiPolygon>("case_recursive_boxes_2",
case_recursive_boxes_2[0], case_recursive_boxes_2[1],
1, 0, 14, 100.0); // Area from SQL Server
#ifdef BOOST_GEOMETRY_TEST_FAIL_TANGENCIES
test_one<Polygon, MultiPolygon, MultiPolygon>("case_recursive_boxes_3",
case_recursive_boxes_3[0], case_recursive_boxes_3[1],
17, 0, 159, 56.5); // Area from SQL Server
#endif
test_one<Polygon, MultiPolygon, MultiPolygon>("case_recursive_boxes_4",
case_recursive_boxes_4[0], case_recursive_boxes_4[1],
1, 1, 42, 96.75);
#ifdef BOOST_GEOMETRY_TEST_FAIL_TANGENCIES
test_one<Polygon, MultiPolygon, MultiPolygon>("case_recursive_boxes_5",
case_recursive_boxes_5[0], case_recursive_boxes_5[1],
3, 2, 110, 70.0);
#ifdef BOOST_GEOMETRY_TEST_FAIL_TANGENCIES
// TODO: fix self touching interior ring (should get 3 interior rings)
test_one<Polygon, MultiPolygon, MultiPolygon>("case_recursive_boxes_6",
case_recursive_boxes_6[0], case_recursive_boxes_6[1],