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
Marc Glisse
e45cb3961b
Remove undocumented and unused constructor of Weighted_Minkowski_distance.
2016-12-13 00:29:16 +01:00
Marc Glisse
1c4554da08
Remove dead call to resize().
2016-12-12 23:54:58 +01:00
Marc Glisse
f64f7fbf1a
Unused parameter in release mode.
2016-12-12 23:30:52 +01:00
Laurent Rineau
c99f0366a8
Merge remote-tracking branch 'cgal/releases/CGAL-4.9-branch'
2016-12-12 17:47:56 +01:00
Andreas Fabri
ed526b8f22
Spatial_searching: bug reported and fixed by Marc Glisse
2016-12-04 11:26:50 +01:00
Marc Glisse
790ca3f05f
Remove redundant call to std::copy.
2016-11-27 19:07:52 +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
Laurent Rineau
51f5697d3d
Add missing #include
2016-09-30 15:23:14 +02:00
Clement Jamin
fa6ecf39be
Merge branch 'Triangulation-add_regular_tri-cjamin_mglisse-old' into Triangulation-add_regular_tri-cjamin_mglisse
2016-09-09 12:55:43 +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
6326ea2372
Merge remote-tracking branch 'cgal/releases/CGAL-4.8-branch'
2016-06-16 16:19:04 +02:00
Sébastien Loriot
7677241b7f
replace static_cast and add missing const
2016-06-14 15:06:37 +02:00
Sébastien Loriot
31d2638b47
force usage of the base class function
2016-06-14 08:42:30 +02:00
Sébastien Loriot
013c25c889
Merge remote-tracking branch 'cgal/releases/CGAL-4.8-branch'
2016-06-08 14:11:28 +02:00
Sébastien Loriot
6ec27d359e
fix furthest orthogonal incremental neighbor
...
previously the current distance was always larger than the initial
one. As a result no branch of the tree could be filtered out and
all the nodes were visited.
2016-06-06 14:41:33 +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
Clement Jamin
b92138cde5
Add a comment about the two new operators
2016-06-01 14:17:29 +02:00
Clement Jamin
cd6cd2918b
Add explicit forwarder to the Base_traits
2016-06-01 14:17:27 +02:00
Clement Jamin
95ab3b1402
Remove the using and call the base's operator() explicitly
2016-06-01 14:17:26 +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
Frédérik Paradis
418c11ec7e
Adding typedef for Sphere_d in Search_traits_d to respect the contract of RangeSearchTraits
2016-04-02 10:51:19 -04:00
Marc Glisse
c527ab2c5c
Don't uselessly repeat the template parameters inside the class.
2016-03-25 21:49:19 +01:00
Marc Glisse
667ca8f417
Compact Kd_tree_rectangle a bit in the dynamic case.
2016-03-25 21:17:37 +01:00
Marc Glisse
f5e9aa8941
Use upper() and lower() in Kd_tree_rectangle.
2016-03-25 15:41:14 +01: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
54135a8ca5
Reorder fields in Kd_tree_rectangle for compactness.
2016-03-25 15:18:41 +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
Simon Giraudot
751d959c05
Fix boost unused typedef warning: replace BOOST_STATIC_ASSERT by CGAL_static_assertion
2016-02-02 14:32:46 +01:00
Sebastien Loriot
32a3972c33
Merge pull request #592 from afabri/CGAL-dont_submit_cleanup-GF
...
Towards getting rid of dont_submit files
2016-01-08 14:14:08 +01:00
Andreas Fabri
e7d3bd96f2
Remove Kd_tree_d_new.h
2015-12-31 16:47:20 +01: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
Sebastien Loriot
40da918aaf
Merge pull request #368 from afabri/Spatial_searching-find_any_point-GF
...
Add function Kd_tree::find_any_point(Query)
2015-10-10 14:24:22 +02:00
Sebastien Loriot
fc66538d74
Merge pull request #380 from janetournois/Spatial_searching-fix_fuzzy_sphere_constructor-jtournois
...
Spatial_searching : fix Fuzzy_sphere constructors
2015-10-07 15:49:54 +02:00
Jane Tournois
69468219e4
update include of enable_if to location compatible with older versions of boost
2015-10-02 11:02:09 +02:00
Jane Tournois
9491fac7a4
update include
2015-10-01 15:58:54 +02:00
Jane Tournois
58e44a5f1f
avoid redundancy of constructors (compilation error) when types are the same
2015-10-01 12:15:45 +02:00
Andreas Fabri
1a4faa8575
Merge branch 'CGLAL-thread_local_storage-GF-old' into CGLAL-thread_local_storage-GF
2015-10-01 10:03:04 +02:00
Andreas Fabri
34099dfe3a
replace pair<Point,bool> wiyh optional<Point>
2015-09-26 10:42:27 +02:00
Sébastien Loriot
06704ceaee
fix a typo
2015-09-24 13:55:57 +02:00
Sébastien Loriot
a5dfe6743b
make (Orthogonal_)incremental_nearest_neighbor a valid range
2015-09-24 08:21:05 +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
728b4a2f5f
Replace incremental search with a range query and a k-neighbor search
2015-06-23 14:59:50 +02:00
Andreas Fabri
803415f2f1
make sure that the begin/end coordinate iterator are for the same point
2015-02-26 18:08:25 +01: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
Laurent Rineau
018919bc3b
Remove an unused header file
2015-01-15 15:26:38 +01:00
Andreas Fabri
c2edcbc1ba
Kd_tree::search now returns the correct iterator
2015-01-14 14:58:35 +01:00
Andreas Fabri
cbaece6134
qualify get<0>(..)
2015-01-10 06:22:51 +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
be5bff77e3
use boost::uint
2015-01-08 09:12:22 +01:00
Laurent Rineau
bec963af35
Add a license header
2015-01-07 18:27:04 +01:00
Andreas Fabri
eb6146e0dc
no need for passing the vector dists through the recursive function
2015-01-07 17:44:58 +01:00
Andreas Fabri
066df11cef
remove unused parameter
2015-01-07 14:01:18 +01:00
Andreas Fabri
b4c997dd7c
remove unused parameter
2015-01-07 13:14:14 +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
Laurent Rineau
ffca6da15d
Fix compilation on Linux
2014-12-15 13:41:49 +01:00
m.overtheil
1e8ca0eb79
Added statistics
2014-12-15 08:55:15 +01:00
m.overtheil
11a98dbc95
Merge branch 'Spatial_searching-final_acceleration-gf' of ssh://scm.cgal.org/var/git/cgal-gsoc into Spatial_searching-final_acceleration-gf
2014-12-12 10:26:20 +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
Andreas Fabri
6adece5ee9
also benchmark bost:container::deque
2014-12-12 09:45:17 +01:00
Andreas Fabri
1bc624ee30
Add a container
2014-12-11 20:33:53 +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
93e11cfeb4
Divided search in nearest and furthest
2014-12-09 15:35:16 +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
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
1e6b69ccd9
Added tparam to doc
2014-12-04 15:58:03 +01:00
Andreas Fabri
417f47c06c
dispatching for dimensions in orer to unroll
2014-12-04 13:17:00 +01:00
m.overtheil
e893bc94d3
Check worst dist before make_pair
2014-12-04 11:46:10 +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
Laurent Rineau
8258187d47
Fix compilation error: missing "typename"
2014-12-03 16:20:22 +01:00
Laurent Rineau
f8911c20dd
Fix compilation error: spurious "typename"
2014-12-03 16:15:52 +01:00
Laurent Rineau
d20eb45039
Fix compilation error: "<CGAL\Dimension.h>"
2014-12-03 16:15:52 +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
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
4bf11c0edc
replaced .assign() with .fill()
2014-12-02 16:04:20 +01:00
m.overtheil
9b3d496572
Added changes from Orthogonal search to Orthogonal inc search
2014-12-02 15:39:41 +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
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
5b67887a5e
Merge branch 'Spatial_searching-Sliding_Midpoint_Splitter_bugfix-gf' into Spatial_searching-final_acceleration-gf
2014-11-28 12:43:12 +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
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
m.overtheil
87aa5ad7c3
Moved to namespace internal,renamed HAS_DIMENSION to HAS_DIMENSION_TAG
2014-11-03 13:33:49 +01:00
m.overtheil
9a7660b6fa
Added compatibility for traits without dimension_tag
2014-11-03 11:15:49 +01:00
m.overtheil
8f94bc329b
Replaced all int dimension with dimension_tags
2014-10-31 15:02:04 +01:00
m.overtheil
c0a37c0a05
Bugfix for Sliding_midpoint splitting rule(default)
...
Fixed a bug causing the tree to have linear depth in some degenerated
cases, e.g. when points are on a segment or on a hyperplane in general.
Added a check of the tight bounding box to avoid that.
Also set the default bucket_size from 3 to 10, which results in much
better runtime.
2014-10-31 10:37:58 +01:00
Mael Rouxel-Labbé
c0cbdab3d8
Fix a bug in Spatial_searching's fuzzy_sphere
...
The contains() function (and its variations) returned false
for all points on the sphere.
2014-07-15 17:54:45 +02:00
Mael Rouxel-Labbé
5ed7255adb
Fix a bug in Spatial_searching's fuzzy_iso_box
...
The contains() function (and its variations) returned false for
all points points P(x,y,z) such that x=box.xmax() or y=box.ymax()
or z=box.zmax(). This excluded some points from being found when
querying a kd tree.
2014-07-08 15:55:14 +02:00
Eric Berberich
dee9fc8235
Merge branch 'Snap_rounding_2-kd_tree_replacement-wkhan-old' into Snap_rounding_2-kd_tree_replacement-wkhan
...
Conflicts:
Installation/changes.html
2014-04-09 10:11:35 +02:00
Eric Berberich
9d8a02aa46
rephrased documentation for capacity in Kd_tree
2014-03-28 14:50:18 +01:00
Waqar Khan
98e6007dd3
* Added the capacity() function to the Kd_tree.h and also added its documentation
...
* Added a test that checks the reserve() and capacity() function for Kd_tree
2014-03-26 18:02:04 +01:00
Eric Berberich
85894658ef
fixed copyright headers
2014-03-10 00:03:24 +01:00
Waqar Khan
1c355ef42a
1. "Snap_rounding_traits_2.h" "Snap_rounding_kd_2.h" "Kd_tree.h" "snap_rounding_data.cpp", Changed the File header signature to match the templated signatures.
...
2. Made the required changes in the concepts i.e. in "Snap_rounding_2/doc/Snap_rounding_2/Concepts/SnapRoundingTraits_2.h"
3. Added documentation for the reserve() method of Kd_tree
4. Deleted the un maintained olk kd_tree package
2014-03-07 16:13:44 +01:00
Waqar Khan
0e14493632
1. "snap_rounding_data.cpp" Added Example usage in-code documentation. Removed the timer that recorded the amount of time taken by the snap_rounding. The timer was initally added to test the snap rounding running time difference using new Kd_trees
...
2. "Snap_rounding_kd_2.h" "Snap_rounding_traits_2.h" Added documentation and changed Copyright information and authors appropriately.
3. "kd_tree.h" Renamed the reserve_to_capacity() to reserve().
4. Snap_rounding_kd_new.h deleted
2014-03-01 18:58:40 +01:00
Sébastien Loriot
f5e96a20ea
add parenthesis
2014-02-24 07:09:13 +01:00
Sébastien Loriot
0b3c2ae383
fix a documentation bug and add static assertions
...
the class Search_traits_adapter must use only Lvalue_property_map since
it uses the Cartesian_const_iterator from the base class which is usually
simply the pointer on the double in the point. If the point returned by
the property map is a temporaty, the iterator is invalid and its behavior
is undefined
2014-02-21 15:36:40 +01:00
Waqar Khan
b46b37e7b2
reserve_to_capacity() method for Kd_tree.h that pre-allocated memory for points added. New Snap_rounding example added where the input data is taken from a file. Snap_rounding_kd_2.h modified to use the reserve_to_capacity method before creating the kd_tree. This improves the running time.
2014-02-18 01:41:44 +01:00
Andreas Fabri
6c547e5663
Mainly added includes
2013-09-13 22:24:30 +02:00
Andreas Fabri
776a8d66e0
unsigned int -> int
2013-02-27 14:28:47 +01:00
Philipp Möller
542f5d9c51
Merged ^/branches/next here
2012-04-16 08:53:21 +00:00
Laurent Rineau
8f59fd9592
Turn QPL into LGPLv3+
2012-01-13 16:33:35 +00:00
Sébastien Loriot
69b2f7079a
BUGFIX:
...
incremental neighbor search classes were storing a nested ref_counted iterator
for begin() which implies that a call to operator++ on a copy of an iterator
increment the internal copy of the class (cannot make several pass).
There is still a problem in case of copy outside of the class but this is
a first step (a deep_copy method should be provided for iterators which would
need a small feature).
2012-01-05 09:45:15 +00:00
Philipp Möller
4d2480ffe0
Adjusted typedef to actually be a value instead of a reference
2011-12-06 16:37:04 +00:00
Andreas Fabri
28cac7eaaa
Introduce size_type as return type for Kd_tree::size()
2011-11-21 12:47:57 +00:00
Sébastien Loriot
bff8218bd0
merge from next
2011-09-30 06:51:51 +00:00
Sébastien Loriot
078e375437
small feature (testsuite OK):
...
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/spatial_search_fuzzy_item_constructor
2011-09-30 06:37:08 +00:00
Sébastien Loriot
751f3ba08b
the class Kd_tree is now read-only thread-safe using a mutex.
2011-09-08 16:12:51 +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
fd7e66b512
in modifs of r62100 removed a needed ++i
2011-04-06 14:36:15 +00:00
Laurent Rineau
3d1fd31b75
Bug fix in <CGAL/Fuzzy_sphere.h>
...
Fuzzy_sphere_3<Search_traits> tried to use Point_d::dimension(), instead of
using Search_traits::Construct_cartesian_const_iterator_d. With a custom
Point_d, there was a compilation error.
2011-04-01 09:47:16 +00:00
Andreas Fabri
6ba8007815
Use CGAL::abs instead of fabs
2011-02-16 14:05:51 +00:00
Laurent Rineau
b6d9716863
According to C++03 [namespace.udecl], a using declaration cannot be about a
...
type.
2010-12-06 11:43:05 +00:00
Sébastien Loriot
5ee07db31f
operator= of iterator: do nothing when internal ptr are the same.
2010-10-22 13:17:52 +00:00
Sébastien Loriot
d07f78578a
add parenthesis to indicate how an expression should be evaluated.
...
This was done so that an assertion of Orthogonal_incremental_nearest_neighbor does
not fail in case new_off == old_off (when using floating point arithmetic).
2010-10-22 11:03:44 +00:00
Sébastien Loriot
ece84b02fd
iterator of Incremental_nn: add missing const to operator* + types required by std algo
...
itertator of Ortho_incremental_nn: the iterator tag was incorrect: forward -> input
2010-10-22 10:58:59 +00:00
Sébastien Loriot
97ddcd58ac
add missing operator= which was responsible for a double delete
...
of a ref-counted value.
2010-10-21 14:28:31 +00:00
Andreas Fabri
0c7b263dee
avoid log N reallocation steps when inserting N objects in a std::vector and add typedef Traits
2010-09-23 13:52:01 +00:00
Sébastien Loriot
9bb873a0cf
remove unused variable in Base constructor
2010-08-19 12:24:38 +00:00
Sébastien Loriot
26e4e3ae68
correct bug in postfix++ of interator in incremental neighbor search methods
2010-08-18 12:53:25 +00:00
Sébastien Loriot
677fa29eb8
add operator-> in iterator of incremental neighbor search classes
2010-08-18 09:52:36 +00:00
Sébastien Loriot
975843b44e
add clear function that was documented but not implemented
2010-08-18 08:41:40 +00:00
Andreas Fabri
beafa441a9
1.0 -> FT(1.0)
2010-06-24 13:45:17 +00:00
Andreas Fabri
7ff07cae2c
0 -> FT(0)
2010-06-22 11:52:55 +00:00
Andreas Fabri
8f720d178f
int -> size_t
2010-06-22 10:34:02 +00:00