Commit Graph

2465 Commits

Author SHA1 Message Date
Laurent Rineau e25669cfcc Merge pull request #6145 from sloriot/BGL-collapse_edges_with_cst
Fix collapse_edge bug when both edges to remove are constrained edges
2021-11-25 17:28:07 +01:00
Sébastien Loriot fc255614e4 fix warning 2021-11-24 15:08:11 +01:00
Laurent Rineau 914ba548b6 Merge pull request #6144 from MaelRL/BGL-Fix_METIS_npart_int-GF
Fix conversion error in METIS wrappers
2021-11-23 15:39:20 +01:00
Sébastien Loriot 7169811f60 remove extra ; and fix indentation 2021-11-23 10:21:20 +01:00
Sébastien Loriot d2be97b1eb fix bug when both edges to remove are constrained edges 2021-11-23 10:16:23 +01:00
Mael Rouxel-Labbé 4f02dd2fc2 Fix the previous, bad fix 2021-11-22 13:06:46 +01:00
Mael Rouxel-Labbé 3857c58324 Fix #part type 2021-11-22 12:38:53 +01:00
Laurent Rineau c199795670 Merge pull request #6104 from sloriot/Property_map-fix_id_map_mutable
restore mutable property of the pmap
2021-11-18 12:27:23 +01:00
Sébastien Loriot 4eb1464aed fix Identity_map mutability and fix CGAL code using it 2021-11-09 11:37:24 +01:00
Sébastien Loriot ab48f63e30 update latest cmake version tested 2021-11-09 10:58:47 +01:00
Sébastien Loriot d33d8d72d7 add missing include statement 2021-11-02 13:54:36 +01:00
Laurent Rineau 22c4c859d2 Merge branch '5.3.x-branch' 2021-11-02 10:59:04 +01:00
Sébastien Loriot 120d94a4cf add new test for documented named parameters 2021-11-01 09:39:51 +01:00
Sébastien Loriot 9543deb304 Merge pull request #6046 from MaelRL/PM-Fix_pmaps_reference_types_master-GF
Various fixes for property maps (master)
2021-10-29 17:40:15 +02:00
Sébastien Loriot 90bc05e715 Merge pull request #6047 from MaelRL/PM-Fix_pmaps_reference_types_5.3-GF
Various fixes for property maps (5.3)
2021-10-29 17:39:22 +02:00
Laurent Rineau ca89949169 Merge pull request #5597 from lrineau/Mesh_3-weighted_images-GF
Mesh_3: Add weighted images
2021-10-29 17:01:33 +02:00
Laurent Rineau 0f498e9cc1 Merge pull request #6072 from sloriot/Tetra_remeshing-fix_np
Fix invalid np name
2021-10-29 16:58:27 +02:00
Sébastien Loriot 49608861ea fix invalid np name 2021-10-20 15:35:50 +02:00
Mael Rouxel-Labbé 131242bb80 Merge branch 'PM-Fix_pmaps_reference_types-GF' into PM-Fix_pmaps_reference_types_5.3-GF 2021-10-12 09:29:23 +02:00
Mael Rouxel-Labbé 8166579e55 Merge branch 'PM-Fix_pmaps_reference_types-GF' into PM-Fix_pmaps_reference_types_master-GF 2021-10-11 19:58:07 +02:00
Mael Rouxel-Labbé 2331eb7cf4 Fix comment 2021-10-08 15:41:54 +02:00
Mael Rouxel-Labbé 590ddf8015 Various fixes for pmaps:
- Use `value_type` when the returned type is not a reference
- Enforce `reference = value_type` if the returned type is not
  a reference (to avoid `typename PM::reference r = get(m, k)`,
  which will take a ref to a temporary if the `reference`
  typedef is an actualy reference)
- Do not use `put_get_helper` if the property map is not a `lvalue`
  **mutable** property map: the `put()` is `map[k] = v`, which
  is broken if `operator[]` does not return a reference
- The concept `boost::lvalue_property_map_tag` requires `operator[](key)`,
  not a reference in `get(map, key)`. You can have a readable property map
  returning a reference through its `get(map, key)`, but if there is
  no `operator[]`, it's just a `boost::readable_property_map_tag`
- Some const correctness to avoid copying maps with state
  or heavy keys in `get(map, key)` / `put(map, key, value)`
- Base the category of a wrapping pmap on what it offers instead
  of just forwarding the base property map's category
- Tried to do something like mutable lvalue pmap:
  * `value_type& operator[](key&)`
  * `ref get(map, const key&)`
  * `put(map, const key&, const value_type&)`
  and non-mutable lvalue pmap:
  * `const value_type& operator[](const key&)`
  * `ref get(map, const key&)`
  but not everything fits properly...
2021-10-08 15:38:47 +02:00
Mael Rouxel-Labbé df560987a6 Whitespace & cleaning changes 2021-10-08 12:13:43 +02:00
Laurent Rineau f581ff74d3 Merge pull request #5427 from sloriot/CGAL_data-moving_files
Regroup data: moving files

# Conflicts:
#	Nef_3/archive/triangulation/include/CGAL/partition_is_valid_2.h
2021-10-07 14:44:01 +02:00
Sébastien Loriot 1857a25d28 Merge remote-tracking branch 'cgal/master' into CGAL_data-moving_files 2021-10-06 13:50:31 +02:00
Sébastien Loriot d40b1e150d remove off from doc example 2021-10-05 17:42:25 +02:00
Mael Rouxel-Labbé 12805b47e8 Uniformize expansion term 2021-10-05 11:33:47 +02:00
Mael Rouxel-Labbé 625848e629 Fix missing ':' in various namespaces 2021-10-04 13:21:47 +02:00
Sébastien Loriot 80c2615b38 handle .off in headers 2021-10-04 10:08:24 +02:00
Sébastien Loriot 8350dea94a char* -> std::string 2021-10-04 09:49:24 +02:00
Sébastien Loriot 47028cd184 automatically move data files in data dir + update paths
Done for OFF/OBJ/STL/XYZ/PWN/PLY
2021-10-04 09:42:49 +02:00
Laurent Rineau 4138477558 Merge pull request #5958 from sloriot/BGL-split_node_less_fctr_calls
Call is-termimal functor only on degree 2 nodes
2021-09-30 16:49:40 +02:00
Sébastien Loriot 67e37e3e56 remove incorrect assertion 2021-09-29 16:43:02 +02:00
Laurent Rineau d784df4e15 Merge pull request #5182 from GilesBathgate/fix-uninitialized-member-bgl-iterator
Fix uninitialized member in iterator.h
2021-09-29 11:47:11 +02:00
Laurent Rineau ad79d37410 Merge pull request #6014 from MaelRL/CGAL-IO_Clarify_binary_text-GF
CGAL IO: Clarify binary warning
2021-09-29 11:46:30 +02:00
Mael Rouxel-Labbé c8cc0747fa Clarify binary warning 2021-09-27 15:33:42 +02:00
Sébastien Loriot 71932f2f1e manual fixes 2021-09-23 18:56:29 +02:00
Sébastien Loriot bd345c7f83 remove .cmd files for examples 2021-09-23 18:54:46 +02:00
Jane Tournois 4b3fee813f ITK is not needed in c3t3_item, and find with the required components only 2021-09-23 14:46:40 +02:00
Sebastien Loriot f9d20f42cc
Merge pull request #5945 from sloriot/BGL-np_ref_for_non_copyable_parameters
Improvement for named parameters
2021-09-10 17:39:47 +02:00
Sébastien Loriot 2e07200e5f use forward instead of move 2021-09-07 12:37:29 +02:00
Sébastien Loriot 64a602ba7c try to remove a warning with clang C++20
warning: local variable 'd' will be copied despite being returned by name [-Wreturn-std-move]
  return d;

CGAL/boost/graph/Named_function_parameters.h:319:10: note: call 'std::move' explicitly to avoid copying
  return d;
         ^
         std::move(d)
2021-09-07 11:47:04 +02:00
Sébastien Loriot b27fc8b4af add missing () 2021-09-07 11:46:54 +02:00
Sébastien Loriot 646e6852dc static_assert is a c++17 feature 2021-09-07 10:21:29 +02:00
Sébastien Loriot 7aad9a5802 Call is-termimal functor only on degree 2 nodes 2021-09-03 17:28:14 +02:00
Sébastien Loriot 1eda841d32 workaround user taking ref to temporary
If D is a temporary, it's lifetime extension is done
when we go out of the scope of choose_parameter
so the const D& returned is dangling
2021-09-03 11:03:22 +02:00
Sébastien Loriot 6e1fc8a4e5 Merge remote-tracking branch 'cgal/master' into HEAD 2021-09-02 16:53:07 +02:00
Sébastien Loriot abddb30bd7 no ref to internal value of the parameter pack 2021-09-02 10:08:46 +02:00
Sébastien Loriot 4e7f1ced58 readd missing function if D is a temporary 2021-09-01 11:44:25 +02:00
Sébastien Loriot b4cbfc7b5c more tests and a bugfix 2021-09-01 11:16:40 +02:00