songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
67,567 Commits 3 Branches 156 Tags 973 MiB
Commit Graph

421 Commits

Author SHA1 Message Date
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 59a7f710dd Merge branch 'Spatial_searching-final_acceleration-gf' 
Improve the performance of Spatial Searching.

Small features:

  https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Spatial_searching_performance_optimization

  https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/spatial_searching_compiletimeD

Approved by the Release Manager

Conflicts:
	Installation/changes.html
 2015-01-15 15:31:35 +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 275e4ba47b remove modefBegin/End 2015-01-08 15:58:36 +01:00
Andreas Fabri af3315aa5f cleanup 2015-01-08 11:36:08 +01:00
Andreas Fabri 1e1dce2d57 use Dimension_tag 2015-01-08 11:35:58 +01:00
Andreas Fabri 6c38bf7f08 use \@ in a .txt file as @ is a special character for doxygen 2015-01-08 10:43:29 +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
Andreas Fabri cb5b17f873 chmod -x 2015-01-07 18:55:19 +01:00
Andreas Fabri 6e7c29e767 chmod -x 2015-01-07 18:55:18 +01:00
Andreas Fabri 78bd64cc9c lowercase file names 2015-01-07 18:55:16 +01:00
Andreas Fabri fba3da1d78 chmod -x 2015-01-07 18:55:13 +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
Andreas Fabri a77205a33c disable warning with push/pop macros around boost header 2014-12-16 17:13:30 +01:00
m.overtheil 65d363408c Fixed two old benchmarks 2014-12-16 13:20:20 +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 5b72551a41 Merge branch 'Spatial_searching-final_acceleration-gf' of ssh://scm.cgal.org/var/git/cgal-gsoc into Spatial_searching-final_acceleration-gf 2014-12-15 15:07:02 +01:00
m.overtheil f375123e69 Added figure of orthogonal distance 2014-12-15 15:06:25 +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 eb55c71236 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 15:35:09 +01:00
m.overtheil 967053e3c7 Added example for orthogonal search with a sphere 
Fixed wrong splitter in benchmark
 2014-12-12 15:33:45 +01:00
Andreas Fabri c98ca70df2 make it generic 2014-12-12 12:03:14 +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 5e7deafb5f Add sizeof.cpp 2014-12-11 15:00:29 +01:00
m.overtheil 799de1db05 Merge branch 'Spatial_searching-final_acceleration-gf' of ssh://scm.cgal.org/var/git/cgal-gsoc into Spatial_searching-final_acceleration-gf 2014-12-11 10:09:58 +01:00
m.overtheil ffeabb441d Updated changes.html 2014-12-11 10:09:45 +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
Andreas Fabri d711ae3968 Add more to \modif 2014-12-11 09:54:36 +01:00
m.overtheil 6b28c7df6d Pointed out what orthogonal search is 2014-12-11 08:44:42 +01:00
m.overtheil 5602747894 Merge branch 'incremental' into Spatial_searching-final_acceleration-gf 2014-12-10 11:28:42 +01:00
m.overtheil 9eab8bccf4 Changed description of vector dists, restructured user manual 2014-12-10 10:18:48 +01:00
m.overtheil 93e11cfeb4 Divided search in nearest and furthest 2014-12-09 15:35:16 +01:00
m.overtheil 23f87a839d Merge branch 'Spatial_searching-final_acceleration-gf' of ssh://scm.cgal.org/var/git/cgal-gsoc into Spatial_searching-final_acceleration-gf 2014-12-09 12:51:21 +01:00
m.overtheil 09878d56f0 typos in doc 2014-12-09 12:51:05 +01:00
Andreas Fabri a0ccf4aa7a Add benchmark 2014-12-09 12:43:06 +01:00
m.overtheil 0dd696c045 Added Modif's to doc 2014-12-09 11:34:15 +01:00
m.overtheil f801015712 Merge branch 'Spatial_searching-final_acceleration-gf' of ssh://scm.cgal.org/var/git/cgal-gsoc into Spatial_searching-final_acceleration-gf 2014-12-09 10:18:04 +01:00
m.overtheil bf7f340e61 Added loop to benchmark, slightly changed doc 2014-12-09 10:15:16 +01:00
Andreas Fabri c775be2506 typos in the user manual 2014-12-08 16:57:44 +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 418642d2a1 Typo 2014-12-08 10:59:46 +01:00
m.overtheil 76cb978a13 Added Figures,benchmark and implementation History 2014-12-08 09:38:20 +01:00
Andreas Fabri df2a957fbe add illustration gfor benchmark 2014-12-05 16:28:34 +01:00
m.overtheil 395b6a6d80 Test worst dist again 2014-12-05 16:17:17 +01:00
m.overtheil 286e957e4f Modification of new example 2014-12-05 15:43:49 +01:00
m.overtheil 7fe5f7c9ae Fixed most of the old benchmarks 2014-12-05 14:36:46 +01:00
m.overtheil 2a71befeaa Added example for splitter worst cases 2014-12-05 12:21:16 +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
m.overtheil d9a132b72e Unrolled orthogonal distance loops for DIM 2 and 3 2014-12-04 14:32:53 +01:00
Andreas Fabri 417f47c06c dispatching for dimensions in orer to unroll 2014-12-04 13:17:00 +01:00
m.overtheil 060c4f208f Removed some output in bench 2014-12-04 12:17:21 +01:00
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
Andreas Fabri d3f7d2565b Use CGAL_IA_FORCE_TO_DOUBLE to fix the tessuite 2014-11-26 14:44:05 +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