Commit Graph

57280 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 6d21677bfb Merge branch 'Spatial_searching-final_acceleration-gf' of ssh://scm.cgal.org/var/git/cgal-gsoc into Spatial_searching-final_acceleration-gf 2014-11-28 10:44:44 +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 30263c4fbf Merge remote-tracking branch 'origin/Scripts-fix_on_Windows-lrineau' into Spatial_searching-final_acceleration-gf 2014-11-27 16:20:53 +01:00
Laurent Rineau 9da107f450 workaround for Cygwin 2014-11-27 16:03:46 +01:00
m.overtheil 71a80152f0 Merge branch 'Spatial_searching-final_acceleration-gf' of ssh://scm.cgal.org/var/git/cgal-gsoc into Spatial_searching-final_acceleration-gf
Conflicts:
	Spatial_searching/include/CGAL/Kd_tree_node.h
	Spatial_searching/include/CGAL/Orthogonal_k_neighbor_search.h
2014-11-27 15:49: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 4cccc4805c 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:08:41 +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
Sébastien Loriot f822c6516c rename a variable to avoid confusion
trivial bugfix for master
2014-11-12 15:58:28 +01:00
Sébastien Loriot 87d32b2829 doc bug-fix
missing a function
2014-11-12 10:31:02 +01:00
Guillaume Damiand 32306a04a6 Merge branch 'CMap-remove_warnings-gdamiand'
Tested in CGAL-4.6-I-51. Approved by the Release Manager.
2014-11-10 15:45:53 +01:00
Laurent Rineau 9796930299 Fix the font weight for links long descriptions prototypes 2014-11-10 14:52:18 +01:00
Guillaume Damiand aee0038113 Merge branch 'CMap-remove_warnings-lrineau' into CMap-remove_warnings-gdamiand 2014-11-07 19:10:18 +01:00
Laurent Rineau d63a998759 Attempt to remove more warnings 2014-11-07 18:54:59 +01:00
Guillaume Damiand 8eddea1e5b Add some CGAL_assume functions in functions manipulating marks in combinatorial map class. 2014-11-07 16:42:32 +01:00
Laurent Rineau 94803a6a96 Implement export to SVG for the CDT_2 demo 2014-11-07 16:09:09 +01:00
Laurent Rineau 2d72cd7f7e Merge branch 'Mesh_3-fix_includes-lrineau'
Fix missing/surperflous #include

Tested in CGAL-4.6-Ic-50.
Approved by the Release Manager.
2014-11-06 11:59:26 +01:00
Laurent Rineau 768ec1d687 Merge branch 'Polyhedron_demo-fix_warning-lrineau'
Fix warnings in the Polyhedron demo. The fixes are in Mesh_3,
Min_sphere_or_spheres_d, and in the Polyhedron demo itself.

Tested in CGAL-4.6-Ic-50.
Approved by the Release Manager.
2014-11-06 11:58:09 +01:00
Laurent Rineau 7d63f9d072 Merge branch 'releases/CGAL-4.5-branch'
Conflicts:
	Installation/changes.html
	Maintenance/release_building/public_release_name
2014-11-06 10:47:45 +01:00
Laurent Rineau e50820d3fd Fix #include in Mesh_3
There was missing #include, and surperfuous #include (hard to detect).
2014-11-05 17:01:28 +01:00
Laurent Rineau 1a6859e18d New scripts, to collect data for the demos installer 2014-11-05 16:09:42 +01:00
Laurent Rineau e9f9b4d300 Minor improvements 2014-11-05 15:16:09 +01:00
Laurent Rineau 43a6d033ac Remove the demo of Circular_kernel_3 2014-11-04 16:12:48 +01:00
m.overtheil d598526bfe added dimension template argument to doc 2014-11-04 15:59:56 +01:00
Laurent Rineau 0288c847ca Fix a warning
include/CGAL/Min_sphere_of_spheres_d/Min_sphere_of_spheres_d_support_set_impl.h:49: warning: comparison between signed and unsigned integer expressions
2014-11-04 12:45:35 +01:00
Laurent Rineau bb0f45bac4 Mesh_3 and Polyhedron_3 demos have plugins in subdirs 2014-11-03 17:25:17 +01:00
Laurent Rineau 4a8d9077c0 Fix a warning
Warning from clang:

Mesh_3/include/CGAL/Mesh_3/C3T3_helpers.h:1358:25: warning: comparison of unsigned expression >= 0 is always true [-Wtautological-compare]
2014-11-03 16:52:51 +01:00