Commit Graph

1652 Commits

Author SHA1 Message Date
Simon Giraudot 89285f1feb Merge remote-tracking branch 'mine/CMake-Third_party_imported_targets-GF' into CMake-Third_party_imported_targets-GF 2020-05-28 08:53:17 +02:00
Mael Rouxel-Labbé 580a1efd5c Remove trailing whitespace / tabs 2020-05-22 15:31:50 +02:00
Mael Rouxel-Labbé fb8463f470 Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-05-22 15:17:56 +02:00
Sébastien Loriot 47bcce0a1c fix warning 2020-05-18 15:55:20 +02:00
Simon Giraudot eb34b655fa Fix outlier removal output 2020-05-18 13:53:12 +02:00
Simon Giraudot 79dbfbf14e Update doc of remove_outliers 2020-05-18 13:53:12 +02:00
Simon Giraudot 1772709b94 Update remove_outliers with new API 2020-05-18 13:53:11 +02:00
Simon Giraudot 82479e780b Better remove outliers using partition and nth_element 2020-05-18 13:53:11 +02:00
Simon Giraudot b44c9917e4 WIP: enhance remove outliers 2020-05-18 13:53:11 +02:00
Maxime Gimeno 20898e4b31 fix functions calls 2020-05-14 13:46:57 +02:00
Maxime Gimeno e81a41f9d7 Fix doc 2020-05-13 15:20:28 +02:00
Maxime Gimeno d6812d9561 Fixes for 3MF and OFF 2020-05-13 10:49:25 +02:00
Mael Rouxel-Labbé 038869cab9 Merge remote-tracking branch 'cgal/master' into CGAL-Improve_NP_doc_presentation-GF 2020-05-12 15:12:21 +02:00
Maxime Gimeno 034297db86 Finish I/O for point_sets 2020-05-12 11:19:47 +02:00
Maxime Gimeno b75130c839 WIP write point_set 2020-05-11 16:04:48 +02:00
Maxime Gimeno 03487c4ce5 WIP Point_set 2020-05-11 14:12:14 +02:00
Simon Giraudot fefdd13f45 Merge remote-tracking branch 'mine/PSP-Cluster_points-GF' into PSP-Cluster_points-GF 2020-05-06 08:59:40 +02:00
Maxime Gimeno 3a9b501612 WIP fixing doc 2020-05-04 16:56:03 +02:00
Maxime Gimeno e6c3f9655f Some fixes 2020-04-30 17:19:46 +02:00
Maxime Gimeno 049439fa6b Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-04-30 16:47:58 +02:00
Sébastien Loriot 3b6c100ca6 Merge remote-tracking branch 'cgal/releases/CGAL-5.0-branch' 2020-04-29 14:12:29 +02:00
Sébastien Loriot 67b53faece Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch' 2020-04-29 14:06:37 +02:00
Simon Giraudot 428e47ebb6 Fix bbox initialization 2020-04-23 13:26:16 +02:00
Simon Giraudot 8ff4f7793d Use std::size_t to avoid integer overflow 2020-04-23 13:26:03 +02:00
Simon Giraudot 1dd6a665a1 Merge remote-tracking branch 'mine/CMake-Third_party_imported_targets-GF' into CMake-Third_party_imported_targets-GF 2020-04-20 09:09:32 +02:00
Simon Giraudot 90ad2cb613 Fix warnings and trailing whitespaces 2020-04-20 08:50:44 +02:00
Sébastien Loriot c253679b2d unify np sentence 2020-04-18 16:27:58 +02:00
Sébastien Loriot 3b52dfd7de Merge remote-tracking branch 'cgal/master' 2020-04-18 14:47:28 +02:00
Maxime Gimeno ba86b13ac9 Massive addition of enable/disable_ifs 2020-04-17 16:05:43 +02:00
Mael Rouxel-Labbé d6cf97278f Fix trailing whitespace 2020-04-17 09:22:57 +02:00
Mael Rouxel-Labbé 0e025c588a Fix unused typedef warning 2020-04-17 09:22:45 +02:00
Mael 4c78812c02
Fix clustering example not requiring Eigen in the CMakeLists.txt 2020-04-16 19:39:06 +02:00
Mael 73ea825b07
Fix unused warning 2020-04-16 19:37:22 +02:00
Mael cc0420a658
Fix namespace 2020-04-16 19:14:11 +02:00
Sebastien Loriot 98fafe4ef1
Merge pull request #4514 from MaelRL/CGAL-Fix_warnings-GF
Fix (some) testuite warnings
2020-04-16 18:15:11 +02:00
Simon Giraudot 60cb33fa31 Merge remote-tracking branch 'mine/PSP-Cluster_points-GF' into PSP-Cluster_points-GF 2020-04-16 17:02:19 +02:00
Simon Giraudot 421096fd7f Use imported targets everywhere 2020-04-15 14:06:13 +02:00
Simon Giraudot 41519e3010 Proposal for imported targets 2020-04-15 14:05:18 +02:00
Mael Rouxel-Labbé 48bd92b4dd Proof read all NP changes 2020-04-13 13:03:05 +02:00
Mael Rouxel-Labbé 2337716bcd Merge remote-tracking branch 'cgal/master' into CGAL-Improve_NP_doc_presentation-GF 2020-04-12 20:46:35 +02:00
Simon Giraudot 42edead686 Fix text and trailing whitespaces 2020-04-08 10:28:22 +02:00
Simon Giraudot 5828c759f9 Remove unused typedef 2020-04-07 09:12:17 +02:00
Simon Giraudot cecc0debe3 Fix missing include 2020-04-07 09:11:25 +02:00
Simon Giraudot a6d800ae5e Fix jet smoothing 2020-04-06 13:40:47 +02:00
Mael Rouxel-Labbé 80f6f659f3 Update to new named parameters macros 2020-04-05 17:56:50 +02:00
Mael Rouxel-Labbé 16092f53d6 Update doc about NPs 2020-04-05 17:56:11 +02:00
Mael Rouxel-Labbé fc79510388 Regroup NP aliases into the base doxyfile.in 2020-04-04 17:26:32 +02:00
Mael Rouxel-Labbé a1b0abfb08 Merge remote-tracking branch 'cgal/master' into CGAL-Improve_NP_doc_presentation-GF 2020-04-04 15:40:38 +02:00
Sebastien Loriot 3bca04d1f9
Merge pull request #4552 from sgiraudot/PSP-No_copy_for_kdtree-GF
[Point Set Processing] Big factorization + cleanup
2020-04-02 14:12:59 +02:00
Maxime Gimeno abc623d5a8 clean-up 2020-04-01 15:03:43 +02:00
Maxime Gimeno 69a2a23cc6 rename IO functions in point_set packages 2020-04-01 14:33:14 +02:00
Simon Giraudot a3a16a93db Correct figures that were swapped 2020-03-31 14:48:44 +02:00
Mael Rouxel-Labbé e7d52999a8 Update PMP NPs to new macros 2020-03-29 17:16:50 +02:00
Maxime Gimeno 4e6fb685c6 Merge remote-tracking branch 'mine/CGAL_IO-maxGimeno' into HEAD 2020-03-27 11:11:10 +01:00
Maxime Gimeno 9c0648a004 Merge tag 'master_before_no_tws_nor_tabs' into CGAL_IO-maxGimeno 2020-03-27 11:05:43 +01:00
Sébastien Loriot 2e180ac589 extra run of the script to remove tabs and trailing whitespaces 2020-03-26 19:29:44 +01:00
Sébastien Loriot a0345b135c Update branch from master after trailing whitespaces and tabs removal 2020-03-26 19:29:05 +01:00
Sébastien Loriot 38789af55d Update branch from master after trailing whitespaces and tabs removal 2020-03-26 19:25:47 +01:00
Sébastien Loriot 8bb22d5b2c extra run of the script to remove tabs and trailing whitespaces
right after the merge of the 5.0 release branch

+ manual fix of the files (indentation was changed in the meantime):
   * Spatial_sorting/include/CGAL/Multiscale_sort.h
   * Spatial_sorting/test/Spatial_sorting/test_multiscale.cpp
2020-03-26 14:26:59 +01:00
Sébastien Loriot 8b153fb495 Merge branch 'cgal/releases/CGAL-5.0-branch'
whitespace+tab removal, merged with option -Xignore-space-change
2020-03-26 14:22:32 +01:00
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 0a46621dc6 Merge branch 'cgal/releases/CGAL-4.14-branch'
whitespace+tab removal, merged with option -Xignore-all-space
2020-03-26 13:28:46 +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 70f3ac32ef Fix files not compiled by doxygen 2020-03-23 13:23:25 +01:00
Simon Giraudot 320876ab23 Replace exception by return value to stop for_each loops 2020-03-23 08:29:08 +01:00
Sébastien Loriot 2a13c8cbec Update from master 2020-03-20 09:05:58 +01:00
Sébastien Loriot eb5d1d9a95 Update from master 2020-03-20 08:58:52 +01:00
Simon Giraudot de64512f5c Fix mistake introduced in header 2020-03-18 16:33:40 +01:00
Simon Giraudot 8d9dac02ea Fix many warnings 2020-03-18 16:20:54 +01:00
Simon Giraudot 8423de8b95 Slightly modify algo/structures to accept 2D points as well 2020-03-18 14:57:53 +01:00
Simon Giraudot 49674688dc Fix unused typedefs 2020-03-18 14:03:31 +01:00
Simon Giraudot 61b51605b2 Fix sequential callback wrapper 2020-03-18 09:06:09 +01:00
Simon Giraudot a27ab3aa66 Fix unused variable 2020-03-18 09:05:57 +01:00
Simon Giraudot 34185bbae1 Fix warnings 2020-03-18 08:30:57 +01:00
Mael Rouxel-Labbé 618a72b739 Merge remote-tracking branch 'cgal/master' into PMP-soup_to_mesh_add_vpm 2020-03-17 20:00:31 +01:00
Simon Giraudot 0e67264624 Update from review 2020-03-17 12:04:44 +01:00
Simon Giraudot 88e3fd4731 Remove garbage cerr 2020-03-17 12:04:44 +01:00
Simon Giraudot b1966323e4 Do not fallback on k=3 if sphere is empty for clustering 2020-03-17 12:04:44 +01:00
Simon Giraudot c4e62d70e8 Remove K parameter and update doc from reviews 2020-03-17 12:04:44 +01:00
Simon Giraudot 80e8283706 Fix errors 2020-03-17 12:04:44 +01:00
Simon Giraudot 7cba1cc1aa Document cluster_point_set() 2020-03-17 12:04:44 +01:00
Simon Giraudot 2bfac0bc86 Reference manual for cluster_point_set() 2020-03-17 12:04:44 +01:00
Simon Giraudot 74070d3356 First version of clustering algorithm 2020-03-17 12:04:44 +01:00
Simon Giraudot 6b2242356d Fix uninitialized variable 2020-03-17 12:03:58 +01:00
Mael Rouxel-Labbé 30d4754a04 Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-03-17 09:03:12 +01:00
Simon Giraudot 0fe2ee40e8 Fix outdated precondition 2020-03-12 10:27:59 +01:00
Simon Giraudot feaa8ce598 Merge remote-tracking branch 'necip/gsoc2019-pointmatcher_icp_wrapper-necipfazil' into gsoc2019-pointmatcher_icp_wrapper-necipfazil 2020-03-05 15:58:17 +01:00
Simon Giraudot 1067694059 Fix some errors 2020-03-05 11:44:45 +01:00
Simon Giraudot 74151aea0f Fix constness error 2020-03-05 10:01:01 +01:00
Simon Giraudot 90f7d81291 Fix callback wrapper if no callback provided 2020-03-02 16:11:55 +01:00
Simon Giraudot fb3ed79148 Add missing file 2020-03-02 13:26:23 +01:00
Simon Giraudot 50ae0aeba4 Replace Parallel_callback by Callback_wrapper + cleaning/improvements of factorized KD Tree 2020-03-02 12:24:40 +01:00
Mael Rouxel-Labbé 26463ded7a Update NPs using default constructed default values to new API
+ misc cleaning
2020-02-28 11:55:17 +01:00
Simon Giraudot fe4b69aec8 Factorize KD-tree calls in PSP + replace TBB functors by lambdas + some cleaning 2020-02-27 15:08:44 +01:00
Mael Rouxel-Labbé 98f3878c4d Move some PSP_3::GetPointMap to CGAL:: namespace 2020-02-20 11:12:15 +01:00
Mael Rouxel-Labbé 3a968a3433 Move GetPointMap to CGAL:: namespace (from CGAL::PSP_3)
Since it'll also be used in PMP
2020-02-19 17:47:43 +01:00
Simon Giraudot 059ed45064 Avoid polluting testing if OpenGR/pointmatcher missing 2020-02-13 09:43:19 +01:00
Mael Rouxel-Labbé 8d8dbb1c0b Fix warnings about checking that an unsigned int is positive 2020-02-10 18:17:40 +01:00
Simon Giraudot 66ebb5a7d6 Fix missing Eigen dep in targets 2020-02-10 11:57:57 +01:00
Simon Giraudot 6c8fd43ebb Use CGAL_target_use_* mechanism for Eigen, LASLIB, OpenCV, TensorFlow, GLPK, SCIP, Boost IOStreams and Serialization 2020-02-10 11:57:56 +01:00
Laurent Rineau 0fd7bbc4ff Merge pull request #4364 from afabri/CGAL-Parallel_if_available_tag
CGAL:: Add Parallel_if_available_tag
2020-02-07 16:25:03 +01:00
Laurent Rineau ce9edc9834 Merge pull request #4450 from MaelRL/CGAL-Use_CGAL_PI-GF
Use `CGAL_PI` where relevant
2020-02-07 16:24:44 +01:00
Mael 8f29c7cb63
Merge branch 'master' into CGAL-Parallel_if_available_tag 2020-01-29 16:42:54 +01:00
Laurent Rineau 5fc7b97e32 Merge pull request #4468 from maxGimeno/TBB-Fix_deprecation_warnings-5_0-maxGimeno
TBB deprecated code replacement
2020-01-29 16:34:56 +01:00
Laurent Rineau 7ce522d99d Merge pull request #4492 from sgiraudot/PSP-Cleanup_Point_with_normal_3_includes-GF
Remove undocumented CGAL::Point_with_normal_3 from examples

# Conflicts:
#	Advancing_front_surface_reconstruction/examples/Advancing_front_surface_reconstruction/reconstruction_structured.cpp
#	Point_set_shape_detection_3/examples/Point_set_shape_detection_3/efficient_RANSAC_custom_shape.cpp
#	Point_set_shape_detection_3/examples/Point_set_shape_detection_3/efficient_RANSAC_parameters.cpp
#	Point_set_shape_detection_3/examples/Point_set_shape_detection_3/plane_regularization.cpp
#	Point_set_shape_detection_3/examples/Point_set_shape_detection_3/shape_detection_with_callback.cpp
#	Shape_detection/examples/Shape_detection/efficient_RANSAC_with_point_access.cpp
#	Shape_detection/examples/Shape_detection/shape_detection_basic_deprecated.cpp
2020-01-29 16:33:57 +01:00
Laurent Rineau 315a0b54d1 Merge pull request #4468 from maxGimeno/TBB-Fix_deprecation_warnings-5_0-maxGimeno
TBB deprecated code replacement
2020-01-29 16:27:53 +01:00
Laurent Rineau 94051f3f63 Merge pull request #4492 from sgiraudot/PSP-Cleanup_Point_with_normal_3_includes-GF
Remove undocumented CGAL::Point_with_normal_3 from examples

# Conflicts:
#	Advancing_front_surface_reconstruction/examples/Advancing_front_surface_reconstruction/reconstruction_structured.cpp
#	Point_set_shape_detection_3/examples/Point_set_shape_detection_3/efficient_RANSAC_custom_shape.cpp
#	Point_set_shape_detection_3/examples/Point_set_shape_detection_3/efficient_RANSAC_parameters.cpp
#	Point_set_shape_detection_3/examples/Point_set_shape_detection_3/plane_regularization.cpp
#	Point_set_shape_detection_3/examples/Point_set_shape_detection_3/shape_detection_with_callback.cpp
#	Shape_detection/examples/Shape_detection/efficient_RANSAC_with_point_access.cpp
#	Shape_detection/examples/Shape_detection/shape_detection_basic_deprecated.cpp
2020-01-29 16:21:31 +01:00
Simon Giraudot 3544d43898 Remove undocumented CGAL::Point_with_normal_3 from examples 2020-01-28 10:09:49 +01:00
Mael Rouxel-Labbé 8f82c1b7a4 Start fixing PLY namespaces 2020-01-24 18:32:46 +01:00
Simon Giraudot 2bbe1f4a21 Fix cmake warning using QUIET 2020-01-22 11:02:33 +01:00
Mael Rouxel-Labbé d620198049 Merge branch 'CGAL_IO-maxGimeno-old' into CGAL_IO-maxGimeno 2020-01-17 12:34:08 +01:00
Simon Giraudot 5daa73c9bc Use CGAL_target_use_* mechanism for OpenGR and pointmatcher 2020-01-16 16:12:34 +01:00
Simon Giraudot f1d155045e Fix licenses 2020-01-16 11:00:00 +01:00
Simon Giraudot 10b92bc1d5 Replace large XYZ by smaller binary PLY + fix examples 2020-01-15 15:26:24 +01:00
Simon Giraudot 5beaa0c164 Merge remote-tracking branch 'necip/gsoc2019-pointmatcher_icp_wrapper-necipfazil' into gsoc2019-pointmatcher_icp_wrapper-necipfazil 2020-01-15 10:28:10 +01:00
Maxime Gimeno 85712ba28c WIP replacing tbb deprecated includes. 2020-01-14 15:03:20 +01:00
Mael Rouxel-Labbé 3c7eb2c6b9 Use CGAL_PI instead of hardcoding it 2020-01-07 15:31:07 +01:00
Simon Giraudot fd44fb278e Add warning about which point set to use as reference 2019-12-11 13:25:16 +01:00
Simon Giraudot 1646f9dba2 Document new parameter 2019-12-11 13:08:27 +01:00
Simon Giraudot ad6403399c Fix assertion 2019-12-11 12:53:32 +01:00
Simon Giraudot e657cd72f7 Add named parameter for max normal deviation 2019-12-11 12:50:44 +01:00
Laurent Rineau 65cde3ce79
Merge branch 'master' into Faster_dd_spatial_searching-cjamin 2019-12-03 19:18:15 +01:00
Necip Yildiran 45e728f1e3 typos were corrected in doc of PSP OpenGR/PointMatcher wrappers 2019-11-29 13:01:53 -05:00
Mael Rouxel-Labbé e73b973b62 Use Parallel_if_available_tag to simplify code that used CGAL_LINKED_WITH_TBB 2019-11-20 12:24:54 +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
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
Maxime Gimeno 22b8e0ccb8 Add some IO sections 2019-09-17 14:32:40 +02:00
Laurent Rineau efcc3fb759 Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch' 2019-09-13 12:28:07 +02:00
Sébastien Loriot b990d02846 use iterator traits 2019-09-12 14:35:02 +02:00
Necip Yildiran fed52c13da Improved doc for OpenGR/PointMatcher wrappers
OpenGR: param max_running_time

PointMatcher: geom_traits
2019-09-03 23:06:46 -04:00
Necip Yildiran 1011121d77 Changed struct init syntax as C++20 is not supported
aggregate initialization with attribute naming is changed to list initialization
2019-09-02 10:35:58 +02:00
Necip Yildiran 28f742e00f Improved doc for PSP: added author 2019-09-02 10:35:58 +02:00
Necip Yildiran f38d89996c Improved doc for OpenGR/PointMathcher wrappers 2019-09-02 10:35:58 +02:00
Simon Giraudot 851a5f8566 Add undocumented named parameter to read a pointmatcher config file 2019-09-02 09:47:23 +02:00
Simon Giraudot 5d65fc3da7 Update regitration functions with new named parameters API 2019-09-02 09:47:23 +02:00
Simon Giraudot fff368c351 Merge remote-tracking branch 'necip/gsoc2019-pointmatcher_icp_wrapper-necipfazil' into gsoc2019-pointmatcher_icp_wrapper-necipfazil 2019-09-02 09:46:54 +02:00
Sébastien Loriot 551313ac5c Merge branch 'cgal/releases/CGAL-4.14-branch' 2019-08-27 06:37:23 +02:00
Sébastien Loriot f0fb56233a Merge 'cgal/releases/CGAL-4.13-branch' 2019-08-27 06:36:39 +02:00
Simon Giraudot 2e4d7981dc Fix doc: no point map but property maps 2019-08-21 15:19:07 +02:00
Simon Giraudot 66d7f39ef8 Fix missing doxygen character 2019-08-21 15:17:42 +02:00
Necip Yildiran e545f9ae5a Improved doc for OpenGR/pointmatcher wrappers; edited Installation/CHANGES.md 2019-08-14 00:06:09 +03:00
Sebastien Loriot fb8fa48950
Merge pull request #4083 from sloriot/CGAL-named_function_parameters
Named function parameters
2019-08-08 10:03:38 +02:00
Sébastien Loriot b84297f8f6 update the usage for the new CGAL named function parameters 2019-07-29 09:38:39 +02:00
Sébastien Loriot 25a05e9f4c Merge branch 'CGAL-named_function_parameters-4.14' into master
Conflicts resolved by hand
2019-07-28 23:46:43 +02:00
Sébastien Loriot 2f81a21523 Merge 'CGAL-named_function_parameters' for 4.13-branch into 4.14-branch
Conflicts resolved by hand
2019-07-28 22:30:13 +02:00
Necip Yildiran 44b7efaa5a Fix opengr/pointmatcher registration example: register point sets 2019-07-28 21:36:38 +03:00
Necip Yildiran 9b33ad8fdf Link libpointmatcher libs with libpointmatcher wrapper examples 2019-07-28 21:35:17 +03:00
Necip Yildiran 67bf1d4f7c Fix OpenGR wrapper: instantiate sampler class using PointType 2019-07-28 18:46:30 +03:00