Commit Graph

425 Commits

Author SHA1 Message Date
Mael Rouxel-Labbé d6cf97278f Fix trailing whitespace 2020-04-17 09:22:57 +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
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 41519e3010 Proposal for imported targets 2020-04-15 14:05:18 +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
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
Sébastien Loriot eb5d1d9a95 Update from master 2020-03-20 08:58:52 +01:00
Simon Giraudot 34185bbae1 Fix warnings 2020-03-18 08:30:57 +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 74070d3356 First version of clustering algorithm 2020-03-17 12:04:44 +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 059ed45064 Avoid polluting testing if OpenGR/pointmatcher missing 2020-02-13 09:43:19 +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
Mael 8f29c7cb63
Merge branch 'master' into CGAL-Parallel_if_available_tag 2020-01-29 16:42:54 +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 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
Simon Giraudot 2bbe1f4a21 Fix cmake warning using QUIET 2020-01-22 11:02:33 +01:00
Simon Giraudot 5daa73c9bc Use CGAL_target_use_* mechanism for OpenGR and pointmatcher 2020-01-16 16:12:34 +01:00
Simon Giraudot 10b92bc1d5 Replace large XYZ by smaller binary PLY + fix examples 2020-01-15 15:26:24 +01: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
Necip Yildiran 8fdc3e9713 Changed struct init syntax as C++20 is not supported
aggregate initialization with attribute naming is changed to list initialization
2019-09-01 21:22:31 -04: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 b1ce7d98ee Removed unnecessary copyright info from psp examples 2019-07-26 14:24:39 +03:00
Necip Yildiran c482d356d7 Merging with OpenGR_wrapper, further documentation
Merging with OpenGR_wrapper branch of remote https://github.com/necipfazil/cgal/
2019-07-26 14:18:27 +03:00
Necip Yildiran 68013aa86c Documentation of pointmatcher registration functions 2019-07-26 13:18:28 +03:00
Necip Yildiran 84bf522352 Added psp example: registration with opengr+pointmatcher pipeline 2019-07-20 00:29:53 +03:00
Necip Yildiran 23eb9768fa Take initial transform for data point set as opt. namedparam to icp regist. method 2019-07-19 23:58:12 +03:00
Necip Yildiran dbec5daa1d pointmatcher icp reg convention: point_set_1 is ref while point_set_2 is data 2019-07-19 14:16:36 +03:00
Necip Yildiran 8bba0536e8 added register_point_sets method that use pointmatcher::icp 2019-07-19 12:16:22 +03:00
Necip Yildiran dbc173d04c changed namedparameters, convenience overloads for pointmatcher::icp 2019-07-19 11:35:12 +03:00
Necip Yildiran a87cc959d4 added named parameters for pointmatcher icp config
Using CGAL::pointmatcher::ICP_config, config (name,params) could be passed to registration method through named parameters. Having pointmatcher style (name,params) pair as ICP_config allows to use extended pointmatcher configurations without needing to change wrapper implementation.
2019-07-17 17:14:17 +03:00
Necip Yildiran a9889a12e3 First draft version of pointmatcher icp wrapper 2019-07-15 01:38:48 +03:00
Simon Giraudot 927474eecd Modify named parameters and begin ref manual 2019-06-26 11:31:02 +02:00
Simon Giraudot 48ad9c4d57 Separate files and rename functions 2019-06-26 11:29:44 +02:00
Sébastien Loriot da776c75c1 add compute_transformation 2019-06-26 11:29:44 +02:00
Sébastien Loriot f2da91be40 update after OpenGR update
OpenGR HEAD = cbce48e030
2019-06-26 11:29:43 +02:00
Sébastien Loriot 5911cbc568 return score and silent logger 2019-06-26 11:29:42 +02:00
Sébastien Loriot d36aa97573 add named parameters for OpenGR options 2019-06-26 11:29:41 +02:00
Sébastien Loriot faf42467c2 first draft version of OpenGR wrapper
done based on super4pcs_test.cc
2019-06-26 11:29:16 +02:00
Laurent Rineau 4fbf00fb8a CMake>=3.13: opt for for new policies up to 3.15 2019-06-19 14:34:59 +02:00
Dmitry Anisimov 3738de08ed
Merge branch 'master' into Point_set_shape_detection_3-make_it_general_with_region_growing-danston 2019-05-23 10:38:45 +02:00
Laurent Rineau 7bcad36d7e
Merge branch 'master' into Installation-remove_FindBLAS_LAPACK_TAUCS-GF 2019-05-14 16:03:28 +02:00
Dmitry Anisimov 92d3417012 dependencies + structuring example fixes 2019-04-25 18:30:43 +02:00
Simon Giraudot aee8735193 Document neighbor_radius parameter and amend example 2019-04-19 12:47:31 +02:00
Simon Giraudot d8b51a9672 Merge remote-tracking branch 'laurent/Installation-remove_FindBLAS_LAPACK_TAUCS-GF' into Installation-remove_FindBLAS_LAPACK_TAUCS-GF 2019-04-09 15:22:45 +02:00
Sébastien Loriot 5a30e88a92 replace cpp11::function by std::function 2019-03-29 13:28:33 +01: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
Sébastien Loriot ce126b87c6 remove cpp11::copy_n, cpp11::prev, and cpp11::next and use std instead 2019-03-29 13:28:32 +01:00
Sébastien Loriot d60f5645aa replace BOOST_FOREACH by c++ ranged-based for loop
some of the command used for the replacement:
ack --cpp  BOOST_FOREACH -l  | xargs sed -i -E "s/BOOST_FOREACH\(([a-zA-Z_:&0-9]+)\s(\w+)\,/for(\1 \2 :/"
ack --cpp  BOOST_FOREACH -l  | xargs sed -i -E "s/BOOST_FOREACH\((const [a-zA-Z_:&0-9]+)\s(\w+)\,/for(\1 \2 :/"
ack --cpp  BOOST_FOREACH -l  | xargs sed -i -E "s/BOOST_FOREACH\((const typename [a-zA-Z_:&0-9]+)\s(\w+)\,/for(\1 \2 :/"
ack --cpp  BOOST_FOREACH -l  | xargs sed -i -E "s/BOOST_FOREACH\((typename [<>a-zA-Z_:&0-9]+)\s(\w+)\,/for(\1 \2 :/"
ack "boost/foreach.hpp" -l --cpp | xargs sed -i '/boost\/foreach.hpp>/d'
2019-03-29 13:22:15 +01:00
Sébastien Loriot 0669c6ad97 remove error messages and disabled test if CPP11 is not available in PSP 2019-03-29 10:41:49 +01:00
Simon Giraudot 911bea4021 Remove Lapack support from Jet_fitting, PSP, Ridges and Solver_interface 2019-03-08 09:53:21 +01:00
Andreas Fabri e08d85f3e3 Set precision of the ostream when writing a point set or face graph. Add a \note in the manual 2019-03-04 15:50:18 +01:00
Laurent Rineau 2671d056cf Merge pull request #3685 from afabri/CGAL-cleanup-GF
CGAL:  Clean up examples and tests
2019-02-28 20:48:48 +01:00
Andreas Fabri e3abd29146 Do not suppress warnings in CMakeLists.txt 2019-02-17 18:45:19 +01:00
Andreas Fabri 25819705f5 Polyhedron, Intersections, PSP 2019-02-14 11:06:13 +01:00
Andreas Fabri dc025bcdf8 Make number of points a parameter 2019-02-08 10:14:59 +01:00
Andreas Fabri c3be03a5a2 PSP: Reduce the size of the data set in an example 2019-02-07 19:39:39 +01:00
Guillaume Damiand 92ba7fa6c9 Update minimum cmake required version in all CMakeLists.txt 2018-10-18 14:49:23 +02:00
Guillaume Damiand 0bd9088b5a Remove all include( ) and include( CGAL_CreateSingleSourceCGALProgram ) in CMakeLists.txt; they are no more required. 2018-10-17 14:17:08 +02:00
Laurent Rineau c68cf8fc4c Merge pull request #3129 from sgiraudot/Point_set_processing-Callbacks-GF
Point Set Processing: Callbacks
2018-06-27 10:21:40 +02:00
Simon Giraudot 70859adb20 Fix callback and avoid making too many syscalls 2018-06-21 12:46:39 +02:00
Simon Giraudot b993dcfc29 Test callbacks with parallel version too 2018-06-18 16:04:34 +02:00
Andreas Fabri a61c51d08f This sneaked in. Thank you Laurent for pointing it out 2018-06-08 16:01:54 +01:00
Andreas Fabri 8efae621d8 And the same for the 3D weight 2018-06-08 15:52:05 +01:00
Simon Giraudot ac391e0fb2 Add example for callbacks 2018-05-29 11:42:04 +02:00
Laurent Rineau f12b3bf302 Prefix CMake options with `CGAL_`
- in `examples/Mesh_3/`,
- in `examples/Point_set_processing_3/`,
- in `demo/Polyhedron/`, and
- in `demo/Triangulation_3/`.
2018-03-08 12:07:49 +01:00
Andreas Fabri f91a93d02b Quit VC++ warning concerning a third party lib for reading LAS files 2018-03-06 15:05:21 +00:00
Simon Giraudot 4393ca5ed5 Fix remaining deprecated function 2018-01-10 16:39:33 +01:00
Simon Giraudot bd73153ce6 Update PSP user manual with new API (+ tutorial to update code) 2018-01-10 16:39:32 +01:00
Simon Giraudot 506a5d2f33 Change API to named parameters in all PSP IO functions/examples/tests/doc 2018-01-10 16:39:31 +01:00
Simon Giraudot 628b229f68 Fix remaining old API in examples 2018-01-10 16:38:36 +01:00
Simon Giraudot 86634b3c17 Use new API of PSP with named parameters in include+example 2018-01-10 16:38:36 +01:00
Simon Giraudot c58ea477f1 compute_average_spacing() with named parameters 2018-01-10 16:38:35 +01:00
Laurent Rineau 1296d83552 Fix the warning about CMP0023 2017-11-28 14:27:29 +01:00
Laurent Rineau 0681ac6dbc Fix the TBB_USE_FILE warnings 2017-11-15 17:00:02 +01:00
Simon Giraudot 50b618d801 Fix typename warnings 2017-08-11 10:07:11 +02:00
Simon Giraudot 6a119fef11 Unify APIs of structuring and regularization 2017-08-01 15:47:58 +02:00
Simon Giraudot 85634b7a27 Change structure_point_set() with generalized API 2017-08-01 15:46:04 +02:00
Simon Giraudot b88deb3759 Rename Efficient_RANSAC_traits as Shape_detection_traits (same for concept) 2017-08-01 15:45:06 +02:00
Simon Giraudot eed458b143 Fix binary write bug 2017-07-11 11:58:54 +02:00
Simon Giraudot 238f3afd70 Fix: use cpp11::tuple in examples 2017-07-11 11:58:54 +02:00
Simon Giraudot fbe9e78ef0 Use std:: everywhere for tuples (make_tuple, get, etc.) 2017-07-11 11:58:54 +02:00
Simon Giraudot e01f62a09f Use Output_rep to output colors 2017-07-11 11:58:53 +02:00
Simon Giraudot 3449599f59 Simplify CMakeLists 2017-07-11 11:58:53 +02:00
Simon Giraudot 4b3a506d44 Fix detection of required C++11 features 2017-07-11 11:58:53 +02:00
Simon Giraudot 40ae0436e1 Add C++11 conditions/tests/warnings for LAS and PLY IO functions and related files 2017-07-11 11:58:53 +02:00
Jane Tournois 20b069852d ifstream should have binary mode 2017-07-11 11:58:52 +02:00
Simon Giraudot d4f6db6234 Fix typo in example comments 2017-07-11 11:58:51 +02:00