Commit Graph

2999 Commits

Author SHA1 Message Date
Sébastien Loriot 4bc837f51d add missing QUIET 2025-03-25 17:45:00 +01:00
Mael Rouxel-Labbé 691fd789f9 Merge remote-tracking branch 'cgal/master' into gsoc2022-isosurface 2025-03-24 21:34:55 +01:00
Andreas Fabri 7b2517a736
Update BGL/include/CGAL/boost/graph/dijkstra_shortest_path.h
Co-authored-by: Laurent Rineau <Laurent.Rineau@cgal.org>
2025-03-21 10:24:34 +01:00
Sébastien Loriot 77a532a9d8 missing one vertex 2025-03-20 19:45:19 +01:00
Andreas Fabri ce56424cd5 Add example; polish doc 2025-03-20 11:59:08 +01:00
Andreas Fabri 954ea5a5fc fix 2025-03-20 11:02:38 +01:00
Andreas Fabri 4014582c13 lowecase 2025-03-20 10:37:53 +01:00
Andreas Fabri d8248383a8 simplify the visitor 2025-03-20 10:29:35 +01:00
Andreas Fabri 8a749c5b61 simplify the code 2025-03-20 10:25:05 +01:00
Andreas Fabri 94801e8826 polish doc 2025-03-18 17:42:43 +01:00
Jane Tournois bcac630220 rename to dijkstra_shortest_path() 2025-03-18 17:11:00 +01:00
Jane Tournois 0e5ec52e31 doc template parameters 2025-03-04 14:45:08 +01:00
Jane Tournois e029ad568a doc 2025-03-04 14:37:48 +01:00
Jane Tournois 2cf5ed144c doc 2025-03-04 11:38:51 +01:00
Jane Tournois c1768cb725 add vertex_index_map and doc 2025-03-04 11:20:28 +01:00
Jane Tournois 7420b06cc6 define map type only once 2025-03-04 10:25:01 +01:00
Jane Tournois 73ed6f81da add missing typedef 2025-03-04 09:27:33 +01:00
Jane Tournois 737a05f998 v0 of using edge_relaxed to avoid re-circulating around each vertex after Dijkstra algo 2025-03-03 17:07:05 +01:00
Sven Oesau 24d44e786b Merge remote-tracking branch 'cgal/master' into PMP-PoissonDiskSampling-GF 2025-02-25 12:24:19 +01:00
Sven Oesau bee8a662f6 renaming helper struct to Vector_matching_point
updates following review
2025-02-25 12:20:51 +01:00
Sven Oesau d92cf1f6a8 added missing header 2025-02-14 13:59:31 +01:00
Sven Oesau d673998f52 integrating comments from reviews
poisson_eliminate now works with d-dimensional points
2025-02-14 13:24:16 +01:00
Sébastien Loriot 9c536ddae6 Merge pull request #8234 from MaelRL/BGL-Add_remove_deg_2_vertex-GF
Add an Euler operation to remove degree 2 vertices
2025-02-12 21:17:43 +01:00
Sébastien Loriot b879d39472 Merge remote-tracking branch 'cgal/6.0.x-branch' 2025-02-12 19:49:46 +01:00
Sébastien Loriot 9b1c378424 Merge remote-tracking branch 'cgal/5.6.x-branch' into 6.0.x-branch 2025-02-12 19:49:09 +01:00
Sebastien Loriot 14b83f0d3e
boost::tie -> std::tie (#8715) 2025-02-12 19:36:19 +01:00
Sebastien Loriot 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
Jane Tournois f24d3ca97f use Dijkstra_end_exception instead of std::exception 2025-02-04 18:50:34 +01:00
Laurent Rineau 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
Jane Tournois a64af9881a doc 2025-02-03 15:43:00 +01:00
Jane Tournois 96cd968423 a little bit of doc + rename "mesh" to "graph" 2025-02-03 12:41:19 +01:00
Jane Tournois 0a8d61bbd1 add edge_weight property map 2025-02-03 11:59:04 +01:00
Jane Tournois c3cf48ca40 add np and return output iterator 2025-01-31 15:54:05 +01:00
Jane Tournois c935b7625f first version of shortest_path(vs, vt, mesh) 2025-01-31 14:25:59 +01:00
Mael 68e7bfa4aa
Might as well use the real type 2025-01-28 21:07:58 +01:00
Mael Rouxel-Labbé 8c5515bb42 Fix types 2025-01-28 21:05:27 +01:00
Sébastien Loriot 3d260ba6eb typo 2025-01-27 10:18:42 +01:00
Sébastien Loriot 107f3696dc boost::tie -> std::tie 2025-01-24 14:20:00 +01:00
Sébastien Loriot 0bb274d169 fix warnings 2025-01-23 11:45:06 +01:00
Sébastien Loriot 36d98614df Merge remote-tracking branch 'cgal/6.0.x-branch' 2025-01-09 19:23:19 +01:00
Sébastien Loriot 0eb709dd65 Merge remote-tracking branch 'cgal/5.6.x-branch' into HEAD 2025-01-09 19:22:39 +01:00
Sébastien Loriot 1e06a8813f handle special case when FFG has a non-manifold mesh and not all umbrellas are selected 2025-01-08 17:31:21 +01:00
Mael Rouxel-Labbé f91a8f8408 Add header include 2024-12-17 11:13:43 +01:00
Sébastien Loriot b32558b87e Merge remote-tracking branch 'cgal/master' into gsoc2022-isosurface 2024-12-16 11:47:34 +01:00
Mael Rouxel-Labbé f6a121d335 Add doc for BGL's remove_degree_2_vertex() 2024-12-16 09:20:21 +01:00
Mael Rouxel-Labbé f744f03d52 Test remove_degree_2_vertex 2024-12-13 22:18:52 +01:00
Mael Rouxel-Labbé 2db11f6a2c Allow removing degree 2 vertices incident to a triangle face 2024-12-13 22:18:33 +01:00
Mael Rouxel-Labbé 9e5dcbf548 Merge remote-tracking branch 'cgal/master' into BGL-Add_remove_deg_2_vertex-GF 2024-12-13 14:44:04 +01:00
Sébastien Loriot 11640a3946 Merge remote-tracking branch 'cgal/6.0.x-branch' in master 2024-12-04 14:13:01 +01:00
Jane Tournois c4760da918 in OpenMesh, the outgoing halfedge of a boundary vertex must be the boundary halfedge 2024-12-03 10:48:57 +01:00
Sébastien Loriot 1b7e7bea6a fix dynamic with default for graph inheriting from another graph 2024-11-28 14:37:00 +01:00
Jane Tournois 7c156fa6cd use NP stream_precision 2024-11-15 14:59:21 +01:00
Jane Tournois 64acf21a1b read and write doubles instead of floats 2024-11-15 14:12:05 +01:00
Sebastien Loriot 74ea8b1f6c
Add CGAL::IO::read_OM() (#8427)
## Summary of Changes

Add a function to read an OpenMesh file ( `*.om` ) in CGALlab. This file
format stores also edges and vertices marked as features.
For the moment the function itself is not documented.

## Release Management

* License and copyright ownership: GeometryFactory
2024-11-14 14:12:26 +01:00
Jane Tournois 82e2e7a267 add missing const 2024-11-12 14:46:31 +01:00
Sébastien Loriot 13fcef62e0 missing const 2024-11-08 16:26:01 +01:00
Sébastien Loriot c8936698ac apply @MaelRL review 2024-11-08 16:22:47 +01:00
Sebastien Loriot 1690619625
CGAL: Modernize CMakeLists.txt (#8528)
## Summary of Changes

- Changed `PUBLIC` to `PRIVATE`  in the `target_link_libraries()`
- ~~Link against `Boost::<COMPONENT>`~~ as we do more than just linking
and must use the `CGAL::_.._support`
- Use `target_compile_definitions()` and `add_compile_definitions()`

More to be done.

## Release Management

* Affected package(s): all
* Issue(s) solved (if any): fix one item of  #4815
* License and copyright ownership: unchanged
2024-10-31 10:32:25 +01:00
Sébastien Loriot 51b98e9cc2 add doc 2024-10-24 16:54:15 +02:00
Jane Tournois 69bf76e106 remove obselete header 2024-10-23 12:32:26 +02:00
Sébastien Loriot 9764dd1dce remove extra include 2024-10-23 12:15:13 +02:00
Jane Tournois cddb3d5c56 move OM.h IO header to BGL package
adapt demo and examples
BGL example TriMesh.cpp does not compile
2024-10-23 11:58:02 +02:00
Sébastien Loriot e21f49d79c Merge pull request #8483 from afabri/CGAL-Issue8399-GF
Cleanup as suggested in Issue 8399
2024-10-21 19:15:29 +02:00
Sébastien Loriot dd25a38a14 Merge pull request #8467 from afabri/STL_extension-Openmesh_conversion-GF
STL_extension: Add conversion operator
2024-10-21 19:15:22 +02:00
Laurent Rineau fb2a9eac90 Merge remote-tracking branch 'cgal/master' into pr/afabri/8528 2024-10-21 16:32:51 +02:00
Sébastien Loriot e7b8a4eb17 Merge pull request #8523 from lrineau/CGAL_CGAL-protect_against_macro_free-GF
protect CGAL against macro `free`
2024-10-18 18:00:37 +02:00
Laurent Rineau 96cd3e6f09 Merge remote-tracking branch 'cgal/master' into pr/afabri/8528 2024-10-17 00:25:24 +02:00
Sven Oesau a06002ab2b Merge remote-tracking branch 'cgal/master' into gsoc2022-isosurface 2024-10-14 14:42:46 +02:00
Andreas Fabri 527569346e CGAL: Modernize CMakeLists.txt 2024-10-08 17:02:41 +01:00
Laurent Rineau d907b362bd the patch was still not complete 2024-10-08 12:45:21 +02:00
albert-github dd02af92a2 issue #8515 Spelling mistakes found checking `en-GB` to `en-US`
Spelling corrections, `en-GB` -> `en-US`
2024-10-05 11:28:29 +02:00
Andreas Fabri a69ff37004 Cleanup as suggested in Issue 8399 2024-09-17 09:51:55 +01:00
Andreas Fabri 6696b2a51f de X 2024-09-17 08:02:32 +01:00
Andreas Fabri 0c89b1a6fe trailing whitespace 2024-09-10 17:24:28 +01:00
Andreas Fabri f2249ab9fd untabify 2024-09-10 08:54:03 +01:00
Andreas Fabri 54a5a10b8e resolve merge conflict 2024-09-10 08:40:22 +01:00
Andreas Fabri 726b9c9485 Show the problem in a test 2024-09-10 08:34:52 +01:00
Sebastien Loriot abd0a58338
Installation - update `FindOpenMesh.cmake` (#8332)
## Summary of Changes

This PR updates CGAL's `FindOpenMesh.cmake`, accordingly with the one
provided by OpenMesh 11.0, and introducing the target
`OpenMesh::OpenMesh`

## Release Management

* Affected package(s): Installation
* License and copyright ownership: unchanged
2024-09-06 13:26:41 +02:00
Jane Tournois 4324445fcb Merge remote-tracking branch 'mine/Installation-findOpenMesh-jtournois' into BGL-Openmesh_selection-GF
# Conflicts:
#	BGL/examples/BGL_OpenMesh/CMakeLists.txt
2024-09-05 10:14:54 +02:00
Sébastien Loriot 4cf1f4b214 CONFIG options is only needed if a FindXXX.cmake exists 2024-09-04 14:48:07 +02:00
Jane Tournois 3f6083e6ff use CGAL::OpenMesh_support in examples and tests 2024-08-27 14:06:16 +02:00
Andreas Fabri 4832f06ae4 Add plugin to read OpenMesh .om files 2024-08-22 11:40:27 +01:00
Andreas Fabri 5d4ba30a10 Avoid need for conversion operator 2024-08-20 16:26:33 +01:00
Andreas Fabri 0e25e333a1 put code in header file 2024-08-20 16:20:33 +01:00
Andreas Fabri 2c4fc75e17 Add CGAL::IO::read_OM() 2024-08-20 15:41:21 +01:00
Andreas Fabri 0c8e489f46 store/retrieve selection and features of an OM 2024-08-20 15:16:13 +01:00
Andreas Fabri b2d5dc4bfc Fix options 2024-08-20 13:38:11 +01:00
Andreas Fabri 457ee55801 Store selection in Status 2024-08-20 12:09:15 +01:00
Sébastien Loriot ce678a62b9 Merge remote-tracking branch 'cgal/5.6.x-branch' 2024-08-19 11:23:25 +02:00
Sébastien Loriot 060f81452a Merge remote-tracking branch 'cgal/5.5.x-branch' into HEAD 2024-08-19 11:19:24 +02:00
Sebastien Loriot 47c417a785
Deal with duplicate lines (#8396)
## Summary of Changes

Deal with Issue #8348 

## Release Management

* Affected package(s):  Triangulation_2 and Periodic_triangulation_2
* Issue(s) solved (if any): fix #8348 
* License and copyright ownership:  unchanged
2024-08-19 11:17:50 +02:00
Sebastien Loriot 862a3b6539
Update CMakeLists.txt for recent VTK to fix CMake Warning (#8279)
## Summary of Changes

Versions >= 9 of VTK trigger the following CMake warning using CGAL's
CMakeLists
```
CMake Deprecation Warning at C:/dev/VTK-9.2.2/build/lib/cmake/vtk-9.2/vtk-use-file-deprecated.cmake:1 (message):
  The `VTK_USE_FILE` is no longer used starting with 8.90.
Call Stack (most recent call first):
  CMakeLists.txt:32 (include)
```

I suggest this modification of the CMakeLists of Mesh_3 examples, that
also requires moving to VTK 9 (9.0 was released in 2020).
If this modification and new requirement are validated, I can apply the
change everywhere.

## Release Management

* Affected package(s): Mesh_3 for now
* License and copyright ownership: unchanged
2024-08-19 11:14:31 +02:00
Andreas Fabri 99539be5c5 explain why duplicate 2024-08-13 08:50:04 +01:00
Sébastien Loriot 35195e311a undo incorrect simplification 2024-08-12 18:11:39 +02:00
Sébastien Loriot eeffa4b752 speed up copy_face_graph
mostly when tm is not empty and almost make it less
dependent on tm size
2024-08-12 09:44:43 +02:00
Andreas Fabri 12468ccf4a Address #8401 2024-08-09 11:32:26 +01:00
Sébastien Loriot f6936400cc Merge pull request #8366 from sloriot/BGL-hx_param
Restore order of template parameters
2024-07-23 17:20:52 +02:00
Sébastien Loriot 630e58f484 Merge remote-tracking branch 'cgal/5.6.x-branch' 2024-07-23 17:18:09 +02:00
Sébastien Loriot f93cb3c552 Merge branch 'cgal/5.5.x-branch' into 'cgal/5.6.x-branch' 2024-07-23 17:15:05 +02:00
Sébastien Loriot 747e6a5fd7 Merge pull request #8365 from sloriot/BGL-doc
Workaround missing links
2024-07-23 17:09:37 +02:00