feat: add remaining examples to cmake

boostorg · Sep 28, 2024 · 68bcb25 · 68bcb25
1 parent 532743b
commit 68bcb25
Show file tree

Hide file tree

Showing 19 changed files with 115 additions and 227 deletions.
diff --git a/doc/reference/algorithms/difference_inserter.qbk b/doc/reference/algorithms/difference_inserter.qbk
diff --git a/doc/src/examples/CMakeLists.txt b/doc/src/examples/CMakeLists.txt
@@ -33,6 +33,7 @@ foreach(item IN ITEMS
 endforeach()
 
 add_subdirectory(algorithms)
+add_subdirectory(arithmetic)
 add_subdirectory(core)
 add_subdirectory(geometries)
 add_subdirectory(io)

diff --git a/doc/src/examples/algorithms/CMakeLists.txt b/doc/src/examples/algorithms/CMakeLists.txt
@@ -65,9 +65,28 @@ foreach(item IN ITEMS
  union
  unique
  within
+
+ # Entries not present in Jamfile
+ # Some of them are used in the documentation, but not all of them.
+ assign_box_corners # uses detail, not used in documentation
+ assign_point_from_index # uses detail, not used in documentation
+ assign_point_to_index # uses detail, not used in documentation
+ azimuth
+ azimuth_strategy
+ covered_by
+ crosses
+ disjoint
+ intersection_poly_poly
+ intersects_segment
+ is_empty
+ make_with_range # uses detail, not used in documentation
+ overlaps
+ perimeter
+ simplify_insert # uses detail, not used in documentation
+ touches_one_geometry
+ touches_two_geometries
  )
 
  boost_geometry_add_example("algorithms" ${item})
 
 endforeach()
-
diff --git a/doc/src/examples/algorithms/assign_box_corners.cpp b/doc/src/examples/algorithms/assign_box_corners.cpp
@@ -27,7 +27,7 @@ int main()
  assign_values(b, 2, 2, 5, 5);
 
  point ll, lr, ul, ur;
- assign_box_corners(b, ll, lr, ul, ur);
+ detail::assign_box_corners(b, ll, lr, ul, ur);
 
  std::cout << "box: " << dsv(b) << std::endl << std::endl;
 

diff --git a/doc/src/examples/algorithms/assign_point_from_index.cpp b/doc/src/examples/algorithms/assign_point_from_index.cpp
@@ -27,8 +27,8 @@ int main()
  assign_values(s, 1, 1, 2, 2);
 
  point first, second;
- assign_point_from_index<0>(s, first);
- assign_point_from_index<1>(s, second);
+ detail::assign_point_from_index<0>(s, first);
+ detail::assign_point_from_index<1>(s, second);
  std::cout
  << "segment: " << dsv(s) << std::endl
  << "first: " << dsv(first) << std::endl

diff --git a/doc/src/examples/algorithms/assign_point_to_index.cpp b/doc/src/examples/algorithms/assign_point_to_index.cpp
@@ -26,8 +26,8 @@ int main()
  point lower_left(0, 0), upper_right(2, 2);
 
  box b;
- assign_point_to_index<0>(lower_left, b);
- assign_point_to_index<1>(upper_right, b);
+ detail::assign_point_to_index<0>(lower_left, b);
+ detail::assign_point_to_index<1>(upper_right, b);
  std::cout << "box: " << dsv(b) << std::endl;
 
  return 0;

diff --git a/doc/src/examples/algorithms/difference_inserter.cpp b/doc/src/examples/algorithms/difference_inserter.cpp
diff --git a/doc/src/examples/algorithms/intersects_segment.cpp b/doc/src/examples/algorithms/intersects_segment.cpp
@@ -20,14 +20,14 @@ int main()
 {
  // Calculate the intersects of a cartesian polygon
  using P = boost::geometry::model::d2::point_xy<double>;
- bg::model::linestring<P> line1, line2;
+ boost::geometry::model::linestring<P> line1, line2;
 
  boost::geometry::read_wkt("linestring(1 1,2 2)", line1);
  boost::geometry::read_wkt("linestring(2 1,1 2)", line2);
 
- bool b = boost::geometry::intersects(line1, line2);
+ bool intersects = boost::geometry::intersects(line1, line2);
 
- std::cout << "Intersects: " << (b ? "YES" : "NO") << std::endl;
+ std::cout << "Intersects: " << (intersects ? "YES" : "NO") << std::endl;
 
  return 0;
 }

diff --git a/doc/src/examples/algorithms/is_empty.cpp b/doc/src/examples/algorithms/is_empty.cpp
@@ -16,7 +16,6 @@
 #include <boost/geometry.hpp>
 #include <boost/geometry/geometries/point_xy.hpp>
 
-
 int main()
 {
  boost::geometry::model::multi_linestring

diff --git a/doc/src/examples/algorithms/simplify_insert.cpp b/doc/src/examples/algorithms/simplify_insert.cpp
@@ -18,18 +18,12 @@
 
 int main()
 {
- using P = boost::geometry::model::d2::point_xy<double>;
- using L = boost::geometry::model::linestring<P>;
-
- L line;
- line.push_back(P(1.1, 1.1));
- line.push_back(P(2.5, 2.1));
- line.push_back(P(3.1, 3.1));
- line.push_back(P(4.9, 1.1));
- line.push_back(P(3.1, 1.9));
+ using L = boost::geometry::model::linestring<boost::geometry::model::d2::point_xy<double>>;
 
+ L const line{{1.1, 1.1}, {2.5, 2.1}, {3.1, 3.1}, {4.9, 1.1}, {3.1, 1.9}};
  L simplified;
- boost::geometry::simplify_inserter(line, std::back_inserter(simplified), 0.5);
+
+ boost::geometry::detail::simplify::simplify_insert(line, std::back_inserter(simplified), 0.5);
 
  std::cout
  << " original: " << boost::geometry::dsv(line) << std::endl

diff --git a/doc/src/examples/algorithms/simplify_insert_with_strategy.cpp b/doc/src/examples/algorithms/simplify_insert_with_strategy.cpp
diff --git a/doc/src/examples/arithmetic/CMakeLists.txt b/doc/src/examples/arithmetic/CMakeLists.txt
@@ -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
+ cross_product
+ dot_product
+ )
+
+ boost_geometry_add_example("arithmetic" ${item})
+
+endforeach()
+
diff --git a/doc/src/examples/geometries/CMakeLists.txt b/doc/src/examples/geometries/CMakeLists.txt
@@ -22,3 +22,5 @@ foreach(item IN ITEMS
 
 endforeach()
 
+add_subdirectory(adapted)
+add_subdirectory(register)
diff --git a/doc/src/examples/geometries/adapted/CMakeLists.txt b/doc/src/examples/geometries/adapted/CMakeLists.txt
@@ -0,0 +1,20 @@
+# 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
+ boost_array
+ boost_fusion
+ boost_tuple
+ c_array
+ std_array
+ )
+
+ boost_geometry_add_example("geometries_adapted" ${item})
+
+endforeach()
+
+add_subdirectory(boost_range)
+
diff --git a/doc/src/examples/geometries/adapted/boost_range/CMakeLists.txt b/doc/src/examples/geometries/adapted/boost_range/CMakeLists.txt
@@ -0,0 +1,18 @@
+# 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
+ filtered
+ reversed
+ sliced
+ strided
+ # uniqued Fails to compile, also commented in Jamfile
+ )
+
+ boost_geometry_add_example("geometries_adapted_range" ${item})
+
+endforeach()
+
diff --git a/doc/src/examples/geometries/adapted/boost_range/sliced.cpp b/doc/src/examples/geometries/adapted/boost_range/sliced.cpp
@@ -19,15 +19,8 @@
 
 int main()
 {
- using namespace boost::assign;
-
  using xy = boost::geometry::model::d2::point_xy<int>;
- boost::geometry::model::linestring<xy> line;
- line += xy(0, 0);
- line += xy(1, 1);
- line += xy(2, 2);
- line += xy(3, 3);
- line += xy(4, 4);
+ boost::geometry::model::linestring<xy> line = {{0, 0}, {1, 1}, {2, 2}, {3, 3}, {4, 4}};
 
  std::cout
  << boost::geometry::dsv(line | boost::adaptors::sliced(1, 3)) << std::endl;

diff --git a/doc/src/examples/geometries/adapted/boost_range/strided.cpp b/doc/src/examples/geometries/adapted/boost_range/strided.cpp
@@ -19,17 +19,10 @@
 
 int main()
 {
- using namespace boost::assign;
  using boost::adaptors::strided;
 
  using xy = boost::geometry::model::d2::point_xy<int>;
- boost::geometry::model::ring<xy> ring;
- ring += xy(0, 0);
- ring += xy(0, 1);
- ring += xy(0, 2);
- ring += xy(1, 2);
- ring += xy(2, 2);
- ring += xy(2, 0);
+ boost::geometry::model::ring<xy> ring {{0, 0}, {0, 1}, {0, 2}, {1, 2}, {2, 2}, {2, 0}};
 
  boost::geometry::correct(ring);