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

2221 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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