Simon Giraudot
2818986299
Fix kd tree node
2020-03-05 10:06:07 +01:00
Simon Giraudot
0661542fd2
Some notes about parallelism in KD Tree
2020-03-04 16:21:14 +01:00
Simon Giraudot
fac53dc3c8
Remove useless boolean
2020-03-04 16:20:49 +01:00
Simon Giraudot
6e629a9478
First version of parallel Kd_tree:build()
2020-03-04 11:05:56 +01:00
Laurent Rineau
ad30f5f440
Fix license header
2019-12-03 19:25:51 +01:00
Laurent Rineau
65cde3ce79
Merge branch 'master' into Faster_dd_spatial_searching-cjamin
2019-12-03 19:18:15 +01:00
Simon Giraudot
c43c6ac2fa
Merge remote-tracking branch 'clement/Faster_dd_spatial_searching-cjamin' into Faster_dd_spatial_searching-cjamin
2019-10-22 13:21:53 +02:00
Simon Giraudot
54aef42f2d
Fix warning
2019-10-22 13:03:35 +02:00
Simon Giraudot
89554f6063
Fix outputiterator return missing
2019-10-22 12:56:36 +02: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
Simon Giraudot
d930cbce64
Fix no_lvalue Search_traits_adapter
2019-10-15 13:52:17 +02:00
Simon Giraudot
027de166f4
Make it possible for Search_traits_adapter to work without lvalue point map
2019-08-26 15:42:24 +02:00
Simon Giraudot
9b02d9d426
Fix warnings
2019-07-04 13:25:56 +02:00
Simon Giraudot
b2e723b548
Merge branch 'Faster_dd_spatial_searching-cjamin-backup' into Faster_dd_spatial_searching-cjamin
2019-07-04 13:17:50 +02:00
Andreas Fabri
e2d19b0c8d
Replace NULL and Nullptr_t with nullptr and nullptr_t
2019-06-04 23:45:44 +02: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
Laurent Rineau
f83053c2a5
Merge pull request #3602 from afabri/CGAL-VC2017_AVX_workarounds-GF
...
Fix for VC2017 with /arch:AVX
2019-01-22 09:14:57 +01:00
Andreas Fabri
0fe3ed828e
Fix for VC2017 with /arch=AVX
2019-01-17 14:42:26 +01:00
Sébastien Loriot
5a2857d451
fix maybe uninitialized warning
...
triggered by target Orthogonal_incremental_neighbor_search
2018-12-06 09:23:26 +01:00
Laurent Rineau
5ec1b841b7
Merge pull request #3170 from MaelRL/CGAL-Fix_some_STL_extension_namespaces-GF
...
STL_Extension: move CGAL::iterator and CGAL::unary/binary functions to CGAL::cpp98::
2018-06-20 17:21:01 +02:00
Mael Rouxel-Labbé
26c857a431
Moved unary/binary_function to CGAL::cpp98
2018-06-13 15:58:19 +02:00
Laurent Rineau
796d1bdcb6
Merge pull request #3142 from sgiraudot/Spatial_searching-Fix_disable_if-GF
...
Spatial Searching: bugfix disable_if
2018-06-12 16:38:20 +02:00
Laurent Rineau
c8009c7250
Merge pull request #3142 from sgiraudot/Spatial_searching-Fix_disable_if-GF
...
Spatial Searching: bugfix disable_if
2018-06-12 16:32:18 +02:00
Simon Giraudot
45afed121c
Include enable_if.hpp header
2018-06-06 08:15:54 +02:00
Simon Giraudot
e5ff062052
Remove extra semicolon
2018-06-04 10:48:08 +02:00
Simon Giraudot
7b0c4e087b
Bugfix: make disable_if work using template and add it to Search_traits_adapter
2018-06-04 10:03:30 +02:00
Laurent Rineau
2596a302c0
Merge pull request #2954 from MaelRL/Spatial_searching-Fix_fuziness_doc-GF
...
Spatial searching: rework fuzzy items
# Conflicts:
# Spatial_searching/test/Spatial_searching/Point_with_info.h
2018-06-01 17:24:02 +02:00
Laurent Rineau
5dee4b4819
Merge pull request #2954 from MaelRL/Spatial_searching-Fix_fuziness_doc-GF
...
Spatial searching: rework fuzzy items
# Conflicts:
# Spatial_searching/test/Spatial_searching/Point_with_info.h
2018-06-01 17:22:10 +02:00
Mael Rouxel-Labbé
1e8f8ab358
Fixed constructing field type from non-int variables
2018-05-16 10:38:47 +02:00
Mael Rouxel-Labbé
a0a6afeaca
Fixed warning (?)
...
My kingdom for readable Windows compilation messages
2018-05-16 10:38:47 +02:00
Mael Rouxel-Labbé
40d1550d65
'if' into 'else if' since min_coord(i) <= max_coord(i)
2018-04-19 15:59:21 +02:00
Mael Rouxel-Labbé
6897cdea85
Do not use an inner approx if 'eps > r'
2018-04-19 14:16:12 +02:00
Mael Rouxel-Labbé
15d925710e
Readability changes
2018-04-19 14:15:56 +02:00
Mael Rouxel-Labbé
7b510962f0
Use CGAL::square
2018-04-19 14:14:43 +02:00
Mael Rouxel-Labbé
65be29442b
Reworked Fuzzy_sphere
...
Same as a6f52ffc31
- Also fixed the way eps > r is handled
- Cached the inner and outer squared radius instead of recomputing every time
2018-03-23 17:06:08 +01:00
Mael Rouxel-Labbé
a6f52ffc31
Reworked Fuzzy_iso_box
...
- points on the boundary of the inner approximation are always reported
- points on the boundary of the outer approximation may or may not be reported
2018-03-23 17:03:17 +01:00
Sébastien Loriot
483f69728e
Refresh branch
2018-02-12 22:21:38 +01:00
Simon Giraudot
6269309d86
Use CGAL include for boost counting/transform iterators everywhere
2018-01-23 11:09:52 +01:00
Andreas Fabri
f76e744bff
Spatial_searching
2018-01-17 20:12:06 +00:00
Andreas Fabri
fb51a69c7c
Mesh_2
2018-01-17 16:50:21 +00:00
Marc Glisse
e2bb2b383b
Merge branch 'master' into Faster_dd_spatial_searching-cjamin
2017-12-07 15:26:46 +01:00
Clement Jamin
5806c25460
Specify 4th template argument for Kd_tree
2017-11-24 15:35:14 +01:00
Clement Jamin
3b6364b5cc
Merge branch 'Faster_dd_spatial_searching-cjamin' of github.com:cjamin/cgal into Faster_dd_spatial_searching-cjamin
2017-11-22 11:32:12 +01:00
Clement Jamin
06b18208e8
Specify 4th template argument for Kd_tree + doc
2017-11-22 11:31:58 +01:00
Sébastien Loriot
04aa045706
add missing identifiers
2017-11-21 13:41:58 +01:00
Marc Glisse
076c3b6ac1
Only check the result if we have computed a result.
2017-11-21 00:02:44 +01:00
Marc Glisse
2df3c40fd7
Don't test outer_range_contains in search_any_point.
...
That just slows it down. The test makes much more sense in search(),
which reports all points.
2017-11-20 23:13:47 +01:00
Clement Jamin
7d69e65cef
Fix indentation
2017-11-20 10:56:47 +01:00
Clement Jamin
be5870e269
Clean-up debug code
2017-11-20 10:55:19 +01:00
Clement Jamin
8d71d73dc8
Merge remote-tracking branch 'remotes/cgal/master' into Faster_dd_spatial_searching-cjamin
2017-11-17 10:41:54 +01:00
Clement Jamin
005f770ef6
Missing typename
2017-11-16 19:01:56 +01:00
Clement Jamin
7954d37086
Useless typename
2017-11-16 18:57:20 +01:00
Clement Jamin
319d2d614c
Fix compilation continued
2017-11-16 18:48:00 +01:00
Clement Jamin
bc5a5c2265
Fix code so that it compiles on Linux
2017-11-16 16:46:05 +01:00
Clement Jamin
63af2a0b73
Fix: inappropriate typename
2017-11-14 11:02:48 +01:00
Sébastien Loriot
ee57fc2d6c
add SPDX identifier for files under the GPL-3+ license
2017-11-12 10:17:51 +01:00
Sébastien Loriot
b352c90b11
add missing include directive for license checking
2017-10-20 22:34:07 +02:00
Clement Jamin
e61e724312
Missing include + fix initialization order
2017-10-18 15:44:07 +02:00
Clement Jamin
1978b63fd9
Optimize (cache+interruptible) non-orthogonal nearest/furthest neighbor search
2017-10-18 15:43:22 +02:00
Clement Jamin
9e2a551ad7
Use cache (if available) in search_any_point
2017-10-18 11:04:00 +02:00
Clement Jamin
ae1f89b4d3
Optimize "search" (all points in ball) when using cache
2017-10-11 10:23:31 +02:00
Laurent Rineau
7e9f756935
Replace all std::unary_function by CGAL::unary_function
2017-10-04 15:57:09 +02:00
Clement Jamin
f0a89af33b
Merge branch 'Faster_dd_spatial_searching-cjamin-old' into Faster_dd_spatial_searching-cjamin
2017-09-15 11:11:28 +02:00
Clement Jamin
1f11dfa004
Use cache when computing furthest neighbors (incremental seach)
2017-09-08 18:34:36 +02:00
Clement Jamin
2f305ec10f
Use cache when computing furthest neighbors
2017-09-08 17:37:09 +02:00
Clement Jamin
82b1ebb063
Clean-up code
2017-06-27 17:59:21 +02:00
Clement Jamin
0de1362e09
Use cache if available for NEAREST neighbor search
2017-06-21 00:34:02 +02:00
Clement Jamin
1cfab77634
Rename header file
2017-06-20 19:52:09 +02:00
Clement Jamin
17a683484f
Move some code to Distance_helper.h + copyright + bug fix
2017-06-20 19:47:26 +02:00
Clement Jamin
b5e948be92
FT is supposed to be public
2017-06-20 19:46:40 +02:00
Clement Jamin
d1659e0315
More minor code improvements
2017-06-20 15:13:02 +02:00
Clement Jamin
4cabf30131
Shorten typedefs
2017-06-20 15:09:55 +02:00
Clement Jamin
33e188dac1
Fix bad merge
2017-06-19 16:46:23 +02:00
Clement Jamin
5b9562ea84
Merge branch 'Triangulation-add_regular_tri-cjamin_mglisse-old' into Triangulation-add_regular_tri-cjamin_mglisse
2017-06-16 11:09:07 +02:00
Clement Jamin
a801221193
Remove the use of numeric_limits + fix typo + better interruptible version
2017-06-13 17:07:20 +02:00
Clement Jamin
069ab04c7e
Add comment
2017-05-22 16:42:07 +02:00
Clement Jamin
5e662a03db
Fix the way we detect the cache
2017-05-22 16:23:58 +02:00
Marc Glisse
54f2b91d6c
Fix printing of empty Kd_tree.
2017-05-22 11:51:52 +02:00
Clement Jamin
e9c35e3861
Allow to enable/disable cache of points
2017-05-19 16:06:02 +02:00
Clement Jamin
26ee6b1a10
Auto-detect if the distance functor has some member functions:
...
transformed_distance_from_coordinates
interruptable_transformed_distance
2017-05-09 17:01:05 +02:00
Clement Jamin
a6c1dfc7a1
Rename the recently-added distance functions
2017-05-09 16:50:24 +02:00
Marc Glisse
f0de24f91f
Update commented-out code to use functor equal_to_p.
2017-05-02 22:35:19 +02:00
Marc Glisse
49dc0855cd
Rename invalidate_built to invalidate_build.
2017-05-02 22:23:34 +02:00
Marc Glisse
e5c8142bcf
Merge branch 'Spatial_searching-misc-glisse-old' into Spatial_searching-misc-glisse
2017-04-29 09:46:05 +02:00
Clement Jamin
89c4e4a8b8
Remove duplicated code
2017-04-27 10:15:36 +02:00
Clement Jamin
7750f85867
WIP: Use a cache storing contiguously the coordinates of all points
...
Note: not backward-compatible, and not useful for all cases
2017-04-24 17:04:48 +02:00
Clement Jamin
6a5dbdc333
Add new variants of transformed_distance
...
- Variant taking iterators on coordinates of P instead of P itself
- Variant with an additional param `stop_if_geq_to_this`: during the computation,
if the partially-computed distance `pcd` gets greater or equal
to `stop_if_geq_to_this`, the computation is stopped and `pcd` is returned.
2017-04-24 16:52:55 +02:00
Laurent Rineau
909e393e61
Merge pull request #1808 from MaelRL/Spatial_searching-Fix_fuzzy_query_item_border
...
Spatial searching: Fix fuzzy query items
2017-01-30 09:54:55 +01:00
Sébastien Loriot
50510c05ea
add include directive for license of all GPL header files
...
done using:
ack-grep "^GPL" */package_info/*/license.txt -l | awk -F "/" '{print $1}' > /tmp/gpl_packages
for i in `cat /tmp/gpl_packages | \
grep -v Operations_on_polyhedra | \
grep -v Algebraic_kernel_for_circles | \
grep -v Algebraic_kernel_for_spheres | \
grep -v Polyhedron_IO`;
do
echo $i
python Scripts/developer_scripts/add_license_in_pkg_header.py $i
done
python Scripts/developer_scripts/add_license_in_pkg_header.py Operations_on_polyhedra Polygon_mesh_processing
python Scripts/developer_scripts/add_license_in_pkg_header.py Algebraic_kernel_for_circles Circular_kernel_2
python Scripts/developer_scripts/add_license_in_pkg_header.py Algebraic_kernel_for_spheres Circular_kernel_3
python Scripts/developer_scripts/add_license_in_pkg_header.py Polyhedron_IO Polyhedron
2017-01-19 15:20:25 +01:00
Marc Glisse
cfd4e92153
Use extended Kd_tree information also for search / search_any_point.
...
Note that we don't want to use set_upper_bound, because it calls
set_max_span, which the current split already avoids.
Also fix Kd_tree_rectangle::lower() with fixed dimension.
2017-01-13 02:11:40 +01:00
Mael Rouxel-Labbé
2d3daa5f58
Doc changes
2017-01-09 22:52:56 +01:00
Mael Rouxel-Labbé
fe8f36bcac
Trailing whitespace in Spatial searching
2017-01-09 17:46:47 +01:00
Mael Rouxel-Labbé
cd89288d46
Revert "Fix a bug in Spatial_searching's fuzzy_iso_box"
...
This reverts commit 5ed7255adb .
2017-01-09 12:14:03 +01:00
Mael Rouxel-Labbé
dcdfc4b95d
Revert "Spatial_searching: bug reported and fixed by Marc Glisse"
...
This reverts commit ed526b8f22 .
2017-01-09 12:14:00 +01:00
Mael Rouxel-Labbé
9491a9a0cf
Revert "Fix a bug in Spatial_searching's fuzzy_sphere"
...
This reverts commit c0cbdab3d8 .
2017-01-09 12:13:12 +01:00
Maxime Gimeno
06dd4a4522
Add a geom-traits concept for distance functions
...
Update the code and the doc accordingly
2016-12-29 07:20:23 +01:00
Marc Glisse
482b0bc073
Store weights of Weighted_Minkowski_distance in an array if dimension is known.
...
This gains 15% on the running time of a real application in 2D.
2016-12-13 00:33:33 +01:00