Commit Graph

2990 Commits

Author SHA1 Message Date
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
Laurent Rineau 9dcc0ef7e8 Merge pull request #5222 from maxGimeno/Tet_remesh-Fix_tbb-maxGimeno
Mesh_3: Fix std::atomic wrong function

# Conflicts:
#	Tetrahedral_remeshing/examples/Tetrahedral_remeshing/CMakeLists.txt
2020-12-09 16:14:19 +01:00
Laurent Rineau 3fc0ba4435 Merge branch '5.1.x-branch' into 5.2.x-branch
# Conflicts:
#	Tetrahedral_remeshing/examples/Tetrahedral_remeshing/CMakeLists.txt
2020-12-09 15:35:47 +01:00
Laurent Rineau 37f85e7702 Merge pull request #5209 from janetournois/Mesh_3-debug_global_optimizers-jtournois
Mesh_3 global optimizers - improve projection to surface
2020-12-09 14:58:56 +01:00
Dmitry Anisimov 3127190bcf marc's review 2020-12-08 12:48:04 +01:00
Jane Tournois 2d73ef361e remove wrong assertions
when v has dimension 3, its incident cells can be either all inside
or all outside the complex
2020-12-04 17:18:04 +01:00
Jane Tournois 232cf10af8 remove unused code 2020-12-04 10:40:42 +01:00
Mael Rouxel-Labbé 35fa50213a Avoid copies in Mesh_triangulation_3's trivial functions
These exist because of P3M3
2020-12-03 12:25:37 +01:00
Maxime Gimeno 5ee03985bf Fix atomic wrong function 2020-11-30 11:37:16 +01:00
Jane Tournois 0ed6aca5a4 replace get_closest_point() by get_closest_triangle()
to use this function with Periodic_3_mesh_3
2020-11-27 13:04:06 +01:00
Jane Tournois 9666b3cb73 replace PCA of points by PCA of triangles
to make projection more precise and avoid moving a point inside a
protecting ball
2020-11-26 16:25:55 +01:00
Maxime Gimeno 3b70343590 Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-11-16 16:19:43 +01:00
Laurent Rineau 646db6ef74 Try to fix a warning on MSVC
```
...\include\CGAL/Polyhedral_mesh_domain_with_features_3.h(264): warning C4267: 'argument': conversion from 'size_t' to '_Ty', possible loss of data
        with
        [
            _Ty=int
        ]
...\cmake\platforms\x64_Cygwin-Windows10_MSVC2017-Release-64bits\test\Mesh_3\test_meshing_polylines_only.cpp(80): note: see reference to function template instantiation 'void CGAL::Polyhedral_mesh_domain_with_features_3<K,CGAL::Polyhedron_3<Gt,CGAL::Mesh_3::Mesh_polyhedron_items<Patch_id>,CGAL::HalfedgeDS_default,std::allocator<_Ty>>,CGAL::Default,Patch_id,CGAL::Tag_true>::add_features<std::_Vector_iterator<std::_Vector_val<std::_Simple_types<std::vector<CGAL::Point_3<Kernel_>,std::allocator<CGAL::Point_3<Kernel_>>>>>>>(InputIterator,InputIterator)' being compiled
        with
        [
            Gt=K,
            Patch_id=int,
            _Ty=int,
            Kernel_=CGAL::Epick,
            InputIterator=std::_Vector_iterator<std::_Vector_val<std::_Simple_types<Polyline>>>
        ]
```
2020-10-27 09:43:46 +01:00
Laurent Rineau 19fa64fdca Mesh_3: Fix Polyhedral_mesh_domain_with_features_3::add_features
This patch, allows to mesh a polyhedron in a 3D demo, while
specifying a polylines item for the sharp features.
2020-10-23 13:52:54 +02:00
Mael Rouxel-Labbé f55ef7dd50 Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-10-09 18:36:17 +02:00
Sebastien Loriot c54622e9b4
Merge pull request #4976 from janetournois/Tet_remeshing-speedup-GF
Tetrahedral Remeshing - speedup
2020-10-02 15:29:24 +02:00
Sebastien Loriot 9e4970faef
Merge pull request #4781 from lrineau/Mesh_3-ITT_support-GF
Add ITT support in Mesh_3
2020-10-02 15:20:04 +02:00
Sebastien Loriot 20ac7ff2da
Merge pull request #4792 from lrineau/Mesh_3-reduce_size_of_debuginfo-GF
Reduce size of symbols (and debug infos)
2020-10-02 15:17:44 +02:00
Sebastien Loriot b92ad36e82
Merge pull request #4892 from lrineau/Mesh_3-new_TBB_task_group_API-GF
Mesh_3: now uses tbb:task_group instead of tbb::task (deprecated)
2020-10-02 15:16:08 +02:00
Jane Tournois 8063d3cf6f replace deprecated std::not1 by std::not_fn
std::not1 is deprecated in C++17 and removed from C++20

commit 5b474e0075 is similar
2020-09-25 15:00:49 +02:00
Mael Rouxel-Labbé 4694a48913 Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-09-22 11:35:25 +02:00
Maxime Gimeno efc903d8dc Fix error 2020-09-10 10:22:09 +02:00
Maxime Gimeno aeda2ef58c Replace boolean name and prevent maxx_domain=0 2020-09-07 12:35:54 +02:00
Maxime Gimeno 98c80402bc Don't use cell info() 2020-09-04 12:27:32 +02:00
Maxime Gimeno 56af55ecd4 Fix bug in mesh_3 tests 2020-08-27 13:46:04 +02:00
Maxime Gimeno 39c0f96492 Fix domain 0 behaviour 2020-08-27 13:18:46 +02:00
Maxime Gimeno 9d1e849517 Allow the .mesh to be read even with null domains 2020-08-27 10:26:58 +02:00
Mael Rouxel-Labbé 8682f9bafb Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-08-24 11:45:17 +02:00
Dmitry Anisimov 263ad6bc99 fixed ch3, inter3, otr2, psp, pmp, smsp, mesh3 + cleanup 2020-08-20 18:25:01 +02:00
Sébastien Loriot 93d62b969c add forward declaration
File_medit.h is included by Mesh_complex_3_in_triangulation_3_base.h
2020-08-18 14:09:06 +02:00
Jane Tournois 1e42f4c9d4 rename IO functions for MEDIT format and a Triangulation_3 2020-08-18 11:16:58 +02:00
Jane Tournois 0a7d8cfd25 add an example with IO for a .mesh file 2020-08-18 10:42:20 +02:00
Laurent Rineau d311fca3ec Remove the deprecated use of approximate_number_of_enqueued_element 2020-08-03 14:42:44 +02:00
Laurent Rineau 4fc2f5938d Mesh_3 now uses tbb:task_group instead of tbb::task (deprecated) 2020-07-31 16:17:56 +02:00
Laurent Rineau 40a0a1bf49 Allow the use of Default as concurrency tag in Mesh_triangulation_3
That is used in Tetrahedral_remeshing.
2020-07-29 16:41:37 +02:00
Laurent Rineau 9a0f310e6b Fix IO of Mesh_vertex_3: case of dimension -1
I forgot that dimension() can be -1, for far points. It has to be
dealt with in I/O.
2020-07-29 16:40:48 +02:00
Laurent Rineau 25eeff801b Fix a warning
```
.../CGAL/Mesh_3/C3T3_helpers.h:1249:14: warning: ‘*((void*)& surface +4)’ may be used uninitialized in this function [-Wmaybe-uninitialized]
 1249 |       return surface;
      |              ^~~~~~~
```
2020-07-22 12:29:55 +02:00
Laurent Rineau 251074ad54 Use an API compatible with boost::optional and std::optional 2020-07-22 12:29:39 +02:00
Mael Rouxel-Labbé b6790c6bc6 Require only ostream instead of ofstream 2020-07-13 16:56:10 +02:00
Laurent Rineau 72d280fdd9 Merge pull request #4803 from janetournois/Tet_remeshing-from_c3t3_input-jtournois
Tetrahedral remeshing from C3T3
2020-07-08 16:24:42 +02:00
Laurent Rineau 2e912d4cb2 Merge branch 'master' into Mesh_3-ITT_support-GF 2020-07-08 16:22:58 +02:00
Laurent Rineau 72b0f36790 Remove the task "Mesher_3::refine_mesh" (useless) 2020-07-08 15:47:56 +02:00
Laurent Rineau bc4fffebc0 ITT for CGAL_MESH_3_VERBOSE as well 2020-07-08 15:47:38 +02:00
Jane Tournois 612d6772b9 operator* between enum and floating type is deprecated, fix warning 2020-07-07 11:13:16 +02:00
Jane Tournois 5b474e0075 replace deprecated std::not1 by std::not_fn
std::not1 is deprecated in C++17 and removed from C++20

+ add a C++17 macro in config.h
2020-07-07 10:49:58 +02:00
Laurent Rineau 4d1d4e51eb Merge pull request #4809 from lrineau/Mesh_3-move_semantic_for_c3t3-GF
Add move-semantic for c3t3, and a test
2020-07-03 16:21:27 +02:00
Jane Tournois 2a4b4a2a10 set the Surface_patch_index also in the infinite cell
otherwise facet and its mirror don't have the same patch index
2020-07-03 07:35:20 +02:00
Laurent Rineau 36fd23d27c Fix the move-constructor: `far_vertices_` was forgot 2020-07-02 16:50:38 +02:00
Jane Tournois 460b1f29a6 Merge branch 'master' into Tet_remeshing-from_c3t3_input-jtournois
# Conflicts:
#	Tetrahedral_remeshing/include/CGAL/Tetrahedral_remeshing/internal/tetrahedral_adaptive_remeshing_impl.h
2020-07-01 08:01:05 +02:00
Laurent Rineau 07eacf5231 Merge pull request #4795 from janetournois/Mesh_3-fix_optimisers_parallel-jtournois
Mesh_3 - fix parallel optimisers
2020-06-30 16:38:05 +02:00
Jane Tournois 40668a297e fix protection of parallel code 2020-06-29 07:07:13 +02:00
Jane Tournois 7740686d78 remove trailing whitespace 2020-06-26 15:54:17 +02:00
Jane Tournois 2a3dba9156 make build_triangulation() more generic with Surface_patch_index instead of int
this is necessary to be able to remesh a C3t3 with a Surface_patch_index that
is not convertible to `int`
It is the case with meshes generated from images, which often use
std::pair<Subdomain_index, Subdomain_index>
2020-06-26 15:53:02 +02:00
Jane Tournois 615ac14086 protect incident_cells_threadsafe with macro
Periodic_3_mesh_3 does not have an implementation of these functions
because it does not have a parallel implementation
2020-06-26 15:51:15 +02:00
Mael Rouxel-Labbé 50e3a838f3 Compilation fixes 2020-06-25 18:20:52 +02:00
Laurent Rineau 3895932005 Fix the TDS: restore the concurrency tag 2020-06-25 16:56:37 +02:00
Laurent Rineau 5572d9dba8 Add move-semantic for c3t3, and a test 2020-06-24 10:59:19 +02:00
Mael Rouxel-Labbé 26ae0d2b8c Misc compilation fixes 2020-06-23 19:11:55 +02:00
Laurent Rineau bd7d3c498f Merge pull request #4786 from lrineau/Mesh_3-fix_compilation_error_MSVC2015-GF
Continue workaround for MSVC2015
2020-06-23 18:49:58 +02:00
Jane Tournois d4b7af22ba use tr_.try_lock_and_get_incident_cells()
and remove a "todo" of CJ
2020-06-19 13:31:52 +02:00
Jane Tournois 7cd18cd659 unlock after the move, even if there is no topological change
to avoid making changes with another thread
2020-06-19 13:31:50 +02:00
Jane Tournois c6a922c9dc fix Facet_updater parallel
`vertex_to_proj` was not locked and this was causing seg faults
2020-06-19 13:31:49 +02:00
Maxime Gimeno ea53a8d70d Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-06-17 14:25:21 +02:00
Laurent Rineau e44d58a49c Fix a bug in this PR
The number of type in `Indices_tuple` and `Index` may differ: one is a
list of types, and the other one is more like a set of types.
2020-06-17 10:22:51 +02:00
Laurent Rineau 86496e469e Repair the I/O of Mesh_vertex_3 2020-06-16 21:56:07 +02:00
Laurent Rineau b64a1718c4 Reduce size of symbols (and debug infos)
- one nested struct `Tds` in `Mesh_triangulation_3`,
- rework of `Mesh_vertex_base_3` and `Compact_mesh_cell_base_3`.

That reduction of debug infos and size of symbols will help the IDE
and debuggers.

```
Debug info size (with gcc-9, and `-g`)

ORIG	AFTER	RATIO  		FILE IN examples/Mesh_3/
56532	55572	1.01727		mesh_3D_image_with_custom_initialization.debug
64696	63420	1.02012		mesh_cubes_intersection_with_features.debug
56700	55536	1.02096		mesh_3D_image.debug
56488	55324	1.02104		mesh_implicit_sphere.debug
56496	55332	1.02104		mesh_implicit_sphere_variable_size.debug
56776	55604	1.02108		mesh_3D_image_variable_size.debug
56520	55296	1.02214		mesh_cubes_intersection.debug
56684	55428	1.02266		mesh_3D_gray_image.debug
56796	55536	1.02269		mesh_3D_gray_image_multiple_values.debug
56732	55472	1.02271		mesh_3D_gray_vtk_image.debug
57128	55824	1.02336		mesh_optimization_example.debug
57420	56088	1.02375		mesh_optimization_lloyd_example.debug
56948	55560	1.02498		mesh_implicit_domains_2.debug
56932	55544	1.02499		mesh_implicit_domains.debug
69160	63304	1.09251		mesh_hybrid_mesh_domain.debug
72212	66088	1.09266		mesh_3D_image_with_features.debug
70172	63924	1.09774		mesh_two_implicit_spheres_with_balls.debug
75388	66128	1.14003		mesh_polyhedral_domain_sm.debug
75676	64412	1.17487		mesh_polyhedral_complex_sm.debug
81544	67772	1.20321		mesh_polyhedral_domain.debug
87456	71672	1.22023		mesh_polyhedral_domain_with_features_sm.debug
87524	71600	1.2224		remesh_polyhedral_surface_sm.debug
92332	74528	1.23889		mesh_polyhedral_complex.debug
98640	77448	1.27363		mesh_polyhedral_domain_with_lipschitz_sizing.debug
95640	74456	1.28452		mesh_polyhedral_domain_with_features.debug
95132	74000	1.28557		mesh_polyhedral_domain_with_surface_inside.debug
95724	74388	1.28682		remesh_polyhedral_surface.debug

1899448	1695256	1.12045		total
```
2020-06-16 17:47:00 +02:00
Laurent Rineau 113c3d1d6f Continue woraround for MSVC2015
That is a followup to commit 5fbaaa9e42
from PR #4468.

I also chose a better name `is_null` instead of
`compare_weighted_circumcenter`.
2020-06-15 15:56:28 +02:00
Laurent Rineau 25710329ac Add ITT support in Mesh_3 2020-06-11 14:56:04 +02:00
Laurent Rineau 871c97273a Merge pull request #4496 from lrineau/CGAL-move_semantic_for_triangulations-GF
Add move-semantic to Compact_container and Triangulations
2020-06-03 16:23:22 +02:00
Laurent Rineau a828cb0d06 Merge pull request #4620 from janetournois/Tetrahedral_remeshing-new-jtournois
Tetrahedral remeshing - new package
2020-06-03 16:23:17 +02:00
Sébastien Loriot 4dda7b6c80 update license of c3t3 related files
a proper package must be created in a later release
2020-05-27 15:53:05 +02:00
Mael Rouxel-Labbé 580a1efd5c Remove trailing whitespace / tabs 2020-05-22 15:31:50 +02:00
Mael Rouxel-Labbé fb8463f470 Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-05-22 15:17:56 +02:00
Laurent Rineau dcc4fb1cc1 Merge remote-tracking branch 'cgal/master' into CGAL-move_semantic_for_triangulations-GF
# Conflicts:
#	STL_Extension/include/CGAL/Compact_container.h
2020-05-20 09:46:26 +02:00
Sébastien Loriot 7c4586be1b Merge remote-tracking branch 'cgal/releases/CGAL-5.0-branch' 2020-05-12 16:59:02 +02:00
Sébastien Loriot fb83386f44 Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch' 2020-05-12 16:58:32 +02:00
Jane Tournois 9d194e3814 add missing includes 2020-05-06 15:18:57 +02:00
Jane Tournois 28a9cb150a replace std::set<Vertex_handle> with std::array<Vertex_handle>
for facets vertices
this should be a lot more efficient
2020-05-06 15:11:06 +02:00
Laurent Rineau 3951c38637 Fix UBSAN error: do not bind reference to null pointer
Equivalent to #4683
2020-05-04 18:54:19 +02:00
Jane Tournois 8ec09f40fc remove dependency on Skin_surface_3
by replacing Triangulation_incremental_builder_3 by
build_triangulation() from tet_soup_to_c3t3.h
(which is part of Mesh_3 as C3T3)
2020-05-04 16:09:27 +02:00
Maxime Gimeno 049439fa6b Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-04-30 16:47:58 +02:00
Jane Tournois 977185466a fix .mesh reader
- fix order of vertices depending on parity of i
- add infinite facets to incident cells map before assigning neighbors
2020-04-22 09:34:46 +02:00
Laurent Rineau fe1f731e22 Fix timestamps 2020-04-21 17:08:57 +02:00
Maxime Gimeno 5b2d46cfa0 Fixes for min/max 2020-04-21 12:04:45 +02:00
Maxime Gimeno 50766d9d03 Fixes for min/max 2020-04-21 11:52:56 +02:00
Maxime Gimeno e9d41d7b7d Fixes for min/max 2020-04-21 11:38:37 +02:00
Jane Tournois cf58a08a55 Merge branch 'master' into Tetrahedral_remeshing-new-jtournois 2020-04-20 06:24:36 +02:00
Jane Tournois e985f03817 initialize time stamp with -1 in Mesh_vertex_base_3
the time stamper checks whether it is -1 or not,
with -1 as default value.
It was not initialized so the behaviour was not as expected.

Similar to what is done in 0e9389b9fe0ad90aaa30ba5d634824d59c7f804d
for Mesh_cell_base_3
2020-04-17 14:05:37 +02:00
Sebastien Loriot 98fafe4ef1
Merge pull request #4514 from MaelRL/CGAL-Fix_warnings-GF
Fix (some) testuite warnings
2020-04-16 18:15:11 +02:00
Jane Tournois 395621a5fa initialize time stamp with -1 in Mesh_cell_base
the time stamper checks whether it is -1 or not,
with -1 as default value.
It was not initialized so the behaviour was not as expected.
2020-04-16 16:40:50 +02:00
Sébastien Loriot acd6d9d8de removing tabs and trailing whitespaces 2020-04-10 11:26:31 +02:00
Jane Tournois dca97faad6 Merge remote-tracking branch 'cgal/master' into Tetrahedral_remeshing-new-jtournois 2020-04-01 12:25:59 +01:00
Jane Tournois e0171c2f24 Merge branch 'master' into Tetrahedral_remeshing-new-jtournois 2020-04-01 07:07:46 +01:00
Maxime Gimeno 4e6fb685c6 Merge remote-tracking branch 'mine/CGAL_IO-maxGimeno' into HEAD 2020-03-27 11:11:10 +01:00
Sébastien Loriot 38789af55d Update branch from master after trailing whitespaces and tabs removal 2020-03-26 19:25:47 +01:00
Sébastien Loriot d1a323c730 extra run of the script to remove tabs and trailing whitespaces 2020-03-26 19:24:14 +01:00
Sébastien Loriot 86e25f7e71 Update branch from master after trailing whitespaces and tabs removal 2020-03-26 19:23:54 +01:00
Sébastien Loriot 58b10a3605 extra run of the script to remove tabs and trailing whitespaces 2020-03-26 18:58:50 +01:00
Sébastien Loriot c1a42c7d37 Update branch from master after trailing whitespaces and tabs removal 2020-03-26 18:58:21 +01:00
Sébastien Loriot 8bb22d5b2c extra run of the script to remove tabs and trailing whitespaces
right after the merge of the 5.0 release branch

+ manual fix of the files (indentation was changed in the meantime):
   * Spatial_sorting/include/CGAL/Multiscale_sort.h
   * Spatial_sorting/test/Spatial_sorting/test_multiscale.cpp
2020-03-26 14:26:59 +01:00
Sébastien Loriot 8b153fb495 Merge branch 'cgal/releases/CGAL-5.0-branch'
whitespace+tab removal, merged with option -Xignore-space-change
2020-03-26 14:22:32 +01:00
Sébastien Loriot 0779373835 extra run of the script to remove tabs and trailing whitespaces
right after the  merge of 4.14 release branch

+ manual fix on one line in:
    * Arrangement_on_surface_2/include/CGAL/IO/Arr_text_formatter.h
    * .travis/generate_travis.sh
2020-03-26 14:16:06 +01:00
Sébastien Loriot 590612a563 run the script to remove tabs and trailing whitespaces 2020-03-26 13:25:16 +01:00
Laurent Rineau e6a42bb597 Fix again a compilation error on Windows
It was:
```
..\include\CGAL/Mesh_3/Protect_edges_sizing_field.h(1265): error C2121: '#': invalid character: possibly the result of a macro expansion
..\include\CGAL/Mesh_3/Protect_edges_sizing_field.h(1257): error C2760: syntax error: unexpected token 'identifier', expected '('
```
2020-03-24 21:20:44 +01:00
Laurent Rineau 6d215c776b Fix compilation error on Windows 2020-03-19 13:28:23 +01:00
Sebastien Loriot 1454b9903c
Merge pull request #4209 from maxGimeno/PMP-Default_pmap-maxGimeno
PMP: Default Property_maps for Index_maps
2020-03-17 18:27:55 +01:00
Mael Rouxel-Labbé c33e8b60d7 Merge remote-tracking branch 'maxgimeno/PMP-Default_pmap-maxGimeno' into CGAL_IO-maxGimeno 2020-03-17 09:33:19 +01:00
Mael Rouxel-Labbé 30d4754a04 Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-03-17 09:03:12 +01:00
Sébastien Loriot 32813dc976 Merge remote-tracking branch 'cgal/releases/CGAL-5.0-branch' 2020-03-16 16:32:47 +01:00
Sébastien Loriot cf99ea072d Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch' 2020-03-16 16:19:38 +01:00
Laurent Rineau 789d3314b6
Merge branch 'master' into Polyhedron-demo__add_qtscript_support_to_Mesh_3_plugin-GF 2020-03-13 17:14:13 +01:00
Laurent Rineau 378554e5a7 Change the API of `for_compact_container`/`Compact_container_traits`
Now, we have a proper pair of getter/setter, and the `void` pointer is
get by a `reinterpret_cast`, instead of a union.

Cc: @mglisse
2020-03-09 17:19:58 +01:00
Mael Rouxel-Labbé 0a2b590110 Use the BGL automatic index map initializer 2020-03-05 15:31:40 +01:00
Laurent Rineau 661924f9bf Labeled_mesh_domain_3: Fix the `value_outside` parameter 2020-03-02 17:15:16 +01:00
Mael Rouxel-Labbé bd8371a295 Remove useless precondition (check that std::size_t >= 0) 2020-02-11 08:57:36 +01:00
Laurent Rineau 5fc7b97e32 Merge pull request #4468 from maxGimeno/TBB-Fix_deprecation_warnings-5_0-maxGimeno
TBB deprecated code replacement
2020-01-29 16:34:56 +01:00
Laurent Rineau 85e2c79dce Merge pull request #4494 from lrineau/Mesh_3-binary_IO_CRLF_issue-GF
Mesh_3 binary I/O: allow to read a binary file with a CRLF EOL at the end of first line
2020-01-29 16:29:44 +01:00
Laurent Rineau 315a0b54d1 Merge pull request #4468 from maxGimeno/TBB-Fix_deprecation_warnings-5_0-maxGimeno
TBB deprecated code replacement
2020-01-29 16:27:53 +01:00
Laurent Rineau 06b1572e4d Merge pull request #4494 from lrineau/Mesh_3-binary_IO_CRLF_issue-GF
Mesh_3 binary I/O: allow to read a binary file with a CRLF EOL at the end of first line
2020-01-29 16:27:41 +01:00
Mael Rouxel-Labbé 41271b67f6 Improvements to CGAL i/o across the board 2020-01-29 10:00:07 +01:00
Jane Tournois d32d65f9da Merge remote-tracking branch 'lrineau/Mesh_3-binary_IO_CRLF_issue-GF' into Tetrahedral_remeshing-new-jtournois 2020-01-28 15:51:30 +00:00
Jane Tournois 3940dd69eb Revert "replace Point type to make it valid for non-weighted triangulations"
This reverts commit 74b12712faae74bf25fdec749049ecb13c517529.
2020-01-28 15:50:50 +00:00
Jane Tournois da5febfac7 replace Point type to make it valid for non-weighted triangulations 2020-01-28 15:50:50 +00:00
Laurent Rineau 4e102d9784 Allow to read a binary file with a CRLF EOL at the end of first line 2020-01-28 15:35:27 +01:00
Maxime Gimeno e3c1de5f03 fix helpers 2020-01-28 10:36:19 +01:00
Maxime Gimeno 05735be4e3 Overload atomic<T*> instead of atomic<T> 2020-01-27 16:02:24 +01:00
Maxime Gimeno 5fbaaa9e42 Workaround for VS 2015 2020-01-27 10:25:24 +01:00
Laurent Rineau c8fe41922d Add a debug display with CGAL_MESH_3_PROTECTION_DEBUG & 1 2020-01-20 18:19:52 +01:00
Laurent Rineau 4532ae48b7 Improve the code that deals with CGAL_MESH_3_DEBUG_FACET_CRITERIA 2020-01-20 18:18:45 +01:00
Laurent Rineau a4991fd6da More dump of the c3t3 in case of crash 2020-01-20 18:18:45 +01:00
Mael Rouxel-Labbé d620198049 Merge branch 'CGAL_IO-maxGimeno-old' into CGAL_IO-maxGimeno 2020-01-17 12:34:08 +01:00
Laurent Rineau 455f8c6351 Merge pull request #4463 from lrineau/Polyhedron_demo-fix_mesh_3_plugin-GF
Bug in the demo (mesh_3_plugin)
2020-01-15 17:31:44 +01:00
Laurent Rineau eff864a2a9 Merge pull request #4463 from lrineau/Polyhedron_demo-fix_mesh_3_plugin-GF
Bug in the demo (mesh_3_plugin)
2020-01-15 17:19:13 +01:00
Maxime Gimeno 85712ba28c WIP replacing tbb deprecated includes. 2020-01-14 15:03:20 +01:00
Laurent Rineau 597a4f1283 Bug in the demo (mesh_3_plugin) 2020-01-10 15:20:56 +01:00
Laurent Rineau 0b0154cac2 Bug in the demo 2020-01-09 16:52:40 +01:00
Laurent Rineau daf2e6839f Improve the code that deals with CGAL_MESH_3_PROTECTION_DEBUG 2020-01-09 16:52:05 +01:00
Laurent Rineau a8cb280133 Fix a compilation error with CGAL_MESH_3_PROTECTION_DEBUG 2020-01-08 15:52:12 +01:00
Laurent Rineau 9de3913dbf Fix warnings 2020-01-08 15:49:16 +01:00
Sebastien Loriot 2c4c4d357a
Merge pull request #4422 from lrineau/Mesh_3-cleanup_detect_polylines-GF
Cleanup: remove unused files from Mesh_3
2019-12-20 09:15:14 +01:00
Laurent Rineau 674627937c Merge pull request #4389 from lrineau/DT_3-issue4388-GF
Fix  DT3 parallel performance loss (issue #4388)
2019-12-17 09:16:52 +01:00
Laurent Rineau 1224939bcb Cleanup: remove unused files
That is a follow-up to the PR https://github.com/CGAL/cgal/pull/2336.
2019-12-16 10:49:35 +01:00
Laurent Rineau 0fa0c4fbb9 Merge pull request #4244 from maxGimeno/AABB_tree-Make_accelerate_distance_queries_default-maxGimeno
AABB_tree: make accelerate distance queries default
2019-12-05 11:05:35 +01:00
Laurent Rineau 3b5d13f023 Merge pull request #4250 from maxGimeno/PMP-Side_of_tm-use_bbox-maxGimeno
PMP: Make Side_of_triangle_mesh faster for disjoint meshes
2019-12-05 11:05:29 +01:00
Laurent Rineau 6cdd833e13 Merge branch 'DT_3-issue4388__for_CGAL-4.14.2-GF' into DT_3-issue4388-GF 2019-12-04 15:39:55 +01:00
Laurent Rineau 6ded244449 Merge branch 'DT_3-issue4388__for_CGAL-4.13.2-GF' into DT_3-issue4388__for_CGAL-4.14.2-GF 2019-12-04 15:32:07 +01:00
Laurent Rineau 3ade506eba Create approximate_size() in Concurrent_compact_container
Instead of having an atomic integer for the size of the compact
container, now all free lists have an atomic integer for their size,
but it is only updated when the size is increased by 10%.
2019-12-04 15:20:52 +01:00
Mael Rouxel-Labbé 53d4c9b580 Simplify 'Hash_handles_with_or_without_timestamps' (use 'Get_time_stamper') 2019-10-28 11:29:08 +01:00
Sébastien Loriot 254d60f642 First pass on removing license notice in header for GPL files 2019-10-19 15:23:19 +02:00
Sébastien Loriot 7356421d80 introduce Commercial license SPDX tag 2019-10-19 12:15:19 +02:00
Sébastien Loriot 9bd9c68b83 update LGPL[23]+ and GPL[23]+ SPDX tags
ack -l --no-svg "SPDX-License-Identifier: GPL-3.0\+" | xargs sed -i "s/SPDX-License-Identifier: GPL-3.0+/SPDX-License-Identifier: GPL-3.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-3.0\+" | xargs sed -i "s/SPDX-License-Identifier: LGPL-3.0+/SPDX-License-Identifier: LGPL-3.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: GPL-2.0\+" | xargs sed -i "s/SPDX-License-Identifier: GPL-2.0+/SPDX-License-Identifier: GPL-2.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-2.0\+" | xargs sed -i "s/SPDX-License-Identifier: LGPL-2.0+/SPDX-License-Identifier: LGPL-2.0-or-later/"
2019-10-18 21:57:54 +02:00
Sébastien Loriot 7a233375b2 add missing const
if non-const was provided, the same map should have been
provided to the tree
2019-10-11 08:07:21 +02:00
Maxime Gimeno a52592909f Remove all calls to accelerate_distance_queries(), now redundant. 2019-09-24 11:44:20 +02:00
Maxime Gimeno 41d5f6fab0 WIP Supported file formats 2019-09-18 16:06:28 +02:00
Maxime Gimeno e5a0ddb7ba Add skeleton for some formats and list DS with documented IO in IOStream.txt 2019-09-18 14:45:38 +02:00
Sébastien Loriot aa339ce63d Merge 'cgal/releases/CGAL-4.14-branch' 2019-08-29 07:37:03 +02:00
Laurent Rineau 4ab183acd9 Fix the miscompilation when TBB is not used
fixup! Fix the miscompilation when TBB is not used
2019-08-19 16:18:50 +02:00
Laurent Rineau 89b4c986d3 Allow Mesh_3 to cope with a 2D initial triangulation 2019-08-16 14:47:42 +02:00
Sébastien Loriot 02b7301db9 Merge 'releases/CGAL-4.14-branch' 2019-08-08 10:23:49 +02:00
Sébastien Loriot c5cdafbaba Merge 'cgal/releases/CGAL-4.13-branch' 2019-08-08 10:22:32 +02:00
Laurent Rineau 40c25757d4 Improve CGAL_MESH_3_DEBUG_POLYLINES_TO_PROTECT 2019-08-01 17:25:10 +02:00
Laurent Rineau 52de8ed5ec Fix a bug introduced in #2739 2019-08-01 17:24:47 +02:00
Laurent Rineau a0ea4f0c5f Merge branch 'releases/CGAL-4.14-branch' 2019-07-31 17:01:03 +02:00
Jane Tournois 49d526c1cf add missing () around min and max for windows 2019-07-29 14:30:03 +02:00
Sébastien Loriot 983645a51a match @{ and @} 2019-07-05 21:49:46 +02:00
Laurent Rineau c5566d3d77 Merge pull request #4023 from lrineau/Mesh_3-remove_old_code-GF
Mesh_3: remove the attempt for `os << std::pair`
2019-07-03 11:18:30 +02:00
Laurent Rineau c0ba28f80a Merge branch 'releases/CGAL-4.14-branch' 2019-07-03 11:18:20 +02:00
Laurent Rineau 71ff0ffda6 Merge pull request #4038 from lrineau/Mesh_3-fix_for_older_compilers-GF
Mesh_3: older versions of gcc does not like that pair of const
2019-07-03 11:10:29 +02:00
Laurent Rineau e79bfd5d03 Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch 2019-07-03 11:10:03 +02:00
Laurent Rineau 7db6b5e513 Older versions of gcc does not like that pair of const
https://cgal.geometryfactory.com/CGAL/testsuite/results-4.14.1-I-173.shtml#Mesh_3_Examples
2019-06-26 16:19:09 +02:00
Laurent Rineau ed9dffe80d remove the attempt for `os << std::pair` 2019-06-21 09:39:42 +02:00
Laurent Rineau 8535a3c03c Merge branch 'releases/CGAL-4.14-branch'
# Conflicts:
#	Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Apollonius_graph_2_impl.h
#	Convex_hull_3/include/CGAL/convex_hull_3.h
#	Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Corefinement/face_graph_utils.h
#	Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Mesh_3_plugin_cgal_code.cpp
#	Stream_support/include/CGAL/IO/Color.h
2019-06-20 14:20:37 +02:00
Laurent Rineau 69a4241d5e Merge pull request #3987 from lrineau/Polyhedron-demo__mesh_several_surfaces_at_a_time-GF
Polyhedron demo:  mesh several surfaces at a time
2019-06-20 14:20:08 +02:00
Laurent Rineau b0c182ce63 Merge pull request #3987 from lrineau/Polyhedron-demo__mesh_several_surfaces_at_a_time-GF
Polyhedron demo:  mesh several surfaces at a time
2019-06-20 14:09:17 +02:00
Laurent Rineau e4aaf2447c Fix the use of offset in Labeled_mesh_domain_3 2019-06-18 15:50:15 +02:00
Laurent Rineau be0d07d150 Merge pull request #3979 from afabri/CGAL-null_ptr-GF
Replace NULL and Nullptr_t with nullptr and nullptr_t
2019-06-17 14:10:35 +02:00
Laurent Rineau 96912aaa20 Merge branch 'releases/CGAL-4.14-branch' 2019-06-17 13:53:42 +02:00
Laurent Rineau 9f99ee087e Merge pull request #3986 from janetournois/Mesh_3-fix_optimizers_protection-jtournois
Mesh_3 : fix global optimizers protection
2019-06-17 13:51:33 +02:00
Laurent Rineau 91157b2167 Fix <CGAL/internal/Mesh_3/check_weights.h>
`Has_feature<Mesh_domain>` is not `Tag_true` or `Tag_false`, but
it *derives* from one of them!

Anyway, it is easier to use the nested value `::value`.
2019-06-13 18:08:38 +02:00
Laurent Rineau dfb37e2378 Fix when called with Surface_mesh instead of Polyhedron_3 2019-06-07 12:06:44 +02:00
Jane Tournois a70bf9458a fix optimizers protection
If some vertices have a non-zero weights and they do not belong to input
features, then global optimizers should not be used.

The case without feature protection was not treated until now.
2019-06-06 17:34:53 +02:00
Andreas Fabri f7b7b9957f Merge remote-tracking branch 'cgal/master' into CGAL-null_ptr-GF 2019-06-05 14:47:11 +02:00
Laurent Rineau 1659505f96 Merge pull request #3953 from lrineau/Mesh_3-lambdas_can_be_sizing_fields-GF
Mesh_3: Allow lambdas (or other callables) as MeshDomainField_3
2019-06-05 11:20:20 +02:00
Andreas Fabri 4581f1b7a8 Morte replacements 2019-06-05 08:39:55 +02:00
Laurent Rineau 22d6d9ebd8 Allow lambdas (or other callables) as MeshDomainField_3
That patch uses C++11 `<type_traits>`, and
`boost::callable_traits::is_invocable` that is available only since
1.66. If Boost<1.66, then the previous behavior (testing
`Sizing_field::FT`) is kept.

Fix issue https://github.com/CGAL/cgal/issues/3005
2019-05-24 10:45:12 +02:00
Laurent Rineau 419032d859 Merge pull request #3947 from MaelRL/CGAL-Fix_typos-GF
Fix some typos in code/comments/documentation
2019-05-23 08:50:14 +02:00
Laurent Rineau 3a9b2fe67f Merge branch 'releases/CGAL-4.14-branch' 2019-05-21 16:36:28 +02:00
Laurent Rineau e4c82fa260 Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch 2019-05-21 16:35:24 +02:00
Mael Rouxel-Labbé 2848158354 Fix typos 2019-05-20 08:54:04 +02:00
Laurent Rineau fee84ae228 Merge pull request #3898 from lrineau/Mesh_3-stop_during_protection-lrineau
Mesh_3 `Protect_edges_sizing_field`: handle the `stop` Boolean

# Conflicts:
#	Mesh_3/include/CGAL/Mesh_3/Protect_edges_sizing_field.h
2019-05-14 16:44:02 +02:00
Laurent Rineau d04a5a24c1 Merge pull request #3898 from lrineau/Mesh_3-stop_during_protection-lrineau
Mesh_3 `Protect_edges_sizing_field`: handle the `stop` Boolean
2019-05-14 16:26:16 +02:00
Laurent Rineau 0cdc5b8527 Fix for Boost-1.71 (master branch)
Pass the criteria object by value, instead of const references: same
semantic, but better than the universal reference used by Boost
Parameter 1.71.
2019-05-14 12:36:02 +02:00
Laurent Rineau 450efd3912 Fix PR #3788 with C++03 2019-05-07 13:59:17 +02:00
Laurent Rineau 130c766d1e Merge branch 'releases/CGAL-4.14-branch' into Mesh_3-stop_during_protection-lrineau 2019-05-06 16:21:52 +02:00
Laurent Rineau 1b1f0a6ac3 Test the feature in the 3D demo, and fix the code 2019-05-03 16:24:50 +02:00
Laurent Rineau 8648a72655 Add new Boost Parameter `nonlinear_growth_of_balls` 2019-05-03 15:49:49 +02:00
Laurent Rineau a1e3e05558 Add maximal_number_of_vertices and stop_ptr to the protection code 2019-05-03 11:46:13 +02:00
Jane Tournois 576a3799eb improve doc of constructor for polyhedral complex
pairs cannot be reversed or the domain is not consistent
2019-04-23 15:29:41 +01:00
Sebastien Loriot 81b78d6a8b
Merge pull request #3810 from maxGimeno/temp_branch
Mesh_3: Simplify AABB_primitive of Polyhedral_mesh_domain_3
2019-04-12 15:32:49 +02:00
Sébastien Loriot db65bd8ecc Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch' 2019-04-11 21:38:48 +02:00
albert-github 1dd7473818 Correction of links
Correction of redirected links and links that moved to another place.
2019-04-11 21:37:05 +02:00