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

691 Commits

Author SHA1 Message Date
Laurent Rineau c8009c7250 Merge pull request #3142 from sgiraudot/Spatial_searching-Fix_disable_if-GF 
Spatial Searching: bugfix disable_if
 2018-06-12 16:32:18 +02:00
Simon Giraudot 45afed121c Include enable_if.hpp header 2018-06-06 08:15:54 +02:00
Simon Giraudot e5ff062052 Remove extra semicolon 2018-06-04 10:48:08 +02:00
Simon Giraudot ff5120e296 Add test of Search traits adapter with Identity map 2018-06-04 10:36:13 +02:00
Simon Giraudot 7b0c4e087b Bugfix: make disable_if work using template and add it to Search_traits_adapter 2018-06-04 10:03:30 +02:00
Laurent Rineau 2596a302c0 Merge pull request #2954 from MaelRL/Spatial_searching-Fix_fuziness_doc-GF 
Spatial searching: rework fuzzy items

# Conflicts:
#	Spatial_searching/test/Spatial_searching/Point_with_info.h
 2018-06-01 17:24:02 +02:00
Laurent Rineau 5dee4b4819 Merge pull request #2954 from MaelRL/Spatial_searching-Fix_fuziness_doc-GF 
Spatial searching: rework fuzzy items

# Conflicts:
#	Spatial_searching/test/Spatial_searching/Point_with_info.h
 2018-06-01 17:22:10 +02:00
Mael Rouxel-Labbé aa95bed59b Added guard object 'Set_ieee_double_precision' 
Fixes issues on 32-bit platforms, see:
https://github.com/CGAL/cgal/pull/2954#issuecomment-384974067
 2018-05-28 17:16:42 +02:00
Mael Rouxel-Labbé d1803dcae7 Fixed random seed propagation (bis) 2018-05-28 17:12:44 +02:00
Mael Rouxel-Labbé 58ff986724 Removed trailing whitespace 2018-05-25 11:36:10 +02:00
Mael Rouxel-Labbé a927fd17cb Fixed includes 2018-05-25 11:36:00 +02:00
Mael Rouxel-Labbé 182e7669c6 Properly propagate the random seed 2018-05-16 10:40:34 +02:00
Mael Rouxel-Labbé 1e8f8ab358 Fixed constructing field type from non-int variables 2018-05-16 10:38:47 +02:00
Mael Rouxel-Labbé a0a6afeaca Fixed warning (?) 
My kingdom for readable Windows compilation messages
 2018-05-16 10:38:47 +02:00
Mael Rouxel-Labbé 40d1550d65 'if' into 'else if' since min_coord(i) <= max_coord(i) 2018-04-19 15:59:21 +02:00
Mael Rouxel-Labbé e3ec3759a6 Fixed warning 2018-04-19 14:17:20 +02:00
Mael Rouxel-Labbé aad08c6c49 Improved class documentation of fuzzy models 2018-04-19 14:16:49 +02:00
Mael Rouxel-Labbé 6897cdea85 Do not use an inner approx if 'eps > r' 2018-04-19 14:16:12 +02:00
Mael Rouxel-Labbé 15d925710e Readability changes 2018-04-19 14:15:56 +02:00
Mael Rouxel-Labbé 7b510962f0 Use CGAL::square 2018-04-19 14:14:43 +02:00
Mael Rouxel-Labbé 05ebc4f7ca Improved tests: always add random points on inner/outer approximation boundaries 2018-03-23 22:46:31 +01:00
Mael Rouxel-Labbé e9682de0bf Fixed typo 2018-03-23 17:36:23 +01:00
Mael Rouxel-Labbé 68a9f9c98f Fixed boost include 2018-03-23 17:08:06 +01:00
Mael Rouxel-Labbé eb32927352 Improved tests of Fuzzy sphere and iso box 2018-03-23 17:07:54 +01:00
Mael Rouxel-Labbé 65be29442b Reworked Fuzzy_sphere 
Same as a6f52ffc31

- Also fixed the way eps > r is handled
- Cached the inner and outer squared radius instead of recomputing every time
 2018-03-23 17:06:08 +01:00
Mael Rouxel-Labbé a6f52ffc31 Reworked Fuzzy_iso_box 
- points on the boundary of the inner approximation are always reported
- points on the boundary of the outer approximation may or may not be reported
 2018-03-23 17:03:17 +01:00
Mael Rouxel-Labbé 437aa0df3e Minor readability change 2018-03-23 17:02:46 +01:00
Mael Rouxel-Labbé d0381a9429 Changed how query points are returned in fuzzy items (doc) 
- points on the boundary of the inner approximation are always returned
- points on the boundary of the outer approximation may or may not be returned
 2018-03-23 17:02:35 +01:00
Laurent Rineau 0a74393dcf Commit all new dependencies files 2018-03-06 18:44:48 +01:00
Laurent Rineau 78e7060525 Merge pull request #2712 from afabri/CGAL-VC+warnlevel_4-GF 
Deal with VC++ warnings of level /W4
 2018-02-19 14:27:06 +01:00
Sébastien Loriot 483f69728e Refresh branch 2018-02-12 22:21:38 +01:00
Maxime Gimeno 688b5dd06e Move dependencies creation to package_info and add dependencies to git 2018-02-02 12:08:05 +01:00
Maxime Gimeno 8bde832931 Fix METIS headers in BGL 2018-02-02 12:08:05 +01:00
Maxime Gimeno a676d5a60e Try to fix errors in classification checks 2018-02-02 12:08:05 +01:00
Maxime Gimeno acd0a72edf Modify travis script to test dependencies 2018-02-02 12:08:05 +01:00
Maxime Gimeno ae36b452bc Add dependencies of all packages 2018-02-02 12:08:05 +01:00
Simon Giraudot 6269309d86 Use CGAL include for boost counting/transform iterators everywhere 2018-01-23 11:09:52 +01:00
Andreas Fabri f76e744bff Spatial_searching 2018-01-17 20:12:06 +00:00
Andreas Fabri fb51a69c7c Mesh_2 2018-01-17 16:50:21 +00:00
Marc Glisse e2bb2b383b
Merge branch 'master' into Faster_dd_spatial_searching-cjamin 2017-12-07 15:26:46 +01:00
Laurent Rineau 0724771416 Merge pull request #2632 from mglisse/Spatial_searching-search_any-glisse 
Kd_tree::search_any_point: don't check outer_range_contains
 2017-12-05 18:25:21 +01:00
Clement Jamin 5806c25460 Specify 4th template argument for Kd_tree 2017-11-24 15:35:14 +01:00
Clement Jamin 323b403347 Update doc 2017-11-24 15:34:25 +01:00
Clement Jamin 3b6364b5cc Merge branch 'Faster_dd_spatial_searching-cjamin' of github.com:cjamin/cgal into Faster_dd_spatial_searching-cjamin 2017-11-22 11:32:12 +01:00
Clement Jamin 06b18208e8 Specify 4th template argument for Kd_tree + doc 2017-11-22 11:31:58 +01:00
Sébastien Loriot 04aa045706 add missing identifiers 2017-11-21 13:41:58 +01:00
Marc Glisse 076c3b6ac1 Only check the result if we have computed a result. 2017-11-21 00:02:44 +01:00
Marc Glisse 2df3c40fd7 Don't test outer_range_contains in search_any_point. 
That just slows it down. The test makes much more sense in search(),
which reports all points.
 2017-11-20 23:13:47 +01:00
Clement Jamin 7d69e65cef Fix indentation 2017-11-20 10:56:47 +01:00
Clement Jamin be5870e269 Clean-up debug code 2017-11-20 10:55:19 +01:00
Clement Jamin 86dfc07ac1 Missing Point_d in user-defined distance (see concept) 2017-11-20 10:49:10 +01:00
Clement Jamin 8d71d73dc8 Merge remote-tracking branch 'remotes/cgal/master' into Faster_dd_spatial_searching-cjamin 2017-11-17 10:41:54 +01:00
Clement Jamin 005f770ef6 Missing typename 2017-11-16 19:01:56 +01:00
Clement Jamin 7954d37086 Useless typename 2017-11-16 18:57:20 +01:00
Clement Jamin 319d2d614c Fix compilation continued 2017-11-16 18:48:00 +01:00
Sébastien Loriot 8b72eacb8b use a uniform name for TODO files 2017-11-16 17:10:05 +01:00
Clement Jamin bc5a5c2265 Fix code so that it compiles on Linux 2017-11-16 16:46:05 +01:00
Laurent Rineau a9365554c9 Merge pull request #2550 from sloriot/CGAL-add_SPDX_tags 
Add SPDX License Identifier
 2017-11-15 16:48:27 +01:00
Laurent Rineau 3ff09bc549 Merge pull request #2580 from lrineau/CGAL-Support_CMake_3.10-GF 
Renew the handle of policies, for CMake-3.10
 2017-11-15 16:47:42 +01:00
Clement Jamin 5e6bb38fff Doc: use "Cartesian coordinates" instead of just "coordinates" 2017-11-15 14:09:16 +01:00
Clement Jamin 63af2a0b73 Fix: inappropriate typename 2017-11-14 11:02:48 +01:00
Sébastien Loriot ee57fc2d6c add SPDX identifier for files under the GPL-3+ license 2017-11-12 10:17:51 +01:00
Clement Jamin 204efcc3f9 Clarify doc 2017-11-10 11:43:11 +01:00
Laurent Rineau 62c70d41ca Renew the handle of policies, for CMake-3.10 
Now that we require CMake>=3.1, we can forget a lot of old CMake policies.

`CMP0053` `OLD` behavior is still needed, because of a bug in Qt5 CMake files, but it will
not be set with CMake>=3.10. Let's assume that a recent CMake version means
a recent Qt5 version.
 2017-11-06 14:58:36 +01:00
Clement Jamin 9f3df944af Fix already-existing bugs in the doc 2017-10-24 14:40:08 +02:00
Sébastien Loriot b352c90b11 add missing include directive for license checking 2017-10-20 22:34:07 +02:00
Clement Jamin 878905ac08 Improved doc 2017-10-20 15:11:22 +02:00
Clement Jamin 4a04579996 Document changes to Euclidean_distance + minor fixes 2017-10-20 11:52:31 +02:00
Clement Jamin e61e724312 Missing include + fix initialization order 2017-10-18 15:44:07 +02:00
Clement Jamin 1978b63fd9 Optimize (cache+interruptible) non-orthogonal nearest/furthest neighbor search 2017-10-18 15:43:22 +02:00
Clement Jamin 685d8b043e Document the option to enable a cache + interruptible distance computation 2017-10-18 11:11:55 +02:00
Clement Jamin 9e2a551ad7 Use cache (if available) in search_any_point 2017-10-18 11:04:00 +02:00
Laurent Rineau 8f46324806 Merge pull request #2475 from sgiraudot/Fix_counting_iterator_warning_everywhere-GF 
Fix counting iterator warnings
 2017-10-11 19:15:15 +02:00
Clement Jamin ae1f89b4d3 Optimize "search" (all points in ball) when using cache 2017-10-11 10:23:31 +02:00
Laurent Rineau 7e9f756935 Replace all std::unary_function by CGAL::unary_function 2017-10-04 15:57:09 +02:00
Simon Giraudot 1e7b9ea027 Fix counting iterator warnings 2017-09-29 14:47:17 +02:00
Clement Jamin f0a89af33b Merge branch 'Faster_dd_spatial_searching-cjamin-old' into Faster_dd_spatial_searching-cjamin 2017-09-15 11:11:28 +02:00
Clement Jamin 1f11dfa004 Use cache when computing furthest neighbors (incremental seach) 2017-09-08 18:34:36 +02:00
Clement Jamin 2f305ec10f Use cache when computing furthest neighbors 2017-09-08 17:37:09 +02:00
Clement Jamin 82b1ebb063 Clean-up code 2017-06-27 17:59:21 +02:00
Clement Jamin 0de1362e09 Use cache if available for NEAREST neighbor search 2017-06-21 00:34:02 +02:00
Clement Jamin 1cfab77634 Rename header file 2017-06-20 19:52:09 +02:00
Clement Jamin 17a683484f Move some code to Distance_helper.h + copyright + bug fix 2017-06-20 19:47:26 +02:00
Clement Jamin b5e948be92 FT is supposed to be public 2017-06-20 19:46:40 +02:00
Clement Jamin d1659e0315 More minor code improvements 2017-06-20 15:13:02 +02:00
Clement Jamin 4cabf30131 Shorten typedefs 2017-06-20 15:09:55 +02:00
Clement Jamin 33e188dac1 Fix bad merge 2017-06-19 16:46:23 +02:00
Clement Jamin 5b9562ea84 Merge branch 'Triangulation-add_regular_tri-cjamin_mglisse-old' into Triangulation-add_regular_tri-cjamin_mglisse 2017-06-16 11:09:07 +02:00
Clement Jamin a801221193 Remove the use of numeric_limits + fix typo + better interruptible version 2017-06-13 17:07:20 +02:00
Laurent Rineau e1faace25b Merge pull request #2091 from mglisse/Spatial_searching-misc-glisse 
kd-tree removal + misc improvements
 2017-05-29 11:17:14 +02:00
Clement Jamin 069ab04c7e Add comment 2017-05-22 16:42:07 +02:00
Clement Jamin 5e662a03db Fix the way we detect the cache 2017-05-22 16:23:58 +02:00
Marc Glisse 54f2b91d6c Fix printing of empty Kd_tree. 2017-05-22 11:51:52 +02:00
Clement Jamin e9c35e3861 Allow to enable/disable cache of points 2017-05-19 16:06:02 +02:00
Clement Jamin 26ee6b1a10 Auto-detect if the distance functor has some member functions: 
transformed_distance_from_coordinates
interruptable_transformed_distance
 2017-05-09 17:01:05 +02:00
Clement Jamin a6c1dfc7a1 Rename the recently-added distance functions 2017-05-09 16:50:24 +02:00
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