Commit Graph

2734 Commits

Author SHA1 Message Date
Jane Tournois 46617ad48f add input_features named parameter
this way the user can
* detect features (on bbox and inside image),
AND
* provide his own features

WARNING : features MUST NOT overlap, or feature protection will endlessly loop
2023-01-13 16:13:52 +01:00
Jane Tournois f1f480d95c add feature_range() as input for detect_features 2023-01-12 14:48:38 +01:00
Jane Tournois 399945f27d is_infinite(seed_cell) cannot be called when tr.dimension() < 3
and looking for the subdomain index is a nonsense
2023-01-05 14:26:57 +01:00
Mael 4d22c90474
Merge branch 'master' into feature/bug_documentation_spell_20221113 2023-01-04 10:06:45 +01:00
Sébastien Loriot fef1a43d35 remove internal from generated doc 2022-12-15 10:43:27 +01:00
Sébastien Loriot ea2a80347f rnd is taken by non-const reference 2022-12-14 17:10:42 +01:00
Laurent Rineau 1b6d590125 Merge pull request #7110 from sloriot/TR-remove_verbose_flag
Mesh_3, dump_c3t3: remove verbose flag
2022-12-14 10:18:16 +01:00
Laurent Rineau 7959549cff Merge pull request #7110 from sloriot/TR-remove_verbose_flag
Mesh_3, dump_c3t3: remove verbose flag
2022-12-14 10:16:58 +01:00
Jane Tournois efcebf2294 seed the far points generator
to make parallel Mesh_3 with 1 thread deterministic
2022-12-13 11:32:21 +01:00
Sébastien Loriot 71e452a6b8 be verbose if the macro is defined 2022-12-12 17:55:41 +01:00
Sebastien Loriot fa72ad2ad0
Merge pull request #6977 from MaelRL/Weights-v2.0-GF
Weights fixes (5.4.x)
2022-12-08 15:21:43 +01:00
Sébastien Loriot 7466cfc383 add verbose option to dump c3t3 2022-12-07 17:11:09 +01:00
albert-github eed54a0ae5 spelling corrections
Some spelling corrections (Directories starting with `O`-`S` , first part),
some backward work
some forward work
2022-11-15 18:45:39 +01:00
Jane Tournois a46c9b1a4e move doc to its right place 2022-11-15 16:27:25 +01:00
albert-github 3674c937f7 spelling corrections
Some spelling corrections (Directories starting with `M`-` N`),
some backward work
some forward work
2022-11-15 15:21:01 +01:00
albert-github 45478184de spelling corrections
Some spelling corrections (Directories starting with `E`-` L`),
some backward work
some forward work
2022-11-15 13:39:40 +01:00
Jane Tournois f21b8819bc rename header to match struct capitals 2022-11-14 15:48:47 +01:00
Jane Tournois 19d4ae4fa6 more doc 2022-11-14 13:30:34 +01:00
Jane Tournois 33499c482a doc 2022-11-14 13:20:15 +01:00
Jane Tournois 7fa1d70b69 weights and features do not work together yet
weights get priority
2022-11-14 11:40:42 +01:00
Jane Tournois 468dd2dccc document named parameter 2022-11-14 11:39:02 +01:00
Jane Tournois 98abdce06e change return type to auto for auxiliary functions
create_labeled_image_mesh_domain(const CGAL::Image_3& image_, const CGAL_NP_CLASS& np)
returns a std::conditional_t<
    CGAL::parameters::is_default_parameter<CGAL_NP_CLASS, internal_np::detect_features_param_t>::value,
    Labeled_mesh_domain_3,
    Mesh_domain_with_polyline_features_3<Labeled_mesh_domain_3>
  >

we need to either copy-paste this std::conditional_t for each instance of
create_labeled_image_mesh_domain, or use auto, to avoid
loosing the Mesh_domain_with_polyline_features_3 wrapper when applicable
2022-11-10 16:12:17 +01:00
Jane Tournois 0ebcbec3c5 comment on Return_type 2022-11-10 11:51:29 +01:00
Jane Tournois a17a83ea34 factorize to avoid code duplication 2022-11-08 21:32:16 +01:00
Jane Tournois 4905ff7e49 change domain type depending on whether detect_features_param is provided 2022-11-08 19:54:07 +01:00
Jane Tournois 4ebbe922bd Merge remote-tracking branch 'cgal/master' into Mesh_3-triple_line_extraction-GF
# Conflicts:
#	BGL/include/CGAL/boost/parameter.h
#	Installation/CHANGES.md
#	Mesh_3/doc/Mesh_3/CGAL/Labeled_mesh_domain_3.h
#	Mesh_3/include/CGAL/Labeled_mesh_domain_3.h

+ fix compilation
+ prepare for using detect_features
2022-11-08 16:17:33 +01:00
Mael Rouxel-Labbé 83b0b0bdef Merge branch 'Weights-v2.0-GF-5.5.x' into Weights-v2.0-GF-master 2022-11-07 14:23:29 +01:00
Mael Rouxel-Labbé 7564b761ac Merge branch 'Weights-v2.0-GF' into Weights-v2.0-GF-5.5.x 2022-11-07 14:11:10 +01:00
Laurent Rineau 8c9281f440 Merge pull request #6642 from sloriot/gsoc2022-boost_np
Replace usage of Boost parameters with CGAL named function parameters
2022-11-07 10:08:38 +01:00
Laurent Rineau 3b90060529 Merge pull request #6978 from janetournois/Mesh_3-detect_cc_in_labeled_images-GF
Mesh 3 for labeled images - avoid vertex clusters on surfaces
2022-11-07 10:08:30 +01:00
Laurent Rineau 714e4445a2 Merge pull request #6978 from janetournois/Mesh_3-detect_cc_in_labeled_images-GF
Mesh 3 for labeled images - avoid vertex clusters on surfaces
2022-11-07 10:06:42 +01:00
Jane Tournois 3816d8c2af boost::optional has_value() is available only since boost 1.68
and CGAL supports boost >= 1.66
2022-11-03 14:27:54 +01:00
Jane Tournois 7f70d48ab9 seed_cell cannot be infinite 2022-11-03 14:27:53 +01:00
Sebastien Loriot 168825a7f1 fix warning 2022-11-03 14:27:53 +01:00
Jane Tournois a8877c5a44 add struct Seed for better readability
and avoid using boost::none to be ready for std::optional (C++17)
2022-11-03 14:27:53 +01:00
Jane Tournois 7faa73bb27 locate of seed that is outside affine hull returns Cell_handle()
accessing the circumcenter was then failing
2022-11-03 14:27:52 +01:00
Jane Tournois 8b76b55b82 remove useless include 2022-11-03 14:27:52 +01:00
Jane Tournois 28a6946070 do not run random shooting in connected components that already are represented
during feature protection, most of the connected components, in particular on
the bbox boundary, are already represented and ready to start/hint Delaunay
refinement

if the chosen seed lies in a cell that already belongs (wrt Is_in_domain(cc))
to the right connected component, random shooting is canceled and
the loop continues to next seed
2022-11-03 14:27:52 +01:00
Jane Tournois db6b051973 on image boundaries, construct point away from the surface
this avoids creating point clusters on surfaces
2022-11-03 14:27:51 +01:00
Laurent Rineau 8e8153c0ac Merge pull request #6871 from afabri/CGAL_assertions-GF
CGAL: No longer per package assertions
2022-11-03 09:44:48 +01:00
Laurent Rineau 56453b7e9f Merge pull request #6953 from afabri/CGAL-Wunused-but-set-variable-GF
Address -Wunused-but-set-variable
2022-11-03 09:44:45 +01:00
Laurent Rineau 0c36f00f71
Update Mesh_3/include/CGAL/Mesh_3/search_for_connected_components_in_labeled_image.h 2022-11-02 16:03:30 +01:00
Sébastien Loriot a9162809c4 fields should be taken by const ref 2022-10-31 10:18:39 +01:00
Laurent Rineau d24b180293 Merge branch 'master' into gsoc2022-boost_np 2022-10-28 15:39:36 +02:00
Sébastien Loriot 0dac9f4c27 fix warnings 2022-10-25 16:04:56 +02:00
Sébastien Loriot 9179a2d41b fix conversion warning 2022-10-24 09:17:40 +02:00
Mael Rouxel-Labbé 9ab7e1ed7f Misc minor code cleaning 2022-10-20 17:21:43 +02:00
Sébastien Loriot 645e33aa56 fix warnings 2022-10-19 17:00:03 +02:00
Sébastien Loriot dcc4e6ade4 disable for all MSVC 2022-10-19 16:59:47 +02:00
Sébastien Loriot 40c1fdc03d use MSVC overload for everybody
clang master also have issue with the generic variadic versions
2022-10-18 06:05:13 +02:00
Andreas Fabri c04dceb71d Merge master 2022-10-14 14:40:58 +01:00
Andreas Fabri f52444425e Mesh_3 2022-10-14 10:25:42 +01:00
Andreas Fabri a4c6df514a Mesh_3 2022-10-14 10:21:44 +01:00
Jane Tournois 45c8d0ef99 add missing template parameters 2022-10-13 17:11:39 +02:00
Jane Tournois 536c35fac5 remove unused parameters 2022-10-13 16:31:15 +02:00
Jane Tournois 6304ce7d8e fix compilation when no feature detection functor is given 2022-10-13 16:17:20 +02:00
Laurent Rineau 2454bf45c3 Merge pull request #6864 from janetournois/Mesh_3-fix_weighted_images-GF
Mesh 3 - fix construction of weights image for labeled image input
2022-10-13 15:17:48 +02:00
Laurent Rineau 1a8e03cc85 Merge pull request #6864 from janetournois/Mesh_3-fix_weighted_images-GF
Mesh 3 - fix construction of weights image for labeled image input
2022-10-13 15:15:22 +02:00
Laurent Rineau adc5bd4677 Merge pull request #6864 from janetournois/Mesh_3-fix_weighted_images-GF
Mesh 3 - fix construction of weights image for labeled image input
2022-10-13 15:14:11 +02:00
Sébastien Loriot 4f347919f2 fix CI 2022-10-11 16:31:19 +02:00
Sébastien Loriot c56198f176 fix copy/paste error + improve doc 2022-10-11 16:01:07 +02:00
Sébastien Loriot 142190007d uniform within a call 2022-10-11 15:30:10 +02:00
Sébastien Loriot 775409dfd8 remove useless links 2022-10-11 14:58:12 +02:00
Sébastien Loriot 6145499ec7 nullptr 2022-10-11 14:54:03 +02:00
Sébastien Loriot 56eb3c59e1 apply suggestions from review 2022-10-11 14:50:50 +02:00
Jane Tournois b499178f7b dump_after_refine_surface must happen after scan_triangulation()
to have c3t3 cells selected as they should
2022-10-11 09:58:47 +02:00
Jane Tournois badfc7d5de add VERY_VERBOSE macro for global optimizers
VERBOSE should not cout all the moves, the log is too long
2022-10-11 09:58:02 +02:00
Sébastien Loriot 1937d74578 the workaround seems to be required for all MSVC versions 2022-10-10 17:02:05 +02:00
Laurent Rineau d18af6e369 Merge pull request #6927 from lrineau/Mesh_3-fix_leaks-GF
Mesh_3: Fix a memory leak in the parallel code
2022-10-07 15:46:34 +02:00
Laurent Rineau 4a26b482a7 Merge pull request #6927 from lrineau/Mesh_3-fix_leaks-GF
Mesh_3: Fix a memory leak in the parallel code
2022-10-07 15:46:34 +02:00
Laurent Rineau 7db002804c Merge pull request #6927 from lrineau/Mesh_3-fix_leaks-GF
Mesh_3: Fix a memory leak in the parallel code
2022-10-07 15:46:06 +02:00
Jane Tournois b5ff78e7f9 reorder includes 2022-10-07 10:37:36 +02:00
Jane Tournois a2d6d792b1 add author 2022-10-07 10:37:15 +02:00
Jane Tournois 1b11faaf00 add missing std:: 2022-10-06 16:02:06 +02:00
Jane Tournois 9bb4fb4d15 protect debug code with macro
and remove default filename ""
2022-10-06 15:10:37 +02:00
Jane Tournois c64a0d8648 add more details about how to choose sigma 2022-10-06 10:44:26 +02:00
Sebastien Loriot 50938b98bc Add missing dot
Co-authored-by: Mael <mael.rouxel.labbe@geometryfactory.com>
2022-10-05 21:52:27 +02:00
Sébastien Loriot 5a02248907 remove disable as enable was removed 2022-10-05 21:50:39 +02:00
Sébastien Loriot c0ff903d21 fix default values 2022-10-05 21:41:20 +02:00
Sébastien Loriot d6d2188cc7 fix warning 2022-10-05 19:33:00 +02:00
Sébastien Loriot daf9add03a fix after review 2022-10-05 16:40:33 +02:00
Sebastien Loriot cbfeb98b38 Apply suggestions from review
Co-authored-by: Mael <mael.rouxel.labbe@geometryfactory.com>
2022-10-05 15:39:04 +02:00
Sébastien Loriot 8c7a1d756f use backticks instead of \c 2022-10-04 19:24:30 +02:00
Sebastien Loriot a61e6bc346 Apply review from Jane
Co-authored-by: Jane Tournois <janetournois@users.noreply.github.com>
2022-10-04 18:56:34 +02:00
Laurent Rineau 187967559b Merge pull request #6796 from janetournois/Mesh_3-compare_distance_performance_issue-jtournois
Mesh_3 speedup (filter failures in `Compare_distance_3(Point_3, Segment_3, Point_3)` )
2022-10-04 13:53:31 +02:00
Laurent Rineau d345d93bbb Merge pull request #6796 from janetournois/Mesh_3-compare_distance_performance_issue-jtournois
Mesh_3 speedup (filter failures in `Compare_distance_3(Point_3, Segment_3, Point_3)` )
2022-10-04 13:50:27 +02:00
Sébastien Loriot 3de965f16d please MSVC 2015
@lrineau do you know why only the constructor has this issue?
2022-10-03 19:08:47 +02:00
Laurent Rineau 8fddaa6baa Mesh_3: Fix a memory leak in the parallel code 2022-10-03 17:15:27 +02:00
Sébastien Loriot fc4c86a491 try to work around MSVC 2015 bugs... 2022-09-30 15:54:30 +02:00
Jane Tournois 13ef721ac0 remove trailing whitespace 2022-09-27 17:04:40 +02:00
Jane Tournois 521e4c123b fix protection macro 2022-09-27 16:54:01 +02:00
Jane Tournois bca99f4a18 add detect_features named parameter for create_labeled_image_mesh_domain_with_features
todo : move it to create_labeled_image_mesh_domain and remove
create_labeled_image_mesh_domain_with_features as soon as PR on named
parameters is merged
2022-09-27 16:17:25 +02:00
Sébastien Loriot b0a144c6e7 update examples to the new API 2022-09-26 20:14:26 +02:00
Sébastien Loriot 54a6462273 move code so that we can reinject mesh_3 parameters functions into NFP class 2022-09-26 20:09:58 +02:00
Sébastien Loriot db7a4e9945 add missing namespace 2022-09-23 15:21:25 +02:00
Mael Rouxel-Labbé 363d1daaef Some more conversions to non-package specific assertions 2022-09-23 15:20:24 +02:00
Andreas Fabri 6d09a886b2 Remove paragraph in the developer manual; Some fixes 2022-09-23 14:12:53 +01:00
Sébastien Loriot 5023cb90cf do no modify visibility and add macro to hide parts 2022-09-23 14:24:37 +02:00
Sébastien Loriot d191d4474a Revert "fix not documented warnings"
This reverts commit 8d773c56348c4055d963c57426d60d118915d22b.
2022-09-23 14:04:51 +02:00
Andreas Fabri d3fca65ae5 CGAL: No longer per package assertions 2022-09-23 12:49:40 +01:00