a2571bbab8
Merge remote-tracking branch 'lrineau/CGAL-followup_PR_8170-lrineau' into Triangulation_3-CDT_3-lrineau
2025-02-11 18:26:52 +01:00
4e5fed81de
fix a bug when `CGAL_BRANCH_BUILD` is falsy (in testsuite tarballs for example)
2025-02-10 15:08:19 +01:00
8eefb7f173
Merge branch 'master' into pr/lrineau/8273
2025-02-07 16:10:52 +01:00
e871025f36
update our CMake supported versions to ...3.31 ( #8727 )
...
## Summary of Changes
Update our CMake supported versions to ...3.31. That will suppress the
warnings about `CMP0167` (from CMake 3.30):
```
CMake Warning (dev) at cmake/modules/display-third-party-libs-versions.cmake:37 (find_package):
Policy CMP0167 is not set: The FindBoost module is removed. Run "cmake
--help-policy CMP0167" for policy details. Use the cmake_policy command to
set the policy and suppress this warning.
```
## Release Management
* Affected package(s): all cmake scripts
* License and copyright ownership: maintenance by GF
2025-02-07 14:03:47 +01:00
bc44c91536
add a benchmark for Polyline_simplification_2
...
Using the tool `compare.py` from [Google Benchmark Tools][1]...
[1]: https://github.com/google/benchmark/blob/main/docs/tools.md
...given that:
- `benchmark_simplify-AFTER` is the file `benchmark_simplify.cpp`
compiled from this branch, and flags `-msse3 -DNDEBUG -O3`
with gcc version 14.2.1,
- `benchmark_simplify-BEFORE` is the same file
compiled from the branch `master`, and same flags and compiler.
the command line was:
```shell
compare.py benchmarks build/Release/benchmark/Polyline_simplification_2/benchmark_simplify-BEFORE build/Release/benchmark/Polyline_simplification_2/benchmark_simplify-AFTER Data/data/wkt/norway-MP.wkt --benchmark_repetitions=20 --benchmark_counters_tabular=true --benchmark_time_unit=s
```
The following results show that there is a speedup
of about 15% (mean) or 18% (median)
```
RUNNING: build/Release/benchmark/Polyline_simplification_2/benchmark_simplify-BEFORE Data/data/wkt/norway-MP.wkt --benchmark_repetitions=20 --benchmark_counters_tabular=true --benchmark_time_unit=s --benchmark_out=/tmp/tmpvxyq_i24
2025-02-06T17:23:08+01:00
Running Data/data/wkt/norway-MP.wkt
Run on (16 X 800 MHz CPU s)
CPU Caches:
L1 Data 48 KiB (x8)
L1 Instruction 32 KiB (x8)
L2 Unified 1280 KiB (x8)
L3 Unified 24576 KiB (x1)
Load Average: 1.47, 2.07, 1.65
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
Benchmark Time CPU Iterations #points #polygons #polylines nb of constraints nb of sub-constraints nb of vertices
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
simplify file Data/data/wkt/norway-MP.wkt 0.067 s 0.067 s 12 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt 0.066 s 0.066 s 12 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt 0.065 s 0.065 s 12 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt 0.073 s 0.072 s 12 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt 0.066 s 0.066 s 12 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt 0.064 s 0.064 s 12 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt 0.067 s 0.066 s 12 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt 0.071 s 0.071 s 12 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt 0.064 s 0.064 s 12 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt 0.064 s 0.064 s 12 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt 0.074 s 0.074 s 12 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt 0.066 s 0.066 s 12 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt 0.075 s 0.074 s 12 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt 0.074 s 0.074 s 12 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt 0.076 s 0.076 s 12 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt 0.078 s 0.078 s 12 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt 0.074 s 0.074 s 12 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt 0.067 s 0.067 s 12 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt 0.064 s 0.064 s 12 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt 0.069 s 0.069 s 12 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt_mean 0.069 s 0.069 s 20 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt_median 0.067 s 0.067 s 20 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt_stddev 0.005 s 0.005 s 20 0 0 0 0 0 0
simplify file Data/data/wkt/norway-MP.wkt_cv 6.73 % 6.68 % 20 0.00% 0.00% 0.00% 0.00% 0.00% 0.00%
RUNNING: build/Release/benchmark/Polyline_simplification_2/benchmark_simplify-AFTER Data/data/wkt/norway-MP.wkt --benchmark_repetitions=20 --benchmark_counters_tabular=true --benchmark_time_unit=s --benchmark_out=/tmp/tmp59ui0dsw
2025-02-06T17:29:26+01:00
Running Data/data/wkt/norway-MP.wkt
Run on (16 X 800.961 MHz CPU s)
CPU Caches:
L1 Data 48 KiB (x8)
L1 Instruction 32 KiB (x8)
L2 Unified 1280 KiB (x8)
L3 Unified 24576 KiB (x1)
Load Average: 1.61, 1.94, 1.73
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
Benchmark Time CPU Iterations #points #polygons #polylines nb of constraints nb of sub-constraints nb of vertices
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
simplify file Data/data/wkt/norway-MP.wkt 0.054 s 0.054 s 13 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt 0.057 s 0.057 s 13 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt 0.059 s 0.059 s 13 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt 0.065 s 0.065 s 13 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt 0.058 s 0.058 s 13 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt 0.056 s 0.056 s 13 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt 0.053 s 0.053 s 13 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt 0.061 s 0.061 s 13 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt 0.058 s 0.058 s 13 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt 0.052 s 0.052 s 13 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt 0.054 s 0.054 s 13 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt 0.055 s 0.054 s 13 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt 0.054 s 0.054 s 13 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt 0.055 s 0.054 s 13 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt 0.054 s 0.054 s 13 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt 0.059 s 0.059 s 13 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt 0.057 s 0.057 s 13 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt 0.058 s 0.057 s 13 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt 0.055 s 0.055 s 13 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt 0.059 s 0.059 s 13 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt_mean 0.057 s 0.057 s 20 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt_median 0.057 s 0.056 s 20 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt_stddev 0.003 s 0.003 s 20 0 0 0 0 0 0
simplify file Data/data/wkt/norway-MP.wkt_cv 5.37 % 5.32 % 20 0.00% 0.00% 0.00% 0.00% 0.00% 0.00%
Comparing build/Release/benchmark/Polyline_simplification_2/benchmark_simplify-BEFORE to build/Release/benchmark/Polyline_simplification_2/benchmark_simplify-AFTER
Benchmark Time CPU Time Old Time New CPU Old CPU New
-----------------------------------------------------------------------------------------------------------------------------------------------
simplify file Data/data/wkt/norway-MP.wkt -0.1941 -0.1942 0 0 0 0
simplify file Data/data/wkt/norway-MP.wkt -0.1269 -0.1272 0 0 0 0
simplify file Data/data/wkt/norway-MP.wkt -0.0900 -0.0918 0 0 0 0
simplify file Data/data/wkt/norway-MP.wkt -0.1049 -0.1065 0 0 0 0
simplify file Data/data/wkt/norway-MP.wkt -0.1204 -0.1206 0 0 0 0
simplify file Data/data/wkt/norway-MP.wkt -0.1279 -0.1282 0 0 0 0
simplify file Data/data/wkt/norway-MP.wkt -0.1962 -0.1961 0 0 0 0
simplify file Data/data/wkt/norway-MP.wkt -0.1370 -0.1377 0 0 0 0
simplify file Data/data/wkt/norway-MP.wkt -0.0951 -0.0962 0 0 0 0
simplify file Data/data/wkt/norway-MP.wkt -0.1851 -0.1852 0 0 0 0
simplify file Data/data/wkt/norway-MP.wkt -0.2720 -0.2716 0 0 0 0
simplify file Data/data/wkt/norway-MP.wkt -0.1702 -0.1717 0 0 0 0
simplify file Data/data/wkt/norway-MP.wkt -0.2700 -0.2703 0 0 0 0
simplify file Data/data/wkt/norway-MP.wkt -0.2644 -0.2634 0 0 0 0
simplify file Data/data/wkt/norway-MP.wkt -0.2861 -0.2856 0 0 0 0
simplify file Data/data/wkt/norway-MP.wkt -0.2492 -0.2488 0 0 0 0
simplify file Data/data/wkt/norway-MP.wkt -0.2310 -0.2301 0 0 0 0
simplify file Data/data/wkt/norway-MP.wkt -0.1382 -0.1389 0 0 0 0
simplify file Data/data/wkt/norway-MP.wkt -0.1401 -0.1406 0 0 0 0
simplify file Data/data/wkt/norway-MP.wkt -0.1464 -0.1467 0 0 0 0
simplify file Data/data/wkt/norway-MP.wkt_pvalue 0.0000 0.0000 U Test, Repetitions: 20 vs 20
simplify file Data/data/wkt/norway-MP.wkt_mean -0.1804 -0.1806 0 0 0 0
simplify file Data/data/wkt/norway-MP.wkt_median -0.1547 -0.1549 0 0 0 0
simplify file Data/data/wkt/norway-MP.wkt_stddev -0.3458 -0.3479 0 0 0 0
simplify file Data/data/wkt/norway-MP.wkt_cv -0.2018 -0.2041 0 0 0 0
OVERALL_GEOMEAN -0.1797 -0.1800 0 0 0 0
```
2025-02-06 17:44:28 +01:00
765744e8b2
fix WKT I/O error handling
2025-02-06 01:22:02 +01:00
050677f002
add CMake option CGAL_with_benchmarks
2025-02-06 01:21:42 +01:00
249a6ac47e
typo correction ( #8728 )
...
Spelling correction
2025-02-05 13:57:16 +01:00
26c3e9cd21
Spelling correction
...
Spelling correction
2025-02-05 10:28:46 +01:00
a6eff02a62
Merge remote-tracking branch 'cgal/6.0.x-branch' into master
2025-02-05 08:42:33 +01:00
5a61b6a994
Merge remote-tracking branch 'cgal/5.6.x-branch' into cgal/6.0.x-branch
2025-02-05 08:40:26 +01:00
54bfdfe04d
Mesh 3 : initial_points_generator parameter for make_mesh_3 point initialization ( #7798 )
...
## Summary of Changes
Added a `initial_points_generator` parameter in make_mesh_3.
With this parameter, we can use a custom functor when initializing the
C3t3 complex.
This functor must follow the
[Initial_points_generator](https://cgal.github.io/7798/v0/Mesh_3/classInitialPointsGenerator.html )
concept.
Tasks:
- [x] Add `initial_points_generator` parameter in `make_mesh_3`
- [x] Make an example
- [x] Write `Construct_initial_points_labeled_image` into a header
- [x] Make `initialize_triangulation_from_labeled_image` use
`Construct_initial_points_labeled_image`
- [x] Change definition of concept `InitialPointsGenerator` to output
`std::tuple<MeshDomain::Point_3, int dimension, MeshDomain::Index>`
(instead of `std::pair<MeshDomain::Point_3, MeshDomain::Index>`)
- [x] Make it pass checks
- [x] Document `initial_points_generator` parameter in `make_mesh_3`
- [x] Document `Construct_initial_points_labeled_image` header
- [x] Document example
- [x] Delete `initialize_triangulation_from_labeled_image` and
`initialize_triangulation_from_gray_image`
- [x] Make an example of labelled and gray image initialisation with the
parameter or the old custom initialization.
- [x] Make small feature page
- [x] add `Construct_initial_points_gray_image.h`, similar to
`Construct_initial_points_labeled_image.h`
- [x] Maybe add a test ?
- [x] announce in `CHANGES.md`, see
https://github.com/CGAL/cgal/pull/7798#issuecomment-2082701644
## Release Management
* Affected package(s): Mesh_3
* Issue(s) solved (if any):
* fix #922
* fix #7469
* discussion #7537
* previous closed PR #7757
* Feature/Small Feature (if any):
[Mesh_3_initial_points_generator_parameter](https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Mesh_3_initial_points_generator_parameter )
* Link to compiled documentation
[*here*](https://cgal.github.io/7798/v4/Manual/index.html ):
*
[make_mesh_3](https://cgal.github.io/7798/v4/Mesh_3/group__PkgMesh3Functions.html#gac8599a0c967075f740bf8e2e92c4770e )
has been modified to receive the parameters :
*
[initial_points_generator](https://cgal.github.io/7798/v4/Mesh_3/group__PkgMesh3Parameters.html#gaf53777b83f1b2f3e7d49275dbab6e46b )
*
[initial_points](https://cgal.github.io/7798/v4/Mesh_3/group__PkgMesh3Parameters.html#gae94f38c6cd23cce45a55608e881a546a )
* The
[InitialPointsGenerator](https://cgal.github.io/7798/v4/Mesh_3/classInitialPointsGenerator.html )
concept that the functor must be a model of.
* A model of this concept :
[Construct_initial_points_labeled_image](https://cgal.github.io/7798/v4/Mesh_3/structCGAL_1_1Construct__initial__points__labeled__image.html )
* License and copyright ownership:
2025-02-05 08:29:06 +01:00
8675d06ea1
Nef_3: Fix issue with the size of the inf box ( #8646 )
...
## Summary of Changes
Fixes Issue #8644
## Release Management
* Affected package(s): Nef_3
* Issue(s) solved (if any): fix #
* License and copyright ownership: unchanged
2025-02-05 08:26:27 +01:00
224acc14c7
Merge remote-tracking branch 'cgal/5.6.x-branch' into cgal/6.0.x-branch
2025-02-05 08:25:32 +01:00
1523772379
Merge pull request #8690 from MaelRL/SLS-API_fixes-6.0.x-GF
...
Fix API issues in 2D Straight Skeletons (6.0.x)
2025-02-05 08:25:27 +01:00
b81fce1e96
Fix API issues in 2D Straight Skeletons (5.6.x) ( #8688 )
...
## Summary of Changes
Fix a number of doc / API issues in 2D straight skeletons, and add more
tests.
TODO:
- [x] More API tests in weighted skeletons
- [x] 6.0.1 version to deal with boost::shared_ptr -> std::shared_ptr
## Release Management
* Affected package(s): `Straight_skeleton_2`
* Issue(s) solved (if any): fix #8686
* Feature/Small Feature (if any): -
* License and copyright ownership: no change
2025-02-05 08:24:24 +01:00
f72e69f8af
Fix warnings ( #8712 )
...
Revealed by #8704
2025-02-05 08:20:29 +01:00
e5001d1a50
update our CMake version 3.18...3.31
...
That will suppress the warnings about `CMP0167` (from CMake 3.30):
```
CMake Warning (dev) at cmake/modules/display-third-party-libs-versions.cmake:37 (find_package):
Policy CMP0167 is not set: The FindBoost module is removed. Run "cmake
--help-policy CMP0167" for policy details. Use the cmake_policy command to
set the policy and suppress this warning.
```
2025-02-04 14:32:37 +01:00
3abe02075b
GMP is not always available
2025-02-01 23:11:25 +01:00
b50579bd09
another fix for the buggy compiler from MSVC 2017
2025-01-31 10:12:04 +01:00
ca17f813b6
fix debug
2025-01-31 08:57:21 +01:00
f20af1a946
fix the value used creating the infimax box used for pairing halfedges
...
without the abs the intersection line of x=-1 and z=-1 would be on the box
leading to invalid behavior (and degenerate halfedges)
2025-01-31 08:54:42 +01:00
f7a57a6c41
Add smaller failing issue
2025-01-31 08:54:29 +01:00
d837dbde21
fix for STL debug mode
...
It is invalid to try to detect if an iterator is singular or value-initialized.
The only operations allowed with value-initialized iterators are:
- copy the iterator, or
- destroy or assign the iterator.
Comparisons like `vertex_it == Vertex_it{}` are not allowed.
2025-01-30 17:51:20 +01:00
571c2ccadc
fix compilation errors with C++>=20, or g++12.2.0
2025-01-30 17:39:32 +01:00
a45ac3eb69
fix the detection of <format> and std::format
2025-01-29 16:28:48 +01:00
c6d6d673af
fix compilation error with gcc-12.2
2025-01-29 16:12:04 +01:00
96dbd55463
extra fix for MSVC 2017 in Constrained_Delaunay_triangulation_2
2025-01-29 14:27:43 +01:00
b701981572
fix another compilation error
...
VC++ 19.16 thought there was an ambiguous call to `operator==`
between `skip_iterator` and `skip_iterator` in the internals of `boost::iterator_adaptor` (yet another matching bug) of VC++ 19.16).
I solved it by using the more modern `boost::stl_interfaces::iterator_interface` from Boost.STLintface (Boost>=1.74).
2025-01-28 15:27:48 +01:00
7f88e5b0cf
fix compilation errors with MSVC 2017 (VC++ 19.16)
2025-01-28 14:01:58 +01:00
5a1f8cdb21
small optimization
2025-01-28 09:44:42 +01:00
3d260ba6eb
typo
2025-01-27 10:18:42 +01:00
9fa067cb4d
recycle the constraints indices
2025-01-24 19:36:57 +01:00
e1e94a1304
fix a warning from UBSAN (in a postcondition)
2025-01-24 18:14:29 +01:00
b31c2ddbe1
CDt_plus_2: lots of refactoring
...
- encapsulate the creation/erasure of constraints in the hierarchy class
- add encapsulation in the hierarchy class, to detect direct uses of members
- add a test of `CDt_plus_2::insert_vertex_in_constraint`, and fix it
- rename `concatenate` and `concatenate2` to
- `concatenate`
- `prepend`
and force a rvalue reference on the argument corresponding to the constraint
that will be swallowed
- rename `split` to `split_tail` and `split2` to `split_head`
- rename `fix_contexts` to give it a longer self-explaning name
2025-01-24 16:29:56 +01:00
e4c7edc436
undo init (will be done globally in another PR)
2025-01-24 10:00:20 +01:00
49b0f52f00
remove no longer valid comment
2025-01-24 08:10:05 +01:00
b19515e1f8
Merge remote-tracking branch 'cgal/6.0.x-branch'
2025-01-24 08:09:18 +01:00
7720caa9dc
Merge remote-tracking branch 'cgal/5.6.x-branch' into HEAD
2025-01-24 08:08:33 +01:00
9a7755b31f
Fix bad detection of warnings + remove outdated scripts ( #8704 )
...
for examples/tests a warning might be reported as `t`
2025-01-24 08:06:52 +01:00
8f78a020ed
Correct icon sizes ( #8703 )
...
Correct icon sizes
**Without correction**
**With correction**
2025-01-24 08:06:03 +01:00
8824b917ae
Update Documentation/doc/resources/1.8.13/cgal_stylesheet.css
...
Co-authored-by: Sebastien Loriot <sloriot.ml@gmail.com>
2025-01-24 08:04:50 +01:00
8a5cbddf72
Update Documentation/doc/resources/1.8.13/cgal_stylesheet.css
...
Co-authored-by: Sebastien Loriot <sloriot.ml@gmail.com>
2025-01-24 08:04:50 +01:00
3aa58ef5fb
Update Documentation/doc/resources/1.8.13/cgal_stylesheet.css
...
Looks like it is not necesary for the 1.8.13 version
Co-authored-by: Sebastien Loriot <sloriot.ml@gmail.com>
2025-01-24 08:04:50 +01:00
e36065c773
Correct icon sizes
...
Correct icon sizes
2025-01-24 08:04:50 +01:00
310f4bdf4e
glue constraints_set.insert(..) and new_constraint_id()
...
.. to prepare a refactoring
2025-01-23 18:20:21 +01:00
0d84f271d6
whitespace and comments
2025-01-23 18:14:05 +01:00
796190863c
derive Ct_plus_2 from the hierarchy
...
Instead of storing the hierarchy as a data member, store it
as a hidden (protected) base class. That allows to forward
member functions easily with using-declarations. That also avoids
mismatches between the names in the triangulation and the hierarchy.
2025-01-23 17:51:53 +01:00
239a2adb1a
virtual -> override
2025-01-23 17:26:06 +01:00
0dcc287941
add CGAL::unordered_flat_set
2025-01-23 17:23:12 +01:00
Laurent Rineau
Sebastien Loriot
albert-github
Andreas Fabri