Commit Graph

53 Commits

Author SHA1 Message Date
Sébastien Loriot 98e471849b moving files from internal to PKG/internal 2021-08-26 11:33:39 +02: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
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
Clement Jamin 06b18208e8 Specify 4th template argument for Kd_tree + doc 2017-11-22 11:31:58 +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 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 e61e724312 Missing include + fix initialization order 2017-10-18 15:44:07 +02:00
Clement Jamin 9e2a551ad7 Use cache (if available) in search_any_point 2017-10-18 11:04:00 +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 2f305ec10f Use cache when computing furthest neighbors 2017-09-08 17:37:09 +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 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
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 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
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
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
Andreas Fabri eb6146e0dc no need for passing the vector dists through the recursive function 2015-01-07 17:44:58 +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
Laurent Rineau ffca6da15d Fix compilation on Linux 2014-12-15 13:41:49 +01:00
m.overtheil 53aecd416f Deleted double indirection 2014-12-08 12:10:52 +01:00
m.overtheil 395b6a6d80 Test worst dist again 2014-12-05 16:17:17 +01:00
Markus Overtheil 6c548a9fad Removed worst dist check 2014-12-05 09:12:05 +01:00
m.overtheil e893bc94d3 Check worst dist before make_pair 2014-12-04 11:46:10 +01:00
Laurent Rineau 8258187d47 Fix compilation error: missing "typename" 2014-12-03 16:20:22 +01:00
m.overtheil b08583e319 Specialized compute_neighbors_orthogonally
It's now compute_nearest_neighbor_orthogonally and
compute_furthest_neighbor_orthogonally
2014-12-03 10:47: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 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
Laurent Rineau 8f59fd9592 Turn QPL into LGPLv3+ 2012-01-13 16:33:35 +00:00
Sébastien Loriot 37b02012b6 fix const-correctness issue in the spatial searching package. In particular this
remove all mutable member variable and leave only one const_cast in the kd-kdtree private function
const_build. This function is called in const predicates when the tree is not already internally built.
The documentation has been update and a few typos fixed at the same time.
2011-09-07 09:04:52 +00:00
Laurent Rineau 369498d1e5 Cancel revision 64607. There had been a problem with the branch.
| ------------------------------------------------------------------------
  | r64607 | efif | 2011-07-05 17:27:04 +0200 (Tue, 05 Jul 2011) | 1 line
  | 
  | Merged feature-branch Aos_2-new_functors-tau into next
  | ------------------------------------------------------------------------
2011-07-06 11:11:58 +00:00
Sébastien Loriot 9bb873a0cf remove unused variable in Base constructor 2010-08-19 12:24:38 +00:00
Andreas Fabri 803a2dbc0e cleanup 2010-05-21 13:27:10 +00:00
Sébastien Loriot 961b9d8557 add empty() method to kdtree
handle case when kdtree is empty for all 4 nearest neighbor search method
correct sort method of bounded_priority_queue (was sorting the complete vector even if not full)
  ==> fix the crash when  k > nb input points
Modify test suite to handle these particular cases
2010-05-11 12:52:53 +00:00
Fernando Cacciola 13152be1ea Fixed call to base's 'branch' function 2010-03-25 14:36:39 +00:00
Sébastien Loriot baee18c295 forget to save two files 2010-01-29 15:21:23 +00:00
Sébastien Loriot 93b2b7cbac Add bounded priority queue as an internal data-structure.
Use the bounded_priority_queue inside Orthogonal_k_neighbor search
and K_neighbor_search, a maximum of code is now shared by these two classes.
This reduces computation time and memory needed.
Extend the interface: to save time the sequence  k-nearest neighbors 
can be sorted (default) or not. 
Add a new test that ensures all methods find the same kth closest neighbor.
Update manual.
2010-01-29 15:19:39 +00:00
Ophir Setter ef48e6975a unsigned K parameter in orthogonal search 2008-07-27 16:46:13 +00:00
Laurent Saboret 91f0bbfe23 Optimization:
Store the neighbors found in a std::set, instead of a list sorted by insertion sort (in type NN_list). 
This makes insertion O(log n) instead of O(n).
2008-07-08 14:45:38 +00:00
Sylvain Pion 884c477f20 macros must be prefixed by CGAL_ 2007-02-15 21:24:48 +00:00