Commit Graph

936 Commits

Author SHA1 Message Date
Mael Rouxel-Labbé 34c91aba5f Merge remote-tracking branch 'cgal/master' into gsoc2021-Surface_mesh_simplification-probabilistic-komaromy 2022-03-14 20:55:23 +01:00
Mael Rouxel-Labbé 56a3e64a16 Move GH calculators to internal namespace 2022-03-14 20:51:57 +01:00
Mael Rouxel-Labbé 1020a401c1 Enhance GH example 2022-03-14 20:51:33 +01:00
Mael Rouxel-Labbé 5b34e6a925 Documentation for Probabilistic Garland-Heckbert 2022-03-14 20:50:48 +01:00
Mael Rouxel-Labbé 0f8437c236 Deprecate GarlandHeckbert_policies
Use GarlandHeckbert_plane_policies and others
2022-03-14 20:50:29 +01:00
Mael Rouxel-Labbé f39c1eb966 Add a test for Garland Heckbert policies 2022-03-14 20:42:26 +01:00
G Yuvan Shankar 45193b1487 Replaced boost::tuple with std::tuple 2022-03-10 10:50:06 +05:30
Sébastien Loriot 4a170e9ec0 default NP for non inlined doc 2022-02-28 10:12:09 +01:00
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é a2c13412b3 Improve GH example 2021-12-23 17:22:44 +01:00
Mael Rouxel-Labbé 854b6dd5b2 Remove support code from examples 2021-12-23 17:21:58 +01:00
Mael Rouxel-Labbé c06b0d9dc2 Update examples 2021-12-22 12:40:08 +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é 9451b14bd5 Fix doc type 2021-12-22 12:02:08 +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 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
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
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
Sébastien Loriot 6992c5273a replace with a stitched version 2021-10-04 09:32:04 +02:00
Sébastien Loriot d8cdba669b rename input 2021-10-04 09:32:03 +02:00
Jane Tournois fb9d9da2d5 fix ambiguity with C++20
The compilation error was
test_edge_collapse_Polyhedron_3.cpp(309,1): error C2872: 'format': ambiguous symbol
2021-08-26 15:57:02 +02:00
Julian Komaromy 0e12e3d162 add disclaimer 2021-08-20 11:39:15 +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 4304426b14 add hausdorff errors do statistics 2021-07-27 11:06:21 +02:00
Julian Komaromy 78f0b75ce5 add missing include 2021-07-26 16:39:15 +02:00
Julian Komaromy ab44601917 add statistics to cmake 2021-07-26 15:39:32 +02:00
Julian Komaromy e2b2ad8acc add benchmarking functions 2021-07-26 15:22:25 +02:00
Julian Komaromy fc6960debc add face aspect ratio statistics 2021-07-19 15:55:05 +02:00
Julian Komaromy 82a2f3622e make histogram generation generic 2021-07-19 13:27:21 +02:00
Julian Komaromy 8d73dc6343 add edge length histograms 2021-07-19 12:54:13 +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
Mael Rouxel-Labbé 21bf16d4eb Tiny example improvements 2021-06-29 15:34:39 +02:00
Mael Rouxel-Labbé 0e6cdc24f8 Comparing GH methods requires Eigen 2021-06-29 15:34:07 +02:00
Julian Komaromy 5767964365 resolve todos and add default values 2021-06-28 15:24:38 +02:00
Julian Komaromy 1a8c192e6d remove executable that isnt in branch 2021-06-28 14:57:20 +02:00
Julian Komaromy de081c380d update output and cmakelists 2021-06-28 14:49:43 +02:00
Julian Komaromy 3fd015595b remove cout 2021-06-28 14:44:19 +02:00
Julian Komaromy ad7d9c0db7 create extra files for testing and demo 2021-06-28 14:42:41 +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
Maxime Gimeno a76bd6081e Replace more sc text 2021-05-21 15:45:50 +02:00
Laurent Rineau 26ad68e486 Merge pull request #5649 from sloriot/CGAL-no_boost_shared_ptr
Replace internal use of boost shared_ptr
2021-05-18 18:14:12 +02:00
Sébastien Loriot fb6f703b55 IO namespace for files in IO directories 2021-05-04 14:36:06 +02:00
Sébastien Loriot 1faa0e2992 replace internal use of boost::shared_ptr by std::shared_ptr 2021-04-28 10:55:26 +02:00
Sebastien Loriot b7323389c7
Merge pull request #5622 from maxGimeno/CMake-Update_versions_in_scripts-maxGimeno
Update maximum cmake versions
2021-04-17 10:58:14 +02:00
Maxime Gimeno c49152359c update max version of cmake and announce the new minimal in CHANGE.md 2021-04-15 15:08:54 +02:00
Maxime Gimeno d5811d0a41 clang-tidy on tests 2021-02-18 15:15:12 +01:00
Laurent Rineau 4c947f0ee0 Merge pull request #5340 from danston/CGAL-clang_warnings_fix-danston
Clang warnings fixed
2021-02-05 16:10:37 +01:00
Sébastien Loriot bc161f2ae9 Merge 'CGAL-Eigen3_support-5.2' 2021-01-15 10:59:20 +01:00
Sébastien Loriot f4935dc199 Merge branch 'CGAL-Eigen3_support-5.1' 2021-01-15 10:54:02 +01:00
Sébastien Loriot eecb00534e fix macro name to be consistent with find_package 2021-01-15 10:43:34 +01:00
Dmitry Anisimov 269a47d773
Merge branch 'master' into CGAL-clang_warnings_fix-danston 2021-01-14 16:51:13 +01:00
Dmitry Anisimov bd600286ee surface mesh simplification range loop analysis copy to ref warning fixed 2021-01-08 10:20:34 +01:00
Maxime Gimeno 3d1c41fd14 Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2021-01-07 15:05:28 +01:00
Laurent Rineau 85325d789f Merge pull request #5090 from afabri/FastEnvelope-GF
Polygon Mesh Processing:  Add envelope test
2021-01-06 16:11:56 +01:00
Sébastien Loriot 02db50ae4f fix warnings 2021-01-04 10:36:14 +01:00
Andreas Fabri 8ae9070e5d Fix warnings 2020-12-30 09:06:19 +00:00
Andreas Fabri f6f8dcfcfd Add data set 2020-12-30 08:56:10 +00:00
Andreas Fabri b6bc0f9579 Fix test. huge did not mean the mesh but the size of the envelope 2020-12-22 10:01:28 +00:00
Sébastien Loriot a095b674e7 change extension to the one recognized by the demo 2020-12-09 14:20:07 +01:00
Andreas Fabri c84f5c1ee5 Address doxygen warnings 2020-11-26 09:56:33 +00:00
Andreas Fabri 08782bac8a Change Filter to PlacementFilter 2020-11-26 09:27:15 +00:00
Andreas Fabri 8ea3c4e653 Finally, we explain the Filter policy 2020-11-23 16:24:01 +00:00
Andreas Fabri 1f29b38fae Apply suggestions from code review
Co-authored-by: Sebastien Loriot <sloriot.ml@gmail.com>
2020-11-23 13:18:00 +01:00
Andreas Fabri 59061b926a fix doc 2020-11-20 12:06:42 +00:00
Andreas Fabri f4667246c2 rename file 2020-11-20 12:03:31 +00:00
Andreas Fabri d85af03761 Fix doc of Filter in SMS 2020-11-20 11:49:23 +00:00
Andreas Fabri e668500c05 fix named parameter 2020-11-17 07:52:51 +00:00
Maxime Gimeno 3b70343590 Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-11-16 16:19:43 +01:00
Andreas Fabri 19234f15ea Fix include 2020-11-16 09:38:26 +00:00
Andreas Fabri 108b57687e fix CMakeLists.txt 2020-11-13 16:36:50 +00:00
Andreas Fabri f246c4abf8 merge 2020-11-13 16:26:57 +00:00
Andreas Fabri ac1200fe28 Cleanup of GetFilter 2020-11-10 10:52:53 +00:00
Andreas Fabri c510a89ea0 Improve doc 2020-11-10 09:59:01 +00:00
Andreas Fabri c01dfb1709 Update Surface_mesh_simplification/doc/Surface_mesh_simplification/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/Bounded_normal_change_placement.h
Co-authored-by: Sebastien Loriot <sloriot.ml@gmail.com>
2020-11-09 22:40:24 +01: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
Andreas Fabri 85bb0775e8 Improve documentation 2020-11-02 14:44:46 +00:00
Andreas Fabri ff368dd84f Add SMS::Envelope_filter 2020-10-22 13:50:30 +01:00
Andreas Fabri 4ee9875556 Add example 2020-10-20 14:22:15 +01:00
Andreas Fabri f6302a9479 Remove test which uses FastEnvelope directly 2020-10-20 14:00:36 +01:00
Maxime Gimeno bebd60c12b Merge remote-tracking branch 'cgal/master' into Cmake_improvements-maxGimeno 2020-10-20 09:53:54 +02: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 ef75dbb26d Deal with degenerate queries 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 95556e2359 small doc changes 2020-10-20 09:17:14 +02:00
Andreas Fabri 5b21794bf6 Add documentation of the filter 2020-10-20 09:17:14 +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
Mael Rouxel-Labbé f55ef7dd50 Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-10-09 18:36:17 +02:00
Jane Tournois bfd4e9915f rename named parameter graph_visitor to visitor 2020-09-15 15:42:24 +02:00
Andreas Fabri a308ff89bb Change tolerance as it becomes pretty slow 2020-09-10 11:02:43 +01:00
Andreas Fabri f31b7fe4e1 SMS: Use FastEnvelope to bound the error 2020-09-09 17:02:03 +01:00
Maxime Gimeno 9c15f2c9dc Use FeatureSummary in the demo, and remove CGAL_FOUND 2020-08-04 12:46:17 +02:00
Mael Rouxel-Labbé 3280b9b087 Use new IO functions 2020-06-26 17:06:42 +02:00
Mael Rouxel-Labbé 9cca59ba36 Actually use the new IO functions + some example improvements 2020-06-23 18:24:39 +02:00
Mael Rouxel-Labbé 6f8a895671 Merge remote-tracking branch 'mine/CGAL-Improve_NP_doc_presentation-GF' into CGAL_IO-maxGimeno 2020-06-18 15:21:27 +02:00
Mael Rouxel-Labbé 26eb7903aa Merge remote-tracking branch 'cgal/master' into CGAL-Improve_NP_doc_presentation-GF 2020-06-18 12:46:46 +02:00