Commit Graph

957 Commits

Author SHA1 Message Date
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
Simon Giraudot 85ab4e9041 Add missing inlines to PSP IO non-template functions 2019-07-24 08:49:34 +02: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
Sébastien Loriot 4ca465a81f try to please clang 2019-07-15 10:51:44 +02:00
Sébastien Loriot 560c77f567 rename named function parameter class 2019-07-15 06:25:02 +02:00
Necip Yildiran a9889a12e3 First draft version of pointmatcher icp wrapper 2019-07-15 01:38:48 +03:00
Sébastien Loriot cebf0657d8 Use a full CGAL version of named function parameters
no longer rely on boost
2019-07-14 22:45:47 +02:00
Necip Yildiran 7029fe4dcb Use transform iterator to transform cgal range+pmaps to gr points on-the-fly
Usage of a point adapter is no longer needed: transform iterator adapts the cgal points to opengr points on-the-fly
2019-07-09 13:07:56 +03:00
Necip Yildiran 13ce95a98a Use Kernel::FT as Scalar type for PointAdapter base point type
Helps to avoid having unnecessary casts resulting loss of precision
2019-07-08 21:57:54 +03:00
Necip Yildiran 090b88437c use vec3 interface to copy point on-the-fly 2019-07-08 13:23:12 +03: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
Necip Yildiran c5bc7239b6 init pointadapter for opengr registration 2019-07-01 12:20:19 +03:00
Simon Giraudot e32d102270 Add verbose display of matrix 2019-06-26 11:31:43 +02:00
Simon Giraudot 7ae6f182dd Copy-paste official doc 2019-06-26 11:31:04 +02:00
Simon Giraudot 6a43faceff Documentation of registration functions (user + ref + biblio) 2019-06-26 11:31:04 +02: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
Efi Fogel 1453280fcd fix license checker 2019-06-26 11:29:43 +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
Andreas Fabri f7b7b9957f Merge remote-tracking branch 'cgal/master' into CGAL-null_ptr-GF 2019-06-05 14:47:11 +02:00
Andreas Fabri 4581f1b7a8 Morte replacements 2019-06-05 08:39:55 +02:00
Andreas Fabri e2d19b0c8d Replace NULL and Nullptr_t with nullptr and nullptr_t 2019-06-04 23:45:44 +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 419032d859 Merge pull request #3947 from MaelRL/CGAL-Fix_typos-GF
Fix some typos in code/comments/documentation
2019-05-23 08:50:14 +02:00
Dmitry Anisimov 110b94c16d conflicts fixes 2019-05-21 20:06:06 +02:00
Mael Rouxel-Labbé 2848158354 Fix typos 2019-05-20 08:54:04 +02:00
Laurent Rineau 90782d4b7f Revert the merge of two pull-requests that target CGAL-4.14-branch
- Revert "Merge pull request #3857 from MaelRL/CGAL-Fix_duplicate_non_manifold_vertices-GF"
- Revert "Merge pull request #3898 from lrineau/Mesh_3-stop_during_protection-lrineau"
2019-05-14 17:50:45 +02:00
Laurent Rineau 7bcad36d7e
Merge branch 'master' into Installation-remove_FindBLAS_LAPACK_TAUCS-GF 2019-05-14 16:03:28 +02:00
Laurent Rineau 554672f363 Merge pull request #3869 from sgiraudot/PSP-Range_neighborhood_NP-GF
[Small Feature] PSP: Spherical Neighborhood Queries
2019-05-06 15:50:10 +02:00
Simon Giraudot 6b112dda54 Make doc of NP neighbor_radius more general and add more specific info to the WLOP doc 2019-05-06 10:36:46 +02:00
Dmitry Anisimov a8a9c3bda4 bgl + shape detection dependent tests 2019-04-26 10:19:46 +02:00
Simon Giraudot d8ec8b8986 Fix warning/error 2019-04-23 10:20:16 +02:00
Simon Giraudot aee8735193 Document neighbor_radius parameter and amend example 2019-04-19 12:47:31 +02:00
Simon Giraudot d167bd0d54 Neighbor query by choosing KNN or radius for PSP algorithms 2019-04-19 11:00:10 +02:00
Andreas Fabri 864ba4249d Merge branch 'Surface_mesh-PLY_IO-GF-old' into Surface_mesh-PLY_IO-GF 2019-04-12 16:19:53 +02:00
Sebastien Loriot 08251247c2
Merge pull request #3831 from afabri/PSP-cleanup-GF
Point Set Processing:  cleanup
2019-04-12 15:34:45 +02:00
Sébastien Loriot db65bd8ecc Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch' 2019-04-11 21:38:48 +02:00
albert-github 1dd7473818 Correction of links
Correction of redirected links and links that moved to another place.
2019-04-11 21:37:05 +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
Simon Giraudot 717137e48f Merge remote-tracking branch 'mine/Surface_mesh-PLY_IO-GF' into Surface_mesh-PLY_IO-GF 2019-04-09 15:11:58 +02:00
Maxime Gimeno 6e46d7e661 Add CGAL:: before sqrt(). 2019-04-08 16:16:51 +02:00
Andreas Fabri 88b0f11284 Move files to PSP/internal 2019-04-08 16:16:51 +02:00
Andreas Fabri a2075494da Move trace.h 2019-04-08 16:16:49 +02:00
Andreas Fabri e5e174941a Restore non-deprecated code 2019-04-03 11:13:28 +02:00
Sébastien Loriot 1c119aec44 replace cpp11::unordered_FOO by std::unordered_FOO 2019-03-29 13:28:33 +01: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 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
Andreas Fabri a472c24185 http:/www.boost.org -> https://www.bost.org 2019-03-20 08:59:22 +01:00
Simon Giraudot 86faeb7fa5 Remove deprecated functions/tests of PSP after 2 releases 2019-03-08 09:46:36 +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 aacd365080 Merge pull request #3703 from sgiraudot/Point_set_processing-Fix_PLY_FT_type_detection-GF
Point Set Processing: Fix PLY FT type detection
2019-02-28 20:48:50 +01:00
Simon Giraudot 1f54c5e0af Merge remote-tracking branch 'mine/Surface_mesh-PLY_IO-GF' into Surface_mesh-PLY_IO-GF 2019-02-26 14:03:27 +01:00
Simon Giraudot df940da6b1 Fix FT type detection 2019-02-22 16:36:18 +01:00
Laurent Rineau fdd8357915
Merge pull request #3580 from afabri/Stream_support-Color-GF
Fix warnings (Add/remove copy constructors, and other warnings)

Co-authored-by: Laurent Rineau <laurent.rineau@cgal.org>
Co-authored-by: Mael <mael.rouxel.labbe@geometryfactory.com>
Co-authored-by: Maxime GIMENO <maxime.gimeno@gmail.com>
2019-02-13 15:25:07 +00:00
Sébastien Loriot ec1de6d077 fix warning 2019-01-31 11:49:41 +01:00
Andreas Fabri c636ea1ce2 Fix PSP 2019-01-28 08:37:26 +01:00
Laurent Rineau afc3de2894
Merge branch 'master' into Stream_support-Color-GF 2019-01-23 09:37:08 +01:00
Simon Giraudot 12dfbd6353 Reorganize PLY IO functions/files 2019-01-22 10:00:23 +01:00
Andreas Fabri df17fbcdaa Fix bilateral smoothing 2019-01-10 17:48:30 +01:00
Sebastien Loriot 86a15599f4
Merge pull request #3342 from sgiraudot/Point_set_processing-Mst_orient_seed_points-GF
[Small Feature] MST Orient Normals with Seeds
2019-01-07 09:22:59 +01:00
Sébastien Loriot 61169b394e Merge remote-tracking branch 'cgal/releases/CGAL-4.13-branch' 2019-01-04 17:19:19 +01:00
Sébastien Loriot 45066e7d91 Merge remote-tracking branch 'cgal/releases/CGAL-4.12-branch' into HEAD 2019-01-04 17:17:03 +01:00
Simon Giraudot 294ebaf8f5 Remove unused variable and useless assertion 2019-01-04 14:34:57 +01:00
Simon Giraudot 7656b16702 Fix typo hightest->highest 2019-01-04 14:34:56 +01:00
Simon Giraudot f406473fd3 Document new named parameter 2019-01-04 14:34:56 +01:00
Simon Giraudot 0396dd1118 Patch to improve normal orientation using user-defined seed points 2019-01-04 14:34:56 +01:00
Simon Giraudot 1cfcb1ba5b Fix stream status handling everywhere PLY reader is used 2018-12-18 15:28:02 +01:00
Simon Giraudot 858d10070b Improve PLY element handling and thus fix bug when reading unknown element 2018-12-17 13:07:56 +01:00
Sébastien Loriot 2f9408f867 rename link name to match package name 2018-10-08 10:28:55 +02:00
Laurent Rineau f8f0872118 Merge branch 'releases/CGAL-4.12-branch' 2018-09-17 11:36:41 +02:00
Simon Giraudot 76b50032a6 Fix constness of parameters of functions to output LAS values 2018-09-06 09:58:49 +02:00
Simon Giraudot ab0e622e8b Fix several bugs/badly done stuff in PLY IO 2018-09-06 09:58:49 +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 c0e79003fc Provide a more generic cpp11::sleep_for() function that handles TBB/STD/MSVC2013 specificities 2018-06-18 16:05:18 +02:00
Mael Rouxel-Labbé 26c857a431 Moved unary/binary_function to CGAL::cpp98 2018-06-13 15:58:19 +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
Simon Giraudot f722955b45 Add missing includes 2018-05-29 12:22:46 +02:00
Simon Giraudot 941e376ce6 Include remarks from review 2018-05-29 11:42:04 +02:00
Simon Giraudot 67c830879c Document callbacks in all functions + in PSP named parameters 2018-05-29 11:42:04 +02:00
Simon Giraudot d11654d2f2 Use cpp11::thread 2018-05-29 11:42:04 +02:00
Simon Giraudot 9dbdc6c826 Fix assignment operator 2018-05-29 11:42:03 +02:00
Simon Giraudot e649d77dde Undef first by safety 2018-05-29 11:42:03 +02:00
Simon Giraudot 7703236025 Callbacks in most Point Set Processing functions 2018-05-29 11:42:03 +02:00
Simon Giraudot 08f4afd00e Bugfix: check that thread is non null 2018-05-29 11:42:03 +02:00
Simon Giraudot 0f66525c2d Simplify code 2018-05-29 11:42:03 +02:00
Simon Giraudot dd1b072fa6 Fix indentation 2018-05-29 11:42:02 +02:00
Simon Giraudot 23f7b130c3 Integrate thread management to Parallel_callback 2018-05-29 11:42:02 +02:00