Commit Graph

4854 Commits

Author SHA1 Message Date
Mael Rouxel-Labbé 95de952715 Misc minor fixes 2022-02-13 18:59:59 +01:00
Mael Rouxel-Labbé 5a9f1b21ee Fix early quitting not quitting as early as it should 2022-02-13 01:01:35 +01:00
Mael Rouxel-Labbé b829c3744f Fix bad TM1 culling bound 2022-02-12 21:50:01 +01:00
Mael Rouxel-Labbé e68f13ff62 Fix bad TM2 culling criterion: (dist <= upper) is sufficient for intersection 2022-02-12 21:49:55 +01:00
Mael Rouxel-Labbé 08ccb7285e Fix wrongly ordered priority queue yielding wrong upper bounds 2022-02-12 13:52:09 +01:00
Mael Rouxel-Labbé e12f9febe8 Fix bad initialization
get_max_distance() does not yield a good hint for the lower value
Also it requires an extra traversal of the tree.
2022-02-12 01:32:34 +01:00
Mael Rouxel-Labbé 25dc9c0f11 Improve reader sanity (no real changes) 2022-02-11 11:31:17 +01:00
Laurent Rineau 5a6c24446b Merge pull request #6309 from sloriot/PMP-size_t_FT
Avoid std::size_t to FT conversion
2022-02-10 23:00:25 +01:00
Sébastien Loriot 62b54dab3f workaround MSVC warning 2022-02-09 19:04:45 +01:00
Mael Rouxel-Labbé 61dd3dd0df Remove some wide 'PMP' namespace declarations 2022-02-09 11:52:36 +01:00
Mael Rouxel-Labbé e5fda3c613 Tiny doc fixes 2022-02-09 10:29:49 +01:00
Laurent Rineau b68329fc28 Merge pull request #6299 from MaelRL/PMP-Repair_SI_improvements_2-GF
PMP::remove_self_intersections improvements
2022-02-08 23:44:26 +01:00
Laurent Rineau d78a7b9255 Merge pull request #6302 from afabri/P2T2-assert-GF
CGAL: In testcode do not use CGAL_assertion but assert
2022-02-08 23:44:24 +01:00
Sébastien Loriot 3e90db4824 prevent another size_t to FT 2022-02-08 17:00:23 +01:00
Sébastien Loriot 705fee5659 avoid cascading with Lazy 2022-02-07 18:35:07 +01:00
Sébastien Loriot ba5e5e041c avoid std::size_t to FT conversion 2022-02-07 09:36:26 +01:00
Sébastien Loriot 4ffc949199 replace boost::unordered by std::unordered
but in T3, Mesh_3, TDS_3, P3[TM]3
2022-02-03 19:11:12 +01:00
Andreas Fabri 440a8dfb7b Fix file name 2022-02-03 08:41:04 +00:00
Sébastien Loriot 77e5beeaca use features available in std instead of boost 2022-02-03 09:28:52 +01:00
Andreas Fabri 735752bec9 Do the remaining changes after Laurent's check 2022-02-03 08:02:11 +00:00
Laurent Rineau f9c05a0ba1 Merge pull request #6253 from afabri/P2T2-assert-GF
CGAL:   In testcode do not use CGAL_assertion  but assert
2022-02-02 16:38:22 +01:00
Laurent Rineau 5b42a501cc Merge pull request #6266 from afabri/CGAL-assertions_in_examples-GF
CGAL Examples: CGAL_assertion ->  assert

# Conflicts:
#	HalfedgeDS/examples/HalfedgeDS/hds_prog_compact2.cpp
#	Triangulation_2/examples/Triangulation_2/triangulation_print_OFF.h
2022-02-02 16:38:01 +01:00
Mael Rouxel-Labbé 9defc96b33 Better detection of bad patch borders (also check the validity of sub patches) 2022-02-02 13:35:51 +01:00
Mael Rouxel-Labbé 2af6aeb573 Do not mark edges incident to degenerate faces as sharp 2022-02-02 13:34:55 +01:00
Mael Rouxel-Labbé 32823cb36b Hide some std::cerr behind debug macros 2022-02-02 13:34:21 +01:00
Laurent Rineau 32f8b7fa4d Merge pull request #6258 from sloriot/PMP-snap_post_cond
fix post condition
2022-02-01 08:58:31 +01:00
Andreas Fabri 79a38d5cb9 CGAL Examples: CGAL_assertion -> assert 2022-01-24 10:19:04 +00:00
Sébastien Loriot a0c17c8655 fix post condition 2022-01-19 13:21:00 +01:00
Andreas Fabri 03bcb67ca6 Deal with PCA 2022-01-18 18:51:37 +00:00
Sebastien Loriot 01414393f7
Fix warning 2022-01-18 09:26:05 +01:00
Sébastien Loriot 07e917ca09 Merge remote-tracking branch 'MaelRL/PMP-Improve_SI_repair-GF' into HEAD 2022-01-18 09:18:20 +01:00
Sébastien Loriot ff77535dd1 add comments about workaround 2022-01-13 14:47:10 +01:00
Sébastien Loriot 10b0af3092 rename macro since Named_function_parameter is part of STL_Extension 2022-01-13 14:43:34 +01:00
Sébastien Loriot 4bbe759f08 Try to please MSVC 2015 2022-01-13 14:25:32 +01:00
Sébastien Loriot 497dbcd44a try to please MSVC 2015 2022-01-13 14:22:29 +01:00
Sébastien Loriot 99a5e3c8ea try to please MSVC2015 2022-01-13 14:01:41 +01:00
Sébastien Loriot 3028bf45bd try to please MSVC2015 2022-01-13 13:43:12 +01:00
Sébastien Loriot 5c7df72f5d de-ambiguate for MSVC2015 2022-01-13 11:42:32 +01:00
Sébastien Loriot 0b7f563b18 fixes after merge 2022-01-12 13:37:38 +01:00
Sébastien Loriot c169c41240 Merge remote-tracking branch 'maxGimeno/PMP-Example_of_new_mp_function-maxGimeno' into HEAD 2022-01-12 13:33:49 +01:00
Laurent Rineau cdf33d4ff9 Merge pull request #6069 from sloriot/PMP-rnd_np
Add random generator np for sampling
2022-01-12 12:21:58 +01:00
Laurent Rineau 12028fed4a Merge pull request #6081 from MaelRL/PMP-PM_to_PS_array_point-GF
Allow polygon soups to use an `std::array` point type in PM_to_PS
2022-01-12 12:21:55 +01:00
Laurent Rineau 413421d3f2 Merge pull request #6195 from sloriot/PMP-snap_split_visitor
Add visitor function call for tracking faces split
2022-01-12 12:21:51 +01:00
Sébastien Loriot c2a7f8a84a fix indentation 2022-01-11 13:07:15 +01:00
Sébastien Loriot 4fa826b3ed keep only the static version of is_default_parameter 2022-01-10 18:36:37 +01:00
Sébastien Loriot 75b03e6c0a use_default_values() -> default_values() 2022-01-10 18:36:37 +01:00
Mael Rouxel-Labbé e38a1f6853 Fix minor issues and warnings 2022-01-10 16:38:15 +01:00
Sébastien Loriot 382cbfaf25 move test + handle no deprecated code 2022-01-10 10:26:11 +01:00
Sébastien Loriot 6d3176e061 move Named_parameters class in STL_extension
helpers stay in BGL because it depends on BGL tags
2022-01-07 15:12:22 +01:00
Sébastien Loriot 3a1064c762 remove strange useless helper class 2022-01-07 13:25:04 +01:00
Sébastien Loriot 84657126bf add missing CGAL namespace 2022-01-07 09:56:38 +01:00
Sébastien Loriot 6ac74caffb fix warnings 2022-01-07 09:26:10 +01:00
Sébastien Loriot 821e7b79a2 remove some Point_set_processing specific helper classes 2022-01-06 18:53:46 +01:00
Sébastien Loriot 9714557046 replace overloads with default parameters (PMP) 2022-01-05 14:41:46 +01:00
Sébastien Loriot 92a0ced3c0 replace overloads with default parameters (PMP) 2022-01-04 18:46:42 +01:00
Sébastien Loriot 1e7785b427 do not use PMP::parameters namespace 2022-01-04 16:00:38 +01:00
Sébastien Loriot 6848e69987 replace all_default() by use_default_values() in tests and examples 2022-01-04 14:06:26 +01:00
Sébastien Loriot ab38865f7c deprecated function 2022-01-04 11:33:50 +01:00
Sébastien Loriot 28ab8e9293 replace CGAL_PMP_NP macros with CGAL_BGL_NP ones 2022-01-04 11:19:05 +01:00
Sébastien Loriot 7900a96115 start documenting use_default_values() 2022-01-03 16:31:09 +01:00
Sébastien Loriot edcfdabf89 fix warnings 2022-01-03 16:31:09 +01:00
Maxime Gimeno 931ed5285e add Lookup_named_param_def 2022-01-03 16:31:08 +01:00
Maxime Gimeno 9cc1e1c5ab Add a boolean np 2022-01-03 16:31:08 +01:00
Maxime Gimeno 5e2f1236a7 Add a new default parameter named use_default_values() 2022-01-03 16:31:01 +01:00
Maxime Gimeno b28ebd5792 Add a test that gathers all usual pmp helpers for NP management 2022-01-03 16:29:23 +01:00
Laurent Rineau ef68e0b913 Merge pull request #6207 from sloriot/CGAL-set_but_not_used_variable
Fix set but unused variable warning
2022-01-03 16:22:34 +01:00
Sébastien Loriot f057a72b2b use random_seed 2022-01-03 10:35:30 +01:00
Sébastien Loriot 5bcf690668 test even in release 2021-12-27 13:12:54 +01:00
Mael Rouxel-Labbé fe51c84552 Merge remote-tracking branch 'cgal/master' into PMP-Improve_SI_repair-GF 2021-12-23 16:40:15 +01:00
Sébastien Loriot 24b3c3eed6 add visitor function call for tracking faces split 2021-12-23 11:23:54 +01:00
Mael Rouxel-Labbé bacdc08865 Fix precondition 2021-12-21 10:46:14 +01:00
Laurent Rineau 2acd9ca3db Merge pull request #6159 from sloriot/PMP-coref_nm_border_vrt_cpy
Apply the operations per patches
2021-12-20 18:06:39 +01:00
Mael Rouxel-Labbé e383ebdfde Hide OBB usage in repair_SI behind macros for now (for licensing reasons) 2021-12-17 10:55:07 +01:00
Sébastien Loriot 39763cda4a avoid useless computation and default should be false for polylines too 2021-12-16 15:18:11 +01:00
Mael Rouxel-Labbé 6ff8379650 Fix compilation errors 2021-12-16 11:38:12 +01:00
Mael Rouxel-Labbé 6c4199be5c More improvements and fixes for repair_SI:
- Use OBB to avoid costly compactify
- Fix "local" variable; use all strategy (constrained/smoothing/etc.)
- Handle adapt creating degeneracies
- Fix adapt returns
- Fix max_element creating out of bound issue
- Better compatibility checks
- Clean output
2021-12-15 16:49:42 +01:00
Mael Rouxel-Labbé ebd390e32b Improvements and fixes for repair_SI 2021-12-07 19:01:50 +01:00
Sébastien Loriot 8ca5971699 handle all patches by operations
this workaround issue with boundary non-manifold vertices
that we needs to be imported
2021-12-07 11:30:34 +01:00
Mael Rouxel-Labbé b27233bbe2 Various important improvements to repair_SI 2021-12-03 16:39:38 +01:00
Mael Rouxel-Labbé f3c6c79ec1 Tiny doc fixes 2021-12-03 15:50:20 +01:00
Mael Rouxel-Labbé e5dfd6c8eb A little less chaotic indentation (no real changes) 2021-12-03 15:49:34 +01:00
Laurent Rineau 3e877fa124 Merge pull request #6109 from afabri/CGAL-VC_max_warning-GF
PMP: Fix Warnings in Master
2021-11-18 12:27:21 +01:00
Laurent Rineau 4d38f2b7b3 Merge pull request #6114 from sloriot/CGAL-cmake_clean_up
Clean cmake scripts of examples and tests
2021-11-18 12:27:19 +01:00
Daniel Thul bb83be1e73
Mesh distance: use spatially sorted sample points
The Hausdorff distance code makes a copy of the provided sample points and sorts them spatially such that the hints provided to the AABB tree will be good. There is an apparent mistake in the code though and instead of the spatially sorted sample points, the original (unsorted) ones are given to the AABB tree. The sorted ones are in fact never used.
This PR changes the code such that the sorted points are used.
2021-11-12 21:58:49 +01:00
Sébastien Loriot ab48f63e30 update latest cmake version tested 2021-11-09 10:58:47 +01:00
Sébastien Loriot 58181afcdb remove useless include directives 2021-11-09 10:16:12 +01:00
Andreas Fabri 451e9e9b26 Fix calls to min and max 2021-11-03 22:09:02 +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 e9cb30955c Merge pull request #6037 from sloriot/PMP-nm_map_license
Add missing license include directive
2021-10-29 17:00:02 +02:00
Laurent Rineau cdedec4449 Merge pull request #6075 from danston/PMP-remove_runtime_assert_in_hdist-danston
Removed Runtime Assert From the Hausdorff Distance Test
2021-10-29 16:59:26 +02:00
Laurent Rineau 04cde86a24 Merge pull request #6080 from sloriot/PMP-max_w
Workaround compilation error on Windows, about `max`
2021-10-29 16:59:22 +02:00
Laurent Rineau 7c185a3e5c Merge pull request #6051 from MaelRL/PMP-Forward_GT_orient_to_bound_volume-GF
PMP: Forward the geometric traits in `orient_to_bound_a_volume()`
2021-10-29 16:50:09 +02:00
Laurent Rineau 8a797935aa Merge pull request #6068 from sloriot/PMP-sampling_doc
Fix NPs and improve doc
2021-10-29 16:50:03 +02:00
Laurent Rineau 5d965e0507 Merge pull request #6051 from MaelRL/PMP-Forward_GT_orient_to_bound_volume-GF
PMP: Forward the geometric traits in `orient_to_bound_a_volume()`
2021-10-29 16:46:39 +02:00
Laurent Rineau 4a17e26e28 Merge pull request #6068 from sloriot/PMP-sampling_doc
Fix NPs and improve doc
2021-10-29 16:46:33 +02:00
Mael Rouxel-Labbé 00cd63f209 Add some includes for completeness 2021-10-25 10:50:47 +02:00
Mael Rouxel-Labbé 0e2225d5c5 Allow polygon soups to use std::array points in PM_to_PS 2021-10-25 10:44:43 +02:00
Sébastien Loriot f4f484c5e0 workaround warning 2021-10-25 09:47:29 +02:00
Dmitry Anisimov d4f1d36f7f removed runtime assert from the hdist test 2021-10-21 15:20:16 +02:00
Sébastien Loriot d34ff25571 test named parameters 2021-10-21 09:11:18 +02:00
Sébastien Loriot f55e482d0f add random generator np for sampling 2021-10-20 09:24:13 +02:00
Sébastien Loriot b793e7cd90 fix NPs and improve doc 2021-10-19 17:38:12 +02:00
Mael Rouxel-Labbé 1ab6b44d7d Fix NP forwarding in volume_CC 2021-10-15 10:22:08 +02:00
Mael Rouxel-Labbé 1f73af6cc4 Drive-by cleaning 2021-10-14 11:09:04 +02:00
Mael Rouxel-Labbé 91e7f1d20c Forward the geom traits in orient_to_bound_a_volume 2021-10-14 11:06:04 +02:00
Sébastien Loriot bdec97bccb remove backtick 2021-10-12 15:02:42 +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é 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
Sébastien Loriot 64ead81a1c add missing license include directive 2021-10-08 15:28:13 +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
Laurent Rineau fb9333f0d0 Merge pull request #6028 from MaelRL/CGAL-Fix_typos-GF
Fix typos
2021-10-07 14:27:21 +02:00
Laurent Rineau 94ee9b1613 Merge pull request #6030 from MaelRL/CGAL-Minor_fixes-GF
Fix uninitialized id maps in heat method
2021-10-07 14:27:16 +02:00
Laurent Rineau 0e3b73852f Merge branch '5.2.x-branch' into 5.3.x-branch 2021-10-07 14:26:14 +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 8a0b290478 char* -> string 2021-10-05 17:42:25 +02:00
Sébastien Loriot 33d60307c7 fix path 2021-10-05 17:42:25 +02:00
Sébastien Loriot efbd86df7f extra manual fixes 2021-10-05 17:42:21 +02:00
Mael Rouxel-Labbé 863ab7541c Various whitespace fixes 2021-10-05 12:14:03 +02:00
Mael Rouxel-Labbé 84d84278b9 Fix VPM type 2021-10-05 12:14:02 +02:00
Mael Rouxel-Labbé 521c72d57e Fix typos 2021-10-04 13:34:07 +02:00
Mael Rouxel-Labbé 625848e629 Fix missing ':' in various namespaces 2021-10-04 13:21:47 +02:00
Sébastien Loriot 6dad5b6922 rename file 2021-10-04 11:00:40 +02:00
Sébastien Loriot b5e7d03634 fix runtime issues 2021-10-04 10:22:13 +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 01017f9deb Merge pull request #6022 from sloriot/PMP-deps
Reduce dependencies
2021-09-30 16:49:34 +02:00
Laurent Rineau 999ce8134a Merge pull request #6022 from sloriot/PMP-deps
Reduce dependencies
2021-09-30 16:48:55 +02:00
Laurent Rineau 804feece28 Merge pull request #5761 from danston/Weights-unification-danston
[Small Feature] Weights Unification
2021-09-29 16:59:34 +02:00
Laurent Rineau bb58df3ae5 Merge pull request #6021 from MaelRL/PMP-Snap_with_KD_tree-GF
Improvements for PMP's snapping code
2021-09-29 16:59:26 +02:00
Sébastien Loriot 2b666db30c use function
avoid compilation error about unknown function
2021-09-29 12:11:42 +02:00
Laurent Rineau 7e42541573 Merge pull request #5633 from sloriot/PMP-add_filter_for_caps_needles
Add a filter in function to remove caps/needle
2021-09-29 11:46:47 +02:00
Laurent Rineau e87bf84395 Merge pull request #5994 from MaelRL/PMP-Detect_sharp_edges_const-GF
Enhancements & fixes for PMP::detect_features
2021-09-29 11:46:41 +02:00
Laurent Rineau 0d304fe737 Merge pull request #6015 from sloriot/PMP-snap_fix_w
Fix vv snapping weight
2021-09-29 11:46:28 +02:00
Laurent Rineau b19086946c Merge pull request #5994 from MaelRL/PMP-Detect_sharp_edges_const-GF
Enhancements & fixes for PMP::detect_features
2021-09-29 11:45:38 +02:00
Sébastien Loriot c374b382a5 reduce dependancies 2021-09-29 11:06:39 +02:00
Mael Rouxel-Labbé b92c22d0a9 Improve preprocessing of snapping (don't move fixed vertices during collapsing) 2021-09-28 16:49:19 +02:00
Mael Rouxel-Labbé 60567eccbb Add Kd_tree-based vertex-vertex snapping + PMP::snap visitor 2021-09-28 16:25:43 +02:00
Sébastien Loriot 542d3603be fix weight for vertex-vertex snapping 2021-09-27 19:46:14 +02:00
Mael 4e5fbb6f22
Specify namespace
Co-authored-by: Laurent Rineau <Laurent.Rineau@cgal.org>
2021-09-27 12:15:09 +02:00
Mael Rouxel-Labbé 878d94e299 Fix sign call 2021-09-24 09:47:33 +02:00
Sébastien Loriot f632a11d0d fix invalid OFF headers 2021-09-23 18:56:15 +02:00
Mael Rouxel-Labbé 2bc5643972 Fix comparison 2021-09-21 16:50:19 +02:00
Laurent Rineau 8cdfc3b214 Merge pull request #5941 from afabri/PMP-edge_lenght_area-GF
Polygon Mesh Processing:  Add measure functions not using sqrt
2021-09-20 17:07:09 +02:00
Mael Rouxel-Labbé c7519ef93c Cache the squared cos value 2021-09-15 14:59:55 +02:00
Mael Rouxel-Labbé fd12c73cba Enhance tests 2021-09-15 14:59:40 +02:00
Mael Rouxel-Labbé a5bbd05c42 Do not compute square roots + various improvements 2021-09-15 14:46:56 +02:00
Mael Rouxel-Labbé 8b7ab25966 Minor cleaning 2021-09-15 14:08:25 +02:00