Commit Graph

397 Commits

Author SHA1 Message Date
Mael Rouxel-Labbé 56a3e64a16 Move GH calculators to internal namespace 2022-03-14 20:51:57 +01:00
Mael Rouxel-Labbé 0f8437c236 Deprecate GarlandHeckbert_policies
Use GarlandHeckbert_plane_policies and others
2022-03-14 20:50:29 +01:00
G Yuvan Shankar 45193b1487 Replaced boost::tuple with std::tuple 2022-03-10 10:50:06 +05:30
Sébastien Loriot 4328179c18 add missing include statement 2022-01-26 11:23:46 +01:00
Sébastien Loriot f04cf17d26 fix assertion 2022-01-26 10:47:05 +01:00
Laurent Rineau 3df4df43fc Merge pull request #5639 from maxGimeno/PMP-Example_of_new_mp_function-maxGimeno
Global clean-up of Named Parameters
2022-01-17 15:34:45 +01:00
Sébastien Loriot c5f78e6a9e fix warning 2022-01-13 10:16:47 +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
Sébastien Loriot 75b03e6c0a use_default_values() -> default_values() 2022-01-10 18:36:37 +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 b04a5f9124 remove overloads with default parameters 2022-01-04 16:14:49 +01:00
Mael Rouxel-Labbé c54526d91d Re-add GH_policies.h as simple dispatcher to all specific implementations 2021-12-23 17:47:37 +01:00
Mael Rouxel-Labbé e28a459c14 Misc cleaning 2021-12-23 17:43:51 +01:00
Mael Rouxel-Labbé d964ca4e48 Naming consistency 2021-12-22 12:39:53 +01:00
Mael Rouxel-Labbé b342e11967 Refactor + improvements for Garland Heckbert methods 2021-12-22 12:03:11 +01:00
Mael Rouxel-Labbé a1b00f9206 Copy property maps 2021-12-22 12:02:53 +01:00
Mael Rouxel-Labbé fb59f96f8d Clean code 2021-12-21 10:46:59 +01:00
Mael Rouxel-Labbé 64b2056d74 Merge remote-tracking branch 'cgal/master' into gsoc2021-Surface_mesh_simplification-probabilistic-komaromy 2021-12-20 12:46:52 +01:00
Sebastien Loriot bd6408a772
Apply suggestions from code review
Co-authored-by: Mael <mael.rouxel.labbe@geometryfactory.com>
2021-12-17 10:17:13 +01:00
Sébastien Loriot b9e2dc625a add relaxed order as parameter 2021-11-30 17:49:58 +01:00
Sébastien Loriot c61fdb831b remove the handle
it is not needed as the id map is used to store handles
2021-11-30 13:49:39 +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
Laurent Rineau 393abddc64 Merge pull request #6042 from sloriot/SMS-expensive_macros
Hide expensive assertions behind _expensive_ macros
2021-10-29 16:46:48 +02:00
Laurent Rineau 40771841ca Merge pull request #6074 from sloriot/SMS-GH_deg_faces
Workaround degenerate faces
2021-10-29 16:46:30 +02:00
Sébastien Loriot 72b8f75f48 workaround degenerate faces 2021-10-21 11:21:04 +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
Sébastien Loriot 75e6e4500f hide expensive assertions behind _expensive_ macros 2021-10-11 11:57:24 +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
Julian Komaromy 3879874387 remove TODOs 2021-08-20 11:35:33 +02:00
Julian Komaromy 55166781e3 remove unused file 2021-08-20 11:35:20 +02:00
Julian Komaromy 390e73d1ba clean up property maps 2021-08-20 11:35:06 +02:00
Julian Komaromy 7744b38afe fix calculating row instead of col 2021-08-03 14:49:10 +02:00
Julian Komaromy 61eca278e6 remove unused files 2021-08-02 16:38:02 +02:00
Julian Komaromy e2054ad648 triangle policies use functions 2021-08-02 16:35:15 +02:00
Julian Komaromy dccb3ddd5f change classic plane to use functions 2021-08-02 15:53:42 +02:00
Julian Komaromy 6bcbe45a6f switch prob plane to use functions 2021-08-02 15:37:39 +02:00
Julian Komaromy 8d16ff5a03 gather quadrics in one file 2021-08-02 12:21:04 +02:00
Julian Komaromy 78f0b75ce5 add missing include 2021-07-26 16:39:15 +02:00
Julian Komaromy ca3a8a68b3 fix out of bounds matrix access 2021-07-12 19:13:06 +02:00
Julian Komaromy 119fea4eb0 add face variance map 2021-07-12 16:51:34 +02:00
Julian Komaromy 3d8f6281f7 add probabilistic triangle quadrics 2021-07-09 16:37:48 +02:00
Julian Komaromy 8947a8fb38 change to average edge length for estimation 2021-07-07 20:54:31 +02:00
Julian Komaromy c01aea6bf6 revert to constructing inside policy 2021-07-05 18:56:33 +02:00
Julian Komaromy 6c7b4a9824 restructure code, implement tri quadrics 2021-07-05 18:05:50 +02:00
Julian Komaromy 5497c3c556 different quadric generators for face and edges 2021-07-03 12:39:49 +02:00
Julian Komaromy ae41291ca6 add precondition for positive variances 2021-06-30 18:30:38 +02:00
Mael Rouxel-Labbé 8fb02b2765 Initialize 'dm' 2021-06-30 10:32:36 +02:00
Julian Komaromy 697ab74ee5 estimate by gm and new constructor 2021-06-29 21:12:30 +02:00
Mael Rouxel-Labbé a97164d5ef Make estimate_variances static and public 2021-06-29 19:21:26 +02:00
Mael Rouxel-Labbé cd20c6461e Remove trailing whitespace 2021-06-29 16:31:20 +02:00
Mael Rouxel-Labbé a3748b35f8 Remove dead header include 2021-06-29 16:29:40 +02:00
Mael Rouxel-Labbé 4d9ec82b1a Fix formula for the 'c' coefficient of the quadric 2021-06-29 15:35:18 +02:00
Mael Rouxel-Labbé 2ef3ccdef7 Erase includes to removed header 2021-06-29 15:34:59 +02:00
Julian Komaromy 5767964365 resolve todos and add default values 2021-06-28 15:24:38 +02:00
Julian Komaromy 3fd015595b remove cout 2021-06-28 14:44:19 +02:00
Julian Komaromy 887bcf7fce fix and incorporate review 2021-06-15 12:11:29 +02:00
Julian Komaromy 1b468fe620 implement probabilistic quadrics 2021-06-09 21:50:55 +02:00
Julian Komaromy afb98de8af use traits class construtions 2021-06-09 21:50:37 +02:00
Julian Komaromy d96f8986be fix constructors and uncomment lines 2021-06-09 21:10:04 +02:00
Julian Komaromy a4b75fbe85 remove obsolote files 2021-06-08 21:13:43 +02:00
Julian Komaromy df368bcabe make quadric detail customizable 2021-06-08 21:12:32 +02:00
Julian Komaromy 4d9b6f13bb move quadric construction into new header 2021-05-31 22:05:32 +02:00
Dmitry Anisimov bd600286ee surface mesh simplification range loop analysis copy to ref warning fixed 2021-01-08 10:20:34 +01:00
Andreas Fabri 8ae9070e5d Fix warnings 2020-12-30 09:06:19 +00:00
Andreas Fabri ac1200fe28 Cleanup of GetFilter 2020-11-10 10:52:53 +00:00
Andreas Fabri 041502a60c Move Envelope_filter to PMP 2020-11-05 08:43:33 +00:00
Andreas Fabri e1c1e1fbb6 capitalize file name in the #include (VC++ did not care) 2020-11-04 11:28:02 +00:00
Andreas Fabri 5ff48521d1 Use TLS; Fix SMS example 2020-11-04 09:53:38 +00:00
Sébastien Loriot 87b8f66e14 update from master 2020-10-20 09:19:13 +02:00
Andreas Fabri 89c9ed68b6 change namespace and add doc 2020-10-20 09:17:16 +02:00
Andreas Fabri a9b78f97a5 Add the test of SMS using the Envelope 2020-10-20 09:17:16 +02:00
Andreas Fabri deeff23907 Rename header file 2020-10-20 09:17:14 +02:00
Andreas Fabri e957de2993 Make the filter a named parameter 2020-10-20 09:17:09 +02:00
Jane Tournois bfd4e9915f rename named parameter graph_visitor to visitor 2020-09-15 15:42:24 +02:00
Andreas Fabri f31b7fe4e1 SMS: Use FastEnvelope to bound the error 2020-09-09 17:02:03 +01:00
Sébastien Loriot d6d8fbeb8b the placement must store the triangles has the AABB-tree does not copy them 2020-04-27 16:06:43 +02:00
Sébastien Loriot 3e75af4fcd remove useless calls to accelerate_distance_queries 2020-04-23 17:00:12 +02:00
Mael Rouxel-Labbé 618a72b739 Merge remote-tracking branch 'cgal/master' into PMP-soup_to_mesh_add_vpm 2020-03-17 20:00:31 +01:00
Mael Rouxel-Labbé ad62f89a20 Use the new index map initializer functions and fix doc 2020-03-06 15:25:38 +01:00
Mael Rouxel-Labbé 26463ded7a Update NPs using default constructed default values to new API
+ misc cleaning
2020-02-28 11:55:17 +01:00
Mael Rouxel-Labbé 80f1583fa8 Minor doc improvements 2020-01-28 12:45:29 +01:00
Mael Rouxel-Labbé 46e7a8f930 Make it optional to pass the AABB tree 2020-01-28 12:45:29 +01:00
Mael Rouxel-Labbé 5ab92fef26 Keep the squared value in memory instead of recomputing it on every call 2020-01-28 12:45:29 +01:00
Mael Rouxel-Labbé d556bcc5d6 Fix compilation / test 2020-01-28 12:45:29 +01:00
Mael Rouxel-Labbé 32e78834eb Clean header 2020-01-28 12:45:29 +01:00
Sébastien Loriot fd43d44fa5 do an initial try with the closest point since do_intersect is with a sphere and not a ball 2020-01-28 12:45:29 +01:00
Maxime Gimeno a17c5b1eb2 Update 2020-01-28 12:45:29 +01:00
Maxime Gimeno 5907ec9a18 Add Policy for bounded distance placement 2020-01-28 12:45:29 +01:00
Maxime Gimeno 4351ecfb5e Add test for bench 2020-01-28 12:45:29 +01:00
Mael Rouxel-Labbé 9a7c98f26c Minor code fixes 2019-11-29 11:42:18 +01:00
Mael Rouxel-Labbé 6cbb0d0712 Make the VertexCostMap a member of the policy
If the dynamic property map isn't attached to the mesh, this could not
work previously.
2019-11-29 09:30:54 +01:00
Mael Rouxel-Labbé 55bb46a383 Use DontAlign property for garland heckbert matrices
See discussion in: https://github.com/CGAL/cgal/pull/4279

Initial warning: https://cgal.geometryfactory.com/CGAL/testsuite/results-5.1-Ic-11.shtml#Surface_mesh_simplification_Examples
2019-11-29 09:29:48 +01:00
Mael Rouxel-Labbé 5057df5cb7 Properly forward a parameter 2019-11-20 09:09:05 +01:00
Mael Rouxel-Labbé 0813fd740b Move partial specializations outside of the Edge_collapse.h class 2019-11-19 11:04:14 +01:00
Mael Rouxel-Labbé ddf9be579b Fix conversion warnings 2019-11-15 11:44:04 +01:00
Mael Rouxel-Labbé a0db18b0bb Fix code typo 2019-11-15 11:43:49 +01:00
Mael Rouxel-Labbé a1763c8789 Mark expensive assertions as expensive 2019-11-15 11:43:32 +01:00
Mael Rouxel-Labbé 11e49e817c Fix compilation of SMS trace code 2019-11-15 11:17:19 +01:00
Mael Rouxel-Labbé ea3736ab20 Fix using full specialization of functions within non namespace scopes 2019-11-15 11:11:04 +01:00
Mael Rouxel-Labbé 6f96731156 Fix header license text 2019-10-28 09:41:51 +01:00