Commit Graph

303 Commits

Author SHA1 Message Date
m.overtheil e893bc94d3 Check worst dist before make_pair 2014-12-04 11:46:10 +01:00
m.overtheil 16dbdf2f9b Merge branch 'Spatial_searching-final_acceleration-gf' of ssh://scm.cgal.org/var/git/cgal-gsoc into Spatial_searching-final_acceleration-gf 2014-12-04 10:14:55 +01:00
m.overtheil 78f257ec46 Added nanoflan benchmark 2014-12-04 10:12:09 +01:00
Andreas Fabri 9c7ab7568c typos and partial switching to \tparam 2014-12-04 10:07:52 +01:00
Andreas Fabri 9650d226a1 typos and partial switching to \tparam 2014-12-04 09:52:01 +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 88dca7f9af Typo 2014-12-03 15:09:28 +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 381fd858ea 2d 2014-11-18 08:43:24 +01:00
m.overtheil d598526bfe added dimension template argument to doc 2014-11-04 15:59:56 +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
m.overtheil f001def817 added statistics 2014-10-24 12:25:48 +02:00
m.overtheil 9246366757 test for bug in kd-tree 2014-10-17 08:23:54 +02:00
Sébastien Loriot 7247e971fc fix wrong documented traits 2014-09-12 13:23:46 +02:00
Mael Rouxel-Labbé 12a72d1a35 Merge branch 'Spatial_searching-fix_fuzzy_iso_box_contains-GF'
Tested in CGAL-4.5-Ic-113.

Approved by the Release Manager.
2014-08-06 18:52:39 +02:00
Mael Rouxel-Labbé 0cface5c3c Fix Circular_querry.cpp
The Fuzzy_sphere bug (c0cbdab) was previously undetected by
the testsuite because Circular_querry.cpp used circles
with radius that cannot exactly be represented (0.2) in
binary and a point could never exactly be on the circle
(the squared distance would be 0.04 + epsilon and the assertions
did not fail). This attempts to fix it by using decimals
that can exactly be represented.

The testsuite now compiles and runs succesfully locally.
2014-07-15 18:24:51 +02: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
Sébastien Loriot e97efd228f prevent linking 2014-07-15 14:25:21 +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 3723b74b61 removed warning (comparison signed/unsigned) 2014-04-03 11:27:47 +02:00
Eric Berberich 1d24106829 removed waarning (comparison signed/unsigned) shown in testsuite 2014-03-29 12:07:34 +01:00
Eric Berberich 3bec7b2823 added comment and allow that capacity might be larger than demanded 2014-03-28 14:56:03 +01:00
Eric Berberich 9d8a02aa46 rephrased documentation for capacity in Kd_tree 2014-03-28 14:50:18 +01:00
Waqar Khan 7b06c4b7c8 Cout changed to cerr in the error message. 2014-03-28 14:46:12 +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 398613ec71 rephrased documentation of "reserve" to proposal of Sebastien 2014-03-10 12:12:59 +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