Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[test] add cases for issues #1229 #1231 #1244 and some test refactoring #1256

Merged
merged 1 commit into from
Mar 13, 2024
Merged

[test] add cases for issues #1229 #1231 #1244 and some test refactoring #1256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions test/algorithms/overlay/overlay_cases.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1176,6 +1176,25 @@ static std::string issue_1186[2] =
"POLYGON((-13848.1446527556 6710443.1496919869,-13848.2559722463 6710440.2884572418,-13847.8106942832 6710440.1096301023,-13847.6993747924 6710443.1496919869,-13847.3654163201 6710442.9708647905,-13846.0295824308 6710442.9708647905,-13846.4748603939 6710435.1024718173,-13847.8106942832 6710435.1024718173,-13848.1446527556 6710435.1024718173,-13849.8144451172 6710443.1496919869,-13848.1446527556 6710443.1496919869),(-13847.4767358109 6710440.1096301023,-13847.8106942832 6710440.1096301023,-13847.9220137740 6710439.9308029665,-13847.5880553017 6710439.7519758362,-13847.4767358109 6710440.1096301023))"
};

// Triangle, nearly a line
static std::string issue_1229[2] =
{
"POLYGON((38436.758 22765.61,930.538 -10523.68,925.121 -10507.965,38436.758 22765.61))",
"POLYGON((38436.758 22765.61,925.121 -10507.965,925.121 -10507.965,38436.758 22765.61))"
};

static std::string issue_1231[2] =
{
"POLYGON((0 5,-6 -17,12 17,0 5),(4 6,5 5,0 1,4 6))",
"POLYGON((3 9,-15 -5,13 -11,3 9))"
};

static std::string issue_1244[2] =
{
"POLYGON((0 0,4 0,4 4,0 4,0 0),(1 1,1 3,2 2,1 1))",
"POLYGON((2 -1,5 2,2 5,2 -1))"
};

static std::string ggl_list_20120229_volker[3] =
{
"POLYGON((1716 1554,2076 2250,2436 2352,2796 1248,3156 2484,3516 2688,3516 2688,3156 2484,2796 1248,2436 2352,2076 2250, 1716 1554))",
Expand Down
227 changes: 137 additions & 90 deletions test/algorithms/set_operations/difference/difference.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,42 @@

#include <boost/geometry/io/wkt/wkt.hpp>

#include <boost/geometry/util/constexpr.hpp>

#include <boost/geometry/geometries/point_xy.hpp>

#include "test_difference.hpp"
#include <algorithms/test_overlay.hpp>
#include <algorithms/overlay/overlay_cases.hpp>
#include <algorithms/overlay/multi_overlay_cases.hpp>

namespace
{

// Change compiler defines to constexpr bools
// to make conditions more readable
// and to always compile all code.
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is done in difference.cpp only, until now.
If you agree, I'll apply it in the others too. And we can apply it everywhere.
Advantages:

  • if i/o ifdef
  • code is always compiled
  • easier to read

Also, we can harmonize it with the removing of the rescaling, as done in this source file.

#if defined(BOOST_GEOMETRY_TEST_FAILURES)
constexpr bool test_failures = true;
#else
constexpr bool test_failures = false;
#endif

#if defined(BOOST_GEOMETRY_TEST_ONLY_ONE_TYPE)
constexpr bool test_only_one_type = true;
#else
constexpr bool test_only_one_type = false;
#endif

#if defined(BOOST_GEOMETRY_TEST_ONLY_ONE_ORDER)
constexpr bool test_only_one_order = true;
#else
constexpr bool test_only_one_order = false;
#endif

} // namespace

// Convenience macros (points are not checked)
// Convenience macros (point counts are not checked)
#define TEST_DIFFERENCE(caseid, clips1, area1, clips2, area2, clips3) \
(test_one<polygon, polygon, polygon>) \
( #caseid, caseid[0], caseid[1], clips1, -1, area1, clips2, -1, area2, \
Expand All @@ -41,10 +68,12 @@
( #caseid, caseid[0], caseid[1], clips1, -1, area1, clips2, -1, area2, \
clips3, -1, area1 + area2, settings)

template <typename P>
template <typename P, bool ClockWise>
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added ccw tests for difference, it was not earlier there. Most cases work, but a few of them don't - they are now conditionally

void test_all()
{
typedef bg::model::polygon<P> polygon;
using polygon = bg::model::polygon<P, ClockWise>;

constexpr bool is_ccw = ! ClockWise;

test_one<polygon, polygon, polygon>("simplex_normal",
simplex_normal[0], simplex_normal[1],
Expand All @@ -67,7 +96,7 @@ void test_all()
1, 5, 8.0);

{
// Sym difference works, but expectations are different for rescaling
// It reports self-intersections for symmetric difference
ut_settings settings;
settings.sym_difference = false;
test_one<polygon, polygon, polygon>("star_comb_15",
Expand Down Expand Up @@ -250,19 +279,17 @@ void test_all()
TEST_DIFFERENCE(case_precision_9, optional(), optional_sliver(), 1, 59.0, count_set(1, 2));
TEST_DIFFERENCE_WITH(case_precision_10, optional(), optional_sliver(), 1, 59, count_set(1, 2), ut_settings(0.001));

#if defined(BOOST_GEOMETRY_USE_RESCALING) || defined(BOOST_GEOMETRY_TEST_FAILURES)
// Fails without rescaling
TEST_DIFFERENCE(case_precision_11, optional(), optional_sliver(), 1, 59.0, count_set(1, 2));
#endif
if BOOST_GEOMETRY_CONSTEXPR(test_failures)
{
// Fails (since rescaling is turned off)
TEST_DIFFERENCE(case_precision_11, optional(), optional_sliver(), 1, 59.0, count_set(1, 2));
}

TEST_DIFFERENCE(case_precision_12, 1, 12.0, 0, 0.0, 1);
TEST_DIFFERENCE_WITH(case_precision_13, 1, 12, 0, 0.0, 1, ut_settings(0.001));
TEST_DIFFERENCE(case_precision_14, 1, 14.0, 1, 8.0, 1);
TEST_DIFFERENCE(case_precision_15, 0, 0.0, 1, 59.0, 1);
#if ! defined(BOOST_GEOMETRY_USE_RESCALING) || defined(BOOST_GEOMETRY_TEST_FAILURES)
// Fails if rescaling is used in combination with get_clusters
TEST_DIFFERENCE(case_precision_16, optional(), optional_sliver(), 1, 59.0, 1);
#endif
TEST_DIFFERENCE(case_precision_17, 0, 0.0, 1, 59.0, 1);
TEST_DIFFERENCE(case_precision_18, 0, 0.0, 1, 59.0, 1);
TEST_DIFFERENCE(case_precision_19, 1, expectation_limits(1.2e-6, 1.35e-5), 1, 59.0, 2);
Expand Down Expand Up @@ -335,11 +362,8 @@ void test_all()
settings);
}

#if ! defined(BOOST_GEOMETRY_USE_RESCALING) || defined(BOOST_GEOMETRY_TEST_FAILURES)
{
ut_settings settings(0.1);
settings.set_test_validity(BG_IF_RESCALED(false, true));
settings.validity_false_negative_sym = BG_IF_RESCALED(true, false);

// SQL Server gives: 0.28937764436705 and 0.000786406897532288 with 44/35 rings
// PostGIS gives: 0.30859375 and 0.033203125 with 35/35 rings
Expand All @@ -348,7 +372,6 @@ void test_all()
ignore_count(), expectation_limits(0.00060440758, 0.00076856),
ignore_count(), settings);
}
#endif

{
ut_settings settings;
Expand Down Expand Up @@ -471,13 +494,14 @@ void test_all()
count_set(1, 6), 20.096189,
count_set(1, 6));

#if defined(BOOST_GEOMETRY_USE_RESCALING) || defined(BOOST_GEOMETRY_TEST_FAILURES)
// Without rescaling the "b" case produces no output.
test_one<polygon, polygon, polygon>("ticket_10108_a",
ticket_10108_a[0], ticket_10108_a[1],
1, 4, {0.0145036, 0.0145037},
1, 4, 0.029019232);
#endif
if BOOST_GEOMETRY_CONSTEXPR(test_failures)
{
// Without rescaling the second case (labeled "b") produces no output.
test_one<polygon, polygon, polygon>("ticket_10108_a",
ticket_10108_a[0], ticket_10108_a[1],
1, 4, {0.0145036, 0.0145037},
1, 4, 0.029019232);
}

test_one<polygon, polygon, polygon>("ticket_10108_b",
ticket_10108_b[0], ticket_10108_b[1],
Expand All @@ -498,66 +522,66 @@ void test_all()
2, 23, 62.25,
0, 0, 0.0);

#if ! defined(BOOST_GEOMETRY_TEST_ONLY_ONE_TYPE)
typedef bg::model::box<P> box;
typedef bg::model::ring<P> ring;

// Other combinations
if BOOST_GEOMETRY_CONSTEXPR(! test_only_one_type)
{
test_one<polygon, polygon, ring>(
"star_ring_ring", example_star, example_ring,
5, 22, 1.1901714,
5, 27, 1.6701714);

test_one<polygon, ring, polygon>(
"ring_star_ring", example_ring, example_star,
5, 27, 1.6701714,
5, 22, 1.1901714);

static std::string const clip = "POLYGON((2.5 0.5,5.5 2.5))";

test_one<polygon, box, ring>("star_box",
clip, example_star,
4, 20, 2.833333, 4, 16, 0.833333);

test_one<polygon, ring, box>("box_star",
example_star, clip,
4, 16, 0.833333, 4, 20, 2.833333);
using box = bg::model::box<P>;
using ring = bg::model::ring<P>;
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

changes in the block below are mainly whitespace

{
// Other combinations
test_one<polygon, polygon, ring>(
"star_ring_ring", example_star, example_ring,
5, 22, 1.1901714,
5, 27, 1.6701714);

test_one<polygon, ring, polygon>(
"ring_star_ring", example_ring, example_star,
5, 27, 1.6701714,
5, 22, 1.1901714);

static std::string const clip = "POLYGON((2.5 0.5,5.5 2.5))";

test_one<polygon, box, ring>("star_box",
clip, example_star,
4, 20, 2.833333, 4, 16, 0.833333);

test_one<polygon, ring, box>("box_star",
example_star, clip,
4, 16, 0.833333, 4, 20, 2.833333);
}

// Combinations of clockwise and counter clockwise
{
using polygon_ccw = bg::model::polygon<P, false>;
test_one<polygon, polygon_ccw, polygon_ccw>(
"star_ring_ccw", example_star, example_ring,
5, 22, 1.1901714,
5, 27, 1.6701714);
test_one<polygon, polygon, polygon_ccw>(
"star_ring_ccw1", example_star, example_ring,
5, 22, 1.1901714,
5, 27, 1.6701714);
test_one<polygon, polygon_ccw, polygon>(
"star_ring_ccw2", example_star, example_ring,
5, 22, 1.1901714,
5, 27, 1.6701714);
}

// Multi/box (should be moved to multi)
{
using mp = bg::model::multi_polygon<polygon>;

static std::string const clip = "POLYGON((2 2,4 4))";

test_one<polygon, box, mp>("simplex_multi_box_mp",
clip, case_multi_simplex[0],
2, -1, 0.53333333333, 3, -1, 8.53333333333);
test_one<polygon, mp, box>("simplex_multi_mp_box",
case_multi_simplex[0], clip,
3, -1, 8.53333333333, 2, -1, 0.53333333333);

}
}

// Counter clockwise
{
typedef bg::model::polygon<P, false> polygon_ccw;
test_one<polygon, polygon_ccw, polygon_ccw>(
"star_ring_ccw", example_star, example_ring,
5, 22, 1.1901714,
5, 27, 1.6701714);
test_one<polygon, polygon, polygon_ccw>(
"star_ring_ccw1", example_star, example_ring,
5, 22, 1.1901714,
5, 27, 1.6701714);
test_one<polygon, polygon_ccw, polygon>(
"star_ring_ccw2", example_star, example_ring,
5, 22, 1.1901714,
5, 27, 1.6701714);
}

// Multi/box (should be moved to multi)
{
typedef bg::model::multi_polygon<polygon> mp;

static std::string const clip = "POLYGON((2 2,4 4))";

test_one<polygon, box, mp>("simplex_multi_box_mp",
clip, case_multi_simplex[0],
2, -1, 0.53333333333, 3, -1, 8.53333333333);
test_one<polygon, mp, box>("simplex_multi_mp_box",
case_multi_simplex[0], clip,
3, -1, 8.53333333333, 2, -1, 0.53333333333);

}
#endif

// Rescaling generates a very small false polygon
TEST_DIFFERENCE(issue_566_a, 1, expectation_limits(143.662),
optional(), optional_sliver(1.0e-5),
Expand All @@ -577,24 +601,42 @@ void test_all()
settings);
}

TEST_DIFFERENCE(issue_875, 1, 3468.77515, 1, 105.425816, 2);
#if ! defined(BOOST_GEOMETRY_USE_RESCALING) || defined(BOOST_GEOMETRY_TEST_FAILURES)
{
// The symmetric difference is invalid for ccw
ut_settings settings;
settings.validity_of_sym = ! is_ccw;
TEST_DIFFERENCE_WITH(issue_875, 1, 3468.77515, 1, 105.425816, 2, settings);
}

TEST_DIFFERENCE(issue_876a, 1, 4728.89916, 1, 786.29563, 2);
#endif
TEST_DIFFERENCE(issue_876b, 1, 6114.18234, 1, 4754.29449, count_set(1, 2));

TEST_DIFFERENCE(issue_1138, 1, 203161.751, 2, 1237551.0171, 1);

if BOOST_GEOMETRY_CONSTEXPR(test_failures)
{
// Fails for both clockwise and counter clockwise in detecting the difference
// of the interior ring, touching the outer ring.
TEST_DIFFERENCE(issue_1231, 1, 203161.751, 2, 1237551.0171, 1);
}

if BOOST_GEOMETRY_CONSTEXPR(! is_ccw || test_failures)
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@awulkiew I assume this is fine, and an else branch is not needed in such cases

{
// Case #1244 is wrong for ccw
TEST_DIFFERENCE(issue_1244, 3, 8, 3, 2, 6);
}

TEST_DIFFERENCE(mysql_21977775, 2, 160.856568913, 2, 92.3565689126, 4);
TEST_DIFFERENCE(mysql_21965285, 1, 92.0, 1, 14.0, 1);
TEST_DIFFERENCE(mysql_23023665_1, 1, 92.0, 1, 142.5, 2);
TEST_DIFFERENCE(mysql_23023665_2, 1, 96.0, 1, 16.0, 2);
TEST_DIFFERENCE(mysql_23023665_3, 1, 225.0, 1, 66.0, 2);
TEST_DIFFERENCE(mysql_23023665_5, 2, 165.23735, 2, 105.73735, 4);

{
// Without rescaling it is invalid
// The symmetric difference is invalid for ccw
ut_settings settings;
settings.set_test_validity(true);
settings.validity_of_sym = ! is_ccw;
TEST_DIFFERENCE_WITH(mysql_23023665_6, 2, 105.68756, 3, 10.18756, 5, settings);
}
{
Expand All @@ -609,7 +651,7 @@ void test_all()
template <typename Point, bool ClockWise, bool Closed>
void test_specific()
{
typedef bg::model::polygon<Point, ClockWise, Closed> polygon;
using polygon = bg::model::polygon<Point, ClockWise, Closed>;

test_one<polygon, polygon, polygon>("ggl_list_20120717_volker",
ggl_list_20120717_volker[0], ggl_list_20120717_volker[1],
Expand All @@ -635,13 +677,18 @@ void test_specific()
int test_main(int, char* [])
{
BoostGeometryWriteTestConfiguration();
test_all<bg::model::d2::point_xy<default_test_type> >();

test_specific<bg::model::d2::point_xy<int>, false, false>();
test_all<bg::model::d2::point_xy<default_test_type>, true>();

#if ! defined(BOOST_GEOMETRY_TEST_ONLY_ONE_TYPE)
test_all<bg::model::d2::point_xy<float> >();
#endif
if BOOST_GEOMETRY_CONSTEXPR(! test_only_one_order)
{
test_all<bg::model::d2::point_xy<default_test_type>, false>();
}

if BOOST_GEOMETRY_CONSTEXPR(! test_only_one_type)
{
test_all<bg::model::d2::point_xy<float>, true>();
}

#if defined(BOOST_GEOMETRY_TEST_FAILURES)
// Not yet fully tested for float and long double.
Expand Down
Loading
Loading