Skip to content

Commit

Permalink
Merge branch 'master' into Kernel_23-Bbox_d-ign
Browse files Browse the repository at this point in the history
  • Loading branch information
afabri committed Aug 14, 2024
2 parents 0c9cb3d + 569b9eb commit b83bcc4
Show file tree
Hide file tree
Showing 733 changed files with 6,769 additions and 3,690 deletions.
2 changes: 1 addition & 1 deletion AABB_tree/benchmark/AABB_tree/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Created by the script cgal_create_cmake_script
# This is the CMake script for compiling a CGAL application.

cmake_minimum_required(VERSION 3.1...3.23)
cmake_minimum_required(VERSION 3.12...3.29)
project(AABB_traits_benchmark)

find_package(CGAL REQUIRED OPTIONAL_COMPONENTS Core)
Expand Down
2 changes: 1 addition & 1 deletion AABB_tree/demo/AABB_tree/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This is the CMake script for compiling the AABB tree demo.

cmake_minimum_required(VERSION 3.1...3.23)
cmake_minimum_required(VERSION 3.12...3.29)
project(AABB_tree_Demo)

# Find includes in corresponding build directories
Expand Down
2 changes: 1 addition & 1 deletion AABB_tree/examples/AABB_tree/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Created by the script cgal_create_cmake_script
# This is the CMake script for compiling a CGAL application.

cmake_minimum_required(VERSION 3.1...3.23)
cmake_minimum_required(VERSION 3.12...3.29)
project(AABB_tree_Examples)

find_package(CGAL REQUIRED)
Expand Down
2 changes: 1 addition & 1 deletion AABB_tree/test/AABB_tree/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Created by the script cgal_create_cmake_script
# This is the CMake script for compiling a CGAL application.

cmake_minimum_required(VERSION 3.1...3.23)
cmake_minimum_required(VERSION 3.12...3.29)
project(AABB_tree_Tests)

find_package(CGAL REQUIRED)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Created by the script cgal_create_cmake_script
# This is the CMake script for compiling a CGAL application.

cmake_minimum_required(VERSION 3.1...3.23)
cmake_minimum_required(VERSION 3.12...3.29)
project(Advancing_front_surface_reconstruction_Examples)

find_package(CGAL REQUIRED)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ int main (int argc, char* argv[])

Efficient_ransac ransac;
ransac.set_input(points);
ransac.add_shape_factory<Plane>(); // Only planes are useful for stucturing
ransac.add_shape_factory<Plane>(); // Only planes are useful for structuring

// Default RANSAC parameters
Efficient_ransac::Parameters op;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Created by the script cgal_create_cmake_script
# This is the CMake script for compiling a CGAL application.

cmake_minimum_required(VERSION 3.1...3.23)
cmake_minimum_required(VERSION 3.12...3.29)
project(Advancing_front_surface_reconstruction_Tests)

find_package(CGAL REQUIRED)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Created by the script cgal_create_cmake_script
# This is the CMake script for compiling a CGAL application.

cmake_minimum_required(VERSION 3.1...3.23)
cmake_minimum_required(VERSION 3.12...3.29)
project(Algebraic_foundations_Examples)

find_package(CGAL REQUIRED)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Created by the script cgal_create_cmake_script
# This is the CMake script for compiling a CGAL application.

cmake_minimum_required(VERSION 3.1...3.23)
cmake_minimum_required(VERSION 3.12...3.29)
project(Algebraic_foundations_Tests)

find_package(CGAL REQUIRED COMPONENTS Core)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.1...3.23)
cmake_minimum_required(VERSION 3.12...3.29)
project(Algebraic_kernel_d_Examples)

find_package(CGAL REQUIRED COMPONENTS Core)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1811,7 +1811,7 @@ class Algebraic_curve_kernel_2 : public AlgebraicKernel_d_1{
* An x-critical point (x,y) of \c f (or its induced curve)
* satisfies f(x,y) = f_y(x,y) = 0,
* where f_y means the derivative w.r.t. y.
* In pariticular, each singular point is x-critical.
* In particular, each singular point is x-critical.
*/
class X_critical_points_2 :
public CGAL::cpp98::binary_function< Curve_analysis_2,
Expand Down Expand Up @@ -1890,7 +1890,7 @@ class Algebraic_curve_kernel_2 : public AlgebraicKernel_d_1{
* An y-critical point (x,y) of \c f (or its induced curve)
* satisfies f(x,y) = f_x(x,y) = 0,
* where f_x means the derivative w.r.t. x.
* In pariticular, each singular point is y-critical.
* In particular, each singular point is y-critical.
*/
class Y_critical_points_2 :
public CGAL::cpp98::binary_function< Curve_analysis_2,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1153,7 +1153,7 @@ class Bitstream_descartes
/*!
* \brief Constructor for a polynomial \c f
*
* See the documentation of the constrctor
* See the documentation of the constructor
* with \c Square_free_descartes_tag
*/
Bitstream_descartes(Polynomial f,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ class Status_line_CA_1_rep {
//! curve has vertical line at this x-coordinate
mutable bool _m_vertical_line;

//! decsribes an event
//! describes an event
mutable bool _m_event;

//! number of arcs running down the pole
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ void algebraic_number_test()

//simplify
{
// just a synatx check
// just a syntax check
Algebraic_real_d_1(P_s2510,1,2).simplify();
}
}
Expand Down
2 changes: 1 addition & 1 deletion Algebraic_kernel_d/test/Algebraic_kernel_d/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.1...3.23)
cmake_minimum_required(VERSION 3.12...3.29)
project(Algebraic_kernel_d_Tests)

# CGAL and its components
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Created by the script cgal_create_cmake_script
# This is the CMake script for compiling a CGAL application.

cmake_minimum_required(VERSION 3.1...3.23)
cmake_minimum_required(VERSION 3.12...3.29)
project(Algebraic_kernel_for_circles_Tests)

find_package(CGAL REQUIRED)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Created by the script cgal_create_cmake_script
# This is the CMake script for compiling a CGAL application.

cmake_minimum_required(VERSION 3.1...3.23)
cmake_minimum_required(VERSION 3.12...3.29)
project(Algebraic_kernel_for_spheres_Tests)

find_package(CGAL REQUIRED)
Expand Down
2 changes: 1 addition & 1 deletion Alpha_shapes_2/examples/Alpha_shapes_2/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Created by the script cgal_create_cmake_script
# This is the CMake script for compiling a CGAL application.

cmake_minimum_required(VERSION 3.1...3.23)
cmake_minimum_required(VERSION 3.12...3.29)
project(Alpha_shapes_2_Examples)

find_package(CGAL REQUIRED)
Expand Down
2 changes: 1 addition & 1 deletion Alpha_shapes_2/test/Alpha_shapes_2/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Created by the script cgal_create_cmake_script
# This is the CMake script for compiling a CGAL application.

cmake_minimum_required(VERSION 3.1...3.23)
cmake_minimum_required(VERSION 3.12...3.29)
project(Alpha_shapes_2_Tests)

find_package(CGAL REQUIRED)
Expand Down
2 changes: 1 addition & 1 deletion Alpha_shapes_3/demo/Alpha_shapes_3/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Created by the script cgal_create_cmake_script
# This is the CMake script for compiling a CGAL application.

cmake_minimum_required(VERSION 3.1...3.23)
cmake_minimum_required(VERSION 3.12...3.29)
project(Alpha_shapes_3_Demo)

# Find includes in corresponding build directories
Expand Down
2 changes: 1 addition & 1 deletion Alpha_shapes_3/examples/Alpha_shapes_3/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Created by the script cgal_create_cmake_script
# This is the CMake script for compiling a CGAL application.

cmake_minimum_required(VERSION 3.1...3.23)
cmake_minimum_required(VERSION 3.12...3.29)
project(Alpha_shapes_3_Examples)

find_package(CGAL REQUIRED)
Expand Down
2 changes: 1 addition & 1 deletion Alpha_shapes_3/test/Alpha_shapes_3/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Created by the script cgal_create_cmake_script
# This is the CMake script for compiling a CGAL application.

cmake_minimum_required(VERSION 3.1...3.23)
cmake_minimum_required(VERSION 3.12...3.29)
project(Alpha_shapes_3_Tests)

find_package(CGAL REQUIRED)
Expand Down
2 changes: 1 addition & 1 deletion Alpha_wrap_3/benchmark/Alpha_wrap_3/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Created by the script cgal_create_cmake_script
# This is the CMake script for compiling a CGAL application.

cmake_minimum_required(VERSION 3.1...3.20)
cmake_minimum_required(VERSION 3.12...3.29)
project(Alpha_wrap_3_Benchmark)

find_package(CGAL REQUIRED)
Expand Down
2 changes: 1 addition & 1 deletion Alpha_wrap_3/examples/Alpha_wrap_3/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Created by the script cgal_create_cmake_script
# This is the CMake script for compiling a CGAL application.

cmake_minimum_required(VERSION 3.1...3.23)
cmake_minimum_required(VERSION 3.12...3.29)
project(Alpha_wrap_3_Examples)

find_package(CGAL REQUIRED)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1191,7 +1191,7 @@ class Alpha_wrapper_3

if(refining)
{
// If we are re-using the triangulation, change the label of the extra elements
// If we are reusing the triangulation, change the label of the extra elements
// that we have added to ensure a manifold result back to external ("manifold" -> "outside")
reset_manifold_labels();

Expand Down
2 changes: 1 addition & 1 deletion Alpha_wrap_3/test/Alpha_wrap_3/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Created by the script cgal_create_cmake_script
# This is the CMake script for compiling a CGAL application.

cmake_minimum_required(VERSION 3.1...3.23)
cmake_minimum_required(VERSION 3.12...3.29)
project(Alpha_wrap_3_Tests)

find_package(CGAL REQUIRED)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Created by the script cgal_create_cmake_script
# This is the CMake script for compiling a CGAL application.

cmake_minimum_required(VERSION 3.1...3.23)
cmake_minimum_required(VERSION 3.12...3.29)
project(Apollonius_graph_2_Examples)

find_package(CGAL REQUIRED COMPONENTS Core)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ namespace ApolloniusGraph_2 {


//--------------------------------------------------------------------
// help functions for the compulation of various quantites
// help functions for the compulation of various quantities

template < class FT >
inline FT
Expand Down
2 changes: 1 addition & 1 deletion Apollonius_graph_2/test/Apollonius_graph_2/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Created by the script cgal_create_cmake_script
# This is the CMake script for compiling a CGAL application.

cmake_minimum_required(VERSION 3.1...3.23)
cmake_minimum_required(VERSION 3.12...3.29)
project(Apollonius_graph_2_Tests)

find_package(CGAL REQUIRED)
Expand Down
2 changes: 1 addition & 1 deletion Arithmetic_kernel/test/Arithmetic_kernel/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Created by the script cgal_create_cmake_script
# This is the CMake script for compiling a CGAL application.

cmake_minimum_required(VERSION 3.1...3.23)
cmake_minimum_required(VERSION 3.12...3.29)
project(Arithmetic_kernel_Tests)

find_package(CGAL REQUIRED COMPONENTS Core)
Expand Down
4 changes: 2 additions & 2 deletions Arrangement_on_surface_2/TODO
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
another chapter on "2D Arrangements on General Surfaces".
This chapter can be much shorter, as all you can do with arrangements was
explained and demonstrated in the "2D Arrangements" chapter. We should
however intorduce the concept of TopologyTraits, and re-interpret the
however introduce the concept of TopologyTraits, and re-interpret the
functionality of the GeometryTraits.

- Incoorporate:
Expand Down Expand Up @@ -98,7 +98,7 @@
- The "planar" zone visitor is also used here. I believe this should work,
as it is generic enough (I hope).
Can you test it by trying to incrementally insert curves to an
arrrangement on a sphere.
arrangement on a sphere.

- We can think of adding a test for the spherical topology, similar to the
construction test developed by Baruch: Namely read n curves from a file,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ int main (int argc, char *argv[])
std::cerr << "Usage: " << argv[0] << " <file name> <method>"
<< std::endl
<< "method is either:" << std::endl
<< " -a for aggragated insertion;" << std::endl
<< " -a for aggregated insertion;" << std::endl
<< " -n for incremental insertion with naive point-location;"
<< std::endl
<< " -w for incremental insertion with walk point-location."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// of line segments it reads from a file.
//
// Usage: seg_arr <-a | -n | -w> <input file>
// Where: -a -- Use aggragated insertion (sweep-line);
// Where: -a -- Use aggregated insertion (sweep-line);
// -n -- Use incremental insertion with naive point-location;
// -w -- Use incremental insertion with walk point-location.
//
Expand Down Expand Up @@ -70,7 +70,7 @@ int main (int argc, char **argv)
std::cerr << "Usage: " << argv[0] << " <file name> <method> [format]"
<< std::endl
<< "method is either:" << std::endl
<< " -a for aggragated insertion;" << std::endl
<< " -a for aggregated insertion;" << std::endl
<< " -n for incremental insertion with naive point-location;"
<< std::endl
<< " -w for incremental insertion with walk point-location."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// of line segments it reads from a file.
//
// Usage: seg_arr <-a | -n | -w> <input file>
// Where: -a -- Use aggragated insertion (sweep-line);
// Where: -a -- Use aggregated insertion (sweep-line);
// -n -- Use incremental insertion with naive point-location;
// -w -- Use incremental insertion with walk point-location.
//
Expand Down Expand Up @@ -70,7 +70,7 @@ int main (int argc, char **argv)
std::cerr << "Usage: " << argv[0] << " <file name> <method> [format]"
<< std::endl
<< "method is either:" << std::endl
<< " -a for aggragated insertion;" << std::endl
<< " -a for aggregated insertion;" << std::endl
<< " -n for incremental insertion with naive point-location;"
<< std::endl
<< " -s for incremental insertion with simple point-location;"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This is the CMake script for compiling a CGAL application.

cmake_minimum_required(VERSION 3.1...3.23)
cmake_minimum_required(VERSION 3.12...3.29)
project(Arrangement_on_surface_2_Demo)

if(NOT POLICY CMP0070 AND POLICY CMP0053)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

class QGraphicsScene;

// Genereic `Arr_compute_y_at_x_2`
// Generic `Arr_compute_y_at_x_2`
template <typename Traits_>
class Arr_compute_y_at_x_2 : public GraphicsSceneMixin {
public:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
using json = nlohmann::ordered_json;

namespace {
// use this traits everytime you construct an arrangment!
// use this traits every time you construct an arrangement!
static Geom_traits s_traits;

// Extended DCEL & Arrangement
Expand Down Expand Up @@ -726,7 +726,7 @@ void Aos::save_arr(Kml::Placemarks& placemarks, const std::string& file_name) {

////////////////////////////////////////////////////////////////////////////
// CURVES
// define a map from each curve to its position in the arrangment
// define a map from each curve to its position in the arrangement
auto& js_curves = js["curves"] = json::array();
using Ext_curve = Ext_aos::X_monotone_curve_2;
std::map<Ext_curve*, std::size_t> curve_pos_map;
Expand Down Expand Up @@ -909,7 +909,7 @@ void Aos::save_arr(Kml::Placemarks& placemarks, const std::string& file_name) {
}
std::cout << "total num half-edges = " << total_num_half_edges << std::endl;

// save the arrangment
// save the arrangement
std::ofstream ofile(file_name);
ofile << js.dump(2);
ofile.close();
Expand Down
Loading

0 comments on commit b83bcc4

Please sign in to comment.