Commit Graph

1664 Commits

Author SHA1 Message Date
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 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
Mael Rouxel-Labbé 12805b47e8 Uniformize expansion term 2021-10-05 11:33:47 +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 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 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 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
Sébastien Loriot 0e730466ef forgot temporary default 2021-09-01 10:13:15 +02:00
Sébastien Loriot aaa3947e40 add a way to extract references from named parameters 2021-09-01 10:02:48 +02:00
Sébastien Loriot 3c257dd01c allow non-copyable object for named parameters 2021-08-31 15:54:25 +02:00
Sébastien Loriot 038c57fb6a Merge pull request #5837 from maxGimeno/PMP-Self_intersections_limited_report-maxGImeno
PMP: Limited Number of Self-intersections
2021-08-13 18:23:20 +02:00
Sébastien Loriot de6d8c6cbd Merge pull request #5742 from danston/Shape_regularization-new_package-danston
[Feature] Shape Regularization New Package
2021-08-13 18:19:35 +02:00
Sebastien Loriot 8d00945943
Merge pull request #5655 from danston/PSP-libpointmatcher_enhancements-danston
[Small Feature] Support for libpointmatcher::GenericDescriptorOutlierFilter
2021-08-12 10:10:13 +02:00
Maxime Gimeno 7345cf1318 Merge remote-tracking branch 'cgal/master' into PMP-Self_intersections_limited_report-maxGImeno 2021-08-11 15:31:20 +02:00
Dmitry Anisimov 933940435a Merge remote-tracking branch 'origin/master' into Shape_regularization-new_package-danston 2021-08-04 15:30:10 +02:00
Laurent Rineau 5759a800e3
Merge pull request #5705 from maxGimeno/CGAL-Clean_up_boost_versions-maxGimeno 2021-07-28 10:14:38 +02:00
Laurent Rineau 4fb90756da Merge pull request #5475 from sloriot/gsoc2019-PMPHDist-martinskrodzki
[Small Feature] Add bounded error Hausdorff distance
2021-07-27 16:28:04 +02:00
Laurent Rineau 2599d8e41a Merge pull request #5863 from MaelRL/BGL-Fix_FFG_nonconst_index_pmaps-GF
Fix index maps for non-const Face_filtered_graph
2021-07-27 15:55:11 +02:00
Laurent Rineau 71175aad53 Merge pull request #5863 from MaelRL/BGL-Fix_FFG_nonconst_index_pmaps-GF
Fix index maps for non-const Face_filtered_graph
2021-07-27 15:52:23 +02:00
Mael Rouxel-Labbé ec9c77b44d Use the non-const ::type typedef for consistency
Internally, both ::type and ::const_type are the same
2021-07-26 13:49:27 +02:00
Mael Rouxel-Labbé 09337e4c3b Add some missing STL includes 2021-07-26 13:06:35 +02:00
Mael Rouxel-Labbé e3b1544070 Revert to binder-pmaps for FFG's index maps (but fix them) 2021-07-26 12:25:46 +02:00
Mael Rouxel-Labbé a221d9f1a7 Using boost:: rather than CGAL:: for FFG's index pmap properties 2021-07-23 14:26:20 +02:00
Mael Rouxel-Labbé eb4d2953d5 Fix index maps for non-const Face_filtered_graph 2021-07-23 12:14:32 +02:00
Maxime Gimeno a3d1765ab4 Merge remote-tracking branch 'cgal/master' into CGAL-Clean_up_boost_versions-maxGimeno 2021-07-19 14:18:40 +02:00
Sebastien Loriot 40f507a1f1
Merge pull request #5800 from MaelRL/SS-Doc_fixes-GF
Harmonization of some IO stream documentation
2021-07-19 07:56:48 +02:00
Maxime Gimeno 03a1639eff Replace NP name 2021-07-09 14:37:21 +02:00
Maxime Gimeno e22ff7c378 add the named parmater 2021-07-06 13:26:02 +02:00
Dmitry Anisimov c5bea93e58 renamed max to maximum and min to minimum in NP to be consistent with other packages 2021-06-30 12:39:01 +02:00
Dmitry Anisimov 73581e15ad added named param for choosing between one sided and symmetric dist in the is_larger_HD function 2021-06-29 14:17:00 +02:00
Mael Rouxel-Labbé 78ff9185b3 Harmonize ASCII usage across all packages 2021-06-23 23:34:32 +02:00
Mael Rouxel-Labbé a34debc92b Uniformize os/is/s/i stream parameter name in Stream_support/io
+ remove extra backticks in NP doc
2021-06-23 23:32:06 +02:00
Jane Tournois ec7a211a1d add parameters to isotropic_remeshing
to able/disable split, collapse, and flip
2021-06-22 14:22:32 +02:00
Dmitry Anisimov aaf55dbaa0 Merge remote-tracking branch 'maxGimeno/PMP-compare_faces_from_meshes-maxGimeno' into gsoc2019-PMPHDist-martinskrodzki 2021-06-18 14:45:24 +02:00
Dmitry Anisimov 0c5d8ed8ed extended named parameters 2021-05-31 17:21:28 +02:00
Dmitry Anisimov ecfbec10fd Merge remote-tracking branch 'origin/master' into Shape_regularization-new_package-danston 2021-05-31 11:36:49 +02:00
Dmitry Anisimov 5384f7a0a0 updated cmakelists, fixed warnings, added BGL params 2021-05-25 11:03:53 +02:00
Laurent Rineau f427e6b87d Merge pull request #5686 from sloriot/PMP-remove_si_boundary_cycles
Allow more repair
2021-05-19 17:24:06 +02:00
Laurent Rineau d6b2c8d9dc Merge pull request #5671 from maxGimeno/CGAL_IO-Add_missing-deprecated_functions-maxGimeno
CGAL_IO: Add missing fallbacks

# Conflicts:
#	BGL/include/CGAL/boost/graph/IO/INP.h
#	Point_set_processing_3/include/CGAL/IO/write_xyz_points.h
2021-05-18 18:13:38 +02:00
Maxime Gimeno 915f585505 misisng tests 2021-05-12 15:48:13 +02:00
Maxime Gimeno 393ae7dae6 Clean-up boost_version reqs 2021-05-12 15:03:53 +02:00
Maxime Gimeno 9acf3d4b19 Add missing fallbacks for IO functions and result_of 2021-05-07 12:50:51 +02:00
Sébastien Loriot 79057f3cdd allow to remesh a patch with boundary cycles of edges if genus is not to be preserved 2021-05-06 14:32:32 +02:00
Sébastien Loriot 4e519a3c7a move documented IO functions in IO namespace 2021-05-05 13:15:37 +02:00
Sébastien Loriot 56025fb5f9 fix release number of depreciation 2021-05-04 14:38:47 +02:00
Sébastien Loriot fb6f703b55 IO namespace for files in IO directories 2021-05-04 14:36:06 +02:00
Dmitry Anisimov cb0e72049b using constant property map instead of new get scalar value class 2021-04-29 18:07:01 +02:00
Dmitry Anisimov c8307dc0d6 added support for GenericDescriptorOutlierFilter to the CGAL libpointmatcher interface 2021-04-29 15:23:38 +02:00
Dmitry Anisimov a2f460c9d6 Merge branch 'master' into gsoc2019-PMPHDist-martinskrodzki 2021-04-27 18:37:32 +02:00
Sebastien Loriot fa4a31a87b
Merge pull request #5583 from sloriot/PMP-face_epsilon_map
Polyhedral_envelope: face epsilon map
2021-04-21 15:26:48 +02:00
Mael 8226666398
Merge branch 'master' into Triangulation_on_sphere_2-GF 2021-04-17 11:22:30 +02:00
Dmitry Anisimov 0333778b96 added face matching, not finished 2021-04-08 16:22:32 +02:00
Laurent Rineau 58ddf16295 Merge pull request #5507 from afabri/PMP-vtune_isotropic_remeshing-GF
PMP:  Accelerate isotropic remeshing
2021-04-06 15:13:11 +02:00
Sébastien Loriot dd19b506ed first version to add epsilon per face 2021-04-03 11:14:15 +02:00
Mael Rouxel-Labbé ca91f533ef Add a NP to not color faces in Tos2::write_OFF 2021-03-24 00:14:58 +01:00
Laurent Rineau e82018f68e Merge pull request #5366 from sloriot/BGL-regul_fct_into_exp_ns
Move non-documented experimental function in experimental namespace
2021-03-03 17:33:17 +01:00
Laurent Rineau d8c294e4e9 Merge pull request #5366 from sloriot/BGL-regul_fct_into_exp_ns
Move non-documented experimental function in experimental namespace
2021-03-03 17:10:25 +01:00
Andreas Fabri a945c4f840 small_vector has reserve() 2021-03-02 21:30:36 +00:00
Andreas Fabri 95ea922de8 Important gain for Euler::add_face() 2021-03-02 14:40:22 +00:00
Laurent Rineau 1a040c8552
Merge pull request #4749 from danston/Polygon_mesh_processing-triangulate_hole_with_cdt2-danston 2021-02-19 07:59:59 +01:00
Laurent Rineau c70da09776 Merge pull request #5049 from sloriot/PMP-corefine_non_manifold
corefine with non manifold edges
2021-02-18 15:26:56 +01:00
Laurent Rineau a72fdb7b3c Merge pull request #5352 from lrineau/CGAL-fix_CGAL_IO-GF
Fixes after the PR "CGAL I/O
2021-02-18 15:23:43 +01:00
Maxime Gimeno e7197d89d2 replace remaining wrong function call 2021-02-08 09:28:13 +01:00
Maxime Gimeno cca6d7fa88 add missing using 2021-02-08 09:06:57 +01:00
Laurent Rineau 731ef9bfea Merge pull request #5397 from sloriot/BGL-iv_cpfg
Handle isolated vertices in the target mesh
2021-02-05 16:10:08 +01:00
Laurent Rineau ec87afe569 Merge pull request #5397 from sloriot/BGL-iv_cpfg
Handle isolated vertices in the target mesh
2021-02-05 16:07:14 +01:00
Maxime Gimeno 2dac31f36f Clean-up and fix doc 2021-02-05 14:14:11 +01:00
Maxime Gimeno 7bf9c14f72 Factorization 2021-01-28 10:01:52 +01:00
Maxime Gimeno 2d59464b2b remove os.precision(6) as it is the default. 2021-01-27 15:49:42 +01:00
Maxime Gimeno 41c823c083 replace default value of stream precision 2021-01-27 15:44:02 +01:00
Sébastien Loriot 71ae816bfa Merge remote-tracking branch 'cgal/master' into PMP-corefine_non_manifold 2021-01-27 13:46:09 +01:00
Sébastien Loriot 026abdb175 handle isolated vertices in the target mesh 2021-01-27 10:17:42 +01:00
Maxime Gimeno 19a10eddfc add missing overloads 2021-01-26 10:40:06 +01:00
Maxime Gimeno 7cf6a3bed0 Fix VRML_2 logic 2021-01-26 10:15:20 +01:00
Sébastien Loriot 27de834e30 move non-documented/exp function in experimental namespace 2021-01-18 11:30:02 +01:00
Maxime Gimeno a46d62b83e WIP testing deprecated IO functions 2021-01-15 15:09:12 +01:00
Sébastien Loriot ad911271a9 Merge commit '6594e7549bd70923990d86c31e2aa267a79bb629' into HEAD 2021-01-15 10:12:17 +01:00
Sébastien Loriot bdd4efe3b3 Merge commit 'efc0c525e8b' into HEAD 2021-01-15 10:06:56 +01:00
Sébastien Loriot efc0c525e8 include non-deprecated header 2021-01-15 10:02:00 +01:00
Dmitry Anisimov f7abb6c343
Merge branch 'master' into Polygon_mesh_processing-triangulate_hole_with_cdt2-danston 2021-01-14 17:23:24 +01:00
Dmitry Anisimov c657451934
Merge branch 'master' into Polygon_mesh_processing-triangulate_hole_with_cdt2-danston 2021-01-14 10:38:51 +01:00
Maxime Gimeno 5948bc846e Try to remove Filtered_kernel from the dependencies of BGL 2021-01-11 14:11:30 +01:00