Skip to content

Commit

Permalink
Merge branch 'develop' of github.com:boostorg/geometry into fix/remov…
Browse files Browse the repository at this point in the history
…e_rescaling_slow
  • Loading branch information
vissarion committed May 29, 2024
2 parents a67283a + 69588ff commit 8b32d4b
Show file tree
Hide file tree
Showing 23 changed files with 273 additions and 7 deletions.
59 changes: 59 additions & 0 deletions test/algorithms/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,69 @@

add_subdirectory(area)
add_subdirectory(buffer)
add_subdirectory(covered_by)
add_subdirectory(convex_hull)
add_subdirectory(closest_points)
add_subdirectory(crosses)
add_subdirectory(detail)
add_subdirectory(disjoint)
add_subdirectory(distance)
add_subdirectory(envelope_expand)
add_subdirectory(equals)
add_subdirectory(intersects)
add_subdirectory(length)
add_subdirectory(overlaps)
add_subdirectory(overlay)
add_subdirectory(perimeter)
add_subdirectory(relate)
add_subdirectory(set_operations)
add_subdirectory(similarity)
add_subdirectory(touches)
add_subdirectory(within)

foreach(item IN ITEMS
append
assign
azimuth
centroid
centroid_multi
comparable_distance
convert
convert_multi
correct
correct_multi
correct_closure
densify
for_each
for_each_multi
is_convex
is_empty
is_simple
is_simple_geo
is_valid
is_valid_failure
is_valid_geo
line_interpolate
make
maximum_gap
merge_elements
num_geometries
num_geometries_multi
num_interior_rings
num_interior_rings_multi
num_points
num_points_multi
num_segments
point_on_surface
remove_spikes
reverse
reverse_multi
simplify
simplify_multi
transform
transform_multi
unique
unique_multi
)
boost_geometry_add_unit_test("algorithms" ${item})
endforeach()
2 changes: 0 additions & 2 deletions test/algorithms/Jamfile
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,6 @@ test-suite boost-geometry-algorithms
[ run num_points.cpp : : : : algorithms_num_points ]
[ run num_points_multi.cpp : : : : algorithms_num_points_multi ]
[ run num_segments.cpp : : : : algorithms_segments ]
[ run perimeter.cpp : : : : algorithms_perimeter ]
[ run perimeter_multi.cpp : : : : algorithms_perimeter_multi ]
[ run point_on_surface.cpp : : : : algorithms_point_on_surface ]
[ run remove_spikes.cpp : : : : algorithms_remove_spikes ]
[ run reverse.cpp : : : : algorithms_reverse ]
Expand Down
16 changes: 16 additions & 0 deletions test/algorithms/closest_points/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Boost.Geometry
# Copyright (c) 2024 Barend Gehrels, Amsterdam, the Netherlands.
# Use, modification and distribution is subject to the Boost Software License,
# Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
# http://www.boost.org/LICENSE_1_0.txt)

foreach(item IN ITEMS
ar_ar
l_ar
l_l
pl_ar
pl_l
pl_pl
)
boost_geometry_add_unit_test("algorithms_closest_points" ${item})
endforeach()
14 changes: 14 additions & 0 deletions test/algorithms/covered_by/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Boost.Geometry
# Copyright (c) 2024 Barend Gehrels, Amsterdam, the Netherlands.
# Use, modification and distribution is subject to the Boost Software License,
# Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
# http://www.boost.org/LICENSE_1_0.txt)

foreach(item IN ITEMS
covered_by
covered_by_gc
covered_by_sph
covered_by_sph_geo
)
boost_geometry_add_unit_test("algorithms" ${item})
endforeach()
13 changes: 13 additions & 0 deletions test/algorithms/crosses/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Boost.Geometry
# Copyright (c) 2024 Barend Gehrels, Amsterdam, the Netherlands.
# Use, modification and distribution is subject to the Boost Software License,
# Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
# http://www.boost.org/LICENSE_1_0.txt)

foreach(item IN ITEMS
crosses
crosses_gc
crosses_sph
)
boost_geometry_add_unit_test("algorithms" ${item})
endforeach()
2 changes: 2 additions & 0 deletions test/algorithms/detail/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
# Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
# http://www.boost.org/LICENSE_1_0.txt)

add_subdirectory(sections)

foreach(item IN ITEMS
calculate_point_order
approximately_equals
Expand Down
13 changes: 13 additions & 0 deletions test/algorithms/detail/sections/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Boost.Geometry
# Copyright (c) 2024 Barend Gehrels, Amsterdam, the Netherlands.
# Use, modification and distribution is subject to the Boost Software License,
# Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
# http://www.boost.org/LICENSE_1_0.txt)

foreach(item IN ITEMS
sectionalize
sectionalize_const
range_by_section
)
boost_geometry_add_unit_test("algorithms" ${item})
endforeach()
21 changes: 21 additions & 0 deletions test/algorithms/disjoint/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Boost.Geometry
# Copyright (c) 2024 Barend Gehrels, Amsterdam, the Netherlands.
# Use, modification and distribution is subject to the Boost Software License,
# Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
# http://www.boost.org/LICENSE_1_0.txt)

foreach(item IN ITEMS
disjoint
disjoint_coverage_a_a
disjoint_coverage_l_a
disjoint_coverage_l_l
disjoint_coverage_p_a
disjoint_coverage_p_l
disjoint_coverage_p_p
disjoint_multi
disjoint_point_box_geometry
disjoint_seg_box
disjoint_sph
)
boost_geometry_add_unit_test("algorithms" ${item})
endforeach()
25 changes: 25 additions & 0 deletions test/algorithms/distance/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Boost.Geometry
# Copyright (c) 2024 Barend Gehrels, Amsterdam, the Netherlands.
# Use, modification and distribution is subject to the Boost Software License,
# Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
# http://www.boost.org/LICENSE_1_0.txt)

foreach(item IN ITEMS
distance
distance_ca_ar_ar
distance_ca_l_ar
distance_ca_l_l
distance_ca_pl_ar
distance_ca_pl_l
distance_ca_pl_pl
distance_se_geo_ar_ar
distance_se_geo_l_ar
distance_se_geo_l_l
distance_se_geo_pl_ar
distance_geo_pl_l
distance_se_geo_pl_pl
distance_se_pl_l
distance_se_pl_pl
)
boost_geometry_add_unit_test("algorithms" ${item})
endforeach()
15 changes: 15 additions & 0 deletions test/algorithms/equals/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Boost.Geometry
# Copyright (c) 2024 Barend Gehrels, Amsterdam, the Netherlands.
# Use, modification and distribution is subject to the Boost Software License,
# Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
# http://www.boost.org/LICENSE_1_0.txt)

foreach(item IN ITEMS
equals
equals_gc
equals_multi
equals_on_spheroid
equals_sph
)
boost_geometry_add_unit_test("algorithms" ${item})
endforeach()
16 changes: 16 additions & 0 deletions test/algorithms/intersects/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Boost.Geometry
# Copyright (c) 2024 Barend Gehrels, Amsterdam, the Netherlands.
# Use, modification and distribution is subject to the Boost Software License,
# Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
# http://www.boost.org/LICENSE_1_0.txt)

foreach(item IN ITEMS
intersects
intersects_box_geometry
intersects_multi
intersects_self
intersects_sph_geo
intersects_sph
)
boost_geometry_add_unit_test("algorithms" ${item})
endforeach()
14 changes: 14 additions & 0 deletions test/algorithms/length/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Boost.Geometry
# Copyright (c) 2024 Barend Gehrels, Amsterdam, the Netherlands.
# Use, modification and distribution is subject to the Boost Software License,
# Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
# http://www.boost.org/LICENSE_1_0.txt)

foreach(item IN ITEMS
length
length_multi
length_sph
length_geo
)
boost_geometry_add_unit_test("algorithms" ${item})
endforeach()
15 changes: 15 additions & 0 deletions test/algorithms/overlaps/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Boost.Geometry
# Copyright (c) 2024 Barend Gehrels, Amsterdam, the Netherlands.
# Use, modification and distribution is subject to the Boost Software License,
# Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
# http://www.boost.org/LICENSE_1_0.txt)

foreach(item IN ITEMS
overlaps
overlaps_areal
overlaps_box
overlaps_gc
overlaps_sph
)
boost_geometry_add_unit_test("algorithms" ${item})
endforeach()
15 changes: 15 additions & 0 deletions test/algorithms/perimeter/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Boost.Geometry
# Copyright (c) 2024 Barend Gehrels, Amsterdam, the Netherlands.
# Use, modification and distribution is subject to the Boost Software License,
# Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
# http://www.boost.org/LICENSE_1_0.txt)

foreach(item IN ITEMS
perimeter
perimeter_base
perimeter_multi
perimeter_geo
perimeter_sph
)
boost_geometry_add_unit_test("algorithms" ${item})
endforeach()
2 changes: 2 additions & 0 deletions test/algorithms/perimeter/Jamfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
test-suite boost-geometry-algorithms-perimeter
:
[ run perimeter.cpp : : : : algorithms_perimeter ]
[ run perimeter_base.cpp : : : : algorithms_perimeter_base ]
[ run perimeter_multi.cpp : : : : algorithms_perimeter_multi ]
[ run perimeter_geo.cpp : : : : algorithms_perimeter_geo ]
[ run perimeter_sph.cpp : : : : algorithms_perimeter_sph ]
;
2 changes: 1 addition & 1 deletion test/algorithms/perimeter/perimeter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)

#include <algorithms/test_perimeter.hpp>
#include "test_perimeter.hpp"

#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/geometries/point_xy.hpp>

#include <algorithms/test_perimeter.hpp>
#include "test_perimeter.hpp"


template <typename P>
Expand Down
2 changes: 1 addition & 1 deletion test/algorithms/perimeter/perimeter_geo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)

#include <algorithms/test_perimeter.hpp>
#include "test_perimeter.hpp"
#include <algorithms/perimeter/perimeter_polygon_cases.hpp>

#include <boost/geometry/geometries/geometries.hpp>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#include <boost/geometry/geometries/polygon.hpp>
#include <boost/geometry/geometries/multi_polygon.hpp>

#include <algorithms/test_perimeter.hpp>
#include "test_perimeter.hpp"


template <typename P>
Expand Down
2 changes: 1 addition & 1 deletion test/algorithms/perimeter/perimeter_sph.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)

#include <algorithms/test_perimeter.hpp>
#include "test_perimeter.hpp"
#include <algorithms/perimeter/perimeter_polygon_cases.hpp>

#include <boost/geometry/geometries/geometries.hpp>
Expand Down
File renamed without changes.
12 changes: 12 additions & 0 deletions test/algorithms/similarity/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# Boost.Geometry
# Copyright (c) 2024 Barend Gehrels, Amsterdam, the Netherlands.
# Use, modification and distribution is subject to the Boost Software License,
# Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
# http://www.boost.org/LICENSE_1_0.txt)

foreach(item IN ITEMS
discrete_frechet_distance
discrete_hausdorff_distance
)
boost_geometry_add_unit_test("algorithms" ${item})
endforeach()
16 changes: 16 additions & 0 deletions test/algorithms/touches/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Boost.Geometry
# Copyright (c) 2024 Barend Gehrels, Amsterdam, the Netherlands.
# Use, modification and distribution is subject to the Boost Software License,
# Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
# http://www.boost.org/LICENSE_1_0.txt)

foreach(item IN ITEMS
touches
touches_box
touches_gc
touches_multi
touches_self
touches_sph
)
boost_geometry_add_unit_test("algorithms" ${item})
endforeach()

0 comments on commit 8b32d4b

Please sign in to comment.