Commit Graph

547 Commits

Author SHA1 Message Date
Marc Glisse 98c7108630 Typo Construct_squared_radius_d
The code is using Compute_* and the doc Construct_*, change the doc.
2016-07-07 18:57:32 +02:00
Clement Jamin 5e03101540 Add concept/model relationship 2016-07-06 11:06:26 +02:00
Guillaume Damiand a8af4dad62 Merge branch 'CGAL_headers_only_step1-gdamiand_cjamin-old' into CGAL_headers_only_step1-gdamiand_cjamin 2016-06-22 09:43:31 +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 94828c1eaa add missing const 2016-06-15 17:35:05 +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
Guillaume Damiand a53f16edac Merge branch 'CGAL_headers_only_step1-gdamiand_cjamin-old' into CGAL_headers_only_step1-gdamiand_cjamin 2016-06-09 19:09:38 +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 ccaa1729ca improve test to cover both Orthogonal & classic incremental neighbor search
Also ensure that the result are good
2016-06-03 16:41:00 +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
Sébastien Loriot ebe067191e test takes errors into account for the exit code 2016-05-25 11:51:15 +02:00
Guillaume Damiand 10469f9c4e Update with master 2016-05-25 10:58:55 +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
Sébastien Loriot 4c29bf1b44 CMAKE_SOURCE_DIR -> CMAKE_CURRENT_SOURCE_DIR 2016-03-24 16:33:46 +01:00
Clement Jamin 9a61b23b55 Use get_default_random() instead of default_random 2016-03-09 10:35:21 +01:00
Sébastien Loriot 881e4d3199 request Core only in examples, tests and demos when really needed 2016-03-07 22:36:57 +01:00
Sébastien Loriot 2d191d6651 commit CMakeLists.txt for all examples and tests 2016-03-07 17:39:36 +01:00
Sébastien Loriot 45406a5296 Merge pull request #788 from bo0ts/Installation-split_config-pmoeller
Split CGALConfig.cmake and CGALExports.cmake
2016-03-06 15:36:55 +01:00
Philipp Möller 4211a4f01e Globally remove CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS
This is a Cmake 2.4.3 variable that isn't even documented anymore.
2016-02-16 17:02:55 +01:00
Philipp Möller 0a04a3a48f Use CGAL_DOC_VERSION 2016-02-11 15:37:54 +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
Sébastien Loriot e64ae35a6e Merge pull request #542 from bo0ts/Documentation-release_build2-pmoeller
Allow to build the documentation in a release
2016-01-07 09:21:46 +01:00
Andreas Fabri a41165b6eb various 2016-01-05 18:04:14 +01:00
Andreas Fabri e7d3bd96f2 Remove Kd_tree_d_new.h 2015-12-31 16:47:20 +01:00
Philipp Möller 71b4e9c515 Use CGAL_FULL_VERSION in all Doxyfile.in 2015-12-17 16:33:28 +01:00
Philipp Möller 81a8f982dc Handle the easy INPUT cases
If INPUT is just PKG/doc/PKG, handle it automatically.
2015-12-10 17:00:26 +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 2e493f297b Merge pull request #389 from afabri/CGAL-Qt3-GF
Remove Qt3 based demos
2015-10-23 17:08:49 +02: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 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