songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
99,179 Commits 3 Branches 156 Tags 974 MiB
Commit Graph

2371 Commits

Author SHA1 Message Date
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
Maxime Gimeno 6795d4fb48 Fix error with new primitive in demo 2019-04-10 10:45:35 +02:00
Laurent Rineau 04bef2b071 Merge pull request #3781 from sloriot/CGAL-update_for_cpp14 
Update for cpp14
 2019-04-08 15:59:28 +02:00
Laurent Rineau 65ebf7d386 Merge branch 'Mesh_3-fix_output_to_vtu-GF' into VTU_output-Add-attribute-GF 2019-04-03 19:57:36 +02:00
Laurent Rineau 043239d738 Avoid copies of vectors of attributes 2019-04-03 19:57:06 +02:00
Laurent Rineau 2e43cc0f71 Remove a warning about an unused variable 2019-04-03 19:11:15 +02:00
Laurent Rineau dcc6d7a58a Fix CGAL::output_to_vtu(..., ASCII) and add tests 2019-04-03 19:03:48 +02:00
Sébastien Loriot 5a30e88a92 replace cpp11::function by std::function 2019-03-29 13:28:33 +01:00
Sébastien Loriot 124012d9f9 replace cpp11::array by std::array 2019-03-29 13:28:33 +01:00
Sébastien Loriot f62624c4f9 replace cpp11::tuple by std::tuple 2019-03-29 13:28:33 +01:00
Sébastien Loriot 1d908c1c0b remove code for CGAL_INTERSECTION_VERSION 1 2019-03-29 13:28:32 +01:00
Sébastien Loriot 0ce7fc09b5 turns iterator pairs into iterable ranges 2019-03-29 13:28:22 +01:00
Sébastien Loriot d60f5645aa replace BOOST_FOREACH by c++ ranged-based for loop 
some of the command used for the replacement:
ack --cpp  BOOST_FOREACH -l  | xargs sed -i -E "s/BOOST_FOREACH\(([a-zA-Z_:&0-9]+)\s(\w+)\,/for(\1 \2 :/"
ack --cpp  BOOST_FOREACH -l  | xargs sed -i -E "s/BOOST_FOREACH\((const [a-zA-Z_:&0-9]+)\s(\w+)\,/for(\1 \2 :/"
ack --cpp  BOOST_FOREACH -l  | xargs sed -i -E "s/BOOST_FOREACH\((const typename [a-zA-Z_:&0-9]+)\s(\w+)\,/for(\1 \2 :/"
ack --cpp  BOOST_FOREACH -l  | xargs sed -i -E "s/BOOST_FOREACH\((typename [<>a-zA-Z_:&0-9]+)\s(\w+)\,/for(\1 \2 :/"
ack "boost/foreach.hpp" -l --cpp | xargs sed -i '/boost\/foreach.hpp>/d'
 2019-03-29 13:22:15 +01:00
Sébastien Loriot 700342bfa7 remove cpp11 workaround in mesh_3 related packages 2019-03-29 10:41:50 +01:00
Maxime Gimeno ec00f50eec Use the same primitive type for polyhedron_3 and other types 2019-03-28 11:37:16 +01:00
Maxime Gimeno fc5e966c20 Simplify the AABB_primitive used in Polyhedral_mesh_donain_3 2019-03-28 11:24:19 +01:00
Maxime Gimeno 4326f39944 Add misisng header 2019-03-25 16:12:42 +01:00
Maxime Gimeno 27ceec33b5 Replace Weighted point by Point 2019-03-21 16:10:18 +01:00
Maxime Gimeno adfeee84d9 typedef the attribute type 2019-03-20 16:25:09 +01:00
Maxime Gimeno 15aca3ebf7 Add a bool to decide if we want to export the complex or the cells not in complex. 2019-03-19 16:08:28 +01:00