mirror of https://github.com/CGAL/cgal
Merge remote-tracking branch 'cgal/master' into Kernel_23-Fix_dangling_ref_in_CC3-GF
This commit is contained in:
commit
f9001833b1
|
|
@ -0,0 +1,35 @@
|
||||||
|
---
|
||||||
|
Language: Cpp
|
||||||
|
BasedOnStyle: LLVM
|
||||||
|
AccessModifierOffset: -2
|
||||||
|
AllowShortFunctionsOnASingleLine: true
|
||||||
|
BinPackParameters: false
|
||||||
|
BreakConstructorInitializers: BeforeComma
|
||||||
|
BreakBeforeBraces: Custom
|
||||||
|
BraceWrapping:
|
||||||
|
AfterCaseLabel: false
|
||||||
|
AfterClass: true
|
||||||
|
AfterControlStatement: MultiLine
|
||||||
|
AfterEnum: false
|
||||||
|
AfterFunction: false
|
||||||
|
AfterNamespace: false
|
||||||
|
AfterObjCDeclaration: false
|
||||||
|
AfterStruct: true
|
||||||
|
AfterUnion: false
|
||||||
|
AfterExternBlock: false
|
||||||
|
BeforeCatch: false
|
||||||
|
BeforeElse: false
|
||||||
|
BeforeLambdaBody: false
|
||||||
|
BeforeWhile: false
|
||||||
|
IndentBraces: false
|
||||||
|
SplitEmptyFunction: false
|
||||||
|
SplitEmptyRecord: false
|
||||||
|
SplitEmptyNamespace: false
|
||||||
|
ColumnLimit: 120
|
||||||
|
# Force pointers to the type for C++.
|
||||||
|
DerivePointerAlignment: false
|
||||||
|
PointerAlignment: Left
|
||||||
|
# Control the spaces around conditionals
|
||||||
|
SpacesInConditionalStatement: false
|
||||||
|
SpaceBeforeParens: false
|
||||||
|
...
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
# Created by the script cgal_create_cmake_script
|
# Created by the script cgal_create_cmake_script
|
||||||
# This is the CMake script for compiling a CGAL application.
|
# This is the CMake script for compiling a CGAL application.
|
||||||
|
|
||||||
cmake_minimum_required(VERSION 3.12...3.29)
|
cmake_minimum_required(VERSION 3.12...3.31)
|
||||||
project(AABB_traits_benchmark)
|
project(AABB_traits_benchmark)
|
||||||
|
|
||||||
find_package(CGAL REQUIRED OPTIONAL_COMPONENTS Core)
|
find_package(CGAL REQUIRED OPTIONAL_COMPONENTS Core)
|
||||||
|
|
@ -13,7 +13,7 @@ create_single_source_cgal_program("tree_construction.cpp")
|
||||||
find_package(benchmark QUIET)
|
find_package(benchmark QUIET)
|
||||||
if(benchmark_FOUND)
|
if(benchmark_FOUND)
|
||||||
create_single_source_cgal_program("tree_creation.cpp")
|
create_single_source_cgal_program("tree_creation.cpp")
|
||||||
target_link_libraries(tree_creation benchmark::benchmark)
|
target_link_libraries(tree_creation PRIVATE benchmark::benchmark)
|
||||||
else()
|
else()
|
||||||
message(STATUS "NOTICE: The benchmark 'tree_creation.cpp' requires the Google benchmark library, and will not be compiled.")
|
message(STATUS "NOTICE: The benchmark 'tree_creation.cpp' requires the Google benchmark library, and will not be compiled.")
|
||||||
endif()
|
endif()
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
# This is the CMake script for compiling the AABB tree demo.
|
# This is the CMake script for compiling the AABB tree demo.
|
||||||
|
|
||||||
cmake_minimum_required(VERSION 3.12...3.29)
|
cmake_minimum_required(VERSION 3.12...3.31)
|
||||||
project(AABB_tree_Demo)
|
project(AABB_tree_Demo)
|
||||||
|
|
||||||
# Find includes in corresponding build directories
|
# Find includes in corresponding build directories
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
# Created by the script cgal_create_cmake_script
|
# Created by the script cgal_create_cmake_script
|
||||||
# This is the CMake script for compiling a CGAL application.
|
# This is the CMake script for compiling a CGAL application.
|
||||||
|
|
||||||
cmake_minimum_required(VERSION 3.12...3.29)
|
cmake_minimum_required(VERSION 3.12...3.31)
|
||||||
project(AABB_tree_Examples)
|
project(AABB_tree_Examples)
|
||||||
|
|
||||||
find_package(CGAL REQUIRED)
|
find_package(CGAL REQUIRED)
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
# Created by the script cgal_create_cmake_script
|
# Created by the script cgal_create_cmake_script
|
||||||
# This is the CMake script for compiling a CGAL application.
|
# This is the CMake script for compiling a CGAL application.
|
||||||
|
|
||||||
cmake_minimum_required(VERSION 3.12...3.29)
|
cmake_minimum_required(VERSION 3.12...3.31)
|
||||||
project(AABB_tree_Tests)
|
project(AABB_tree_Tests)
|
||||||
|
|
||||||
find_package(CGAL REQUIRED)
|
find_package(CGAL REQUIRED)
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
# Created by the script cgal_create_cmake_script
|
# Created by the script cgal_create_cmake_script
|
||||||
# This is the CMake script for compiling a CGAL application.
|
# This is the CMake script for compiling a CGAL application.
|
||||||
|
|
||||||
cmake_minimum_required(VERSION 3.12...3.29)
|
cmake_minimum_required(VERSION 3.12...3.31)
|
||||||
project(Advancing_front_surface_reconstruction_Examples)
|
project(Advancing_front_surface_reconstruction_Examples)
|
||||||
|
|
||||||
find_package(CGAL REQUIRED)
|
find_package(CGAL REQUIRED)
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
# Created by the script cgal_create_cmake_script
|
# Created by the script cgal_create_cmake_script
|
||||||
# This is the CMake script for compiling a CGAL application.
|
# This is the CMake script for compiling a CGAL application.
|
||||||
|
|
||||||
cmake_minimum_required(VERSION 3.12...3.29)
|
cmake_minimum_required(VERSION 3.12...3.31)
|
||||||
project(Advancing_front_surface_reconstruction_Tests)
|
project(Advancing_front_surface_reconstruction_Tests)
|
||||||
|
|
||||||
find_package(CGAL REQUIRED)
|
find_package(CGAL REQUIRED)
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,6 @@
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
\addtogroup PkgAlgebraicFoundationsRef
|
\addtogroup PkgAlgebraicFoundationsRef
|
||||||
\todo check generated documentation
|
|
||||||
|
|
||||||
\cgalPkgDescriptionBegin{Algebraic Foundations,PkgAlgebraicFoundations}
|
\cgalPkgDescriptionBegin{Algebraic Foundations,PkgAlgebraicFoundations}
|
||||||
\cgalPkgPicture{Algebraic_foundations2.png}
|
\cgalPkgPicture{Algebraic_foundations2.png}
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
# Created by the script cgal_create_cmake_script
|
# Created by the script cgal_create_cmake_script
|
||||||
# This is the CMake script for compiling a CGAL application.
|
# This is the CMake script for compiling a CGAL application.
|
||||||
|
|
||||||
cmake_minimum_required(VERSION 3.12...3.29)
|
cmake_minimum_required(VERSION 3.12...3.31)
|
||||||
project(Algebraic_foundations_Examples)
|
project(Algebraic_foundations_Examples)
|
||||||
|
|
||||||
find_package(CGAL REQUIRED)
|
find_package(CGAL REQUIRED)
|
||||||
|
|
|
||||||
|
|
@ -21,6 +21,7 @@
|
||||||
#include <CGAL/Algebraic_structure_traits.h>
|
#include <CGAL/Algebraic_structure_traits.h>
|
||||||
#include <CGAL/Real_embeddable_traits.h>
|
#include <CGAL/Real_embeddable_traits.h>
|
||||||
#include <CGAL/Kernel/Same_uncertainty.h>
|
#include <CGAL/Kernel/Same_uncertainty.h>
|
||||||
|
#include <boost/mpl/if.hpp>
|
||||||
|
|
||||||
namespace CGAL {
|
namespace CGAL {
|
||||||
CGAL_NTS_BEGIN_NAMESPACE
|
CGAL_NTS_BEGIN_NAMESPACE
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
# Created by the script cgal_create_cmake_script
|
# Created by the script cgal_create_cmake_script
|
||||||
# This is the CMake script for compiling a CGAL application.
|
# This is the CMake script for compiling a CGAL application.
|
||||||
|
|
||||||
cmake_minimum_required(VERSION 3.12...3.29)
|
cmake_minimum_required(VERSION 3.12...3.31)
|
||||||
project(Algebraic_foundations_Tests)
|
project(Algebraic_foundations_Tests)
|
||||||
|
|
||||||
find_package(CGAL REQUIRED COMPONENTS Core)
|
find_package(CGAL REQUIRED COMPONENTS Core)
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,6 @@
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
\addtogroup PkgAlgebraicKernelDRef
|
\addtogroup PkgAlgebraicKernelDRef
|
||||||
\todo check generated documentation
|
|
||||||
\cgalPkgDescriptionBegin{Algebraic Kernel,PkgAlgebraicKernelD}
|
\cgalPkgDescriptionBegin{Algebraic Kernel,PkgAlgebraicKernelD}
|
||||||
\cgalPkgPicture{Algebraic_kernel_d.png}
|
\cgalPkgPicture{Algebraic_kernel_d.png}
|
||||||
\cgalPkgSummaryBegin
|
\cgalPkgSummaryBegin
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
cmake_minimum_required(VERSION 3.12...3.29)
|
cmake_minimum_required(VERSION 3.12...3.31)
|
||||||
project(Algebraic_kernel_d_Examples)
|
project(Algebraic_kernel_d_Examples)
|
||||||
|
|
||||||
find_package(CGAL REQUIRED COMPONENTS Core)
|
find_package(CGAL REQUIRED COMPONENTS Core)
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
cmake_minimum_required(VERSION 3.12...3.29)
|
cmake_minimum_required(VERSION 3.12...3.31)
|
||||||
project(Algebraic_kernel_d_Tests)
|
project(Algebraic_kernel_d_Tests)
|
||||||
|
|
||||||
# CGAL and its components
|
# CGAL and its components
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
# Created by the script cgal_create_cmake_script
|
# Created by the script cgal_create_cmake_script
|
||||||
# This is the CMake script for compiling a CGAL application.
|
# This is the CMake script for compiling a CGAL application.
|
||||||
|
|
||||||
cmake_minimum_required(VERSION 3.12...3.29)
|
cmake_minimum_required(VERSION 3.12...3.31)
|
||||||
project(Algebraic_kernel_for_circles_Tests)
|
project(Algebraic_kernel_for_circles_Tests)
|
||||||
|
|
||||||
find_package(CGAL REQUIRED)
|
find_package(CGAL REQUIRED)
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
# Created by the script cgal_create_cmake_script
|
# Created by the script cgal_create_cmake_script
|
||||||
# This is the CMake script for compiling a CGAL application.
|
# This is the CMake script for compiling a CGAL application.
|
||||||
|
|
||||||
cmake_minimum_required(VERSION 3.12...3.29)
|
cmake_minimum_required(VERSION 3.12...3.31)
|
||||||
project(Algebraic_kernel_for_spheres_Tests)
|
project(Algebraic_kernel_for_spheres_Tests)
|
||||||
|
|
||||||
find_package(CGAL REQUIRED)
|
find_package(CGAL REQUIRED)
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
# Created by the script cgal_create_cmake_script
|
# Created by the script cgal_create_cmake_script
|
||||||
# This is the CMake script for compiling a CGAL application.
|
# This is the CMake script for compiling a CGAL application.
|
||||||
|
|
||||||
cmake_minimum_required(VERSION 3.12...3.29)
|
cmake_minimum_required(VERSION 3.12...3.31)
|
||||||
project(Alpha_shapes_2_Examples)
|
project(Alpha_shapes_2_Examples)
|
||||||
|
|
||||||
find_package(CGAL REQUIRED)
|
find_package(CGAL REQUIRED)
|
||||||
|
|
|
||||||
|
|
@ -1442,7 +1442,7 @@ Alpha_shape_2<Dt,EACT>::find_alpha_solid() const
|
||||||
// takes O(#alpha_shape) time
|
// takes O(#alpha_shape) time
|
||||||
Type_of_alpha alpha_solid = 0;
|
Type_of_alpha alpha_solid = 0;
|
||||||
|
|
||||||
if (number_of_vertices()<3) return alpha_solid;
|
if (dimension()!=2) return alpha_solid;
|
||||||
|
|
||||||
Finite_vertices_iterator vertex_it;
|
Finite_vertices_iterator vertex_it;
|
||||||
// only finite vertices
|
// only finite vertices
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
# Created by the script cgal_create_cmake_script
|
# Created by the script cgal_create_cmake_script
|
||||||
# This is the CMake script for compiling a CGAL application.
|
# This is the CMake script for compiling a CGAL application.
|
||||||
|
|
||||||
cmake_minimum_required(VERSION 3.12...3.29)
|
cmake_minimum_required(VERSION 3.12...3.31)
|
||||||
project(Alpha_shapes_2_Tests)
|
project(Alpha_shapes_2_Tests)
|
||||||
|
|
||||||
find_package(CGAL REQUIRED)
|
find_package(CGAL REQUIRED)
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
# Created by the script cgal_create_cmake_script
|
# Created by the script cgal_create_cmake_script
|
||||||
# This is the CMake script for compiling a CGAL application.
|
# This is the CMake script for compiling a CGAL application.
|
||||||
|
|
||||||
cmake_minimum_required(VERSION 3.12...3.29)
|
cmake_minimum_required(VERSION 3.12...3.31)
|
||||||
project(Alpha_shapes_3_Demo)
|
project(Alpha_shapes_3_Demo)
|
||||||
|
|
||||||
# Find includes in corresponding build directories
|
# Find includes in corresponding build directories
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
# Created by the script cgal_create_cmake_script
|
# Created by the script cgal_create_cmake_script
|
||||||
# This is the CMake script for compiling a CGAL application.
|
# This is the CMake script for compiling a CGAL application.
|
||||||
|
|
||||||
cmake_minimum_required(VERSION 3.12...3.29)
|
cmake_minimum_required(VERSION 3.12...3.31)
|
||||||
project(Alpha_shapes_3_Examples)
|
project(Alpha_shapes_3_Examples)
|
||||||
|
|
||||||
find_package(CGAL REQUIRED)
|
find_package(CGAL REQUIRED)
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
# Created by the script cgal_create_cmake_script
|
# Created by the script cgal_create_cmake_script
|
||||||
# This is the CMake script for compiling a CGAL application.
|
# This is the CMake script for compiling a CGAL application.
|
||||||
|
|
||||||
cmake_minimum_required(VERSION 3.12...3.29)
|
cmake_minimum_required(VERSION 3.12...3.31)
|
||||||
project(Alpha_shapes_3_Tests)
|
project(Alpha_shapes_3_Tests)
|
||||||
|
|
||||||
find_package(CGAL REQUIRED)
|
find_package(CGAL REQUIRED)
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
# Created by the script cgal_create_cmake_script
|
# Created by the script cgal_create_cmake_script
|
||||||
# This is the CMake script for compiling a CGAL application.
|
# This is the CMake script for compiling a CGAL application.
|
||||||
|
|
||||||
cmake_minimum_required(VERSION 3.12...3.29)
|
cmake_minimum_required(VERSION 3.12...3.31)
|
||||||
project(Alpha_wrap_3_Benchmark)
|
project(Alpha_wrap_3_Benchmark)
|
||||||
|
|
||||||
find_package(CGAL REQUIRED)
|
find_package(CGAL REQUIRED)
|
||||||
|
|
|
||||||
|
|
@ -75,7 +75,7 @@ double mean_min_angle(const Mesh& mesh)
|
||||||
const Triangle_3 tr = surface_mesh_face_to_triangle(f, mesh);
|
const Triangle_3 tr = surface_mesh_face_to_triangle(f, mesh);
|
||||||
std::array<FT, 3> angles = triangle_angles(tr);
|
std::array<FT, 3> angles = triangle_angles(tr);
|
||||||
|
|
||||||
FT min_angle = std::min({angles[0], angles[1], angles[2]});
|
FT min_angle = (std::min)({angles[0], angles[1], angles[2]});
|
||||||
|
|
||||||
min_angle = min_angle * (180.0 / CGAL_PI);
|
min_angle = min_angle * (180.0 / CGAL_PI);
|
||||||
mean_min_angle += min_angle;
|
mean_min_angle += min_angle;
|
||||||
|
|
@ -93,7 +93,7 @@ double mean_max_angle(const Mesh& mesh)
|
||||||
const Triangle_3 tr = surface_mesh_face_to_triangle(f, mesh);
|
const Triangle_3 tr = surface_mesh_face_to_triangle(f, mesh);
|
||||||
std::array<FT, 3> angles = triangle_angles(tr);
|
std::array<FT, 3> angles = triangle_angles(tr);
|
||||||
|
|
||||||
FT max_angle = std::max({angles[0], angles[1], angles[2]});
|
FT max_angle = (std::max)({angles[0], angles[1], angles[2]});
|
||||||
|
|
||||||
max_angle = max_angle * (180.0 / CGAL_PI);
|
max_angle = max_angle * (180.0 / CGAL_PI);
|
||||||
mean_max_angle += max_angle;
|
mean_max_angle += max_angle;
|
||||||
|
|
@ -151,8 +151,8 @@ double mean_edge_ratio(const Mesh& mesh,
|
||||||
FT a = std::sqrt(CGAL::squared_distance(tr[0], tr[1]));
|
FT a = std::sqrt(CGAL::squared_distance(tr[0], tr[1]));
|
||||||
FT b = std::sqrt(CGAL::squared_distance(tr[1], tr[2]));
|
FT b = std::sqrt(CGAL::squared_distance(tr[1], tr[2]));
|
||||||
FT c = std::sqrt(CGAL::squared_distance(tr[2], tr[0]));
|
FT c = std::sqrt(CGAL::squared_distance(tr[2], tr[0]));
|
||||||
FT min_edge = std::min({a, b, c});
|
FT min_edge = (std::min)({a, b, c});
|
||||||
FT max_edge = std::max({a, b, c});
|
FT max_edge = (std::max)({a, b, c});
|
||||||
FT edge_ratio = max_edge / min_edge;
|
FT edge_ratio = max_edge / min_edge;
|
||||||
|
|
||||||
mean_edge_ratio += edge_ratio;
|
mean_edge_ratio += edge_ratio;
|
||||||
|
|
@ -181,7 +181,7 @@ double mean_aspect_ratio(const Mesh& mesh,
|
||||||
FT c = std::sqrt(CGAL::squared_distance(tr[2], tr[0]));
|
FT c = std::sqrt(CGAL::squared_distance(tr[2], tr[0]));
|
||||||
FT s = 0.5 * (a + b + c);
|
FT s = 0.5 * (a + b + c);
|
||||||
FT inscribed_radius = std::sqrt((s * (s - a) * (s - b) * (s - c)) / s);
|
FT inscribed_radius = std::sqrt((s * (s - a) * (s - b) * (s - c)) / s);
|
||||||
FT max_edge = std::max({a, b, c});
|
FT max_edge = (std::max)({a, b, c});
|
||||||
FT aspect_ratio = max_edge / inscribed_radius;
|
FT aspect_ratio = max_edge / inscribed_radius;
|
||||||
aspect_ratio /= (2. * std::sqrt(3.)); // normalized
|
aspect_ratio /= (2. * std::sqrt(3.)); // normalized
|
||||||
mean_aspect_ratio += aspect_ratio;
|
mean_aspect_ratio += aspect_ratio;
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
# Created by the script cgal_create_cmake_script
|
# Created by the script cgal_create_cmake_script
|
||||||
# This is the CMake script for compiling a CGAL application.
|
# This is the CMake script for compiling a CGAL application.
|
||||||
|
|
||||||
cmake_minimum_required(VERSION 3.12...3.29)
|
cmake_minimum_required(VERSION 3.12...3.31)
|
||||||
project(Alpha_wrap_3_Examples)
|
project(Alpha_wrap_3_Examples)
|
||||||
|
|
||||||
find_package(CGAL REQUIRED)
|
find_package(CGAL REQUIRED)
|
||||||
|
|
|
||||||
|
|
@ -97,7 +97,7 @@ template <typename Cb>
|
||||||
class Cell_base_with_timestamp
|
class Cell_base_with_timestamp
|
||||||
: public Cb
|
: public Cb
|
||||||
{
|
{
|
||||||
std::size_t time_stamp_;
|
std::size_t time_stamp_ = std::size_t(-2);
|
||||||
|
|
||||||
public:
|
public:
|
||||||
using Has_timestamp = CGAL::Tag_true;
|
using Has_timestamp = CGAL::Tag_true;
|
||||||
|
|
@ -112,7 +112,7 @@ public:
|
||||||
public:
|
public:
|
||||||
template <typename... Args>
|
template <typename... Args>
|
||||||
Cell_base_with_timestamp(const Args&... args)
|
Cell_base_with_timestamp(const Args&... args)
|
||||||
: Cb(args...), time_stamp_(-1)
|
: Cb(args...)
|
||||||
{ }
|
{ }
|
||||||
|
|
||||||
Cell_base_with_timestamp(const Cell_base_with_timestamp& other)
|
Cell_base_with_timestamp(const Cell_base_with_timestamp& other)
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
# Created by the script cgal_create_cmake_script
|
# Created by the script cgal_create_cmake_script
|
||||||
# This is the CMake script for compiling a CGAL application.
|
# This is the CMake script for compiling a CGAL application.
|
||||||
|
|
||||||
cmake_minimum_required(VERSION 3.12...3.29)
|
cmake_minimum_required(VERSION 3.12...3.31)
|
||||||
project(Alpha_wrap_3_Tests)
|
project(Alpha_wrap_3_Tests)
|
||||||
|
|
||||||
find_package(CGAL REQUIRED)
|
find_package(CGAL REQUIRED)
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,6 @@
|
||||||
/// \ingroup PkgApolloniusGraph2Ref
|
/// \ingroup PkgApolloniusGraph2Ref
|
||||||
/*!
|
/*!
|
||||||
\addtogroup PkgApolloniusGraph2Ref
|
\addtogroup PkgApolloniusGraph2Ref
|
||||||
\todo check generated documentation
|
|
||||||
\cgalPkgDescriptionBegin{2D Apollonius Graphs (Delaunay Graphs of Disks),PkgApolloniusGraph2}
|
\cgalPkgDescriptionBegin{2D Apollonius Graphs (Delaunay Graphs of Disks),PkgApolloniusGraph2}
|
||||||
\cgalPkgPicture{CircleVoronoi.png}
|
\cgalPkgPicture{CircleVoronoi.png}
|
||||||
\cgalPkgSummaryBegin
|
\cgalPkgSummaryBegin
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
# Created by the script cgal_create_cmake_script
|
# Created by the script cgal_create_cmake_script
|
||||||
# This is the CMake script for compiling a CGAL application.
|
# This is the CMake script for compiling a CGAL application.
|
||||||
|
|
||||||
cmake_minimum_required(VERSION 3.12...3.29)
|
cmake_minimum_required(VERSION 3.12...3.31)
|
||||||
project(Apollonius_graph_2_Examples)
|
project(Apollonius_graph_2_Examples)
|
||||||
|
|
||||||
find_package(CGAL REQUIRED COMPONENTS Core)
|
find_package(CGAL REQUIRED COMPONENTS Core)
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
# Created by the script cgal_create_cmake_script
|
# Created by the script cgal_create_cmake_script
|
||||||
# This is the CMake script for compiling a CGAL application.
|
# This is the CMake script for compiling a CGAL application.
|
||||||
|
|
||||||
cmake_minimum_required(VERSION 3.12...3.29)
|
cmake_minimum_required(VERSION 3.12...3.31)
|
||||||
project(Apollonius_graph_2_Tests)
|
project(Apollonius_graph_2_Tests)
|
||||||
|
|
||||||
find_package(CGAL REQUIRED)
|
find_package(CGAL REQUIRED)
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
# Created by the script cgal_create_cmake_script
|
# Created by the script cgal_create_cmake_script
|
||||||
# This is the CMake script for compiling a CGAL application.
|
# This is the CMake script for compiling a CGAL application.
|
||||||
|
|
||||||
cmake_minimum_required(VERSION 3.12...3.29)
|
cmake_minimum_required(VERSION 3.12...3.31)
|
||||||
project(Arithmetic_kernel_Tests)
|
project(Arithmetic_kernel_Tests)
|
||||||
|
|
||||||
find_package(CGAL REQUIRED COMPONENTS Core)
|
find_package(CGAL REQUIRED COMPONENTS Core)
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
# This is the CMake script for compiling a CGAL application.
|
# This is the CMake script for compiling a CGAL application.
|
||||||
|
|
||||||
cmake_minimum_required(VERSION 3.12...3.29)
|
cmake_minimum_required(VERSION 3.12...3.31)
|
||||||
project(Arrangement_on_surface_2_Demo)
|
project(Arrangement_on_surface_2_Demo)
|
||||||
|
|
||||||
if(NOT POLICY CMP0070 AND POLICY CMP0053)
|
if(NOT POLICY CMP0070 AND POLICY CMP0053)
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
# This is the CMake script for compiling a CGAL application.
|
# This is the CMake script for compiling a CGAL application.
|
||||||
|
|
||||||
cmake_minimum_required(VERSION 3.12...3.29)
|
cmake_minimum_required(VERSION 3.12...3.31)
|
||||||
project(Arrangement_on_surface_2_earth_Demo)
|
project(Arrangement_on_surface_2_earth_Demo)
|
||||||
|
|
||||||
if(NOT POLICY CMP0070 AND POLICY CMP0053)
|
if(NOT POLICY CMP0070 AND POLICY CMP0053)
|
||||||
|
|
@ -16,27 +16,24 @@ find_package(Qt6 QUIET COMPONENTS Core Gui OpenGL OpenGLWidgets Widgets Xml)
|
||||||
find_package(CGAL COMPONENTS Qt6)
|
find_package(CGAL COMPONENTS Qt6)
|
||||||
find_package(nlohmann_json QUIET 3.9)
|
find_package(nlohmann_json QUIET 3.9)
|
||||||
|
|
||||||
if (NOT CGAL_FOUND OR NOT CGAL_Qt6_FOUND OR NOT Qt6_FOUND OR NOT Boost_FOUND OR NOT nlohmann_json_FOUND)
|
set(MISSING_DEPS "")
|
||||||
if (NOT CGAL_FOUND)
|
if (NOT CGAL_FOUND)
|
||||||
set(MISSING_DEPS "the CGAL library, ${MISSING_DEPS}")
|
set(MISSING_DEPS "the CGAL library, ${MISSING_DEPS}")
|
||||||
endif()
|
endif()
|
||||||
if (NOT CGAL_Qt6_FOUND)
|
if (NOT CGAL_Qt6_FOUND)
|
||||||
set(MISSING_DEPS "the CGAL Qt6 component, ${MISSING_DEPS}")
|
set(MISSING_DEPS "the CGAL Qt6 component, ${MISSING_DEPS}")
|
||||||
endif()
|
endif()
|
||||||
if (NOT Qt6_FOUND)
|
if (NOT Qt6_FOUND)
|
||||||
set(MISSING_DEPS "the Qt6 library, ${MISSING_DEPS}")
|
set(MISSING_DEPS "the Qt6 library, ${MISSING_DEPS}")
|
||||||
endif()
|
endif()
|
||||||
if (NOT Boost_FOUND)
|
if (NOT nlohmann_json_FOUND)
|
||||||
set(MISSING_DEPS "the Boost library, ${MISSING_DEPS}")
|
|
||||||
endif()
|
|
||||||
if (NOT nlohmann_json_FOUND)
|
|
||||||
set(MISSING_DEPS "JSON for Modern C++ 3.9+ (know as nlohmann_json), ${MISSING_DEPS}")
|
set(MISSING_DEPS "JSON for Modern C++ 3.9+ (know as nlohmann_json), ${MISSING_DEPS}")
|
||||||
endif()
|
|
||||||
|
|
||||||
message(STATUS "NOTICE: This project requires ${MISSING_DEPS} and will not be compiled.")
|
|
||||||
return()
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
if (MISSING_DEPS)
|
||||||
|
message(STATUS "NOTICE: This project requires ${MISSING_DEPS}and will not be compiled.")
|
||||||
|
return()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
|
||||||
add_compile_definitions(QT_NO_VERSION_TAGGING)
|
add_compile_definitions(QT_NO_VERSION_TAGGING)
|
||||||
|
|
|
||||||
|
|
@ -62,7 +62,7 @@ void GUI_country_pick_handler::mouse_press_event(QMouseEvent* e) {
|
||||||
auto sd = sqrt(d);
|
auto sd = sqrt(d);
|
||||||
auto t1 = (-b - sd) / (2 * a);
|
auto t1 = (-b - sd) / (2 * a);
|
||||||
auto t2 = (-b + sd) / (2 * a);
|
auto t2 = (-b + sd) / (2 * a);
|
||||||
if (t1 > 0 && t2 > 0) ti = std::min(t1, t2);
|
if (t1 > 0 && t2 > 0) ti = (std::min)(t1, t2);
|
||||||
else if (t1 > 0) ti = t1;
|
else if (t1 > 0) ti = t1;
|
||||||
else ti = t2;
|
else ti = t2;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -140,7 +140,7 @@ void Main_widget::initializeGL() {
|
||||||
for (auto& [country_name, triangle_points] : country_triangles_map) {
|
for (auto& [country_name, triangle_points] : country_triangles_map) {
|
||||||
auto country_triangles = std::make_unique<Triangles>(triangle_points);
|
auto country_triangles = std::make_unique<Triangles>(triangle_points);
|
||||||
auto color = QVector4D(rndm(), rndm(), rndm(), 1);
|
auto color = QVector4D(rndm(), rndm(), rndm(), 1);
|
||||||
auto m = std::max(color.x(), std::max(color.y(), color.z()));
|
auto m = (std::max)(color.x(), (std::max)(color.y(), color.z()));
|
||||||
color /= m;
|
color /= m;
|
||||||
color *= m_dimming_factor;
|
color *= m_dimming_factor;
|
||||||
color.setW(1);
|
color.setW(1);
|
||||||
|
|
|
||||||
|
|
@ -973,6 +973,7 @@ public:
|
||||||
* u_1\f$ to \f$ u_2\f$.
|
* u_1\f$ to \f$ u_2\f$.
|
||||||
* \pre `e1` and `e2` share a common end-vertex, such that the two other
|
* \pre `e1` and `e2` share a common end-vertex, such that the two other
|
||||||
* end-vertices of the two edges are associated with `c`'s endpoints.
|
* end-vertices of the two edges are associated with `c`'s endpoints.
|
||||||
|
* \pre `e1` and `e2` have the same direction.
|
||||||
*/
|
*/
|
||||||
Halfedge_handle merge_edge(Halfedge_handle e1,
|
Halfedge_handle merge_edge(Halfedge_handle e1,
|
||||||
Halfedge_handle e2,
|
Halfedge_handle e2,
|
||||||
|
|
|
||||||
|
|
@ -66,7 +66,6 @@ namespace ArrTraits {}
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
\addtogroup PkgArrangementOnSurface2Ref
|
\addtogroup PkgArrangementOnSurface2Ref
|
||||||
\todo check generated documentation
|
|
||||||
\cgalPkgDescriptionBegin{2D Arrangements,PkgArrangementOnSurface2}
|
\cgalPkgDescriptionBegin{2D Arrangements,PkgArrangementOnSurface2}
|
||||||
\cgalPkgPicture{Arrangement_2.png}
|
\cgalPkgPicture{Arrangement_2.png}
|
||||||
\cgalPkgSummaryBegin
|
\cgalPkgSummaryBegin
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
# Created by the script cgal_create_cmake_script
|
# Created by the script cgal_create_cmake_script
|
||||||
# This is the CMake script for compiling a CGAL application.
|
# This is the CMake script for compiling a CGAL application.
|
||||||
|
|
||||||
cmake_minimum_required(VERSION 3.12...3.29)
|
cmake_minimum_required(VERSION 3.12...3.31)
|
||||||
project(Arrangement_on_surface_2_Examples)
|
project(Arrangement_on_surface_2_Examples)
|
||||||
|
|
||||||
find_package(CGAL REQUIRED COMPONENTS Core OPTIONAL_COMPONENTS Qt6)
|
find_package(CGAL REQUIRED COMPONENTS Core OPTIONAL_COMPONENTS Qt6)
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,6 @@ int main ()
|
||||||
|
|
||||||
#else
|
#else
|
||||||
|
|
||||||
#include <CGAL/basic.h>
|
|
||||||
#include <CGAL/Arrangement_2.h>
|
#include <CGAL/Arrangement_2.h>
|
||||||
#include <CGAL/Arr_algebraic_segment_traits_2.h>
|
#include <CGAL/Arr_algebraic_segment_traits_2.h>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,6 @@ int main ()
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
|
|
||||||
#include <CGAL/basic.h>
|
|
||||||
#include <CGAL/Arrangement_2.h>
|
#include <CGAL/Arrangement_2.h>
|
||||||
#include <CGAL/Arr_algebraic_segment_traits_2.h>
|
#include <CGAL/Arr_algebraic_segment_traits_2.h>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,6 @@
|
||||||
#include <list>
|
#include <list>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
#include <CGAL/basic.h>
|
|
||||||
#include <CGAL/Arr_batched_point_location.h>
|
#include <CGAL/Arr_batched_point_location.h>
|
||||||
|
|
||||||
#include "arr_inexact_construction_segments.h"
|
#include "arr_inexact_construction_segments.h"
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,6 @@
|
||||||
|
|
||||||
#include <list>
|
#include <list>
|
||||||
|
|
||||||
#include <CGAL/basic.h>
|
|
||||||
#include <CGAL/Arr_vertical_decomposition_2.h>
|
#include <CGAL/Arr_vertical_decomposition_2.h>
|
||||||
|
|
||||||
#include "arr_exact_construction_segments.h"
|
#include "arr_exact_construction_segments.h"
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,6 @@
|
||||||
|
|
||||||
#ifdef CGAL_USE_CORE
|
#ifdef CGAL_USE_CORE
|
||||||
|
|
||||||
#include <CGAL/basic.h>
|
|
||||||
#include <CGAL/Arr_naive_point_location.h>
|
#include <CGAL/Arr_naive_point_location.h>
|
||||||
|
|
||||||
#include "arr_conics.h"
|
#include "arr_conics.h"
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,6 @@
|
||||||
// Associating a color attribute with segments using the consolidated
|
// Associating a color attribute with segments using the consolidated
|
||||||
// curve-data traits.
|
// curve-data traits.
|
||||||
|
|
||||||
#include <CGAL/basic.h>
|
|
||||||
#include <CGAL/Arr_consolidated_curve_data_traits_2.h>
|
#include <CGAL/Arr_consolidated_curve_data_traits_2.h>
|
||||||
|
|
||||||
#include "arr_exact_construction_segments.h"
|
#include "arr_exact_construction_segments.h"
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
//! \file examples/Arrangement_on_surface_2/curve_history.cpp
|
//! \file examples/Arrangement_on_surface_2/curve_history.cpp
|
||||||
// Constructing an arrangement with curve history.
|
// Constructing an arrangement with curve history.
|
||||||
|
|
||||||
#include <CGAL/basic.h>
|
|
||||||
#include <CGAL/Arrangement_with_history_2.h>
|
#include <CGAL/Arrangement_with_history_2.h>
|
||||||
#include <CGAL/Arr_trapezoid_ric_point_location.h>
|
#include <CGAL/Arr_trapezoid_ric_point_location.h>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
//! \file examples/Arrangement_on_surface_2/dcel_extension.cpp
|
//! \file examples/Arrangement_on_surface_2/dcel_extension.cpp
|
||||||
// Extending all DCEL records (vertices, edges and faces).
|
// Extending all DCEL records (vertices, edges and faces).
|
||||||
|
|
||||||
#include <CGAL/basic.h>
|
|
||||||
#include <CGAL/Arr_extended_dcel.h>
|
#include <CGAL/Arr_extended_dcel.h>
|
||||||
|
|
||||||
#include "arr_exact_construction_segments.h"
|
#include "arr_exact_construction_segments.h"
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,6 @@
|
||||||
|
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
|
|
||||||
#include <CGAL/basic.h>
|
|
||||||
#include <CGAL/Arr_extended_dcel.h>
|
#include <CGAL/Arr_extended_dcel.h>
|
||||||
#include <CGAL/IO/Arr_iostream.h>
|
#include <CGAL/IO/Arr_iostream.h>
|
||||||
#include <CGAL/IO/Arr_text_formatter.h>
|
#include <CGAL/IO/Arr_text_formatter.h>
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,6 @@
|
||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
|
|
||||||
#include <CGAL/basic.h>
|
|
||||||
#include <CGAL/Arr_curve_data_traits_2.h>
|
#include <CGAL/Arr_curve_data_traits_2.h>
|
||||||
|
|
||||||
#include "arr_linear.h"
|
#include "arr_linear.h"
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
//! \file examples/Arrangement_on_surface_2/edge_manipulation_curve_history.cpp
|
//! \file examples/Arrangement_on_surface_2/edge_manipulation_curve_history.cpp
|
||||||
// Removing curves and manipulating edges in an arrangement with history.
|
// Removing curves and manipulating edges in an arrangement with history.
|
||||||
|
|
||||||
#include <CGAL/basic.h>
|
|
||||||
#include <CGAL/Arrangement_with_history_2.h>
|
#include <CGAL/Arrangement_with_history_2.h>
|
||||||
#include <CGAL/Arr_walk_along_line_point_location.h>
|
#include <CGAL/Arr_walk_along_line_point_location.h>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,6 @@
|
||||||
|
|
||||||
#ifdef CGAL_USE_CORE
|
#ifdef CGAL_USE_CORE
|
||||||
|
|
||||||
#include <CGAL/basic.h>
|
|
||||||
#include <CGAL/draw_arrangement_2.h>
|
#include <CGAL/draw_arrangement_2.h>
|
||||||
|
|
||||||
#include "arr_conics.h"
|
#include "arr_conics.h"
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
//! \file examples/Arrangement_on_surface_2/face_extension.cpp
|
//! \file examples/Arrangement_on_surface_2/face_extension.cpp
|
||||||
// Extending the arrangement-face records.
|
// Extending the arrangement-face records.
|
||||||
|
|
||||||
#include <CGAL/basic.h>
|
|
||||||
#include <CGAL/Arr_extended_dcel.h>
|
#include <CGAL/Arr_extended_dcel.h>
|
||||||
#include <CGAL/Arr_observer.h>
|
#include <CGAL/Arr_observer.h>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,6 @@
|
||||||
|
|
||||||
#include <cassert>
|
#include <cassert>
|
||||||
|
|
||||||
#include <CGAL/basic.h>
|
|
||||||
#include <CGAL/Arr_overlay_2.h>
|
#include <CGAL/Arr_overlay_2.h>
|
||||||
#include <CGAL/Arr_default_overlay_traits.h>
|
#include <CGAL/Arr_default_overlay_traits.h>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,6 @@
|
||||||
// Associating a name attribute with segments using the generic curve-data
|
// Associating a name attribute with segments using the generic curve-data
|
||||||
// traits.
|
// traits.
|
||||||
|
|
||||||
#include <CGAL/basic.h>
|
|
||||||
#include <CGAL/Arr_curve_data_traits_2.h>
|
#include <CGAL/Arr_curve_data_traits_2.h>
|
||||||
|
|
||||||
#include "arr_polylines.h"
|
#include "arr_polylines.h"
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,6 @@
|
||||||
|
|
||||||
#ifdef CGAL_USE_CORE
|
#ifdef CGAL_USE_CORE
|
||||||
|
|
||||||
#include <CGAL/basic.h>
|
|
||||||
#include <CGAL/draw_arrangement_2.h>
|
#include <CGAL/draw_arrangement_2.h>
|
||||||
|
|
||||||
#include "arr_conics.h"
|
#include "arr_conics.h"
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
//! \file examples/Arrangement_on_surface_2/incremental_insertion.cpp
|
//! \file examples/Arrangement_on_surface_2/incremental_insertion.cpp
|
||||||
// Using the global incremental insertion functions.
|
// Using the global incremental insertion functions.
|
||||||
|
|
||||||
#include <CGAL/basic.h>
|
|
||||||
#include <CGAL/Arr_naive_point_location.h>
|
#include <CGAL/Arr_naive_point_location.h>
|
||||||
|
|
||||||
#include "arr_exact_construction_segments.h"
|
#include "arr_exact_construction_segments.h"
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,6 @@
|
||||||
|
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
|
|
||||||
#include <CGAL/basic.h>
|
|
||||||
#include <CGAL/IO/Arr_iostream.h>
|
#include <CGAL/IO/Arr_iostream.h>
|
||||||
|
|
||||||
#include "arr_inexact_construction_segments.h"
|
#include "arr_inexact_construction_segments.h"
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,6 @@
|
||||||
|
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
|
|
||||||
#include <CGAL/basic.h>
|
|
||||||
#include <CGAL/Arrangement_with_history_2.h>
|
#include <CGAL/Arrangement_with_history_2.h>
|
||||||
#include <CGAL/IO/Arr_with_history_iostream.h>
|
#include <CGAL/IO/Arr_with_history_iostream.h>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,6 @@
|
||||||
#include <list>
|
#include <list>
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
|
|
||||||
#include <CGAL/basic.h>
|
|
||||||
#include <CGAL/IO/Arr_iostream.h>
|
#include <CGAL/IO/Arr_iostream.h>
|
||||||
|
|
||||||
#include "arr_linear.h"
|
#include "arr_linear.h"
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,6 @@
|
||||||
|
|
||||||
#ifdef CGAL_USE_CORE
|
#ifdef CGAL_USE_CORE
|
||||||
|
|
||||||
#include <CGAL/basic.h>
|
|
||||||
#include <CGAL/draw_arrangement_2.h>
|
#include <CGAL/draw_arrangement_2.h>
|
||||||
|
|
||||||
#include "arr_conics.h"
|
#include "arr_conics.h"
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
//! \file examples/Arrangement_on_surface_2/observer.cpp
|
//! \file examples/Arrangement_on_surface_2/observer.cpp
|
||||||
// Using a simple arrangement observer.
|
// Using a simple arrangement observer.
|
||||||
|
|
||||||
#include <CGAL/basic.h>
|
|
||||||
#include <CGAL/Arr_observer.h>
|
#include <CGAL/Arr_observer.h>
|
||||||
|
|
||||||
#include "arr_exact_construction_segments.h"
|
#include "arr_exact_construction_segments.h"
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
//! \file examples/Arrangement_on_surface_2/overlay.cpp
|
//! \file examples/Arrangement_on_surface_2/overlay.cpp
|
||||||
// A simple overlay of two arrangements.
|
// A simple overlay of two arrangements.
|
||||||
|
|
||||||
#include <CGAL/basic.h>
|
|
||||||
#include <CGAL/Arr_overlay_2.h>
|
#include <CGAL/Arr_overlay_2.h>
|
||||||
|
|
||||||
#include "arr_exact_construction_segments.h"
|
#include "arr_exact_construction_segments.h"
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,6 @@
|
||||||
|
|
||||||
#include <cassert>
|
#include <cassert>
|
||||||
|
|
||||||
#include <CGAL/basic.h>
|
|
||||||
#include <CGAL/Arr_extended_dcel.h>
|
#include <CGAL/Arr_extended_dcel.h>
|
||||||
#include <CGAL/Arr_overlay_2.h>
|
#include <CGAL/Arr_overlay_2.h>
|
||||||
#include <CGAL/Arr_default_overlay_traits.h>
|
#include <CGAL/Arr_default_overlay_traits.h>
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,6 @@
|
||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
#include <CGAL/basic.h>
|
|
||||||
#include <CGAL/Arr_extended_dcel.h>
|
#include <CGAL/Arr_extended_dcel.h>
|
||||||
#include <CGAL/Arr_overlay_2.h>
|
#include <CGAL/Arr_overlay_2.h>
|
||||||
#include <CGAL/Arr_default_overlay_traits.h>
|
#include <CGAL/Arr_default_overlay_traits.h>
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,6 @@
|
||||||
|
|
||||||
#ifdef CGAL_USE_CORE
|
#ifdef CGAL_USE_CORE
|
||||||
|
|
||||||
#include <CGAL/basic.h>
|
|
||||||
#include <CGAL/draw_arrangement_2.h>
|
#include <CGAL/draw_arrangement_2.h>
|
||||||
|
|
||||||
#include "arr_conics.h"
|
#include "arr_conics.h"
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
//! \file examples/Arrangement_on_surface_2/point_location.cpp
|
//! \file examples/Arrangement_on_surface_2/point_location.cpp
|
||||||
// Answering point-location queries.
|
// Answering point-location queries.
|
||||||
|
|
||||||
#include <CGAL/basic.h>
|
|
||||||
#include <CGAL/Arr_naive_point_location.h>
|
#include <CGAL/Arr_naive_point_location.h>
|
||||||
#include <CGAL/Arr_landmarks_point_location.h>
|
#include <CGAL/Arr_landmarks_point_location.h>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,6 @@ int main() {
|
||||||
|
|
||||||
#else
|
#else
|
||||||
|
|
||||||
#include <CGAL/basic.h>
|
|
||||||
#include <CGAL/Arr_polycurve_traits_2.h>
|
#include <CGAL/Arr_polycurve_traits_2.h>
|
||||||
|
|
||||||
#include "arr_Bezier.h"
|
#include "arr_Bezier.h"
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,6 @@ int main() {
|
||||||
|
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
#include <CGAL/basic.h>
|
|
||||||
#include <CGAL/CORE_algebraic_number_traits.h>
|
#include <CGAL/CORE_algebraic_number_traits.h>
|
||||||
#include <CGAL/Arr_polycurve_traits_2.h>
|
#include <CGAL/Arr_polycurve_traits_2.h>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,6 @@ int main() {
|
||||||
|
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
#include <CGAL/basic.h>
|
|
||||||
#include <CGAL/Arr_polycurve_traits_2.h>
|
#include <CGAL/Arr_polycurve_traits_2.h>
|
||||||
|
|
||||||
#include "arr_conics.h"
|
#include "arr_conics.h"
|
||||||
|
|
|
||||||
|
|
@ -5,8 +5,6 @@
|
||||||
#include <list>
|
#include <list>
|
||||||
#include <chrono>
|
#include <chrono>
|
||||||
|
|
||||||
#include <CGAL/basic.h>
|
|
||||||
|
|
||||||
#include "arr_exact_construction_segments.h"
|
#include "arr_exact_construction_segments.h"
|
||||||
#include "arr_print.h"
|
#include "arr_print.h"
|
||||||
#include "read_objects.h"
|
#include "read_objects.h"
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
//! \file examples/Arrangement_on_surface_2/spherical_overlay.cpp
|
//! \file examples/Arrangement_on_surface_2/spherical_overlay.cpp
|
||||||
// Overlay of two arrangements embedded on the sphere.
|
// Overlay of two arrangements embedded on the sphere.
|
||||||
|
|
||||||
#include <CGAL/basic.h>
|
|
||||||
#include <CGAL/Arr_overlay_2.h>
|
#include <CGAL/Arr_overlay_2.h>
|
||||||
#include <CGAL/Arr_default_overlay_traits.h>
|
#include <CGAL/Arr_default_overlay_traits.h>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,6 @@
|
||||||
|
|
||||||
#include <list>
|
#include <list>
|
||||||
|
|
||||||
#include <CGAL/basic.h>
|
|
||||||
#include <CGAL/Arr_tracing_traits_2.h>
|
#include <CGAL/Arr_tracing_traits_2.h>
|
||||||
#include <CGAL/Arr_counting_traits_2.h>
|
#include <CGAL/Arr_counting_traits_2.h>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,6 @@
|
||||||
|
|
||||||
#include <list>
|
#include <list>
|
||||||
|
|
||||||
#include <CGAL/basic.h>
|
|
||||||
#include <CGAL/Arr_vertical_decomposition_2.h>
|
#include <CGAL/Arr_vertical_decomposition_2.h>
|
||||||
|
|
||||||
#include "arr_linear.h"
|
#include "arr_linear.h"
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
//! \file examples/Arrangement_on_surface_2/ex_vertical_ray_shooting.cpp
|
//! \file examples/Arrangement_on_surface_2/ex_vertical_ray_shooting.cpp
|
||||||
// Answering vertical ray-shooting queries.
|
// Answering vertical ray-shooting queries.
|
||||||
|
|
||||||
#include <CGAL/basic.h>
|
|
||||||
#include <CGAL/Arr_walk_along_line_point_location.h>
|
#include <CGAL/Arr_walk_along_line_point_location.h>
|
||||||
#include <CGAL/Arr_trapezoid_ric_point_location.h>
|
#include <CGAL/Arr_trapezoid_ric_point_location.h>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -411,7 +411,7 @@ public:
|
||||||
m_object(base.construct_opposite_2_object()), m_counter(counter) {}
|
m_object(base.construct_opposite_2_object()), m_counter(counter) {}
|
||||||
|
|
||||||
/*! operates */
|
/*! operates */
|
||||||
X_monotone_curve_2 operator()(const X_monotone_curve_2& xc)
|
X_monotone_curve_2 operator()(const X_monotone_curve_2& xc) const
|
||||||
{ ++m_counter; return m_object(xc); }
|
{ ++m_counter; return m_object(xc); }
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -429,7 +429,7 @@ public:
|
||||||
m_object(base.compare_endpoints_xy_2_object()), m_counter(counter) {}
|
m_object(base.compare_endpoints_xy_2_object()), m_counter(counter) {}
|
||||||
|
|
||||||
/*! operates */
|
/*! operates */
|
||||||
Comparison_result operator()(const X_monotone_curve_2& xc)
|
Comparison_result operator()(const X_monotone_curve_2& xc) const
|
||||||
{ ++m_counter; return m_object(xc); }
|
{ ++m_counter; return m_object(xc); }
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
# Created by the script cgal_create_cmake_script
|
# Created by the script cgal_create_cmake_script
|
||||||
# This is the CMake script for compiling a CGAL application.
|
# This is the CMake script for compiling a CGAL application.
|
||||||
|
|
||||||
cmake_minimum_required(VERSION 3.12...3.29)
|
cmake_minimum_required(VERSION 3.12...3.31)
|
||||||
project(Arrangement_on_surface_2_Tests)
|
project(Arrangement_on_surface_2_Tests)
|
||||||
|
|
||||||
enable_testing()
|
enable_testing()
|
||||||
|
|
|
||||||
|
|
@ -88,7 +88,7 @@ boost::graph_traits<Graph>::edge_iterator ei;
|
||||||
Algorithms obtain incidence information in graphs with the help of global
|
Algorithms obtain incidence information in graphs with the help of global
|
||||||
functions such as:
|
functions such as:
|
||||||
- `std::pair<vertex_iterator,vertex_iterator> vertices(const Graph& g);` to obtain an iterator range providing access to all the vertices, or
|
- `std::pair<vertex_iterator,vertex_iterator> vertices(const Graph& g);` to obtain an iterator range providing access to all the vertices, or
|
||||||
- `int num_vertices(const Graph&);` to obtain the number of vertices of a graph, or
|
- `vertices_size_type num_vertices(const Graph&);` to obtain the number of vertices of a graph, or
|
||||||
- `vertex_descriptor source(edge_descriptor, const Graph&);` to obtain the source vertex of an edge.
|
- `vertex_descriptor source(edge_descriptor, const Graph&);` to obtain the source vertex of an edge.
|
||||||
|
|
||||||
Note, that the way we have written the types is a simplification; in reality,
|
Note, that the way we have written the types is a simplification; in reality,
|
||||||
|
|
|
||||||
|
|
@ -40,6 +40,6 @@ faces(const FaceListGraph& g);
|
||||||
This is the case for implementations only marking faces deleted in the face container.
|
This is the case for implementations only marking faces deleted in the face container.
|
||||||
*/
|
*/
|
||||||
template <typename FaceListGraph>
|
template <typename FaceListGraph>
|
||||||
boost::graph_traits<FaceListGraph>::face_size_type
|
boost::graph_traits<FaceListGraph>::faces_size_type
|
||||||
num_faces(const FaceListGraph& g);
|
num_faces(const FaceListGraph& g);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -40,6 +40,6 @@ halfedges(const HalfedgeListGraph& g);
|
||||||
This is the case for implementations only marking halfedges deleted in the halfedge container.
|
This is the case for implementations only marking halfedges deleted in the halfedge container.
|
||||||
*/
|
*/
|
||||||
template <typename HalfedgeListGraph>
|
template <typename HalfedgeListGraph>
|
||||||
boost::graph_traits<HalfedgeListGraph>::halfedge_size_type
|
boost::graph_traits<HalfedgeListGraph>::halfedges_size_type
|
||||||
num_halfedges(const HalfedgeListGraph& g);
|
num_halfedges(const HalfedgeListGraph& g);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -741,6 +741,7 @@ user might encounter.
|
||||||
- `CGAL::Euler::join_vertex()`
|
- `CGAL::Euler::join_vertex()`
|
||||||
- `CGAL::Euler::make_hole()`
|
- `CGAL::Euler::make_hole()`
|
||||||
- `CGAL::Euler::remove_center_vertex()`
|
- `CGAL::Euler::remove_center_vertex()`
|
||||||
|
- `CGAL::Euler::remove_degree_2_vertex()`
|
||||||
- `CGAL::Euler::remove_face()`
|
- `CGAL::Euler::remove_face()`
|
||||||
- `CGAL::Euler::split_edge()`
|
- `CGAL::Euler::split_edge()`
|
||||||
- `CGAL::Euler::split_face()`
|
- `CGAL::Euler::split_face()`
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
# Created by the script cgal_create_CMakeLists
|
# Created by the script cgal_create_CMakeLists
|
||||||
# This is the CMake script for compiling a set of CGAL applications.
|
# This is the CMake script for compiling a set of CGAL applications.
|
||||||
|
|
||||||
cmake_minimum_required(VERSION 3.12...3.29)
|
cmake_minimum_required(VERSION 3.12...3.31)
|
||||||
project(BGL_LCC_Examples)
|
project(BGL_LCC_Examples)
|
||||||
|
|
||||||
# CGAL and its components
|
# CGAL and its components
|
||||||
|
|
|
||||||
|
|
@ -28,7 +28,7 @@ int main(int argc, char** argv)
|
||||||
// Here we start at an arbitrary vertex
|
// Here we start at an arbitrary vertex
|
||||||
// Any other vertex could be the starting point
|
// Any other vertex could be the starting point
|
||||||
vertex_iterator vb, ve;
|
vertex_iterator vb, ve;
|
||||||
boost::tie(vb,ve)=vertices(lcc);
|
std::tie(vb,ve)=vertices(lcc);
|
||||||
vertex_descriptor vd = *vb;
|
vertex_descriptor vd = *vb;
|
||||||
|
|
||||||
std::cout << "We compute distances to " << vd->point() << std::endl;
|
std::cout << "We compute distances to " << vd->point() << std::endl;
|
||||||
|
|
@ -45,7 +45,7 @@ int main(int argc, char** argv)
|
||||||
boost::on_tree_edge()))));
|
boost::on_tree_edge()))));
|
||||||
|
|
||||||
// Traverse all vertices and show at what distance they are
|
// Traverse all vertices and show at what distance they are
|
||||||
for(boost::tie(vb,ve)=vertices(lcc); vb!=ve; ++vb)
|
for(std::tie(vb,ve)=vertices(lcc); vb!=ve; ++vb)
|
||||||
{
|
{
|
||||||
vd = *vb;
|
vd = *vb;
|
||||||
std::cout<<vd->point()<<" is "<<distance[vd->id()]<<" hops away."<<std::endl;
|
std::cout<<vd->point()<<" is "<<distance[vd->id()]<<" hops away."<<std::endl;
|
||||||
|
|
|
||||||
|
|
@ -40,7 +40,7 @@ OutputIterator adjacent_vertices_V2(const LCC& g,
|
||||||
OutputIterator out)
|
OutputIterator out)
|
||||||
{
|
{
|
||||||
halfedge_around_target_iterator hi, he;
|
halfedge_around_target_iterator hi, he;
|
||||||
for(boost::tie(hi, he) = halfedges_around_target(halfedge(vd,g),g); hi != he; ++hi)
|
for(std::tie(hi, he) = halfedges_around_target(halfedge(vd,g),g); hi != he; ++hi)
|
||||||
{
|
{
|
||||||
*out++ = source(*hi,g);
|
*out++ = source(*hi,g);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -41,7 +41,7 @@ void kruskal(const LCC& lcc)
|
||||||
"point [ \n";
|
"point [ \n";
|
||||||
|
|
||||||
vertex_iterator vb, ve;
|
vertex_iterator vb, ve;
|
||||||
for(boost::tie(vb,ve) = vertices(lcc); vb!=ve; ++vb){
|
for(std::tie(vb,ve) = vertices(lcc); vb!=ve; ++vb){
|
||||||
std::cout << (*vb)->point() << "\n";
|
std::cout << (*vb)->point() << "\n";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -31,7 +31,7 @@ void calculate_face_normals(const HalfedgeGraph& g,
|
||||||
typedef typename boost::property_traits<NormalMap>::value_type normal;
|
typedef typename boost::property_traits<NormalMap>::value_type normal;
|
||||||
|
|
||||||
face_iterator fb, fe;
|
face_iterator fb, fe;
|
||||||
for(boost::tie(fb, fe) = faces(g); fb != fe; ++fb)
|
for(std::tie(fb, fe) = faces(g); fb != fe; ++fb)
|
||||||
{
|
{
|
||||||
halfedge_descriptor edg = halfedge(*fb, g);
|
halfedge_descriptor edg = halfedge(*fb, g);
|
||||||
halfedge_descriptor edgb = edg;
|
halfedge_descriptor edgb = edg;
|
||||||
|
|
|
||||||
|
|
@ -42,10 +42,10 @@ void fct(const LCC& lcc)
|
||||||
std::cout << vd->point() << std::endl;
|
std::cout << vd->point() << std::endl;
|
||||||
}
|
}
|
||||||
|
|
||||||
std::cout << "boost::tie + std::for_each" << std::endl;
|
std::cout << "std::tie + std::for_each" << std::endl;
|
||||||
vertex_iterator vb, ve;
|
vertex_iterator vb, ve;
|
||||||
|
|
||||||
boost::tie(vb,ve) = vertices_range(lcc);
|
std::tie(vb,ve) = vertices_range(lcc);
|
||||||
std::for_each(vb,ve, Fct());
|
std::for_each(vb,ve, Fct());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -49,7 +49,7 @@ int main(int argc, char** argv)
|
||||||
typedef boost::transform_iterator<Source<LCC>,halfedge_around_target_iterator> adjacent_vertex_iterator;
|
typedef boost::transform_iterator<Source<LCC>,halfedge_around_target_iterator> adjacent_vertex_iterator;
|
||||||
|
|
||||||
halfedge_around_target_iterator hb,he;
|
halfedge_around_target_iterator hb,he;
|
||||||
boost::tie(hb,he) = halfedges_around_target(halfedge(vd,lcc),lcc);
|
std::tie(hb,he) = halfedges_around_target(halfedge(vd,lcc),lcc);
|
||||||
adjacent_vertex_iterator avib, avie;
|
adjacent_vertex_iterator avib, avie;
|
||||||
avib = boost::make_transform_iterator(hb, Source<LCC>(lcc));
|
avib = boost::make_transform_iterator(hb, Source<LCC>(lcc));
|
||||||
avie = boost::make_transform_iterator(he, Source<LCC>(lcc));
|
avie = boost::make_transform_iterator(he, Source<LCC>(lcc));
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
# Created by the script cgal_create_CMakeLists
|
# Created by the script cgal_create_CMakeLists
|
||||||
# This is the CMake script for compiling a set of CGAL applications.
|
# This is the CMake script for compiling a set of CGAL applications.
|
||||||
|
|
||||||
cmake_minimum_required(VERSION 3.12...3.29)
|
cmake_minimum_required(VERSION 3.12...3.31)
|
||||||
project(BGL_OpenMesh_Examples)
|
project(BGL_OpenMesh_Examples)
|
||||||
|
|
||||||
# CGAL and its components
|
# CGAL and its components
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
cmake_minimum_required(VERSION 3.12...3.29)
|
cmake_minimum_required(VERSION 3.12...3.31)
|
||||||
project(BGL_arrangement_2_Examples)
|
project(BGL_arrangement_2_Examples)
|
||||||
|
|
||||||
find_package(CGAL REQUIRED)
|
find_package(CGAL REQUIRED)
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
# Created by the script cgal_create_CMakeLists
|
# Created by the script cgal_create_CMakeLists
|
||||||
# This is the CMake script for compiling a set of CGAL applications.
|
# This is the CMake script for compiling a set of CGAL applications.
|
||||||
|
|
||||||
cmake_minimum_required(VERSION 3.12...3.29)
|
cmake_minimum_required(VERSION 3.12...3.31)
|
||||||
|
|
||||||
project(BGL_graphcut_Examples)
|
project(BGL_graphcut_Examples)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
# Created by the script cgal_create_CMakeLists
|
# Created by the script cgal_create_CMakeLists
|
||||||
# This is the CMake script for compiling a set of CGAL applications.
|
# This is the CMake script for compiling a set of CGAL applications.
|
||||||
|
|
||||||
cmake_minimum_required(VERSION 3.12...3.29)
|
cmake_minimum_required(VERSION 3.12...3.31)
|
||||||
project(BGL_polyhedron_3_Examples)
|
project(BGL_polyhedron_3_Examples)
|
||||||
|
|
||||||
# CGAL and its components
|
# CGAL and its components
|
||||||
|
|
|
||||||
|
|
@ -24,9 +24,9 @@ int main(int argc, char** argv) {
|
||||||
vertex_iterator vb, ve;
|
vertex_iterator vb, ve;
|
||||||
int index = 0;
|
int index = 0;
|
||||||
|
|
||||||
// boost::tie assigns the first and second element of the std::pair
|
// std::tie assigns the first and second element of the std::pair
|
||||||
// returned by boost::vertices to the variables vit and ve
|
// returned by boost::vertices to the variables vit and ve
|
||||||
for(boost::tie(vb,ve)=vertices(P); vb!=ve; ++vb ){
|
for(std::tie(vb,ve)=vertices(P); vb!=ve; ++vb ){
|
||||||
vertex_descriptor vd = *vb;
|
vertex_descriptor vd = *vb;
|
||||||
vd->id() = index++;
|
vd->id() = index++;
|
||||||
}
|
}
|
||||||
|
|
@ -37,7 +37,7 @@ int main(int argc, char** argv) {
|
||||||
|
|
||||||
// Here we start at an arbitrary vertex
|
// Here we start at an arbitrary vertex
|
||||||
// Any other vertex could be the starting point
|
// Any other vertex could be the starting point
|
||||||
boost::tie(vb,ve)=vertices(P);
|
std::tie(vb,ve)=vertices(P);
|
||||||
vertex_descriptor vd = *vb;
|
vertex_descriptor vd = *vb;
|
||||||
|
|
||||||
std::cout << "We compute distances to " << vd->point() << std::endl;
|
std::cout << "We compute distances to " << vd->point() << std::endl;
|
||||||
|
|
@ -54,7 +54,7 @@ int main(int argc, char** argv) {
|
||||||
|
|
||||||
|
|
||||||
// Traverse all vertices and show at what distance they are
|
// Traverse all vertices and show at what distance they are
|
||||||
for(boost::tie(vb,ve)=vertices(P); vb!=ve; ++vb ){
|
for(std::tie(vb,ve)=vertices(P); vb!=ve; ++vb ){
|
||||||
vd = *vb;
|
vd = *vb;
|
||||||
std::cout << vd->point() << " is " << distance[vd->id()] << " hops away" << std::endl;
|
std::cout << vd->point() << " is " << distance[vd->id()] << " hops away" << std::endl;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -36,7 +36,7 @@ adjacent_vertices_V2(const Polyhedron& g,
|
||||||
{
|
{
|
||||||
halfedge_around_target_iterator hi, he;
|
halfedge_around_target_iterator hi, he;
|
||||||
|
|
||||||
for(boost::tie(hi, he) = halfedges_around_target(halfedge(vd,g),g); hi != he; ++hi)
|
for(std::tie(hi, he) = halfedges_around_target(halfedge(vd,g),g); hi != he; ++hi)
|
||||||
{
|
{
|
||||||
*out++ = source(*hi,g);
|
*out++ = source(*hi,g);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -33,9 +33,9 @@ kruskal(const Polyhedron& P)
|
||||||
vertex_iterator vb, ve;
|
vertex_iterator vb, ve;
|
||||||
int index = 0;
|
int index = 0;
|
||||||
|
|
||||||
// boost::tie assigns the first and second element of the std::pair
|
// std::tie assigns the first and second element of the std::pair
|
||||||
// returned by boost::vertices to the variables vb and ve
|
// returned by boost::vertices to the variables vb and ve
|
||||||
for(boost::tie(vb, ve)=vertices(P); vb!=ve; ++vb){
|
for(std::tie(vb, ve)=vertices(P); vb!=ve; ++vb){
|
||||||
vertex_index_pmap[*vb]= index++;
|
vertex_index_pmap[*vb]= index++;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -59,7 +59,7 @@ kruskal(const Polyhedron& P)
|
||||||
" coord Coordinate {\n"
|
" coord Coordinate {\n"
|
||||||
" point [ \n";
|
" point [ \n";
|
||||||
|
|
||||||
for(boost::tie(vb, ve) = vertices(P); vb!=ve; ++vb){
|
for(std::tie(vb, ve) = vertices(P); vb!=ve; ++vb){
|
||||||
std::cout << " " << (*vb)->point() << "\n";
|
std::cout << " " << (*vb)->point() << "\n";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -41,7 +41,7 @@ kruskal( const Polyhedron& P)
|
||||||
"point [ \n";
|
"point [ \n";
|
||||||
|
|
||||||
vertex_iterator vb, ve;
|
vertex_iterator vb, ve;
|
||||||
for(boost::tie(vb,ve) = vertices(P); vb!=ve; ++vb){
|
for(std::tie(vb,ve) = vertices(P); vb!=ve; ++vb){
|
||||||
std::cout << (*vb)->point() << "\n";
|
std::cout << (*vb)->point() << "\n";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -75,9 +75,9 @@ int main() {
|
||||||
vertex_iterator vb, ve;
|
vertex_iterator vb, ve;
|
||||||
int index = 0;
|
int index = 0;
|
||||||
|
|
||||||
// boost::tie assigns the first and second element of the std::pair
|
// std::tie assigns the first and second element of the std::pair
|
||||||
// returned by boost::vertices to the variables vit and ve
|
// returned by boost::vertices to the variables vit and ve
|
||||||
for(boost::tie(vb,ve)=vertices(P); vb!=ve; ++vb ){
|
for(std::tie(vb,ve)=vertices(P); vb!=ve; ++vb ){
|
||||||
vertex_descriptor vd = *vb;
|
vertex_descriptor vd = *vb;
|
||||||
vd->id() = index++;
|
vd->id() = index++;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -26,7 +26,7 @@ void calculate_face_normals(const HalfedgeGraph& g,
|
||||||
typedef typename boost::property_traits<NormalMap>::value_type normal;
|
typedef typename boost::property_traits<NormalMap>::value_type normal;
|
||||||
|
|
||||||
face_iterator fb, fe;
|
face_iterator fb, fe;
|
||||||
for(boost::tie(fb, fe) = faces(g); fb != fe; ++fb)
|
for(std::tie(fb, fe) = faces(g); fb != fe; ++fb)
|
||||||
{
|
{
|
||||||
halfedge_descriptor edg = halfedge(*fb, g);
|
halfedge_descriptor edg = halfedge(*fb, g);
|
||||||
halfedge_descriptor edgb = edg;
|
halfedge_descriptor edgb = edg;
|
||||||
|
|
|
||||||
|
|
@ -40,10 +40,10 @@ void fct(const Polyhedron& p)
|
||||||
std::cout << vd->point() << std::endl;
|
std::cout << vd->point() << std::endl;
|
||||||
}
|
}
|
||||||
|
|
||||||
std::cout << "boost::tie + std::for_each" << std::endl;
|
std::cout << "std::tie + std::for_each" << std::endl;
|
||||||
vertex_iterator vb, ve;
|
vertex_iterator vb, ve;
|
||||||
|
|
||||||
boost::tie(vb,ve) = vertices_range(p);
|
std::tie(vb,ve) = vertices_range(p);
|
||||||
std::for_each(vb,ve, Fct());
|
std::for_each(vb,ve, Fct());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -47,7 +47,7 @@ int main(int argc, char** argv)
|
||||||
typedef boost::transform_iterator<Source<Polyhedron>,halfedge_around_target_iterator> adjacent_vertex_iterator;
|
typedef boost::transform_iterator<Source<Polyhedron>,halfedge_around_target_iterator> adjacent_vertex_iterator;
|
||||||
|
|
||||||
halfedge_around_target_iterator hb,he;
|
halfedge_around_target_iterator hb,he;
|
||||||
boost::tie(hb,he) = halfedges_around_target(halfedge(vd,P),P);
|
std::tie(hb,he) = halfedges_around_target(halfedge(vd,P),P);
|
||||||
adjacent_vertex_iterator avib, avie;
|
adjacent_vertex_iterator avib, avie;
|
||||||
avib = boost::make_transform_iterator(hb, Source<Polyhedron>(P));
|
avib = boost::make_transform_iterator(hb, Source<Polyhedron>(P));
|
||||||
avie = boost::make_transform_iterator(he, Source<Polyhedron>(P));
|
avie = boost::make_transform_iterator(he, Source<Polyhedron>(P));
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
cmake_minimum_required(VERSION 3.12...3.29)
|
cmake_minimum_required(VERSION 3.12...3.31)
|
||||||
project(BGL_surface_mesh_Examples)
|
project(BGL_surface_mesh_Examples)
|
||||||
|
|
||||||
find_package(CGAL REQUIRED)
|
find_package(CGAL REQUIRED)
|
||||||
|
|
|
||||||
|
|
@ -51,7 +51,7 @@ int main(int argc, char** argv)
|
||||||
std::ofstream outxyz("out.xyz");
|
std::ofstream outxyz("out.xyz");
|
||||||
outxyz.precision(17);
|
outxyz.precision(17);
|
||||||
boost::graph_traits<SM>::vertex_iterator vit, ve;
|
boost::graph_traits<SM>::vertex_iterator vit, ve;
|
||||||
boost::tie(vit, ve) = vertices(sm);
|
std::tie(vit, ve) = vertices(sm);
|
||||||
for(; vit!=ve; ++vit)
|
for(; vit!=ve; ++vit)
|
||||||
{
|
{
|
||||||
if(get(vertex_pid_map, *vit) == 0)
|
if(get(vertex_pid_map, *vit) == 0)
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
cmake_minimum_required(VERSION 3.12...3.29)
|
cmake_minimum_required(VERSION 3.12...3.31)
|
||||||
project(BGL_triangulation_2_Examples)
|
project(BGL_triangulation_2_Examples)
|
||||||
|
|
||||||
find_package(CGAL REQUIRED)
|
find_package(CGAL REQUIRED)
|
||||||
|
|
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue