Mael
8cdcd006f0
Use 'seed' even when TBB is not linked
2019-12-17 17:57:54 +01:00
Mael Rouxel-Labbé
7af0704cea
Reintegrate the callback within the call to box_intersection_d()
...
This is motivated by the fact that if you have a configuration
where there is a large number of boxes intersection (such as
k*n^2, with n being the number of faces), then the size
of the concurrent container can be very large and thus
the memory footprint would be huge.
Instead, since the box_intersection_d call is now parallel,
we can just do callbacks in the tree directly. The only thing is,
we want to have these (heavy) callback calls to be roughly balanced.
For this, we random shuffle the range of faces.
Same runtime as before, no more huge memory footprint!
2019-12-11 09:52:52 +01:00
Mael Rouxel-Labbé
57fed1416a
Factorize code creating throwing output iterators
2019-12-04 09:10:49 +01:00
Mael Rouxel-Labbé
b210bf3f08
Fix conflict in struct names
2019-12-03 19:56:00 +01:00
Mael Rouxel-Labbé
e9e3d9b5b0
Add missing includes
2019-12-03 16:23:35 +01:00
Mael Rouxel-Labbé
c526d40b44
Fix throwing as soon as boxes intersect and not checking for actual intersection
2019-12-03 16:17:53 +01:00
Mael Rouxel-Labbé
6bd31f593e
Minor doc fix
2019-12-03 14:30:11 +01:00
Mael Rouxel-Labbé
cbf78b3de1
Minor doc / comment changes
2019-12-03 12:11:19 +01:00
Mael Rouxel-Labbé
c0921a5e53
Fix collecting all intersecting pairs before throwing + fix NP improper forward
2019-12-03 12:00:31 +01:00
Mael Rouxel-Labbé
0191d868fa
Simplify and clean parallel code for PMP::self_intersections
2019-12-02 16:39:58 +01:00
Mael Rouxel-Labbé
41bb11cdee
Make unique indentation style a little less unique (no real changes)
2019-11-19 17:08:25 +01:00
Mael Rouxel-Labbé
b6dd62be52
Use ID_FROM_BOX_ADDRESS in Box_with_info_d where safe
...
That is, where we are passing box ranges by pointer.
See also 52ce0b6ac4
2019-11-19 17:06:47 +01:00
Mael Rouxel-Labbé
ac86fadd7a
Misc code formatting improvements
2019-11-19 12:51:17 +01:00
Andreas Fabri
a44674a694
Add ConcurrencyTag in Box_intersection_d
2019-11-15 21:45:19 +01:00
Andreas Fabri
bef2b5f1b8
Parallelize using 2 or 4 parallel threads
2019-11-15 16:21:25 +01:00
Andreas Fabri
40fbe18dcd
Merge branch 'Box_intersection_d-accelerate-GF' of github.com:afabri/cgal into Box_intersection_d-accelerate-GF
2019-11-15 12:55:43 +01:00
Mael
ff960adea0
Fix namespace lookup issue (and a warning)
2019-11-14 17:08:58 +01:00
Andreas Fabri
3caad9bc88
Remove #include
2019-11-14 13:26:47 +01:00
Andreas Fabri
f033e0a244
Cleanup
2019-11-14 11:45:37 +01:00
Andreas Fabri
899b9ec384
Remove experimental code
2019-11-14 11:31:50 +01:00
Andreas Fabri
45cd4dc8bf
remove parameter; Add ConcurrencyTag to does_self_intersect
2019-11-14 11:21:40 +01:00
Sébastien Loriot
e4b205bca6
update doc + reorder/factorize code
2019-11-14 06:31:43 +01:00
Sébastien Loriot
ceddeb9756
hide debug code
2019-11-13 15:55:08 +01:00
Andreas Fabri
5ea8d36129
Do not use a concurrent_vector
2019-11-13 09:35:48 +01:00
Andreas Fabri
2d14c67304
Remove unused class Output_iterator_with_bool
2019-11-13 09:07:10 +01:00
Andreas Fabri
a35a7ebf9b
fix a reserve()
2019-11-12 18:40:17 +01:00
Andreas Fabri
343ca0b4a7
Add the version that reports all pairs of faces and performs the intersection tests in parallel
2019-11-12 18:27:32 +01:00
Andreas Fabri
732d1d8f8a
Add overloads with ConcurencyTag
2019-11-12 16:32:08 +01:00
Andreas Fabri
fc72b37db4
Functor cleanup
2019-11-12 15:31:26 +01:00
Andreas Fabri
899d8f7b59
cleanup
2019-11-12 13:01:26 +01:00
Andreas Fabri
ead0da3c77
WIP: not the same number of intersections for Tuyaeaux.stl
2019-11-12 11:40:40 +01:00
Andreas Fabri
b6bc521c22
WIP does not even compile
2019-11-08 16:21:20 +01:00
Andreas Fabri
e18413c9b5
fixes
2019-11-07 21:26:53 +01:00
Andreas Fabri
21bd1af505
Avoid chains of next and target
2019-11-07 17:54:46 +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
Laurent Rineau
c58815d7c7
Merge pull request #4269 from maxGimeno/PMP-Fix_doc_macro-maxGimeno
...
PMP: Fix doc macro
2019-10-15 16:34:06 +02:00
Maxime Gimeno
cf4e1b4bd6
Add missing macro definition
2019-10-03 12:15:46 +02:00
Maxime Gimeno
0c26c6c3e8
Add missing macro def
2019-10-03 12:14:41 +02:00
Maxime Gimeno
9e3b59e55d
Add missing macro def
2019-10-03 12:07:47 +02:00
Sébastien Loriot
1a4c47d6b4
update macro name
2019-09-19 12:47:48 +02:00
Laurent Rineau
ebcd182b5c
Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch'
2019-09-17 14:31:44 +02:00
Maxime Gimeno
d893b694f4
Don't use "using parameters::choose_param"
2019-09-17 10:11:12 +02:00
Sébastien Loriot
5fe1b43ce6
Merge pull request #4139 from MaelRL/PMP-Fix_duplicate_nm_vertices_5.0-GF
...
PMP: Fix improper halfedge incidence state in post non-manifold vertex duplication mesh (5.0)
2019-08-29 20:10:16 +02:00
Sébastien Loriot
73ff5f610b
Merge pull request #4174 from MaelRL/PMP-Fix_boundary_cycle_stitching_5.0-GF
...
PMP: Fix boundary cycle when non manifold vertices exist in the cycle (5.0)
2019-08-29 20:09:34 +02:00
Sebastien Loriot
201a4b8ff8
Merge pull request #4176 from MaelRL/PMP-Fix_boundary_cycle_nm_vertices-4.14-GF
...
PMP: Fix boundary cycle when non manifold vertices exist in the cycle (4.14)
2019-08-29 19:52:12 +02:00
Sebastien Loriot
98f3847cf1
Merge pull request #4137 from MaelRL/PMP-Fix_duplicate_nm_vertices_414-GF
...
PMP: Fix improper halfedge incidence state in post non-manifold vertex duplication mesh (4.14)
2019-08-29 19:51:17 +02:00
Sebastien Loriot
aa3b75a596
Merge pull request #4178 from janetournois/PMP-fix_isotropic_remeshing_degenerate_flip-jtournois
...
`PMP::isotropic_remeshing()` - prevent creating non-manifold configurations
2019-08-29 07:32:44 +02:00
Sébastien Loriot
551313ac5c
Merge branch 'cgal/releases/CGAL-4.14-branch'
2019-08-27 06:37:23 +02:00