Commit Graph

60 Commits

Author SHA1 Message Date
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
Laurent Rineau 65cde3ce79
Merge branch 'master' into Faster_dd_spatial_searching-cjamin 2019-12-03 19:18:15 +01: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 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 f76e744bff Spatial_searching 2018-01-17 20:12:06 +00:00
Marc Glisse e2bb2b383b
Merge branch 'master' into Faster_dd_spatial_searching-cjamin 2017-12-07 15:26:46 +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 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
Sébastien Loriot ee57fc2d6c add SPDX identifier for files under the GPL-3+ license 2017-11-12 10:17:51 +01: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
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 17a683484f Move some code to Distance_helper.h + copyright + bug fix 2017-06-20 19:47:26 +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 e9c35e3861 Allow to enable/disable cache of points 2017-05-19 16:06:02 +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
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
Marc Glisse df573404d0 Merge branch 'Spatial_searching-misc-glisse-old' into Spatial_searching-misc-glisse 2016-10-26 11:12:04 +02:00
Sébastien Loriot 849c097cfd A possible fix for further neighbor search
if we want to keep using tigh bbox we need more double per node
2016-06-03 16:40:13 +02:00
Marc Glisse 6815316c9f Let it compile... 2016-04-10 15:23:24 +02:00
Marc Glisse d9d1c79f28 Point removal in kd-tree. 2016-04-07 16:05:21 +02:00
Marc Glisse 7438d46087 Remove low_value/high_value that don't apply to the non-extended Kd_tree_internal_node. 2016-03-25 15:27:34 +01:00
Marc Glisse 475154e6af Stop once we've found a point in search_any_point
I am not familiar with this code, please double-check that the change makes sense.
2016-03-24 23:17:40 +01:00
Andreas Fabri 34099dfe3a replace pair<Point,bool> wiyh optional<Point> 2015-09-26 10:42:27 +02:00
Andreas Fabri 482ea27103 Add Kd_tree.search_any_point(Point_d,FuzzyQueryItem) 2015-09-23 11:17:58 +02:00
Andreas Fabri 728b4a2f5f Replace incremental search with a range query and a k-neighbor search 2015-06-23 14:59:50 +02:00
Andreas Fabri be5bff77e3 use boost::uint 2015-01-08 09:12:22 +01:00
Laurent Rineau ffca6da15d Fix compilation on Linux 2014-12-15 13:41:49 +01:00
m.overtheil df6cd26804 Replaced std::container with boost container
Also changed stored ints to uint32_t
2014-12-12 10:24:56 +01:00
m.overtheil ddf4b932b0 Replaced separator for better memory alignment 2014-12-11 15:56:26 +01:00
Andreas Fabri ad0fa23571 Add a specialization to save memory in the case of general search 2014-12-11 10:03:01 +01:00
m.overtheil 53aecd416f Deleted double indirection 2014-12-08 12:10:52 +01:00
Laurent Rineau 791ded9f35 Fix indentation 2014-12-03 16:20:28 +01:00
Laurent Rineau dfeb7d7b44 Fix compilation error: need a typedef for base class 2014-12-03 16:20:28 +01:00
m.overtheil 10249fb7f9 Bug in print() 2014-12-03 15:44:14 +01:00
m.overtheil 17068ae8b4 Documentation 2014-12-03 14:55:20 +01:00
m.overtheil a031dedd83 Fixed bug in print() 2014-12-03 12:23:25 +01:00
m.overtheil e6019889cc Added dimension tags to Kd_tree_rectangle
Introduced dimension tags for a speedup when we know the dimension
at compiletime.
2014-11-28 15:08:46 +01:00
m.overtheil 9da9cff768 Merge branch 'Spatial_searching-Rectangle_compiletimeD-gf' into Spatial_searching-final_acceleration-gf
Conflicts:
	Spatial_searching/benchmark/Spatial_searching/nn3cgal.cpp
	Spatial_searching/include/CGAL/Kd_tree.h
	Spatial_searching/include/CGAL/Kd_tree_node.h
2014-11-28 13:10:08 +01:00
m.overtheil cb4f9c3521 Divided Kd_tree_node into internal and leaf node
The Kd_tree_node now has two derived classes Kd_tree_internal_node
and Kd_tree_leaf_node. This commit is tested under Windows x64
2014-11-27 15:42:18 +01:00
m.overtheil afd47e07ee Started to divide Kd_tree_node in two types
NO WORKING CODE! Commit is just for my own synchronisation
2014-11-26 16:03:57 +01:00