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

377 Commits

Author SHA1 Message Date
Sébastien Loriot 0779373835 extra run of the script to remove tabs and trailing whitespaces 
right after the  merge of 4.14 release branch

+ manual fix on one line in:
    * Arrangement_on_surface_2/include/CGAL/IO/Arr_text_formatter.h
    * .travis/generate_travis.sh
 2020-03-26 14:16:06 +01:00
Sébastien Loriot 590612a563 run the script to remove tabs and trailing whitespaces 2020-03-26 13:25:16 +01:00
Simon Giraudot 023085af41 Fix misused iterator 2020-03-25 15:36:58 +01:00
Simon Giraudot 929e1e4bce Fix "may be used uninitialized" warning 2020-03-24 16:05:44 +01:00
Simon Giraudot 0b1d13e815 Fix conversion warning 2020-03-23 09:49:17 +01:00
Simon Giraudot 37a6a4360f Fix warnings 2020-03-19 15:50:22 +01:00
Simon Giraudot 9ab9081038 Use emplace_back() 2020-03-16 10:46:30 +01:00
Simon Giraudot e716d902cf Remove now useless workaround 2020-03-05 14:15:09 +01:00
Simon Giraudot bd1c509531 Clean garbage 2020-03-05 13:40:52 +01:00
Simon Giraudot 2818986299 Fix kd tree node 2020-03-05 10:06:07 +01:00
Simon Giraudot 0661542fd2 Some notes about parallelism in KD Tree 2020-03-04 16:21:14 +01:00
Simon Giraudot fac53dc3c8 Remove useless boolean 2020-03-04 16:20:49 +01:00
Simon Giraudot 6e629a9478 First version of parallel Kd_tree:build() 2020-03-04 11:05:56 +01:00
Laurent Rineau ad30f5f440 Fix license header 2019-12-03 19:25:51 +01:00
Laurent Rineau 65cde3ce79
Merge branch 'master' into Faster_dd_spatial_searching-cjamin 2019-12-03 19:18:15 +01:00
Simon Giraudot c43c6ac2fa Merge remote-tracking branch 'clement/Faster_dd_spatial_searching-cjamin' into Faster_dd_spatial_searching-cjamin 2019-10-22 13:21:53 +02:00
Simon Giraudot 54aef42f2d Fix warning 2019-10-22 13:03:35 +02:00
Simon Giraudot 89554f6063 Fix outputiterator return missing 2019-10-22 12:56:36 +02:00
Sébastien Loriot 254d60f642 First pass on removing license notice in header for GPL files 2019-10-19 15:23:19 +02:00
Sébastien Loriot 7356421d80 introduce Commercial license SPDX tag 2019-10-19 12:15:19 +02:00
Sébastien Loriot 9bd9c68b83 update LGPL[23]+ and GPL[23]+ SPDX tags 
ack -l --no-svg "SPDX-License-Identifier: GPL-3.0\+" | xargs sed -i "s/SPDX-License-Identifier: GPL-3.0+/SPDX-License-Identifier: GPL-3.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-3.0\+" | xargs sed -i "s/SPDX-License-Identifier: LGPL-3.0+/SPDX-License-Identifier: LGPL-3.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: GPL-2.0\+" | xargs sed -i "s/SPDX-License-Identifier: GPL-2.0+/SPDX-License-Identifier: GPL-2.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-2.0\+" | xargs sed -i "s/SPDX-License-Identifier: LGPL-2.0+/SPDX-License-Identifier: LGPL-2.0-or-later/"
 2019-10-18 21:57:54 +02:00
Simon Giraudot d930cbce64 Fix no_lvalue Search_traits_adapter 2019-10-15 13:52:17 +02:00
Simon Giraudot 027de166f4 Make it possible for Search_traits_adapter to work without lvalue point map 2019-08-26 15:42:24 +02:00
Simon Giraudot 9b02d9d426 Fix warnings 2019-07-04 13:25:56 +02:00
Simon Giraudot b2e723b548 Merge branch 'Faster_dd_spatial_searching-cjamin-backup' into Faster_dd_spatial_searching-cjamin 2019-07-04 13:17:50 +02:00
Andreas Fabri e2d19b0c8d Replace NULL and Nullptr_t with nullptr and nullptr_t 2019-06-04 23:45:44 +02:00
Sébastien Loriot 124012d9f9 replace cpp11::array by std::array 2019-03-29 13:28:33 +01:00
Sébastien Loriot f62624c4f9 replace cpp11::tuple by std::tuple 2019-03-29 13:28:33 +01:00
Laurent Rineau f83053c2a5 Merge pull request #3602 from afabri/CGAL-VC2017_AVX_workarounds-GF 
Fix for VC2017 with /arch:AVX
 2019-01-22 09:14:57 +01:00
Andreas Fabri 0fe3ed828e Fix for VC2017 with /arch=AVX 2019-01-17 14:42:26 +01:00
Sébastien Loriot 5a2857d451 fix maybe uninitialized warning 
triggered by target Orthogonal_incremental_neighbor_search
 2018-12-06 09:23:26 +01:00
Laurent Rineau 5ec1b841b7 Merge pull request #3170 from MaelRL/CGAL-Fix_some_STL_extension_namespaces-GF 
STL_Extension: move CGAL::iterator and CGAL::unary/binary functions to CGAL::cpp98::
 2018-06-20 17:21:01 +02:00
Mael Rouxel-Labbé 26c857a431 Moved unary/binary_function to CGAL::cpp98 2018-06-13 15:58:19 +02:00
Laurent Rineau 796d1bdcb6 Merge pull request #3142 from sgiraudot/Spatial_searching-Fix_disable_if-GF 
Spatial Searching: bugfix disable_if
 2018-06-12 16:38:20 +02:00
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 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é 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é 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é 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
Sébastien Loriot 483f69728e Refresh branch 2018-02-12 22:21:38 +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
Clement Jamin 5806c25460 Specify 4th template argument for Kd_tree 2017-11-24 15:35:14 +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 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
Clement Jamin bc5a5c2265 Fix code so that it compiles on Linux 2017-11-16 16:46:05 +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
Sébastien Loriot b352c90b11 add missing include directive for license checking 2017-10-20 22:34:07 +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 9e2a551ad7 Use cache (if available) in search_any_point 2017-10-18 11:04:00 +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
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
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 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
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é 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 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 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
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
Marc Glisse a1c231737b Rewrite to handle points on the boundary that may be on either side. 2016-08-25 19:39:58 +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 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
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 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
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
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
Andreas Fabri e7d3bd96f2 Remove Kd_tree_d_new.h 2015-12-31 16:47:20 +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 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 69468219e4 update include of enable_if to location compatible with older versions of boost 2015-10-02 11:02:09 +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