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