Marc Glisse
211458372d
Add trivial assert in the test.
2017-05-04 16:25:34 +02:00
Marc Glisse
f0de24f91f
Update commented-out code to use functor equal_to_p.
2017-05-02 22:35:19 +02:00
Marc Glisse
49dc0855cd
Rename invalidate_built to invalidate_build.
2017-05-02 22:23:34 +02:00
Marc Glisse
e5c8142bcf
Merge branch 'Spatial_searching-misc-glisse-old' into Spatial_searching-misc-glisse
2017-04-29 09:46:05 +02:00
Clement Jamin
89c4e4a8b8
Remove duplicated code
2017-04-27 10:15:36 +02:00
Andreas Fabri
c81b707bfb
Do not include graph_traits_{Polyhedron | Surface_mesh}.h
2017-04-24 19:17:43 +02:00
Clement Jamin
7750f85867
WIP: Use a cache storing contiguously the coordinates of all points
...
Note: not backward-compatible, and not useful for all cases
2017-04-24 17:04:48 +02:00
Clement Jamin
6a5dbdc333
Add new variants of transformed_distance
...
- Variant taking iterators on coordinates of P instead of P itself
- Variant with an additional param `stop_if_geq_to_this`: during the computation,
if the partially-computed distance `pcd` gets greater or equal
to `stop_if_geq_to_this`, the computation is stopped and `pcd` is returned.
2017-04-24 16:52:55 +02:00
Laurent Rineau
909e393e61
Merge pull request #1808 from MaelRL/Spatial_searching-Fix_fuzzy_query_item_border
...
Spatial searching: Fix fuzzy query items
2017-01-30 09:54:55 +01:00
Sébastien Loriot
50510c05ea
add include directive for license of all GPL header files
...
done using:
ack-grep "^GPL" */package_info/*/license.txt -l | awk -F "/" '{print $1}' > /tmp/gpl_packages
for i in `cat /tmp/gpl_packages | \
grep -v Operations_on_polyhedra | \
grep -v Algebraic_kernel_for_circles | \
grep -v Algebraic_kernel_for_spheres | \
grep -v Polyhedron_IO`;
do
echo $i
python Scripts/developer_scripts/add_license_in_pkg_header.py $i
done
python Scripts/developer_scripts/add_license_in_pkg_header.py Operations_on_polyhedra Polygon_mesh_processing
python Scripts/developer_scripts/add_license_in_pkg_header.py Algebraic_kernel_for_circles Circular_kernel_2
python Scripts/developer_scripts/add_license_in_pkg_header.py Algebraic_kernel_for_spheres Circular_kernel_3
python Scripts/developer_scripts/add_license_in_pkg_header.py Polyhedron_IO Polyhedron
2017-01-19 15:20:25 +01:00
Marc Glisse
cfd4e92153
Use extended Kd_tree information also for search / search_any_point.
...
Note that we don't want to use set_upper_bound, because it calls
set_max_span, which the current split already avoids.
Also fix Kd_tree_rectangle::lower() with fixed dimension.
2017-01-13 02:11:40 +01:00
Mael Rouxel-Labbé
2d3daa5f58
Doc changes
2017-01-09 22:52:56 +01:00
Mael Rouxel-Labbé
fe8f36bcac
Trailing whitespace in Spatial searching
2017-01-09 17:46:47 +01:00
Mael Rouxel-Labbé
e64f271451
Updated the documentation of Fuzzy Query Items
2017-01-09 17:43:53 +01:00
Mael Rouxel-Labbé
affece6748
Renaming away 'exact' and minor changes
2017-01-09 17:36:04 +01:00
Mael Rouxel-Labbé
991874b81d
Renamed range for clarity
2017-01-09 16:29:41 +01:00
Mael Rouxel-Labbé
b9914b0a9f
Updated the circular_query example
...
-- Made it clearer that choosing epsilon=0 does not mean one get all the points
within a disk
-- Changed the values for center / fuzziness
2017-01-09 15:13:32 +01:00
Mael Rouxel-Labbé
577a335aae
Fixed inequalities in Circular_query.cpp
2017-01-09 14:40:40 +01:00
Mael Rouxel-Labbé
cd89288d46
Revert "Fix a bug in Spatial_searching's fuzzy_iso_box"
...
This reverts commit 5ed7255adb .
2017-01-09 12:14:03 +01:00
Mael Rouxel-Labbé
dcdfc4b95d
Revert "Spatial_searching: bug reported and fixed by Marc Glisse"
...
This reverts commit ed526b8f22 .
2017-01-09 12:14:00 +01:00
Mael Rouxel-Labbé
9491a9a0cf
Revert "Fix a bug in Spatial_searching's fuzzy_sphere"
...
This reverts commit c0cbdab3d8 .
2017-01-09 12:13:12 +01:00
Maxime Gimeno
06dd4a4522
Add a geom-traits concept for distance functions
...
Update the code and the doc accordingly
2016-12-29 07:20:23 +01:00
Marc Glisse
482b0bc073
Store weights of Weighted_Minkowski_distance in an array if dimension is known.
...
This gains 15% on the running time of a real application in 2D.
2016-12-13 00:33:33 +01:00
Marc Glisse
e45cb3961b
Remove undocumented and unused constructor of Weighted_Minkowski_distance.
2016-12-13 00:29:16 +01:00
Marc Glisse
1c4554da08
Remove dead call to resize().
2016-12-12 23:54:58 +01:00
Marc Glisse
f64f7fbf1a
Unused parameter in release mode.
2016-12-12 23:30:52 +01:00
Laurent Rineau
c99f0366a8
Merge remote-tracking branch 'cgal/releases/CGAL-4.9-branch'
2016-12-12 17:47:56 +01:00
Andreas Fabri
ed526b8f22
Spatial_searching: bug reported and fixed by Marc Glisse
2016-12-04 11:26:50 +01:00
Marc Glisse
790ca3f05f
Remove redundant call to std::copy.
2016-11-27 19:07:52 +01:00
Marc Glisse
f7741b1f2b
Confusion between the 2 islower flags. Ordering issue on setting / clearing removed_ flag.
2016-11-25 17:19:03 +01:00
Marc Glisse
7bdb83a4e1
Very minimal test for Kd_tree::remove.
2016-11-25 15:34:18 +01:00
Marc Glisse
d1b461350b
Incomplete renaming in last changes...
2016-11-25 15:29:47 +01:00
Marc Glisse
36af1c17f4
Let remove() take a functor as argument.
2016-10-27 23:17:42 +02:00
Marc Glisse
158c77dc8b
Document invalidate_built.
...
And detail the interactions between insertions and removals.
2016-10-27 22:33:16 +02:00
Sébastien Loriot
96c1d4c45b
remove a non needed requirement from concepts
...
Kernel_traits was needed for the random generator in the examples/tests
2016-10-27 09:41:44 +02:00
Marc Glisse
df573404d0
Merge branch 'Spatial_searching-misc-glisse-old' into Spatial_searching-misc-glisse
2016-10-26 11:12:04 +02:00
Marc Glisse
3038832982
Handle insert-after-remove in Kd_tree.
...
Untested.
2016-10-26 11:02:41 +02:00
Andreas Fabri
64a901a863
Add the documentation for Kd_tree::build() and unify it with AABB_tree::build.
...
The latter was in a Section 'Advanced' (not \cgalAdvanced, just a \heading).
They are now both in the Section `Creation`.
2016-10-13 10:07:48 +02:00
Laurent Rineau
223c1cf5a4
Merge pull request #1530 from lrineau/Installation-compute_dependencies-GF
...
Compute and fix packages dependencies
2016-10-05 13:11:04 +02:00
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
Sébastien Loriot
7e2ee496de
update project name of cmake scripts of tests
2016-09-08 00:26:37 +02:00
Sébastien Loriot
6b338eeb1f
improve the name of projects in cmake scripts of examples
2016-09-08 00:02:55 +02:00
Laurent Rineau
c8ad04550e
Merge pull request #1325 from sgiraudot/Spatial_searching-Fix_misleading_examples-GF
...
Spatial searching: fix misleading typedef in examples
2016-08-29 12:30:04 +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
Jane Tournois
47a5606eea
this commit fixes the following issue :
...
<<The AABB_tree<AT> internally use the spatial searching and in particular instantiates Search_traits_3 with AT. This implies according to that page that the concept AABBTraits must be a Kernel.
A clean solution is adding a new concept in Spatial searching that describes requirements of the template parameter of Search_traits_3. Then we can say that AABBTraits refines this concept. For consistency, we do the same for the template parameter of Search_traits_2.
>>
2016-08-23 16:28:50 +02:00
Simon Giraudot
bd4c94af53
Fix misleading typedef in examples
2016-08-02 12:44:47 +02:00
Clement Jamin
88b86f96f4
Add concept/model relationship
2016-07-29 12:06:01 +02:00
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
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
Sébastien Loriot
f5e96a20ea
add parenthesis
2014-02-24 07:09:13 +01:00
Sébastien Loriot
7451a3a238
fix incorrect name
2014-02-21 15:46:56 +01:00
Sébastien Loriot
0b3c2ae383
fix a documentation bug and add static assertions
...
the class Search_traits_adapter must use only Lvalue_property_map since
it uses the Cartesian_const_iterator from the base class which is usually
simply the pointer on the double in the point. If the point returned by
the property map is a temporaty, the iterator is invalid and its behavior
is undefined
2014-02-21 15:36:40 +01:00
Waqar Khan
b46b37e7b2
reserve_to_capacity() method for Kd_tree.h that pre-allocated memory for points added. New Snap_rounding example added where the input data is taken from a file. Snap_rounding_kd_2.h modified to use the reserve_to_capacity method before creating the kd_tree. This improves the running time.
2014-02-18 01:41:44 +01:00
Sébastien Loriot
0fa2cacb60
remove doc_tex documentation (including developer manual) and old manual tools
2013-12-03 17:27:02 +01:00
Laurent Rineau
67a3824cec
Change permissions of files created by Andreas
2013-10-04 16:57:11 +02:00
Andreas Fabri
6c547e5663
Mainly added includes
2013-09-13 22:24:30 +02:00
Andreas Fabri
60ebed5255
Passing to Simple_cartesian makes it 30% faster
...
Seeding random makes it reproducible
2013-08-27 09:28:10 +02:00