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
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
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
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
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é
a1b0abfb08
Merge remote-tracking branch 'cgal/master' into CGAL-Improve_NP_doc_presentation-GF
2020-04-04 15:40:38 +02:00
Maxime Gimeno
69a2a23cc6
rename IO functions in point_set packages
2020-04-01 14:33:14 +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
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
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
Mael Rouxel-Labbé
8d8dbb1c0b
Fix warnings about checking that an unsigned int is positive
2020-02-10 18:17:40 +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
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
Mael Rouxel-Labbé
8f82c1b7a4
Start fixing PLY namespaces
2020-01-24 18:32:46 +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
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
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
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
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
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
67bf1d4f7c
Fix OpenGR wrapper: instantiate sampler class using PointType
2019-07-28 18:46:30 +03:00
Laurent Rineau
7b1889b87e
Merge branch 'releases/CGAL-4.14-branch'
...
# Conflicts:
# Point_set_processing_3/include/CGAL/IO/write_ply_points.h
2019-07-26 18:45:17 +02:00
Laurent Rineau
da2726e0e7
Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch
...
# Conflicts:
# CGAL_ipelets/include/CGAL/CGAL_Ipelet_base_v7.h
# Installation/lib/cmake/CGAL/CGALConfig.cmake
# Intersections_2/test/Intersections_2/test_intersections_2.cpp
# Segment_Delaunay_graph_2/test/Segment_Delaunay_graph_2/include/test_types.h
# Snap_rounding_2/include/CGAL/Snap_rounding_kd_2.h
2019-07-26 18:33:55 +02: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
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