From d3ae3b4fdae3cf1e9b9b7cb94316335fd457577c Mon Sep 17 00:00:00 2001 From: Sven Oesau Date: Thu, 14 Nov 2024 10:39:24 +0100 Subject: [PATCH 01/12] documented Eigen3 version requirement of Ceres documented use of OSQP in Shape Regularization package --- Documentation/doc/Documentation/Third_party.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Documentation/doc/Documentation/Third_party.txt b/Documentation/doc/Documentation/Third_party.txt index 2d6382b3c17..c42fbd91a9a 100644 --- a/Documentation/doc/Documentation/Third_party.txt +++ b/Documentation/doc/Documentation/Third_party.txt @@ -289,6 +289,8 @@ requires solving complex non-linear least squares problems. Visit the official website of the library at `ceres-solver.org` for more information. +\attention \ceres requires to be compiled with the exact same version of \eigen that is used for \cgal. + \attention \ceres indicates that `glog` is a recommended dependency. `glog` has `libunwind` as a recommended dependency. On some platforms, linking with `libunwind` was responsible for an increase of the runtime of the final application. If you experience such an issue, we recommend to compile \ceres without `glog` support. @@ -315,7 +317,7 @@ The \scip web site is `https://www.scipopt.or \osqp (Operator Splitting Quadratic Program) is currently one of the fastest open source solvers for convex Quadratic Programs (QP). -In \cgal, \osqp provides an optional solver for the QP problems often arising in various computational geometry algorithms. +In \cgal, \osqp provides an optional solver for the quadratic programming used in the \ref PkgShapeRegularization package. In order to use \osqp in \cgal programs, the executables should be linked with the CMake imported target `CGAL::OSQP_support` provided in `CGAL_OSQP_support.cmake`. The \osqp web site is `https://osqp.org`. From 64acf21a1b3249757daccb9609955c47760475ad Mon Sep 17 00:00:00 2001 From: Jane Tournois Date: Fri, 15 Nov 2024 14:12:05 +0100 Subject: [PATCH 02/12] read and write doubles instead of floats --- BGL/include/CGAL/boost/graph/IO/OM.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/BGL/include/CGAL/boost/graph/IO/OM.h b/BGL/include/CGAL/boost/graph/IO/OM.h index 9d393022a03..1040652eff4 100644 --- a/BGL/include/CGAL/boost/graph/IO/OM.h +++ b/BGL/include/CGAL/boost/graph/IO/OM.h @@ -15,6 +15,7 @@ #include #include +#include #include #include @@ -34,7 +35,7 @@ namespace internal { template bool read_OM(const std::string& fname, Graph& g, VPM vpm, VFeaturePM vfpm, EFeaturePM efpm) { - typedef OpenMesh::PolyMesh_ArrayKernelT<> OMesh; + typedef OpenMesh::PolyMesh_ArrayKernelT OMesh; typedef typename boost::graph_traits::vertex_descriptor om_vertex_descriptor; typedef typename boost::graph_traits::vertex_descriptor vertex_descriptor; typedef typename boost::graph_traits::halfedge_descriptor om_halfedge_descriptor; @@ -75,7 +76,7 @@ bool read_OM(const std::string& fname, Graph& g, VPM vpm, VFeaturePM vfpm, EFeat template bool write_OM(std::string fname, const Graph& g, VPM vpm, VFeaturePM vfpm, EFeaturePM efpm) { - typedef OpenMesh::PolyMesh_ArrayKernelT<> OMesh; + typedef OpenMesh::PolyMesh_ArrayKernelT OMesh; typedef typename boost::graph_traits::vertex_descriptor om_vertex_descriptor; typedef typename boost::graph_traits::vertex_descriptor vertex_descriptor; typedef typename boost::graph_traits::halfedge_descriptor om_halfedge_descriptor; @@ -108,7 +109,7 @@ bool write_OM(std::string fname, const Graph& g, VPM vpm, VFeaturePM vfpm, EFeat omesh.status(omv).set_feature(isfeature); } - return OpenMesh::IO::write_mesh(omesh, fname, OpenMesh::IO::Options::Status); + return OpenMesh::IO::write_mesh(omesh, fname, OpenMesh::IO::Options::Status, 18); } } // end of internal namespace From 7c156fa6cd9b6a977223241a1c97294da0b027d1 Mon Sep 17 00:00:00 2001 From: Jane Tournois Date: Fri, 15 Nov 2024 14:59:21 +0100 Subject: [PATCH 03/12] use NP stream_precision --- BGL/include/CGAL/boost/graph/IO/OM.h | 14 +++++++++++--- Lab/demo/Lab/Plugins/IO/OM_io_plugin.cpp | 6 ++++-- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/BGL/include/CGAL/boost/graph/IO/OM.h b/BGL/include/CGAL/boost/graph/IO/OM.h index 1040652eff4..9c582267ae1 100644 --- a/BGL/include/CGAL/boost/graph/IO/OM.h +++ b/BGL/include/CGAL/boost/graph/IO/OM.h @@ -74,7 +74,8 @@ bool read_OM(const std::string& fname, Graph& g, VPM vpm, VFeaturePM vfpm, EFeat } template -bool write_OM(std::string fname, const Graph& g, VPM vpm, VFeaturePM vfpm, EFeaturePM efpm) +bool write_OM(std::string fname, const Graph& g, VPM vpm, VFeaturePM vfpm, EFeaturePM efpm, + const std::streamsize precision) { typedef OpenMesh::PolyMesh_ArrayKernelT OMesh; typedef typename boost::graph_traits::vertex_descriptor om_vertex_descriptor; @@ -109,7 +110,7 @@ bool write_OM(std::string fname, const Graph& g, VPM vpm, VFeaturePM vfpm, EFeat omesh.status(omv).set_feature(isfeature); } - return OpenMesh::IO::write_mesh(omesh, fname, OpenMesh::IO::Options::Status, 18); + return OpenMesh::IO::write_mesh(omesh, fname, OpenMesh::IO::Options::Status, precision); } } // end of internal namespace @@ -209,6 +210,11 @@ bool read_OM(const std::string& fname, \cgalParamType{a class model of `ReadablePropertyMap` with `boost::graph_traits::%vertex_descriptor` as key type and `bool` as value type.} \cgalParamNEnd + \cgalParamNBegin{stream_precision} + \cgalParamDescription{a parameter used to set the precision (i.e. how many digits are generated) of the output stream} + \cgalParamType{int} + \cgalParamDefault{the precision of the stream `os`} + \cgalParamNEnd \cgalNamedParamsEnd \returns `true` if writing was successful, `false` otherwise. @@ -229,7 +235,9 @@ bool write_OM(const std::string& fname, CGAL::Constant_property_map(false)); auto vpm = choose_parameter(get_parameter(np, internal_np::vertex_point), get_const_property_map(vertex_point, g)); - return internal::write_OM(fname, g, vpm, vfpm, efpm); + std::streamsize precision = choose_parameter(get_parameter(np, internal_np::stream_precision), + 18); + return internal::write_OM(fname, g, vpm, vfpm, efpm, precision); } diff --git a/Lab/demo/Lab/Plugins/IO/OM_io_plugin.cpp b/Lab/demo/Lab/Plugins/IO/OM_io_plugin.cpp index 286fdd5bc01..6b08185ab4d 100644 --- a/Lab/demo/Lab/Plugins/IO/OM_io_plugin.cpp +++ b/Lab/demo/Lab/Plugins/IO/OM_io_plugin.cpp @@ -180,12 +180,14 @@ save(QFileInfo fileinfo, QList& items) res = CGAL::IO::write_OM((const char*)fileinfo.filePath().toUtf8() , *sm_item->face_graph() , CGAL::parameters::vertex_is_constrained_map(selection_item->constrained_vertices_pmap()) - .edge_is_constrained_map(selection_item->constrained_edges_pmap())); + .edge_is_constrained_map(selection_item->constrained_edges_pmap()) + .stream_precision(18)); } else { res = CGAL::IO::write_OM((const char*)fileinfo.filePath().toUtf8() - , *sm_item->face_graph()); + , *sm_item->face_graph() + , CGAL::parameters::stream_precision(18)); } if (res) From 7632a01f6ce822786021ee24c41d1102c5629417 Mon Sep 17 00:00:00 2001 From: Jane Tournois Date: Fri, 15 Nov 2024 16:22:07 +0100 Subject: [PATCH 04/12] 18->17 Co-authored-by: Sebastien Loriot --- Lab/demo/Lab/Plugins/IO/OM_io_plugin.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Lab/demo/Lab/Plugins/IO/OM_io_plugin.cpp b/Lab/demo/Lab/Plugins/IO/OM_io_plugin.cpp index 6b08185ab4d..ab81338bf06 100644 --- a/Lab/demo/Lab/Plugins/IO/OM_io_plugin.cpp +++ b/Lab/demo/Lab/Plugins/IO/OM_io_plugin.cpp @@ -181,13 +181,13 @@ save(QFileInfo fileinfo, QList& items) , *sm_item->face_graph() , CGAL::parameters::vertex_is_constrained_map(selection_item->constrained_vertices_pmap()) .edge_is_constrained_map(selection_item->constrained_edges_pmap()) - .stream_precision(18)); + .stream_precision(17)); } else { res = CGAL::IO::write_OM((const char*)fileinfo.filePath().toUtf8() , *sm_item->face_graph() - , CGAL::parameters::stream_precision(18)); + , CGAL::parameters::stream_precision(17)); } if (res) From 51bfe99ff1d53ce0fc1470c4c0cac38e41f202f0 Mon Sep 17 00:00:00 2001 From: Sven Oesau Date: Fri, 15 Nov 2024 14:14:10 +0100 Subject: [PATCH 05/12] bugfix initial intervals --- .../include/CGAL/KSP_3/Intersection_graph.h | 8 +++----- .../include/CGAL/Kinetic_space_partition_3.h | 2 +- .../Kinetic_surface_reconstruction/ksr_parameters.cpp | 2 ++ 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Kinetic_space_partition/include/CGAL/KSP_3/Intersection_graph.h b/Kinetic_space_partition/include/CGAL/KSP_3/Intersection_graph.h index 3dffb18c35f..e500e1a9653 100644 --- a/Kinetic_space_partition/include/CGAL/KSP_3/Intersection_graph.h +++ b/Kinetic_space_partition/include/CGAL/KSP_3/Intersection_graph.h @@ -289,9 +289,8 @@ public: m_initial_intervals.resize(e.size()); std::size_t idx = 0; - for (const auto& edge : e) { + for (const auto& edge : e) m_initial_intervals[idx++] = m_graph[edge].intervals; - } m_initial_part_of_partition.resize(m_ifaces.size()); for (idx = 0; idx < m_ifaces.size(); idx++) @@ -303,9 +302,8 @@ public: CGAL_assertion(e.size() == m_initial_intervals.size()); std::size_t idx = 0; - for (auto edge : e) { - m_graph[edge].intervals = m_initial_intervals[idx]; - } + for (auto edge : e) + m_graph[edge].intervals = m_initial_intervals[idx++]; CGAL_assertion(m_ifaces.size() == m_initial_part_of_partition.size()); for (idx = 0; idx < m_ifaces.size(); idx++) diff --git a/Kinetic_space_partition/include/CGAL/Kinetic_space_partition_3.h b/Kinetic_space_partition/include/CGAL/Kinetic_space_partition_3.h index a0f5c66e7e6..e76a9b26cf1 100644 --- a/Kinetic_space_partition/include/CGAL/Kinetic_space_partition_3.h +++ b/Kinetic_space_partition/include/CGAL/Kinetic_space_partition_3.h @@ -731,7 +731,7 @@ public: } if (m_parameters.verbose) - std::cout << "ksp v: " << m_partition_nodes[0].m_data->vertices().size() << " f: " << m_partition_nodes[0].face2vertices.size() << " vol: " << m_volumes.size() << std::endl; + std::cout << "ksp v: " << m_partition_nodes[0].m_data->vertices().size() << " f: " << m_partition_nodes[0].face2vertices.size() << " vol: " << m_volumes.size() << std::endl; return; } diff --git a/Kinetic_surface_reconstruction/examples/Kinetic_surface_reconstruction/ksr_parameters.cpp b/Kinetic_surface_reconstruction/examples/Kinetic_surface_reconstruction/ksr_parameters.cpp index 9e624e3cc66..d411451b0d5 100644 --- a/Kinetic_surface_reconstruction/examples/Kinetic_surface_reconstruction/ksr_parameters.cpp +++ b/Kinetic_surface_reconstruction/examples/Kinetic_surface_reconstruction/ksr_parameters.cpp @@ -198,6 +198,8 @@ int main(const int argc, const char** argv) { FT after_reconstruction = timer.time(); + std::cout << polylist.size() << " polygons, " << vtx.size() << " vertices" << std::endl; + if (polylist.size() > 0) CGAL::IO::write_polygon_soup("polylist_" + std::to_string(parameters.graphcut_lambda) + (parameters.use_ground ? "_g" : "_") + ".off", vtx, polylist); From e680f83e8b1701e1369db281bf5be3d5b6c7fa32 Mon Sep 17 00:00:00 2001 From: Sven Oesau Date: Fri, 15 Nov 2024 18:17:54 +0100 Subject: [PATCH 06/12] doc fix --- .../Kinetic_surface_reconstruction.txt | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Kinetic_surface_reconstruction/doc/Kinetic_surface_reconstruction/Kinetic_surface_reconstruction.txt b/Kinetic_surface_reconstruction/doc/Kinetic_surface_reconstruction/Kinetic_surface_reconstruction.txt index 08cb4000e2f..99ee3553995 100644 --- a/Kinetic_surface_reconstruction/doc/Kinetic_surface_reconstruction/Kinetic_surface_reconstruction.txt +++ b/Kinetic_surface_reconstruction/doc/Kinetic_surface_reconstruction/Kinetic_surface_reconstruction.txt @@ -284,9 +284,9 @@ Building_C 3.432 -370 +369 -1.466 +1.457 40,1 @@ -376,10 +376,10 @@ Meeting Room 15 -0,03 - 10 +0,03 + 3 0,5 @@ -396,10 +396,10 @@ Full Thing 12 -0,05 - 3 +0,05 + 1 0,5 @@ -416,10 +416,10 @@ Hilbert cube 12 -0,03 - 5 +0,03 + 4 0,5 @@ -456,10 +456,10 @@ Building_C 15 -0,5 - 3 +0,5 + 2 0,77 From 5e554b234982627c2335c7e641adc55d5a139454 Mon Sep 17 00:00:00 2001 From: Sven Oesau Date: Fri, 15 Nov 2024 18:29:43 +0100 Subject: [PATCH 07/12] removed unnecessary computations --- .../CGAL/Kinetic_surface_reconstruction_3.h | 65 ++----------------- 1 file changed, 5 insertions(+), 60 deletions(-) diff --git a/Kinetic_surface_reconstruction/include/CGAL/Kinetic_surface_reconstruction_3.h b/Kinetic_surface_reconstruction/include/CGAL/Kinetic_surface_reconstruction_3.h index bdc4687b6d4..761470cfc83 100644 --- a/Kinetic_surface_reconstruction/include/CGAL/Kinetic_surface_reconstruction_3.h +++ b/Kinetic_surface_reconstruction/include/CGAL/Kinetic_surface_reconstruction_3.h @@ -627,7 +627,6 @@ private: std::vector > m_volume_votes; // pair votes std::vector m_volume_below_ground; std::vector > m_cost_matrix; - std::vector m_volumes; // normalized volume of each kinetic volume std::vector m_labels; std::size_t m_total_inliers; @@ -747,9 +746,9 @@ private: std::cout << "* computing data term ... "; std::size_t max_inside = 0, max_outside = 0; - for (std::size_t i = 0; i < m_volumes.size(); i++) { - max_inside = (std::max)(static_cast(m_cost_matrix[0][i + 6]), max_inside); - max_outside = (std::max)(static_cast(m_cost_matrix[1][i + 6]), max_outside); + for (std::size_t i = 6; i < m_cost_matrix[0].size(); i++) { + max_inside = (std::max)(static_cast(m_cost_matrix[0][i]), max_inside); + max_outside = (std::max)(static_cast(m_cost_matrix[1][i]), max_outside); } // Dump volumes colored by votes @@ -1743,55 +1742,14 @@ private: return face_area; } - FT volume(typename LCC::Dart_descriptor volume_dart) { - FT x = 0, y = 0, z = 0; - std::size_t count = 0; - From_exact from_exact; - - // Collect vertices to obtain point on the inside. - for (auto& fd : m_lcc.template one_dart_per_incident_cell<2, 3>(volume_dart)) { - typename LCC::Dart_descriptor fdh = m_lcc.dart_descriptor(fd); - - for (const auto& vd : m_lcc.template one_dart_per_incident_cell<0, 2>(fdh)) { - const auto &p = from_exact(m_lcc.point(m_lcc.dart_descriptor(vd))); - x += p.x(); - y += p.y(); - z += p.z(); - count++; - } - } - - Point_3 center(x / count, y / count, z / count); - - FT vol = 0; - // Second iteration for computing the area of each face and the volume spanned with the center point. - for (auto& fd : m_lcc.template one_dart_per_incident_cell<2, 3>(volume_dart)) { - typename LCC::Dart_descriptor fdh = m_lcc.dart_descriptor(fd); - - Plane_3 plane; - FT a = area(fdh, plane); - Vector_3 n = plane.orthogonal_vector(); - - FT distance = CGAL::abs((plane.point() - center) * n); - vol += distance * a / 3.0; - } - - return vol; - } - void count_volume_votes_lcc() { // const int debug_volume = -1; - FT total_volume = 0; std::size_t num_volumes = m_kinetic_partition.number_of_volumes(); m_volume_votes.clear(); m_volume_votes.resize(num_volumes, std::make_pair(0, 0)); - m_volumes.resize(num_volumes, 0); - - for (std::size_t i = 6; i < num_volumes; i++) { + for (std::size_t i = 6; i < num_volumes; i++) m_cost_matrix[0][i] = m_cost_matrix[1][i] = 0; - m_volumes[i] = 0; - } From_exact from_exact; @@ -1829,28 +1787,15 @@ private: m_cost_matrix[1][v[j] + 6] += static_cast(out[j]); } } - - for (auto& d : m_lcc.template one_dart_per_cell<3>()) { - typename LCC::Dart_descriptor dh = m_lcc.dart_descriptor(d); - - std::size_t volume_index = m_lcc.template info<3>(dh).volume_id; - m_volumes[volume_index] = volume(dh); - - total_volume += m_volumes[volume_index]; - } - - // Normalize volumes - for (FT& v : m_volumes) - v /= total_volume; } template void create_planar_shapes(const NamedParameters& np) { - if (m_points.size() < 3) { if (m_verbose) std::cout << "* no points found, skipping" << std::endl; return; } + if (m_verbose) std::cout << "* getting planar shapes using region growing" << std::endl; FT xmin, ymin, zmin, xmax, ymax, zmax; From b64a868ff0e05e44dfa6770422b73186990a5655 Mon Sep 17 00:00:00 2001 From: Sven Oesau Date: Fri, 15 Nov 2024 18:40:03 +0100 Subject: [PATCH 08/12] removing redundant initialization reformatting output --- .../ksr_parameters.cpp | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/Kinetic_surface_reconstruction/examples/Kinetic_surface_reconstruction/ksr_parameters.cpp b/Kinetic_surface_reconstruction/examples/Kinetic_surface_reconstruction/ksr_parameters.cpp index d411451b0d5..8575827b5a6 100644 --- a/Kinetic_surface_reconstruction/examples/Kinetic_surface_reconstruction/ksr_parameters.cpp +++ b/Kinetic_surface_reconstruction/examples/Kinetic_surface_reconstruction/ksr_parameters.cpp @@ -171,15 +171,10 @@ int main(const int argc, const char** argv) { timer.start(); std::size_t num_shapes = ksr.detect_planar_shapes(param); - std::cout << num_shapes << " detected planar shapes" << std::endl; FT after_shape_detection = timer.time(); - ksr.initialize_partition(param); - - FT after_init = timer.time(); - ksr.partition(parameters.k_intersections); FT after_partition = timer.time(); @@ -222,19 +217,16 @@ int main(const int argc, const char** argv) { else ksr.reconstruct(l, external_nodes, std::back_inserter(vtx), std::back_inserter(polylist)); - if (polylist.size() > 0) { non_empty = true; CGAL::IO::write_polygon_soup("polylist_" + std::to_string(l) + (parameters.use_ground ? "_g" : "_") + ".off", vtx, polylist); } } - std::cout << "Shape detection: " << after_shape_detection << " seconds!" << std::endl; - std::cout << "Kinetic partition: " << (after_partition - after_shape_detection) << " seconds!" << std::endl; - std::cout << " initialization: " << (after_init - after_shape_detection) << " seconds!" << std::endl; - std::cout << " partition: " << (after_partition - after_init) << " seconds!" << std::endl; - std::cout << "Kinetic reconstruction: " << (after_reconstruction - after_partition) << " seconds!" << std::endl; - std::cout << "Total time: " << time << " seconds!" << std::endl << std::endl; + std::cout << "Shape detection and initialization\nof kinetic partition: " << after_shape_detection << " seconds!" << std::endl; + std::cout << "Kinetic partition: " << (after_partition - after_shape_detection) << " seconds!" << std::endl; + std::cout << "Kinetic reconstruction: " << (after_reconstruction - after_partition) << " seconds!" << std::endl; + std::cout << "Total time: " << time << " seconds!" << std::endl << std::endl; return (non_empty) ? EXIT_SUCCESS : EXIT_FAILURE; } From c71488fcaf0621c60165253737407d05cdef222d Mon Sep 17 00:00:00 2001 From: Sven Oesau Date: Mon, 18 Nov 2024 11:39:56 +0100 Subject: [PATCH 09/12] more appropriate console output --- .../examples/Kinetic_surface_reconstruction/ksr_parameters.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Kinetic_surface_reconstruction/examples/Kinetic_surface_reconstruction/ksr_parameters.cpp b/Kinetic_surface_reconstruction/examples/Kinetic_surface_reconstruction/ksr_parameters.cpp index 8575827b5a6..b7593484504 100644 --- a/Kinetic_surface_reconstruction/examples/Kinetic_surface_reconstruction/ksr_parameters.cpp +++ b/Kinetic_surface_reconstruction/examples/Kinetic_surface_reconstruction/ksr_parameters.cpp @@ -171,7 +171,7 @@ int main(const int argc, const char** argv) { timer.start(); std::size_t num_shapes = ksr.detect_planar_shapes(param); - std::cout << num_shapes << " detected planar shapes" << std::endl; + std::cout << num_shapes << " regularized detected planar shapes" << std::endl; FT after_shape_detection = timer.time(); From 28b91c3d4e3cf4b5ed1809b9583dcf7f76281ac4 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Thu, 21 Nov 2024 17:00:40 +0100 Subject: [PATCH 10/12] compress json files --- Maintenance/test_handling/create_testresult_page | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Maintenance/test_handling/create_testresult_page b/Maintenance/test_handling/create_testresult_page index f26fd7c30de..3d8fb4f5170 100755 --- a/Maintenance/test_handling/create_testresult_page +++ b/Maintenance/test_handling/create_testresult_page @@ -19,6 +19,7 @@ use Date::Format; use JSON; use File::Copy; use FindBin; +use IO::Compress::Gzip qw(gzip $GzipError) ; my $server_url="https://cgal.geometryfactory.com/"; my $cgal_members="${server_url}CGAL/Members/"; @@ -827,7 +828,8 @@ sub create_summary_page { }; my $json = JSON->new->allow_nonref; my $json_text = $json->encode($final_data); - open my $fh, '>', "$testresult_dir/$release_name/search_index.json" or die "Could not open file: $!"; + my $fh = new IO::Compress::Gzip "$testresult_dir/$release_name/search_index.json.gz" + or die "IO::Compress::Gzip failed: $GzipError\n"; print $fh $json_text; close $fh; From da588c9f95ba1040801afb7e9304259d9359835b Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Thu, 21 Nov 2024 17:02:51 +0100 Subject: [PATCH 11/12] fix a comment in --- Installation/include/CGAL/config.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Installation/include/CGAL/config.h b/Installation/include/CGAL/config.h index d72f65bc5e8..a154b5caad8 100644 --- a/Installation/include/CGAL/config.h +++ b/Installation/include/CGAL/config.h @@ -149,11 +149,11 @@ #define CGAL_USE_SSE2_FABS #endif -// Same for C++17 #if !(__cplusplus >= 201703L || _MSVC_LANG >= 201703L) #error "CGAL requires C++ 17" #endif -// Same for C++20 + +// Macro to detect C++20 #if __cplusplus >= 202002L || _MSVC_LANG >= 202002L # define CGAL_CXX20 1 #endif From 2b0c79e85a333dc40739f18fe0babb6a1276961e Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Tue, 26 Nov 2024 10:14:17 +0100 Subject: [PATCH 12/12] update reuse to v5 --- .github/workflows/reuse.yml | 17 +++++++++-------- .../demo/Arrangement_on_surface_2_earth/Aos.cpp | 2 +- .../demo/Arrangement_on_surface_2_earth/Aos.h | 2 +- .../Arrangement_on_surface_2_earth/Aos_defs.h | 2 +- .../Aos_triangulator.cpp | 2 +- .../Aos_triangulator.h | 2 +- .../Arrangement_on_surface_2_earth/Camera.cpp | 2 +- .../Arrangement_on_surface_2_earth/Camera.h | 2 +- .../Camera_manip.cpp | 2 +- .../Camera_manip.h | 2 +- .../Camera_manip_rot.cpp | 2 +- .../Camera_manip_rot.h | 2 +- .../Camera_manip_rot_bpa.cpp | 2 +- .../Camera_manip_rot_bpa.h | 2 +- .../Camera_manip_zoom.cpp | 2 +- .../Camera_manip_zoom.h | 2 +- .../Common_defs.h | 2 +- .../GUI_country_pick_handler.cpp | 2 +- .../GUI_country_pick_handler.h | 2 +- .../GUI_event_handler.cpp | 2 +- .../GUI_event_handler.h | 2 +- .../Geodesic_arcs.cpp | 2 +- .../Geodesic_arcs.h | 2 +- .../Kml_reader.cpp | 2 +- .../Arrangement_on_surface_2_earth/Kml_reader.h | 2 +- .../Line_strips.cpp | 2 +- .../Line_strips.h | 2 +- .../Main_widget.cpp | 2 +- .../Main_widget.h | 2 +- .../Main_widget_old.h | 2 +- .../Message_manager.cpp | 2 +- .../Message_manager.h | 2 +- .../Shader_program.cpp | 2 +- .../Shader_program.h | 2 +- .../Single_vertex.cpp | 2 +- .../Single_vertex.h | 2 +- .../Arrangement_on_surface_2_earth/Sphere.cpp | 2 +- .../Arrangement_on_surface_2_earth/Sphere.h | 2 +- .../demo/Arrangement_on_surface_2_earth/Timer.h | 2 +- .../Arrangement_on_surface_2_earth/Tools.cpp | 2 +- .../demo/Arrangement_on_surface_2_earth/Tools.h | 2 +- .../Triangles.cpp | 2 +- .../Arrangement_on_surface_2_earth/Triangles.h | 2 +- .../Verification.cpp | 2 +- .../Verification.h | 2 +- .../Arrangement_on_surface_2_earth/Vertices.cpp | 2 +- .../Arrangement_on_surface_2_earth/Vertices.h | 2 +- .../World_coordinate_axes.cpp | 2 +- .../World_coordinate_axes.h | 2 +- .../Arrangement_on_surface_2_earth/arr_print.h | 2 +- .../Arrangement_on_surface_2_earth/earth.cpp | 2 +- .../CGAL/create_weighted_straight_skeleton_2.h | 2 +- .../include/CGAL/draw_straight_skeleton_2.h | 2 +- ...lygon_triangulation_graphics_scene_options.h | 2 +- .../include/CGAL/Regular_triangulation_2.h | 2 +- .../CGAL/Triangulation_2/internal/In_domain.h | 2 +- .../CGAL/draw_constrained_triangulation_2.h | 2 +- .../include/CGAL/draw_triangulation_2.h | 2 +- .../include/CGAL/mark_domain_in_triangulation.h | 2 +- .../include/CGAL/draw_voronoi_diagram_2.h | 2 +- 60 files changed, 68 insertions(+), 67 deletions(-) diff --git a/.github/workflows/reuse.yml b/.github/workflows/reuse.yml index e312e8a88ad..533abad36bc 100644 --- a/.github/workflows/reuse.yml +++ b/.github/workflows/reuse.yml @@ -10,17 +10,18 @@ jobs: reuse: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 - - name: REUSE version - uses: fsfe/reuse-action@v4 + - name: Checkout + uses: actions/checkout@v4 + - name: Display reuse-tool version + uses: fsfe/reuse-action@v5 with: args: --version - - name: REUSE lint - uses: fsfe/reuse-action@v4 + - name: REUSE Compliance Check + uses: fsfe/reuse-action@v5 with: args: --include-submodules lint - name: REUSE SPDX SBOM - uses: fsfe/reuse-action@v4 + uses: fsfe/reuse-action@v5 with: args: spdx - name: install dependencies @@ -29,7 +30,7 @@ jobs: run: | mkdir -p ./release cmake -DDESTINATION=./release -DCGAL_VERSION=9.9 -P ./Scripts/developer_scripts/cgal_create_release_with_cmake.cmake - - name: REUSE lint release tarball - uses: fsfe/reuse-action@v4 + - name: REUSE Compliance Check of release tarball + uses: fsfe/reuse-action@v5 with: args: --root ./release/CGAL-9.9 --include-submodules lint diff --git a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Aos.cpp b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Aos.cpp index 2d782eec1ac..3faf4d76f8c 100644 --- a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Aos.cpp +++ b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Aos.cpp @@ -1,4 +1,4 @@ -// Copyright(c) 2023, 2024 Tel-Aviv University (Israel). +// Copyright (c) 2023, 2024 Tel-Aviv University (Israel). // All rights reserved. // // This file is part of CGAL (www.cgal.org). diff --git a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Aos.h b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Aos.h index af4b9c2d2ff..49de97f2da9 100644 --- a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Aos.h +++ b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Aos.h @@ -1,4 +1,4 @@ -// Copyright(c) 2023, 2024 Tel-Aviv University (Israel). +// Copyright (c) 2023, 2024 Tel-Aviv University (Israel). // All rights reserved. // // This file is part of CGAL (www.cgal.org). diff --git a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Aos_defs.h b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Aos_defs.h index 5332eb1e856..414202e9c13 100644 --- a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Aos_defs.h +++ b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Aos_defs.h @@ -1,4 +1,4 @@ -// Copyright(c) 2023, 2024 Tel-Aviv University (Israel). +// Copyright (c) 2023, 2024 Tel-Aviv University (Israel). // All rights reserved. // // This file is part of CGAL (www.cgal.org). diff --git a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Aos_triangulator.cpp b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Aos_triangulator.cpp index e635345c38c..b1a866b65b2 100644 --- a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Aos_triangulator.cpp +++ b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Aos_triangulator.cpp @@ -1,4 +1,4 @@ -// Copyright(c) 2023, 2024 Tel-Aviv University (Israel). +// Copyright (c) 2023, 2024 Tel-Aviv University (Israel). // All rights reserved. // // This file is part of CGAL (www.cgal.org). diff --git a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Aos_triangulator.h b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Aos_triangulator.h index 4d291b43e1e..bbbbe6e83e1 100644 --- a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Aos_triangulator.h +++ b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Aos_triangulator.h @@ -1,4 +1,4 @@ -// Copyright(c) 2023, 2024 Tel-Aviv University (Israel). +// Copyright (c) 2023, 2024 Tel-Aviv University (Israel). // All rights reserved. // // This file is part of CGAL (www.cgal.org). diff --git a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Camera.cpp b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Camera.cpp index 0b4b6fa40f1..061e8e02149 100644 --- a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Camera.cpp +++ b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Camera.cpp @@ -1,4 +1,4 @@ -// Copyright(c) 2023, 2024 Tel-Aviv University (Israel). +// Copyright (c) 2023, 2024 Tel-Aviv University (Israel). // All rights reserved. // // This file is part of CGAL (www.cgal.org). diff --git a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Camera.h b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Camera.h index 9d166a794b0..7629d747f3e 100644 --- a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Camera.h +++ b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Camera.h @@ -1,4 +1,4 @@ -// Copyright(c) 2023, 2024 Tel-Aviv University (Israel). +// Copyright (c) 2023, 2024 Tel-Aviv University (Israel). // All rights reserved. // // This file is part of CGAL (www.cgal.org). diff --git a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Camera_manip.cpp b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Camera_manip.cpp index ef904a969ca..f25847b2a5b 100644 --- a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Camera_manip.cpp +++ b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Camera_manip.cpp @@ -1,4 +1,4 @@ -// Copyright(c) 2023, 2024 Tel-Aviv University(Israel). +// Copyright (c) 2023, 2024 Tel-Aviv University(Israel). // All rights reserved. // // This file is part of CGAL (www.cgal.org). diff --git a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Camera_manip.h b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Camera_manip.h index d04f087f8fa..0b56e2d93ae 100644 --- a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Camera_manip.h +++ b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Camera_manip.h @@ -1,4 +1,4 @@ -// Copyright(c) 2023, 2024 Tel-Aviv University (Israel). +// Copyright (c) 2023, 2024 Tel-Aviv University (Israel). // All rights reserved. // // This file is part of CGAL (www.cgal.org). diff --git a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Camera_manip_rot.cpp b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Camera_manip_rot.cpp index 7750fda4529..18885014973 100644 --- a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Camera_manip_rot.cpp +++ b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Camera_manip_rot.cpp @@ -1,4 +1,4 @@ -// Copyright(c) 2023, 2024 Tel-Aviv University (Israel). +// Copyright (c) 2023, 2024 Tel-Aviv University (Israel). // All rights reserved. // // This file is part of CGAL (www.cgal.org). diff --git a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Camera_manip_rot.h b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Camera_manip_rot.h index 30f268507c9..6b11ca95cb9 100644 --- a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Camera_manip_rot.h +++ b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Camera_manip_rot.h @@ -1,4 +1,4 @@ -// Copyright(c) 2023, 2024 Tel-Aviv University (Israel). +// Copyright (c) 2023, 2024 Tel-Aviv University (Israel). // All rights reserved. // // This file is part of CGAL (www.cgal.org). diff --git a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Camera_manip_rot_bpa.cpp b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Camera_manip_rot_bpa.cpp index 8d6a22cd7ac..a8327ca2ff8 100644 --- a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Camera_manip_rot_bpa.cpp +++ b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Camera_manip_rot_bpa.cpp @@ -1,4 +1,4 @@ -// Copyright(c) 2023, 2024 Tel-Aviv University (Israel). +// Copyright (c) 2023, 2024 Tel-Aviv University (Israel). // All rights reserved. // // This file is part of CGAL (www.cgal.org). diff --git a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Camera_manip_rot_bpa.h b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Camera_manip_rot_bpa.h index 1867e6a74ba..0e041335aee 100644 --- a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Camera_manip_rot_bpa.h +++ b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Camera_manip_rot_bpa.h @@ -1,4 +1,4 @@ -// Copyright(c) 2023, 2024 Tel-Aviv University (Israel). +// Copyright (c) 2023, 2024 Tel-Aviv University (Israel). // All rights reserved. // // This file is part of CGAL (www.cgal.org). diff --git a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Camera_manip_zoom.cpp b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Camera_manip_zoom.cpp index 724ce32f134..f4c4e63c65b 100644 --- a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Camera_manip_zoom.cpp +++ b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Camera_manip_zoom.cpp @@ -1,4 +1,4 @@ -// Copyright(c) 2023, 2024 Tel-Aviv University (Israel). +// Copyright (c) 2023, 2024 Tel-Aviv University (Israel). // All rights reserved. // // This file is part of CGAL (www.cgal.org). diff --git a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Camera_manip_zoom.h b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Camera_manip_zoom.h index 3ec15895a8a..e701db1f870 100644 --- a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Camera_manip_zoom.h +++ b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Camera_manip_zoom.h @@ -1,4 +1,4 @@ -// Copyright(c) 2023, 2024 Tel-Aviv University (Israel). +// Copyright (c) 2023, 2024 Tel-Aviv University (Israel). // All rights reserved. // // This file is part of CGAL (www.cgal.org). diff --git a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Common_defs.h b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Common_defs.h index 42533e6434c..63a2549a8f5 100644 --- a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Common_defs.h +++ b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Common_defs.h @@ -1,4 +1,4 @@ -// Copyright(c) 2023, 2024 Tel-Aviv University (Israel). +// Copyright (c) 2023, 2024 Tel-Aviv University (Israel). // All rights reserved. // // This file is part of CGAL (www.cgal.org). diff --git a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/GUI_country_pick_handler.cpp b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/GUI_country_pick_handler.cpp index 0f9e9b7c796..58bc34f3ca2 100644 --- a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/GUI_country_pick_handler.cpp +++ b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/GUI_country_pick_handler.cpp @@ -1,4 +1,4 @@ -// Copyright(c) 2023, 2024 Tel-Aviv University (Israel). +// Copyright (c) 2023, 2024 Tel-Aviv University (Israel). // All rights reserved. // // This file is part of CGAL (www.cgal.org). diff --git a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/GUI_country_pick_handler.h b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/GUI_country_pick_handler.h index 08fe585289e..d51fdcc479c 100644 --- a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/GUI_country_pick_handler.h +++ b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/GUI_country_pick_handler.h @@ -1,4 +1,4 @@ -// Copyright(c) 2023, 2024 Tel-Aviv University (Israel). +// Copyright (c) 2023, 2024 Tel-Aviv University (Israel). // All rights reserved. // // This file is part of CGAL (www.cgal.org). diff --git a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/GUI_event_handler.cpp b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/GUI_event_handler.cpp index 848ea3d2cee..57fc5bce495 100644 --- a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/GUI_event_handler.cpp +++ b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/GUI_event_handler.cpp @@ -1,4 +1,4 @@ -// Copyright(c) 2023, 2024 Tel-Aviv University (Israel). +// Copyright (c) 2023, 2024 Tel-Aviv University (Israel). // All rights reserved. // // This file is part of CGAL (www.cgal.org). diff --git a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/GUI_event_handler.h b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/GUI_event_handler.h index d29dce172f1..334d5aabfa1 100644 --- a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/GUI_event_handler.h +++ b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/GUI_event_handler.h @@ -1,4 +1,4 @@ -// Copyright(c) 2023, 2024 Tel-Aviv University (Israel). +// Copyright (c) 2023, 2024 Tel-Aviv University (Israel). // All rights reserved. // // This file is part of CGAL (www.cgal.org). diff --git a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Geodesic_arcs.cpp b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Geodesic_arcs.cpp index 83de65cb955..353e6198513 100644 --- a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Geodesic_arcs.cpp +++ b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Geodesic_arcs.cpp @@ -1,4 +1,4 @@ -// Copyright(c) 2023, 2024 Tel-Aviv University (Israel). +// Copyright (c) 2023, 2024 Tel-Aviv University (Israel). // All rights reserved. // // This file is part of CGAL (www.cgal.org). diff --git a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Geodesic_arcs.h b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Geodesic_arcs.h index 7e8a3a13849..ebe4b914762 100644 --- a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Geodesic_arcs.h +++ b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Geodesic_arcs.h @@ -1,4 +1,4 @@ -// Copyright(c) 2023, 2024 Tel-Aviv University (Israel). +// Copyright (c) 2023, 2024 Tel-Aviv University (Israel). // All rights reserved. // // This file is part of CGAL (www.cgal.org). diff --git a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Kml_reader.cpp b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Kml_reader.cpp index 8ec7d23ea76..9e8df3dd72e 100644 --- a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Kml_reader.cpp +++ b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Kml_reader.cpp @@ -1,4 +1,4 @@ -// Copyright(c) 2023, 2024 Tel-Aviv University (Israel). +// Copyright (c) 2023, 2024 Tel-Aviv University (Israel). // All rights reserved. // // This file is part of CGAL (www.cgal.org). diff --git a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Kml_reader.h b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Kml_reader.h index dbeaa5eeced..1ede700cb77 100644 --- a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Kml_reader.h +++ b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Kml_reader.h @@ -1,4 +1,4 @@ -// Copyright(c) 2023, 2024 Tel-Aviv University (Israel). +// Copyright (c) 2023, 2024 Tel-Aviv University (Israel). // All rights reserved. // // This file is part of CGAL (www.cgal.org). diff --git a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Line_strips.cpp b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Line_strips.cpp index 93ab6cd5596..8cff0c0e0ad 100644 --- a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Line_strips.cpp +++ b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Line_strips.cpp @@ -1,4 +1,4 @@ -// Copyright(c) 2023, 2024 Tel-Aviv University (Israel). +// Copyright (c) 2023, 2024 Tel-Aviv University (Israel). // All rights reserved. // // This file is part of CGAL (www.cgal.org). diff --git a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Line_strips.h b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Line_strips.h index a4b0d996adc..1e5b5bfca3f 100644 --- a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Line_strips.h +++ b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Line_strips.h @@ -1,4 +1,4 @@ -// Copyright(c) 2023, 2024 Tel-Aviv University (Israel). +// Copyright (c) 2023, 2024 Tel-Aviv University (Israel). // All rights reserved. // // This file is part of CGAL (www.cgal.org). diff --git a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Main_widget.cpp b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Main_widget.cpp index 4d711d66128..f99c6c7e55b 100644 --- a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Main_widget.cpp +++ b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Main_widget.cpp @@ -1,4 +1,4 @@ -// Copyright(c) 2023, 2024 Tel-Aviv University (Israel). +// Copyright (c) 2023, 2024 Tel-Aviv University (Israel). // All rights reserved. // // This file is part of CGAL (www.cgal.org). diff --git a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Main_widget.h b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Main_widget.h index 136c0220679..a9e3493ea34 100644 --- a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Main_widget.h +++ b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Main_widget.h @@ -1,4 +1,4 @@ -// Copyright(c) 2023, 2024 Tel-Aviv University (Israel). +// Copyright (c) 2023, 2024 Tel-Aviv University (Israel). // All rights reserved. // // This file is part of CGAL (www.cgal.org). diff --git a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Main_widget_old.h b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Main_widget_old.h index 541a8f27d80..0bf4895eb8c 100644 --- a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Main_widget_old.h +++ b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Main_widget_old.h @@ -1,4 +1,4 @@ -// Copyright(c) 2023, 2024 Tel-Aviv University (Israel). +// Copyright (c) 2023, 2024 Tel-Aviv University (Israel). // All rights reserved. // // This file is part of CGAL (www.cgal.org). diff --git a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Message_manager.cpp b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Message_manager.cpp index 69ddf0cdf02..76548edddcf 100644 --- a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Message_manager.cpp +++ b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Message_manager.cpp @@ -1,4 +1,4 @@ -// Copyright(c) 2023, 2024 Tel-Aviv University (Israel). +// Copyright (c) 2023, 2024 Tel-Aviv University (Israel). // All rights reserved. // // This file is part of CGAL (www.cgal.org). diff --git a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Message_manager.h b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Message_manager.h index f2cb59fc1ee..3f0708feb32 100644 --- a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Message_manager.h +++ b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Message_manager.h @@ -1,4 +1,4 @@ -// Copyright(c) 2023, 2024 Tel-Aviv University (Israel). +// Copyright (c) 2023, 2024 Tel-Aviv University (Israel). // All rights reserved. // // This file is part of CGAL (www.cgal.org). diff --git a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Shader_program.cpp b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Shader_program.cpp index c52d2db408d..12c218b6286 100644 --- a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Shader_program.cpp +++ b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Shader_program.cpp @@ -1,4 +1,4 @@ -// Copyright(c) 2023, 2024 Tel-Aviv University (Israel). +// Copyright (c) 2023, 2024 Tel-Aviv University (Israel). // All rights reserved. // // This file is part of CGAL (www.cgal.org). diff --git a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Shader_program.h b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Shader_program.h index 1c0c4d06061..c424197dccc 100644 --- a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Shader_program.h +++ b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Shader_program.h @@ -1,4 +1,4 @@ -// Copyright(c) 2023, 2024 Tel-Aviv University (Israel). +// Copyright (c) 2023, 2024 Tel-Aviv University (Israel). // All rights reserved. // // This file is part of CGAL (www.cgal.org). diff --git a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Single_vertex.cpp b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Single_vertex.cpp index ce94629bbfa..97ab1719c6d 100644 --- a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Single_vertex.cpp +++ b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Single_vertex.cpp @@ -1,4 +1,4 @@ -// Copyright(c) 2023, 2024 Tel-Aviv University (Israel). +// Copyright (c) 2023, 2024 Tel-Aviv University (Israel). // All rights reserved. // // This file is part of CGAL (www.cgal.org). diff --git a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Single_vertex.h b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Single_vertex.h index 078b697e38f..f8e56d11e37 100644 --- a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Single_vertex.h +++ b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Single_vertex.h @@ -1,4 +1,4 @@ -// Copyright(c) 2023, 2024 Tel-Aviv University (Israel). +// Copyright (c) 2023, 2024 Tel-Aviv University (Israel). // All rights reserved. // // This file is part of CGAL (www.cgal.org). diff --git a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Sphere.cpp b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Sphere.cpp index 8a24ae4c6b8..29d45c3fd1d 100644 --- a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Sphere.cpp +++ b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Sphere.cpp @@ -1,4 +1,4 @@ -// Copyright(c) 2023, 2024 Tel-Aviv University (Israel). +// Copyright (c) 2023, 2024 Tel-Aviv University (Israel). // All rights reserved. // // This file is part of CGAL (www.cgal.org). diff --git a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Sphere.h b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Sphere.h index 983a40a89a0..c5266804633 100644 --- a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Sphere.h +++ b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Sphere.h @@ -1,4 +1,4 @@ -// Copyright(c) 2023, 2024 Tel-Aviv University (Israel). +// Copyright (c) 2023, 2024 Tel-Aviv University (Israel). // All rights reserved. // // This file is part of CGAL (www.cgal.org). diff --git a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Timer.h b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Timer.h index 1c0606be591..e22edee8287 100644 --- a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Timer.h +++ b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Timer.h @@ -1,4 +1,4 @@ -// Copyright(c) 2023, 2024 Tel-Aviv University (Israel). +// Copyright (c) 2023, 2024 Tel-Aviv University (Israel). // All rights reserved. // // This file is part of CGAL (www.cgal.org). diff --git a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Tools.cpp b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Tools.cpp index c2173dd20d2..be59c995576 100644 --- a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Tools.cpp +++ b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Tools.cpp @@ -1,4 +1,4 @@ -// Copyright(c) 2023, 2024 Tel-Aviv University (Israel). +// Copyright (c) 2023, 2024 Tel-Aviv University (Israel). // All rights reserved. // // This file is part of CGAL (www.cgal.org). diff --git a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Tools.h b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Tools.h index 5b7c1362149..308a0dc8714 100644 --- a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Tools.h +++ b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Tools.h @@ -1,4 +1,4 @@ -// Copyright(c) 2023, 2024 Tel-Aviv University (Israel). +// Copyright (c) 2023, 2024 Tel-Aviv University (Israel). // All rights reserved. // // This file is part of CGAL (www.cgal.org). diff --git a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Triangles.cpp b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Triangles.cpp index 39eb89a7a5b..aec03a4f17a 100644 --- a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Triangles.cpp +++ b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Triangles.cpp @@ -1,4 +1,4 @@ -// Copyright(c) 2023, 2024 Tel-Aviv University (Israel). +// Copyright (c) 2023, 2024 Tel-Aviv University (Israel). // All rights reserved. // // This file is part of CGAL (www.cgal.org). diff --git a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Triangles.h b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Triangles.h index ce24fc55d6a..b819870e128 100644 --- a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Triangles.h +++ b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Triangles.h @@ -1,4 +1,4 @@ -// Copyright(c) 2023, 2024 Tel-Aviv University (Israel). +// Copyright (c) 2023, 2024 Tel-Aviv University (Israel). // All rights reserved. // // This file is part of CGAL (www.cgal.org). diff --git a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Verification.cpp b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Verification.cpp index 705f082eed6..55132c9b786 100644 --- a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Verification.cpp +++ b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Verification.cpp @@ -1,4 +1,4 @@ -// Copyright(c) 2023, 2024 Tel-Aviv University (Israel). +// Copyright (c) 2023, 2024 Tel-Aviv University (Israel). // All rights reserved. // // This file is part of CGAL (www.cgal.org). diff --git a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Verification.h b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Verification.h index fc407256e5e..92e0480ebc3 100644 --- a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Verification.h +++ b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Verification.h @@ -1,4 +1,4 @@ -// Copyright(c) 2023, 2024 Tel-Aviv University (Israel). +// Copyright (c) 2023, 2024 Tel-Aviv University (Israel). // All rights reserved. // // This file is part of CGAL (www.cgal.org). diff --git a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Vertices.cpp b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Vertices.cpp index dc64111bf93..5a15e5a3a5f 100644 --- a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Vertices.cpp +++ b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Vertices.cpp @@ -1,4 +1,4 @@ -// Copyright(c) 2023, 2024 Tel-Aviv University (Israel). +// Copyright (c) 2023, 2024 Tel-Aviv University (Israel). // All rights reserved. // // This file is part of CGAL (www.cgal.org). diff --git a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Vertices.h b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Vertices.h index 1ec741f3688..124d6be26fb 100644 --- a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Vertices.h +++ b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Vertices.h @@ -1,4 +1,4 @@ -// Copyright(c) 2023, 2024 Tel-Aviv University (Israel). +// Copyright (c) 2023, 2024 Tel-Aviv University (Israel). // All rights reserved. // // This file is part of CGAL (www.cgal.org). diff --git a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/World_coordinate_axes.cpp b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/World_coordinate_axes.cpp index baea14f53bf..d85076c8810 100644 --- a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/World_coordinate_axes.cpp +++ b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/World_coordinate_axes.cpp @@ -1,4 +1,4 @@ -// Copyright(c) 2023, 2024 Tel-Aviv University (Israel). +// Copyright (c) 2023, 2024 Tel-Aviv University (Israel). // All rights reserved. // // This file is part of CGAL (www.cgal.org). diff --git a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/World_coordinate_axes.h b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/World_coordinate_axes.h index 53d50109d90..80073d85535 100644 --- a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/World_coordinate_axes.h +++ b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/World_coordinate_axes.h @@ -1,4 +1,4 @@ -// Copyright(c) 2023, 2024 Tel-Aviv University (Israel). +// Copyright (c) 2023, 2024 Tel-Aviv University (Israel). // All rights reserved. // // This file is part of CGAL (www.cgal.org). diff --git a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/arr_print.h b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/arr_print.h index 611bb8db15a..6e4b9fcc389 100644 --- a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/arr_print.h +++ b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/arr_print.h @@ -1,4 +1,4 @@ -// Copyright(c) 2023, 2024 Tel-Aviv University (Israel). +// Copyright (c) 2023, 2024 Tel-Aviv University (Israel). // All rights reserved. // // This file is part of CGAL (www.cgal.org). diff --git a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/earth.cpp b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/earth.cpp index 4bd86b24e98..2a7a5f7d4ee 100644 --- a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/earth.cpp +++ b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/earth.cpp @@ -1,4 +1,4 @@ -// Copyright(c) 2023, 2024 Tel-Aviv University (Israel). +// Copyright (c) 2023, 2024 Tel-Aviv University (Israel). // All rights reserved. // // This file is part of CGAL (www.cgal.org). diff --git a/Straight_skeleton_2/include/CGAL/create_weighted_straight_skeleton_2.h b/Straight_skeleton_2/include/CGAL/create_weighted_straight_skeleton_2.h index 85c4cd6b99e..96c42fb9925 100644 --- a/Straight_skeleton_2/include/CGAL/create_weighted_straight_skeleton_2.h +++ b/Straight_skeleton_2/include/CGAL/create_weighted_straight_skeleton_2.h @@ -1,4 +1,4 @@ -// Copyright(c) 2006 Fernando Luis Cacciola Carballal. All rights reserved. +// Copyright (c) 2006 Fernando Luis Cacciola Carballal. All rights reserved. // // This file is part of CGAL(www.cgal.org). // diff --git a/Straight_skeleton_2/include/CGAL/draw_straight_skeleton_2.h b/Straight_skeleton_2/include/CGAL/draw_straight_skeleton_2.h index 8ff502ba5e3..05d1c653940 100644 --- a/Straight_skeleton_2/include/CGAL/draw_straight_skeleton_2.h +++ b/Straight_skeleton_2/include/CGAL/draw_straight_skeleton_2.h @@ -1,4 +1,4 @@ -// Copyright(c) 2018 INRIA Sophia-Antipolis (France). +// Copyright (c) 2018 INRIA Sophia-Antipolis (France). // All rights reserved. // // This file is part of CGAL (www.cgal.org). diff --git a/Triangulation_2/examples/Triangulation_2/polygon_triangulation_graphics_scene_options.h b/Triangulation_2/examples/Triangulation_2/polygon_triangulation_graphics_scene_options.h index 4768211fdfa..3b814a7a639 100644 --- a/Triangulation_2/examples/Triangulation_2/polygon_triangulation_graphics_scene_options.h +++ b/Triangulation_2/examples/Triangulation_2/polygon_triangulation_graphics_scene_options.h @@ -1,4 +1,4 @@ -// Copyright(c) 2022 GeometryFactory (France). +// Copyright (c) 2022 GeometryFactory (France). // All rights reserved. // // This file is part of CGAL (www.cgal.org). diff --git a/Triangulation_2/include/CGAL/Regular_triangulation_2.h b/Triangulation_2/include/CGAL/Regular_triangulation_2.h index d7cae81c69e..94e5d5fb67a 100644 --- a/Triangulation_2/include/CGAL/Regular_triangulation_2.h +++ b/Triangulation_2/include/CGAL/Regular_triangulation_2.h @@ -1,4 +1,4 @@ -// Copyright(c) 1997 INRIA Sophia-Antipolis (France). +// Copyright (c) 1997 INRIA Sophia-Antipolis (France). // All rights reserved. // // This file is part of CGAL (www.cgal.org). diff --git a/Triangulation_2/include/CGAL/Triangulation_2/internal/In_domain.h b/Triangulation_2/include/CGAL/Triangulation_2/internal/In_domain.h index f46b2f423ef..92f6fb29ff6 100644 --- a/Triangulation_2/include/CGAL/Triangulation_2/internal/In_domain.h +++ b/Triangulation_2/include/CGAL/Triangulation_2/internal/In_domain.h @@ -1,4 +1,4 @@ -// Copyright(c) 2022 GeometryFactory (France). +// Copyright (c) 2022 GeometryFactory (France). // All rights reserved. // // This file is part of CGAL (www.cgal.org). diff --git a/Triangulation_2/include/CGAL/draw_constrained_triangulation_2.h b/Triangulation_2/include/CGAL/draw_constrained_triangulation_2.h index 05d933f92e9..441ac7f3fcb 100644 --- a/Triangulation_2/include/CGAL/draw_constrained_triangulation_2.h +++ b/Triangulation_2/include/CGAL/draw_constrained_triangulation_2.h @@ -1,4 +1,4 @@ -// Copyright(c) 2022 GeometryFactory (France). +// Copyright (c) 2022 GeometryFactory (France). // All rights reserved. // // This file is part of CGAL (www.cgal.org). diff --git a/Triangulation_2/include/CGAL/draw_triangulation_2.h b/Triangulation_2/include/CGAL/draw_triangulation_2.h index 32a42879ae4..f91fa5b4aaa 100644 --- a/Triangulation_2/include/CGAL/draw_triangulation_2.h +++ b/Triangulation_2/include/CGAL/draw_triangulation_2.h @@ -1,4 +1,4 @@ -// Copyright(c) 2018 INRIA Sophia-Antipolis (France). +// Copyright (c) 2018 INRIA Sophia-Antipolis (France). // All rights reserved. // // This file is part of CGAL (www.cgal.org). diff --git a/Triangulation_2/include/CGAL/mark_domain_in_triangulation.h b/Triangulation_2/include/CGAL/mark_domain_in_triangulation.h index 1e6a108657f..249cd94e367 100644 --- a/Triangulation_2/include/CGAL/mark_domain_in_triangulation.h +++ b/Triangulation_2/include/CGAL/mark_domain_in_triangulation.h @@ -1,4 +1,4 @@ -// Copyright(c) 2022 GeometryFactory (France). +// Copyright (c) 2022 GeometryFactory (France). // All rights reserved. // // This file is part of CGAL (www.cgal.org). diff --git a/Voronoi_diagram_2/include/CGAL/draw_voronoi_diagram_2.h b/Voronoi_diagram_2/include/CGAL/draw_voronoi_diagram_2.h index 534d5aa47c3..d5efc0c0a30 100644 --- a/Voronoi_diagram_2/include/CGAL/draw_voronoi_diagram_2.h +++ b/Voronoi_diagram_2/include/CGAL/draw_voronoi_diagram_2.h @@ -1,4 +1,4 @@ -// Copyright(c) 2019 Foundation for Research and Technology-Hellas (Greece). +// Copyright (c) 2019 Foundation for Research and Technology-Hellas (Greece). // All rights reserved. // // This file is part of CGAL (www.cgal.org).