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

503 Commits

Author SHA1 Message Date
Jane Tournois e116f4ea63 fix unused variable warning 2015-10-06 14:16:30 +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 3b506683c4 add an example where the previous commit is tested/shown 2015-10-01 16:18:04 +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 6e214c5f4a remove Qt3 demos and empty dontsubmit files 2015-09-30 12:51:40 +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 46b156a955 Update Spatial_searching.txt 
typo (whitespace)
 2015-09-09 16:29:00 +02:00
Andreas Fabri c3ad989c9f Use wrapper for the very basic mutex locking 2015-09-04 09:46:51 +02:00
Sébastien Loriot 6cb766fc9e Merge remote-tracking branch 'cgal-dev/Scale_space-bench-GF' 
improve the performances of the Scale-space reconstruction package

Tested in CGAL-4.7-Ic-102
 2015-07-31 14:45:17 +02:00
Sébastien Loriot e393f1488d remove commited CMakeList 2015-07-31 14:41:18 +02:00
Andreas Fabri 804b61f59b remove file that was accidentally added 2015-07-16 10:20:27 +02:00
Laurent Rineau f9917c487e CMake 2.8.11 2015-07-13 12:36:43 +02:00
Sébastien Loriot 722abba27b cosmetic changes to remove mentions of QT4 2015-07-07 18:00:43 +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
Sébastien Loriot 4494fe089f add missing typedef in the doc 2015-05-19 11:42:13 +02:00
Laurent Rineau 15aef699ad Re-add /wd4244 under Windows 2015-03-09 16:58:32 +01:00
Andreas Fabri bd0c90d198 use \tparam; polish of examples 2015-02-27 11:47:59 +01:00
Andreas Fabri af84e62b6c Use the Epick_d kernel in two examples, and for 4d and not 2D 2015-02-26 18:08:26 +01: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 63945bdac9 fix links. They went into the dD kernel 2015-02-10 10:50:50 +01:00
Andreas Fabri 2cf40cafab Search_traits is not a model of RangeSearchTraits 2015-02-10 10:33:40 +01:00
Andreas Fabri d6af92ced2 cleanup in the ref manal 2015-02-10 10:02:11 +01:00
Andreas Fabri 567a557930 fix links 2015-01-29 10:04:03 +01:00
Andreas Fabri 520e47fc16 Add a tiny data set 2015-01-27 11:11:02 +01:00
Andreas Fabri c0286ce026 Add examples to search the closest vertices of a polygonal mesh 2015-01-27 10:51:48 +01:00
Sébastien Loriot 8637097561 Merge remote-tracking branch 'origin/Spatial_searching-fixes_for_4.6-GF' 
Tested in CGAL-4.6-Ic-113
  Approved by the RM
 2015-01-26 17:05:31 +01:00
Andreas Fabri d444701fa0 Add that Kd_tree::begin(0/end() is not in the insertion order 2015-01-20 10:40:10 +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 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
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