Commit Graph

75 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
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 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
Andreas Fabri fb51a69c7c Mesh_2 2018-01-17 16:50:21 +00: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 319d2d614c Fix compilation continued 2017-11-16 18:48:00 +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
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
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 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
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 f7741b1f2b Confusion between the 2 islower flags. Ordering issue on setting / clearing removed_ flag. 2016-11-25 17:19:03 +01:00
Marc Glisse d1b461350b Incomplete renaming in last changes... 2016-11-25 15:29:47 +01:00
Marc Glisse 36af1c17f4 Let remove() take a functor as argument. 2016-10-27 23:17:42 +02:00
Marc Glisse df573404d0 Merge branch 'Spatial_searching-misc-glisse-old' into Spatial_searching-misc-glisse 2016-10-26 11:12:04 +02:00
Marc Glisse 3038832982 Handle insert-after-remove in Kd_tree.
Untested.
2016-10-26 11:02:41 +02:00
Marc Glisse a1c231737b Rewrite to handle points on the boundary that may be on either side. 2016-08-25 19:39:58 +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
Andreas Fabri 6b2c4dd7c6 Merge branch 'CGLAL-thread_local_storage-GF-old' into CGLAL-thread_local_storage-GF 2015-11-09 14:26:42 +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 c3ad989c9f Use wrapper for the very basic mutex locking 2015-09-04 09:46:51 +02:00
Andreas Fabri 2694a6faf5 Do not #include Memory_size.h as it includes windows.h with nasty #defines
It was introduced for Kd_tree::statistics(0 by Markus
2015-01-16 08:48:13 +01:00
Andreas Fabri c2edcbc1ba Kd_tree::search now returns the correct iterator 2015-01-14 14:58:35 +01:00
Andreas Fabri 5adf8e388c Workaround for boost::container::deque; 1 bug fix 2015-01-09 10:23:32 +01:00
Sébastien Loriot d3fb97b74b factorise the checking for the nested type Dimension 2015-01-09 10:19:48 +01:00
Andreas Fabri 2dcecc137e remove extra ';' after a macro 2015-01-08 09:51:33 +01:00
Andreas Fabri 8d86f77cbc remove unused parameters; int -> ptrdiff_t 2015-01-07 12:05:53 +01:00
m.overtheil 61f642bde6 Changed order of nodes in deque
Fixed example with user defined point.
Fixed weighted minkowski distance.
2014-12-16 11:49:15 +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
m.overtheil eecc4b480e Fixed deleted double indirection 2014-12-08 15:37:23 +01:00
m.overtheil 53aecd416f Deleted double indirection 2014-12-08 12:10:52 +01:00
m.overtheil af343d926e Added new traversal rule and dists vector to Orthogonal search
Functions min_dist_to_rectangle and max... have an overload with
std::vector<FT>& dists now. That is required for ortho searches, so
we have no backwards compatibility.
The values for extended internal nodes have also been changed.
2014-12-02 10:36:36 +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 d22d78a04f Reorder pts vector for spatial locality
IMPORTANT: This only works for point types with a
default constructor! Added that in the test.
2014-11-28 12:42:19 +01:00
m.overtheil 32877332ec Reorder pts vector
NO WORKING CODE! Just for my synchronisytion
2014-11-28 09:28:51 +01:00