Commit Graph

2990 Commits

Author SHA1 Message Date
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 0e823324c9 Allow to use an Epick-like kernel with float as FT 2022-10-10 15:49:17 +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 8d019c5622 consider bbox polylines as features for making weights "black" on features 2022-09-28 08:07:06 +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
Jane Tournois fe590eecd2 remove outdated headers 2022-09-27 10:35:22 +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
Jane Tournois 1976710f9c add weights input to the labeled image + features domain 2022-09-23 17:21:01 +02:00
Jane Tournois 77a121c1a6 Merge branch 'Mesh_3-fix_weighted_images-GF' into Mesh_3-triple_line_extraction_and_weights-GF 2022-09-23 15:53:14 +01:00
Jane Tournois 6175050c90 Merge branch 'Mesh_3-triple_line_extraction-GF' into Mesh_3-triple_line_extraction_and_weights-GF
# Conflicts:
#	Mesh_3/examples/Mesh_3/mesh_3D_image_with_detection_of_features.cpp
2022-09-23 16:26:49 +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
Sébastien Loriot 6397378bdc fix not documented warnings 2022-09-23 13:29:40 +02:00
Jane Tournois af908bea25 use ITK DiscreteGaussianImageFilter with variance = 1 voxel
sigma parameter is difficult to use for end user
2022-09-22 12:48:46 +02:00
Sébastien Loriot 56ee7b3deb add missing include directive 2022-09-21 18:36:00 +02:00
Sébastien Loriot d2cd6244ff clean up Periodic_3_mesh_3 doc 2022-09-21 17:20:29 +02:00
Laurent Rineau 2c6ab3ca51
Update Labeled_mesh_domain_3.h
[skip ci]
2022-09-21 15:49:19 +02:00
Sébastien Loriot 6b07cbdadd clean up Mesh_3 internal parameters 2022-09-21 15:45:14 +02:00
Sébastien Loriot 6505bb7d39 fix parameters 2022-09-21 11:49:28 +02:00
Sébastien Loriot 70468210a4 fix indentation 2022-09-21 10:18:21 +02:00
Sébastien Loriot d8f0bc4c08 dedicated macro for precondition 2022-09-21 09:42:32 +02:00
Sébastien Loriot 681120764e please the CI with a new macro 2022-09-21 09:36:41 +02:00
Sébastien Loriot 74b90ca71b fix links 2022-09-20 18:09:53 +02:00
Sébastien Loriot b740c31bc1 clean up make_mesh_3 and refine_mesh_3 2022-09-20 18:03:47 +02:00
Sébastien Loriot bab2d0c280 clean up perturb_mesh_3 2022-09-20 16:02:10 +02:00
Sébastien Loriot e6c8854260 clean up odt_optimize_mesh_3 2022-09-20 15:55:05 +02:00
Jane Tournois 8c09f72039 add debug code 2022-09-20 15:54:54 +02:00
Sébastien Loriot e23d77bbf7 clean lloyd_optimize_mesh_3 2022-09-20 14:27:30 +02:00
Sébastien Loriot 928ef0b447 clean up exude_mesh 2022-09-20 14:26:56 +02:00
Sébastien Loriot d5a82f3412 clean up Mesh_criteria 2022-09-20 14:03:13 +02:00
Sébastien Loriot b1610e10a7 fix Labeled_mesh_domain_3 doc and add missing backward compatibility functions 2022-09-19 21:32:02 +02:00
Sébastien Loriot 457877b21b mark the function as deprecated 2022-09-19 06:38:09 +02:00
Sébastien Loriot 28c583ce17 disambiguate and mark it as deprecated 2022-09-19 06:29:37 +02:00
Sébastien Loriot 4701aadf1d add missing include directives for CI 2022-09-16 17:00:26 +02:00
Sébastien Loriot acf2a7ecdf try to present backward compatibility 2022-09-16 16:54:58 +02:00
Sébastien Loriot 0e62685f39 force images to be taken by reference 2022-09-16 14:36:06 +02:00
Sébastien Loriot 953b01db1f regroup code for named parameters 2022-09-15 15:10:12 +02:00
Sébastien Loriot e085a47b19 fix doc warnings/errors in Mesh_3 2022-09-15 12:49:13 +02:00
Sébastien Loriot dfc24f98d8 move header before documenting it 2022-09-15 09:49:28 +02:00
GYuvanShankar 7b30693cd7 More testsuite/polyhedron fixes 2022-09-07 17:57:34 +05:30
Laurent Rineau 67a5a69e7f Revert "temporarily replace explicit call to kernel"
This reverts commit 43ef4e35ba.
2022-08-25 10:29:04 +02:00
GYuvanShankar 620a8f204c Fixed named parameters not found error 2022-08-23 15:43:26 +05:30
GYuvanShankar 530d6e0f78 Fixed tests not running in Mesh_3 2022-08-23 14:58:15 +05:30
Laurent Rineau e7ffd0b943 New patch
This patch removes the cause of filter failures of `Compare_distance_3`, and
keep the exactness.
2022-08-19 15:25:28 +02:00
GYuvanShankar ce44ebf64d Documentation change, removed BOOST_PARAMETER_MAX_ARITY macro 2022-08-17 18:03:26 +05:30
Sébastien Loriot fe5befbf25 remove whitespace 2022-08-16 18:07:14 +02:00
Sébastien Loriot ad6329c263 Merge 'cgal/master' into gsoc2022-boost_np 2022-08-16 17:52:18 +02:00
Jane Tournois 43ef4e35ba temporarily replace explicit call to kernel
there are more than 90% filter failures in calls to
Compare_distance_3()(Point_3, Segment_3, Point_3)

this commits divides by 10 the initialization (protecting ball
placement) time, at least on polyhedral surfaces input
2022-08-11 15:32:18 +02:00
GYuvanShankar 02ddb5c1c3 Documentation for mandatory parameters 2022-08-08 14:36:26 +05:30
Jane Tournois 5768339d5c remove the "more than 3 subdomains" filter 2022-08-04 12:47:23 +02:00
Sébastien Loriot 861588abe1 Merge 'sloriot/CGAL-std_type_traits' into master 2022-08-03 20:19:51 +02:00
Sébastien Loriot e063ac1e2d add missing polylines 2022-08-01 14:58:51 +02:00
Jane Tournois e2f9887ad8 Merge remote-tracking branch 'cgal/master' into Mesh_3-triple_line_extraction-GF
# Conflicts:
#	Installation/CHANGES.md
2022-07-28 16:07:22 +02:00
Sébastien Loriot e532260914 fix compilation issues 2022-07-27 18:42:38 +02:00
GYuvanShankar 1ee7340343 Removed np for mandatory param for certain fns 2022-07-27 20:16:47 +05:30
Sébastien Loriot 8a13b7fbeb Add missing NP only version
also remove other constructors that does not seem needed
2022-07-27 12:07:27 +02:00
Sébastien Loriot 19c146b6e2 add deprecated compatibility version 2022-07-27 12:07:08 +02:00
Sébastien Loriot f2aeaf710b use Named_parameters for variadic specialization 2022-07-27 11:24:26 +02:00
Sébastien Loriot 6802528cd6 make it uniform 2022-07-27 11:07:28 +02:00
Sébastien Loriot e0f99d3c77 fix template parameter 2022-07-22 08:57:04 +02:00
Sébastien Loriot 5ad476997d workaround MVC2015 bug 2022-07-22 08:56:37 +02:00
GYuvanShankar cafe5b1817 Removed deprecated docs/warnings 2022-07-19 14:10:05 +05:30
GYuvanShankar 520545d543 Named parameter for mandatory parameters DRAFT 2022-07-19 13:10:35 +05:30
GYuvanShankar 78afe0c76e Moved named parameter specific code to seperate file 2022-07-14 12:34:50 +05:30
Sébastien Loriot 1e857506c1 Merge remote-tracking branch 'cgal/5.5.x-branch' 2022-07-12 18:22:02 +02:00
Sébastien Loriot 12795ba29c Merge remote-tracking branch 'cgal/5.4.x-branch' into HEAD 2022-07-12 18:21:16 +02:00
Sébastien Loriot c32e2b1416 use operator|| 2022-07-12 18:18:34 +02:00
Sébastien Loriot 493795f95d also accomodate older versions of clang 2022-07-12 18:18:34 +02:00
Sébastien Loriot ad1e333538 handle older GCC versions 2022-07-12 18:18:34 +02:00
Sébastien Loriot 45b5fd43f8 fix more warnings 2022-07-12 18:18:34 +02:00
GYuvanShankar 996985126c Changed some functions to pass without specifying param. name 2022-07-05 20:33:49 +05:30
Sébastien Loriot 18f3d6e35b add missing inline 2022-07-01 10:12:23 +02:00
Sébastien Loriot 93590720b7 remove trailing whitespaces 2022-07-01 09:58:42 +02:00
Christopher Nicol 96ead54e16 trailing spaces deleted, unused variable removed. 2022-07-01 09:26:23 +02:00
Christopher Nicol 3470370807 Addition of the 4-5-6-7-8 colors cases 2022-06-30 15:26:09 +02:00
Jane Tournois 17b760a8ea rename outdated header protection macros 2022-06-30 12:18:49 +02:00
Jane Tournois 8a14b52465 fix header protection macro 2022-06-30 10:22:42 +01:00
Sébastien Loriot bff69397b6 add missing case and start/end indices 2022-06-30 10:22:41 +01:00
Sébastien Loriot 3a7a0e155c add all cases in the table + add placeholders for sampling curves of all cases. 2022-06-30 10:22:41 +01:00
Jane Tournois 149ee2abaa rename headers, internal functions and directory 2022-06-30 10:22:41 +01:00
Sébastien Loriot a30f4fe644 fix invalid endpoint 2022-06-30 10:22:41 +01:00
Jane Tournois b69fd9bf30 add missing include header 2022-06-30 10:21:53 +01:00
Jane Tournois 9fd17a85dd avoid circular includes 2022-06-30 10:20:55 +01:00
Jane Tournois 781541b9e7 attempt to fix CI check_headers error 2022-06-30 10:20:19 +01:00
Jane Tournois ed8286307a add missing inline's causing multiple definitions link errors in the demo 2022-06-30 10:20:19 +01:00
Jane Tournois cc411375a5 fix g++ compilation error 2022-06-30 10:20:19 +01:00
Jane Tournois 755c403f94 remove useless template parameter 2022-06-30 10:20:18 +01:00
Jane Tournois 223ea3cf6e move Null_subdomain_index up to have definitions in a valid order 2022-06-30 10:20:18 +01:00
Jane Tournois 102b79a6aa fix missing brackets warning for clang 2022-06-30 10:20:18 +01:00
Jane Tournois e80f628e2b add create_labeled_image_mesh_domain_with_features(image)
and do not document the detect_triple_lines() function
2022-06-30 10:20:18 +01:00
Jane Tournois 8de92cf4ac int * CGAL::square()
fixes error
error: no match for ‘operator*’ (operand types are ‘int’ and ‘CGAL::Null_functor::result_type’ {aka ‘CGAL::Null_tag’})
2022-06-30 10:20:17 +01:00
Jane Tournois cc9661171b add missing include 2022-06-30 10:20:17 +01:00
Jane Tournois a538aa9523 remove more é 2022-06-30 10:20:17 +01:00
Jane Tournois 607b2e5d19 remove é 2022-06-30 10:20:17 +01:00
Jane Tournois 3eeffaee4e add missing license include 2022-06-30 10:20:16 +01:00
Jane Tournois 018f9cc656 make clear what should or should not be unsigned char
get Word from Word_type, and use an unsigned integral type to
be able to use it as an index in a table

Separate the types Word_type and Word (convert from CGAL Image_3 labels
into the Word format)
2022-06-30 10:20:16 +01:00
Jane Tournois 715295fdc8 add license headers, and add namespaces 2022-06-30 10:20:16 +01:00
Jane Tournois 0e04ec9d5c add word type as template parameter 2022-06-30 10:20:15 +01:00
Jane Tournois 23d8288206 add license header and namespaces 2022-06-30 10:20:15 +01:00
Jane Tournois a5563fc5fc move code back to internal header 2022-06-30 10:20:15 +01:00
Jane Tournois 7d9ea52032 move triple lines detection code to new header 2022-06-30 10:20:15 +01:00
Jane Tournois cc97d1015f start refactoring 2022-06-30 10:20:14 +01:00
Jane Tournois 097897182d add missing license 2022-06-30 10:20:14 +01:00
Jane Tournois d14ab9c91a add detection of triple lines from labeled images
for tet meshing with features
2022-06-30 10:20:14 +01:00
GYuvanShankar 4457b05350 Removed _new prefix from named parameters 2022-06-29 17:38:54 +05:30
Sébastien Loriot 1a4a6816ac Merge pull request #6084 from janetournois/PMP-add_surface_mesher-jtournois
PMP - add surface remeshing from Mesh_3
2022-06-29 09:20:10 +02:00
GYuvanShankar 7a080f9b92 New API support and doc for Mesh_criteria_3.h 2022-06-29 12:28:41 +05:30
GYuvanShankar 60f7a5c7cf New API support and docs for Labeled_mesh_domain_3.h 2022-06-27 20:26:35 +05:30
Andreas Fabri 70a06b4696 Do not use CGAL::iterator_v<> as it is responsible for the ICE of VC2015 2022-06-27 08:58:17 +01:00
GYuvanShankar 5a8d90019e New API support and docs for optimize_periodic_3_mesh_3.h 2022-06-21 18:45:25 +05:30
GYuvanShankar 109d74466d New API support and docs for make_mesh_3.h 2022-06-21 14:11:49 +05:30
GYuvanShankar 93514bd826 New API support and doc for refine_mesh_3.h 2022-06-20 18:31:49 +05:30
GYuvanShankar 0af311c0b3 New API support and docs for perturb_mesh_3.h 2022-06-17 14:30:25 +05:30
GYuvanShankar d0d64efe30 New API support and doc for lloyd_optimize_mesh_3.h 2022-06-16 20:34:46 +05:30
Sébastien Loriot 4015911aeb doc value type of default vpm for the output mesh 2022-06-16 13:39:47 +02:00
GYuvanShankar 2555a3e3b8 Real_timer to 2022-06-15 13:48:35 +05:30
GYuvanShankar 89c07e7718 New API support and doc for odt_optimize_mesh_3.h 2022-06-15 13:31:45 +05:30
GYuvanShankar 11341ed33d Support for docs 2022-06-14 19:11:44 +05:30
Laurent Rineau c132b6a11e Merge remote-tracking branch 'cgal/master' into Mesh_data_structure_3-new_package-jtournois 2022-06-13 16:26:34 +02:00
GYuvanShankar e213a90451 Fixed problem running testsuite 2022-06-12 10:34:41 +05:30
Sébastien Loriot b96f6d5ce9 move is_iterator to type_traits 2022-06-10 09:43:59 +02:00
Sébastien Loriot 44250cb019 is_iterator_XXX<>::value --> is_iterator_XXX_v<> 2022-06-10 09:40:29 +02:00
Sébastien Loriot 5872413f37 remove boost is_same headers 2022-06-10 08:48:53 +02:00
Sébastien Loriot 3fa436459d BOOST_MPL_ASSERT -> static_assert 2022-06-10 08:46:01 +02:00
Sébastien Loriot 4f5f8341cc use std::enable_if_t 2022-06-10 07:37:53 +02:00
GYuvanShankar e6619ab67b Provided new API support for exude_mesh_3 2022-06-09 14:25:33 +05:30
Sébastien Loriot eee363df27 Merge cgal/master 2022-06-08 23:23:07 +02:00
Sébastien Loriot 5746e59b34 Merge cgal/master 2022-06-08 23:13:25 +02:00
Jane Tournois 3483e1acd5 remove SMDS_3 config file 2022-06-08 23:03:50 +02:00
Jane Tournois 35cec9d95a fix file location 2022-06-08 23:02:39 +02:00
Jane Tournois bccae527c0 move file back to Mesh_3 2022-06-08 22:57:25 +02:00
Jane Tournois 27e034638a move license and config back to Mesh_3 2022-06-08 22:57:25 +02:00
Jane Tournois f934c2514e create new concepts and models SimplicialMeshCellBase_3 and SimplicialMeshVertexBase_3
todo : document concepts and models
2022-06-08 22:57:25 +02:00
Jane Tournois 355b52d21f rename TMDS_3 to SMDS_3, end. 2022-06-08 22:57:25 +02:00
Jane Tournois c0f8245e5a add compatibility headers for documented headers 2022-06-08 22:57:24 +02:00
Sébastien Loriot c8cbbbfb1d Merge cgal/master 2022-06-08 22:49:25 +02:00
Jane Tournois 4d43e39d10 move headers to TMDS_3
add TMDS_3/config.h
and update includes
2022-06-08 22:45:20 +02:00
Jane Tournois a878d3d0eb move header to TMDS_3
to avoid dependency on Mesh_3 for Tetrahedral_remeshing
2022-06-08 22:45:20 +02:00
Jane Tournois a76e3bb93f move cell and vertex base headers to TMDS_3
to avoid dependency on Mesh_3 for tet remeshing
2022-06-08 22:45:20 +02:00
Jane Tournois 60fc37d5c5 move internal/TMDS_3 to TMDS_3/internal 2022-06-08 22:45:20 +02:00
Sébastien Loriot 5e124e5d5f Merge cgal/master 2022-06-08 22:43:17 +02:00
Jane Tournois 95b3da51cf move all MDS_3 to TMDS_3 (with T for Tetrahedral) 2022-06-08 22:35:50 +02:00
Sébastien Loriot f0fc06b998 Merge cgal/master 2022-06-08 22:10:34 +02:00
Sébastien Loriot 920c35c30e Merge cgal/master 2022-06-08 21:56:39 +02:00
Jane Tournois e0335e3e5e move everything about C3t3 to new package MDS_3 2022-06-08 21:46:51 +02:00
Jane Tournois e86c4027af move C3T3 headers to MDS_3 new package
MDS_3 is "3D Mesh Data Structure"
2022-06-08 21:46:50 +02:00
Jane Tournois 675d5f4ff9 there is no need to disable/enable warnings here 2022-06-07 09:58:16 +02:00
Jane Tournois 06f84573bd fix warning
warning: moving a local object in a return statement prevents copy elision
2022-06-07 09:57:42 +02:00
Andreas Fabri ab0c0b96de Remove unused typedef 2022-06-06 15:16:23 +01:00
Jane Tournois 70f5981aac fix compilation using new is_default_parameter::value 2022-06-02 10:06:53 +02:00
Jane Tournois 86c9a35c15 Merge remote-tracking branch 'cgal/master' into PMP-add_surface_mesher-jtournois 2022-06-02 08:25:30 +01:00
Jane Tournois 1f75a4038c introduce new criterion visitor for size lower bound 2022-05-27 17:19:40 +02:00
Jane Tournois 446c77b8c9 use is_lower_bound to differentiate criterion 2022-05-27 16:35:34 +02:00
Jane Tournois 45c5767fb0 add parameter to specify in uniform sizing that it is a lower bound 2022-05-27 15:47:28 +02:00
Jane Tournois 4c97f7ba4a add minimal bound radius parameter 2022-05-27 14:50:33 +02:00
Jane Tournois 8ce197ec3d transform visit() into template functions
to prepare derivation of criterion visitor
2022-05-27 14:42:10 +02:00
Jane Tournois b6fb247f41 add new parameters for minimal size 2022-05-27 14:36:08 +02:00
Sebastien Loriot 7924273cab
Merge pull request #6448 from janetournois/Mesh_3-fix_weights_doc-jtournois
Mesh_3::generate_label_weights - add documentation group
2022-05-26 18:08:14 +02:00
Jane Tournois 533bb05041 fix early return type 2022-05-10 09:46:41 +02:00
Sebastien Loriot b4ffa85e86
Fix typos
Co-authored-by: Mael <mael.rouxel.labbe@geometryfactory.com>
2022-05-09 17:47:53 +02:00
Jane Tournois 09940df90d Merge branch 'PMP-add_surface_mesher-jtournois' of github.com:janetournois/cgal into PMP-add_surface_mesher-jtournois 2022-05-09 16:57:54 +02:00
Jane Tournois 5d263f6f45 add a template parameter for the output mesh 2022-05-09 16:57:43 +02:00
Jane Tournois f3713da161 the input mesh does not need to be mutable 2022-05-09 13:57:27 +02:00
Laurent Rineau 2f243c44e9 Merge pull request #6525 from janetournois/Mesh_3-fix_polylines_to_protect_angle-jtournois
CGAL::Mesh_3::polylines_to_protect with angle bound - bug fix
2022-05-06 14:21:56 +02:00
Jane Tournois 4e449d2722
Update Mesh_3/include/CGAL/Polygon_mesh_processing/surface_Delaunay_remeshing.h
Co-authored-by: Sebastien Loriot <sloriot.ml@gmail.com>
2022-05-05 16:00:51 +02:00
Laurent Rineau 83fb998a66 Fix the non-determinism 2022-05-04 17:15:39 +02:00
Jane Tournois 613eb6a2cf doc 2022-04-29 15:57:41 +02:00
Jane Tournois 56b03c8abf fix the use of reference type 2022-04-29 15:43:19 +02:00
Jane Tournois 65c03a5acf reorganize feature detection section 2022-04-29 15:19:54 +02:00
Jane Tournois 59e8aa85b6 Fix return type of get_parameter_reference (use traits::reference, not const auto&) 2022-04-29 14:00:58 +02:00
Jane Tournois f0022a5e21 change API to return triangulation instead of modifying Tr& out
and fix compilation errors after merging master
2022-04-29 13:53:39 +02:00
Jane Tournois c21fe46525 Merge remote-tracking branch 'cgal/master' into PMP-add_surface_mesher-jtournois
# Conflicts:
#	Polygon_mesh_processing/doc/Polygon_mesh_processing/PackageDescription.txt
#	Polygon_mesh_processing/examples/Polygon_mesh_processing/CMakeLists.txt
2022-04-29 10:48:08 +02:00
Laurent Rineau 6f6eded0e1 Merge pull request #6492 from MaelRL/P3M3-Better_output-GF
Fix C3T3_facets_to_TM conversion for periodic meshes
2022-04-27 16:32:01 +02:00
Laurent Rineau 6d2a3dc772 Merge pull request #6492 from MaelRL/P3M3-Better_output-GF
Fix C3T3_facets_to_TM conversion for periodic meshes
2022-04-27 16:30:51 +02:00
Jane Tournois 74540b0b01 min should be max
90 is a conservative lower bound on angle bound
2022-04-26 15:32:02 +02:00
Andreas Fabri 61e36373aa Mesh_3: Suppress a clang warning 2022-04-25 14:04:11 +01:00
Mael ab03816081
Also put `Vertex_handle` typedef behind `CGAL_assertion_code` 2022-04-20 10:26:26 +02:00
Sébastien Loriot 4fc9fe5ffc fix warning 2022-04-19 20:27:45 +02:00
Mael Rouxel-Labbé 4b82575b30 Fix C3T3_facets_to_TM conversion for periodic meshes 2022-04-15 14:11:41 +02:00
Jane Tournois f89a6e4ce8 test if angle is acute, and then if smaller than the input angle
if angle at p is acute, then v should be considered as a terminal
vertex to ensure termination
2022-03-22 15:25:43 +01:00
Jane Tournois 5913be0db8 add documentation group 2022-03-22 12:13:42 +01:00
Jane Tournois 36e95ddc3f use add_triple_line_features header 2022-03-21 09:13:14 +01:00
Jane Tournois a69bb89564 move triple line detection function to new header 2022-03-18 19:55:52 +01:00
Jane Tournois cfd0fd2201 add missing default constructor 2022-03-11 10:40:14 +01:00
Jane Tournois 8e0b41bf7e add tunable angle to Angle_tester for polylines_to_protect() 2022-03-11 08:27:03 +01:00
Laurent Rineau fc7f67269f Make two programs less verbose
Fix #6353
2022-02-24 15:41:47 +01:00
Jane Tournois 49a0ff3fb5 use weight value for readability 2022-02-16 15:38:15 +01:00
Jane Tournois 79bb343c9e get debug code outside of loop 2022-02-16 12:39:24 +01:00
Jane Tournois cdf9849c57 set all neighbors to 1 to avoid dealing with weights in feature detection 2022-02-16 10:10:48 +01:00
Jane Tournois 9bb393ee11 fix loop 2022-02-15 18:41:32 +01:00
Jane Tournois f7aef4aaca experiments to deal with triple lines extraction and weights 2022-02-15 18:30:57 +01:00
Jane Tournois a2abc9b9e0 fix second template parameter 2022-02-15 15:29:56 +01:00
Jane Tournois 2c14df7dd5 make kd tree mutable 2022-02-15 15:29:31 +01:00
Sébastien Loriot 593ff5371c Merge remote-tracking branch 'cgal/master' into HEAD 2022-02-01 20:11:27 +01:00
Laurent Rineau a22b459637 Merge pull request #6259 from afabri/Mesh_3-permissive-GF
Mesh_3: Fixes for VC++ with option /permissive-
2022-01-21 16:08:30 +01:00
Andreas Fabri ade80dcf4d Fix initialisation of atomic 2022-01-20 08:44:38 +00:00
Andreas Fabri d4f9be848c Mesh_3: Fixes for VC++ with option /permissive- 2022-01-19 13:58:51 +00: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 398e71d37d Merge pull request #6155 from sloriot/STL_extension-Modifiable_priority_queue_clean_up
Add option to use a relaxed order
2022-01-12 12:21:53 +01:00
Sébastien Loriot 1c3e09f562 rename internal namespace
default_values -> default_values_for_mesh_3
2022-01-10 18:36:32 +01:00
Sébastien Loriot 1e7785b427 do not use PMP::parameters namespace 2022-01-04 16:00:38 +01:00
Laurent Rineau 7cada272e8
Merge pull request #6124 from janetournois/Mesh_3-polyhedral_complex_in_demo-GF 2022-01-03 16:48:37 +01:00
Laurent Rineau 7e0f325f87 Merge pull request #6196 from MaelRL/Mesh_3-Remove_trailing_semicolon-GF
Fix: remove extra ';'
2022-01-03 16:26:05 +01:00
Mael Rouxel-Labbé 91d862d997 Remove extra ';' 2021-12-23 11:58:28 +01:00
Jane Tournois 4f5f83acbf rename delaunay_remeshing to surface_Delaunay_remeshing
with capital D
2021-12-20 11:46:58 +01:00
Sébastien Loriot f26de8e819 use the container in STL_extension and not the internal one 2021-11-30 13:20:15 +01:00
Jane Tournois 355d11f98e start refactoring 2021-11-16 17:14:15 +01:00
Jane Tournois ddc7aa343d add missing license 2021-11-16 14:37:03 +01:00
Jane Tournois 0936df8b63 add detection of triple lines from labeled images
for tet meshing with features
2021-11-16 11:53:45 +01:00
Jane Tournois e6bacfb226 make polyhedral complex usable with Surface_mesh 2021-11-12 10:44:41 +01:00
Jane Tournois c9b70e46a3 doc 2021-11-02 14:40:35 +01:00
Jane Tournois cc53fadab1 avoid copy 2021-11-02 14:37:44 +01:00
Jane Tournois 32ac340b6e fix link 2021-11-02 13:49:24 +01:00
Jane Tournois 61507f33c9 doc 2021-11-02 11:32:11 +01:00
Jane Tournois fa06d5f8c5 use get_parameter_reference and remove nasty include 2021-11-02 11:31:13 +01:00
Jane Tournois bbee8a9063 use is_default_parameter 2021-11-02 11:27:14 +01:00
Jane Tournois 79c4d4f1c8 mael's review 2021-11-02 11:23:50 +01:00
Jane Tournois 18529dded2 ref added 2021-11-02 09:40:20 +01:00
Sébastien Loriot ac77ee3140 fix doc build 2021-11-01 16:17:11 +01:00
Jane Tournois 909e69888c
Merge branch 'master' into PMP-add_surface_mesher-jtournois 2021-10-29 17:47:25 +02: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
Jane Tournois 1569978d3c add polyline_constraints as input for delaunay_remeshing
and add a test using it
2021-10-29 17:20:07 +02:00
Laurent Rineau ca89949169 Merge pull request #5597 from lrineau/Mesh_3-weighted_images-GF
Mesh_3: Add weighted images
2021-10-29 17:01:33 +02:00
Laurent Rineau bb7253638e Merge pull request #6040 from lrineau/Mesh_3-remove_const_in_Set_of_indices-lrineau
CGAL/Mesh_3/experimental/AABB_filtered_projection_traits.h: Remove  boost::remove_const<..> from the index type
2021-10-29 16:59:59 +02:00
Laurent Rineau aca24f489b Merge pull request #6054 from janetournois/Mesh_3-uninitialized_warnings-GF
Mesh_3 - fix maybe uninitialized warning
2021-10-29 16:59:45 +02:00
Jane Tournois 90b5c60956 rename make_surface_mesh() to delaunay_remeshing() 2021-10-29 14:52:14 +02:00
Jane Tournois b664ee54c3 workaround deprecation warning of versions < 5 of ITK 2021-10-29 12:27:04 +02:00
Jane Tournois b221437366 doc 2021-10-27 22:58:02 +02:00
Jane Tournois 5ec19abc7b domain.detect_features() and domain.add_features() cannot be called in sequence
so we separate the use of edge_is_constrained_map and automatic detection of features
2021-10-27 22:53:48 +02:00
Jane Tournois c113247f83 add missing typename 2021-10-27 13:18:21 +02:00
Jane Tournois e8ac9f281c add feature detection 2021-10-27 12:24:24 +02:00
Jane Tournois a9318b3832 fix maybe uninitialized warning 2021-10-15 09:48:54 +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
Jane Tournois c8918a9b0d fix conversion warning 2021-10-11 13:19:40 +02:00
Jane Tournois 9041574b9e remove free function remove_isolated_vertices_in_mesh_3
a member function of C3T3 is enough
2021-10-11 12:24:10 +02:00
Laurent Rineau 1af4f9336b Remove boost::remove_const<..> for the index type
It does not seem to be necessary. Actually, I really do not see why it
could have been necessary in the past.
2021-10-08 16:24:51 +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
Laurent Rineau a5e3469e78 Merge pull request #6011 from janetournois/Mesh_3-prevent_bad_initialization-jtournois
Mesh_3 - warning message after bad initialization
2021-10-06 12:04:54 +02:00
Jane Tournois ac7b637247 make types consistent with non-weighted label images 2021-10-05 10:27:03 +02:00
Jane Tournois f5eeffbbf6 remove unnecessary inheritance 2021-10-04 16:41:40 +02:00
Jane Tournois 5b2e4d1501 replace std::unary_function, that is deprecated in C++11 2021-10-04 16:09:50 +02:00
Jane Tournois a6d486f11a add missing cast 2021-10-04 15:23:44 +02:00
Jane Tournois dd493fdc9a loop on i because label is not used 2021-10-04 12:11:45 +02:00
Jane Tournois 7dc8723d54 fix default in doc 2021-10-01 14:47:46 +02:00
Jane Tournois 6e9252d196 doc 2021-10-01 14:25:14 +02:00
Jane Tournois aa3505084d add facet_topology 2021-10-01 10:59:15 +02:00
Jane Tournois 7e673974cc add facet_distance 2021-10-01 10:30:08 +02:00
Jane Tournois dfe501d70a add facet_angle 2021-10-01 10:22:15 +02:00
Jane Tournois 8837473736 add facet_size 2021-10-01 09:41:06 +02:00
Jane Tournois 9bbd1b179a add edge sizing field management 2021-10-01 09:23:25 +02:00
Jane Tournois b26edb5a86 minor reorganization 2021-09-30 15:36:03 +02:00
Jane Tournois dd0b8aaa12 doc 2021-09-30 15:03:46 +02:00
Jane Tournois 4e5ca9d9ac remove unused named parameter 2021-09-30 14:53:39 +02:00
Jane Tournois ad066f656e fix license include 2021-09-30 14:50:00 +02:00
Sébastien Loriot 6dd313d233 move header to Mesh_3 2021-09-30 14:40:44 +02:00
Jane Tournois 932639eb6f move warning code to have it happen when c3t3 has already been scanned 2021-09-30 11:24:21 +02:00
Jane Tournois 591141b600 use v->meshing_info() for performances
it avoids creating two std::set of vertices, and the use of
std::set_difference
2021-09-27 14:57:10 +02:00
Jane Tournois db5e638ac2 un-document remove_far_points_in_mesh_3 and merge with remove_isolated_vertices_in_mesh_3 2021-09-27 11:47:43 +02:00
Jane Tournois dc0dad1577 remove wrong recommendation 2021-09-27 11:02:42 +02:00
Jane Tournois 8864d3fb7e fix iterator type 2021-09-24 17:50:57 +02:00
Jane Tournois 0f4c64b7f4 fix iterator type 2021-09-24 17:34:27 +02:00
Jane Tournois 7545d2e302 document remove_isolated_vertices_in_mesh_3() 2021-09-24 17:15:36 +02:00
Jane Tournois 2c40d3f639 Merge branch 'Mesh_3-document_remove_far_points-GF' into Mesh_3-isolated_vertices-jtournois 2021-09-24 17:06:45 +02:00
Jane Tournois 66f62dec9e add new function to remove isolated vertices
i.e. vertices that are part of the triangulation but do not
belong to a cell of the complex
2021-09-24 17:04:15 +02:00
Jane Tournois b58c67d712 use macros 2021-09-24 14:41:10 +02:00
Jane Tournois 6d42c1ddf2 add warning message for the case when initialization has failed 2021-09-24 11:14:29 +02:00
Jane Tournois 4b3fee813f ITK is not needed in c3t3_item, and find with the required components only 2021-09-23 14:46:40 +02:00
Jane Tournois 17215709a7 create CGAL::Image_3 for weights before counting non-white pixels
and avoid implicit conversion to CGAL::Image_3 in the call
to count_non_white_pixels, which was then calling the destructor of
CGAL::Image_3, deleting `weights` at the same time
2021-09-23 10:46:28 +02:00
Jane Tournois 0bc25f9f20 doc (add dependency and new link) 2021-09-21 21:44:40 +02:00
Jane Tournois 8bfb4e4464 avoid all triple for loops on i,j,k 2021-09-21 19:45:51 +02:00
Jane Tournois 666a54097d documents weights size 2021-09-20 12:00:11 +02:00
Jane Tournois bad72db82d document CGAL::remove_far_points_in_mesh_3() 2021-09-17 16:03:06 +02:00
Sébastien Loriot 5945e48a3e restore sub-directories accidently removed in 98e471849b 2021-09-17 08:14:06 +02:00
Mael Rouxel-Labbé 8a92d51601 Merge branch 'Distance_3-Add_Tri_Tri-GF-old' into Distance_3-Add_Tri_Tri-GF 2021-09-02 17:26:44 +02:00
Jane Tournois e1d4c0df80 rename generate_weights() to generate_label_weights() 2021-08-31 14:58:21 +02:00
Sébastien Loriot 2c889a3b52 remove unused files 2021-08-26 11:43:58 +02:00
Sébastien Loriot 98e471849b moving files from internal to PKG/internal 2021-08-26 11:33:39 +02:00
Sébastien Loriot 1a65f4ca0a Merge remote-tracking branch 'cgal/5.3.x-branch' 2021-08-25 19:33:46 +02:00
Sébastien Loriot 3d77cbd804 Merge remote-tracking branch 'cgal/5.2.x-branch' into HEAD 2021-08-25 19:33:29 +02:00
Jane Tournois 5439dbd07e fix mismatch between two definitions of Mesher_level_conflict_status
that were in different namespaces (CGAL and CGAL::Mesh_3)
2021-08-25 19:32:13 +02:00
Jane Tournois 4b84c4b1f3 move dump to debug code 2021-07-29 12:02:40 +02:00
Jane Tournois 438422eb6d fix outdated code
Co-authored-by: Laurent Rineau <Laurent.Rineau@cgal.org>
2021-07-29 11:29:32 +02:00
Jane Tournois d1de29d7f1 improve debug code 2021-07-29 10:46:00 +02:00
Jane Tournois b2d762256f add missing id increment 2021-07-29 10:43:43 +02:00
Jane Tournois 720d1a7ca8 fix types and do not skip label 0 2021-07-28 17:35:25 +02:00
Jane Tournois 2637bf6343 add weighted images to the demo 2021-07-27 09:33:49 +02:00
Jane Tournois c5a6838a03 add missing typename 2021-07-26 15:14:18 +02:00
Jane Tournois fc9aed70e9 doc 2021-07-26 14:27:55 +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
Laurent Rineau 5896af7960 Fix indentation 2021-07-13 11:49:51 +02:00
Laurent Rineau f8a2878b0c Port Mesh_3 to oneAPI-TBB
The work was already mostly done in PR #4892, but there was still two
issues:
  - `tbb::parallel_do` has been removed, and `tbb::parall_for_each`
  was to be used instead,
  - the support for `tbb_hasher` has been removed.

This time, I have tested in a container were
intel-oneapi-tbb-common-devel-2021.3.0-2021.3.0-511.noarch was
installed, but not tbb version 2020.
2021-07-13 11:38:43 +02:00
Jane Tournois ba95896f93 add doc for weighted images 2021-07-06 15:56:55 +02:00
Jane Tournois d069c07b04 remove Image_word_type template parameter 2021-07-05 14:38:46 +02:00
Jane Tournois 89a227af80 make 'weights' a boost named parameter of create_labeled_image_mesh_domain() 2021-06-25 17:09:32 +02:00
Jane Tournois ee6f2f8df5 wrap debug code in macro CGAL_MESH_3_WEIGHTED_IMAGES_DEBUG 2021-06-24 15:04:09 +02:00
Jane Tournois 5828996f2e the Weights_type is unsigned char, not Image_word_type 2021-06-24 14:50:10 +02:00
Mael Rouxel-Labbé 084a1efe2d Merge remote-tracking branch 'cgal/master' into Distance_3-Add_Tri_Tri-GF 2021-06-23 22:30:03 +02:00
Jane Tournois 3b23b5650d generate_weights is now working 2021-06-21 09:59:25 +02:00
Laurent Rineau 20dcc7b57e Merge pull request #5762 from janetournois/Mesh_3-fix_warning_pr5587-jtournois
Mesh_3 - fix missing initializer warning
2021-06-16 15:04:57 +02:00
Laurent Rineau d74d4745df Merge pull request #5762 from janetournois/Mesh_3-fix_warning_pr5587-jtournois
Mesh_3 - fix missing initializer warning
2021-06-16 15:03:45 +02:00
Jane Tournois c07c71275d duplicate image before application of filters 2021-06-15 16:01:21 +02:00
Jane Tournois 16db150f65 fix allocation of image
then :
- smooth each indicator function with Gaussian filter
- compute the maximum image of all indicator functions
2021-06-15 14:37:24 +02:00
Jane Tournois 293b28d7f1 perform gaussian smoothing 2021-06-14 17:28:53 +02:00
Jane Tournois b47cf8e0d9 compute indicator images and fit them to [0; 255] 2021-06-14 17:24:50 +02:00
Jane Tournois d831724b10 convert a CGAL::Image_3 to ITK format to generate weights for weighted images
- add ITK as a dependency for mesh_3D_weighted_image.cpp
- WIP
2021-06-14 16:49:43 +02:00
Jane Tournois b69f643239 add missing param in initializer list 2021-06-04 15:58:26 +02:00
Laurent Rineau 59a0da4f13 Merge pull request #5692 from maxGimeno/CGAL_cpp11_atomic_and_threads-maxGimeno
CGAL:: Use std atomic and threads

# Conflicts:
#	Arrangement_on_surface_2/include/CGAL/Arr_counting_traits_2.h
2021-05-19 17:23:53 +02:00
Laurent Rineau 82bec8a1d6 Merge pull request #5692 from maxGimeno/CGAL_cpp11_atomic_and_threads-maxGimeno
CGAL:: Use std atomic and threads

# Conflicts:
#	Arrangement_on_surface_2/include/CGAL/Arr_counting_traits_2.h
2021-05-19 17:11:37 +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
Maxime Gimeno 17ac255108 Fix calls t cpp11:atomic stuff 2021-05-18 15:43:59 +02:00
Maxime Gimeno 393ae7dae6 Clean-up boost_version reqs 2021-05-12 15:03:53 +02:00
Maxime Gimeno f6cefea66a Add required constructors to Mesh_vertex_base_3<Parallel_tag> 2021-05-11 09:21:58 +02:00
Maxime Gimeno 1b5b61ab0a Add include 2021-05-07 12:17:32 +02:00
Maxime Gimeno 9872ac9cf8 Replace tbb::atomic 2021-05-07 11:16:50 +02:00
Maxime Gimeno 3e03d50b8a replace usages of CGAL::cpp11::atomic and thread by std:: calls 2021-05-07 11:10:30 +02:00
Maxime Gimeno e9b7595fff Deprecate CGAL headers for threads, atomic and result_of, and move their content to config.h as fallback 2021-05-07 11:09:24 +02:00
Sébastien Loriot 4e519a3c7a move documented IO functions in IO namespace 2021-05-05 13:15:37 +02:00
Sébastien Loriot fb6f703b55 IO namespace for files in IO directories 2021-05-04 14:36:06 +02:00
Sébastien Loriot 70058db9b7 add IO namespace for Mesh_3 package 2021-05-03 15:39:07 +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
Sébastien Loriot 39367c2313 Merge remote-tracking branch 'cgal/5.2.x-branch' 2021-04-17 11:14:29 +02:00
Sébastien Loriot cbd95907cd Merge remote-tracking branch 'cgal/5.1.x-branch' into HEAD 2021-04-17 11:11:28 +02:00
Sebastien Loriot e3020f1c64
Merge pull request #5526 from janetournois/Mesh_3-add_determinism_test-jtournois
Mesh_3 - more testing of determinism
2021-04-17 10:52:30 +02:00
Laurent Rineau 76d2fcd1e1 Missing header 2021-04-13 11:03:00 +02:00
Mael Rouxel-Labbé fba303341f Merge remote-tracking branch 'cgal/master' into Distance_3-Add_Tri_Tri-GF 2021-04-12 15:33:14 +02:00
Mael Rouxel-Labbé 5deb509374 Move to Distance_3/X_Y.h rather than squared_distance_X_Y.h (as Intersections) 2021-04-12 14:42:44 +02:00
Laurent Rineau 71b85f4b85 Fix license 2021-04-08 18:44:19 +02:00
Laurent Rineau a5aaab66cf Add weighted images
The API is not final.
2021-04-08 18:29:04 +02:00
Jane Tournois 0f4559a5e2 add missing default value
attempt to fix "maybe uninitialized" warning
2021-04-06 17:39:54 +02:00
Jane Tournois 7574751d4f not all points on the edges of the cube are corners
differentiate between corner vertices and edge vertices
corner vertices are forced to be "terminal" in the call
to split_graph_into_polylines() hence leading to
as many polylines as segments on image bbox edges
2021-04-06 14:59:49 +01:00
Laurent Rineau 1b54449dc5 Merge pull request #4878 from danston/Kernels-decltypes-danston
Improve decltype/result_of/invoke_result
2021-04-06 15:13:21 +02:00
Jane Tournois 1b323b8599 when aabb_tree is empty, there are no patches
hence no incident patches
we only refer to an aabb tree of curves
2021-04-02 14:44:26 +02:00
Laurent Rineau 0cb823656a Merge pull request #5463 from janetournois/Mesh_3-example_initialization_cc_in_gray_images-jtournois
Mesh 3 - connected components initialization for 3D gray images
2021-03-24 15:05:29 +01:00
Mael Rouxel-Labbé 27069d423c Update header includes 2021-03-12 12:52:05 +01:00
Dmitry Anisimov 00c185b028
Merge branch 'master' into Kernels-decltypes-danston 2021-03-12 12:06:20 +01:00
Laurent Rineau b1d78a909f Merge pull request #5433 from sloriot/CGAL-last_bind
Remove last bind
2021-03-03 17:32:59 +01:00
Laurent Rineau 38b45f79b1 Merge pull request #5468 from sloriot/CGAL-tiny_fixes
Mesh_3: various small bug-fixes
2021-03-03 17:29:37 +01:00
Laurent Rineau 6f8f36462f Merge pull request #5433 from sloriot/CGAL-last_bind
Remove last bind
2021-03-03 17:10:13 +01:00
Laurent Rineau d4c331cd37 Merge pull request #5468 from sloriot/CGAL-tiny_fixes
Mesh_3: various small bug-fixes
2021-03-03 16:39:52 +01:00
Laurent Rineau fa7393cb15 Merge pull request #5389 from sloriot/Mesh_3-fix_patch_id_map
Clean and fix default facet patch id map
2021-02-18 15:19:15 +01:00
Sébastien Loriot 98e48385e8 a RIGHT angle is also a corner 2021-02-17 15:49:48 +01:00
Sébastien Loriot 3b9dafb23b fix after BOOST_FOREACH -> for replacement 2021-02-17 15:49:30 +01:00
Jane Tournois 7c9e45206d add image_values_to_subdomain_indices parameter 2021-02-12 17:20:46 +01:00
Jane Tournois 8e492aa4f6 add initialization by detection of connected components in gray level image 2021-02-12 16:53:45 +01:00
Sébastien Loriot 4bb0406240 do not include boost/bind.hpp (shouldn't be used anymore) + fix remaining bind
(nasty using namespace boost!)
2021-02-12 15:35:19 +01:00
Jane Tournois c13a7a855c take into account the translation tx, ty, tz in Get_point from an image 2021-02-12 15:25:24 +01:00
Laurent Rineau d7bc38f683 Take the translation TX/TY/TZ into account 2021-02-12 14:16:54 +01:00
Laurent Rineau e94c41714a Fix a compilation error
The definition of `initialize_triangulation_from_gray_image`
required `initialize_triangulation_from_labeled_image` to be defined,
or at least declared.
2021-02-12 14:15:56 +01:00
Jane Tournois 5e86781ad8 add code to detect connected components in gray-level images 2021-02-12 10:29:14 +01:00
Sébastien Loriot 5835698fe2 no ref on temporary 2021-02-10 15:42:29 +01:00
Dmitry Anisimov 81d9556707 Merge remote-tracking branch 'upstream/master' into Kernels-decltypes-danston 2021-02-10 10:06:45 +01:00
Laurent Rineau a735e849c0 Merge pull request #5152 from sloriot/CGAL-remove_bind
Replace usages of boost::bind
2021-02-05 16:14:04 +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
Laurent Rineau 1453294c74 Merge pull request #5376 from lrineau/Mesh_3-fix_mesh_implicit_domains.cpp-GF
Fix examples/Mesh_3/mesh_implicit_domains.cpp
2021-02-05 16:10:24 +01:00
Laurent Rineau 7e2ee4946d Merge pull request #5152 from sloriot/CGAL-remove_bind
Replace usages of boost::bind
2021-02-05 16:07:34 +01:00
Laurent Rineau 3d71b8e5f0 Merge pull request #5376 from lrineau/Mesh_3-fix_mesh_implicit_domains.cpp-GF
Fix examples/Mesh_3/mesh_implicit_domains.cpp
2021-02-05 16:07:22 +01:00
Sébastien Loriot f69be333f0 Merge remote-tracking branch 'cgal/5.2.x-branch' into CGAL-remove_bind 2021-01-29 18:44:50 +01:00
Sébastien Loriot bf128b3fda rename typedef to make clear it is a property map 2021-01-25 16:19:23 +01:00
Sébastien Loriot fd371ef96b refactor the facet patch id maps + update the default 2021-01-25 16:09:17 +01:00
Laurent Rineau 6fe18d8068 Enhance the debugging tools in Mesh_3 2021-01-20 15:38:05 +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 269a47d773
Merge branch 'master' into CGAL-clang_warnings_fix-danston 2021-01-14 16:51:13 +01:00
Dmitry Anisimov 086299c56e tetrahedral remeshing range loop analysis copy to ref and auto warnings fixed 2021-01-08 10:39:24 +01:00
Maxime Gimeno 3d1c41fd14 Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2021-01-07 15:05:28 +01:00
Sébastien Loriot 2eb9908699 replace bind in Mesh_3 packages 2021-01-06 12:59:12 +01:00
Sébastien Loriot 361ef0cbbf simplify 2020-12-22 17:13:11 +01:00
Sébastien Loriot d1e1846f5e iterators are multipass 2020-12-22 16:55:25 +01:00
Laurent Rineau 34cde36fd9 Merge pull request #5209 from janetournois/Mesh_3-debug_global_optimizers-jtournois
Mesh_3 global optimizers - improve projection to surface
2020-12-09 16:14:35 +01:00