Commit Graph

312 Commits

Author SHA1 Message Date
Simon Giraudot 4ec9bd6c9a Optimize location of node 2021-04-07 14:26:19 +02:00
Simon Giraudot 4c0018791c Fix bbox, width and depth computations in Octree wrapper 2021-04-07 14:13:29 +02:00
Maxime Gimeno 17602e589e Merge remote-tracking branch 'cgal/master' into CGAL-clang_tidy__nullptr_on_Mesh_2-GF 2021-04-07 09:17:51 +02:00
Laurent Rineau 343ef10367 Merge pull request #5547 from sgiraudot/Fix_stdpow_related_warnings-GF
Fix warning: std::pow(float, int) returns double instead of float in recent C++
2021-04-06 15:13:00 +02:00
Simon Giraudot 1794620ab9 Move index access property map to property map package 2021-04-01 09:43:14 +02:00
Simon Giraudot 616cd5a549 Apply corrections from review 2021-04-01 08:55:51 +02:00
Simon Giraudot 91de37ec3a Fix warning: std::pow(float, int) returns double instead of float in recent C++ 2021-03-23 11:25:53 +01:00
Simon Giraudot 987b177833 Fix conversion warning 2021-03-18 08:36:34 +01:00
Simon Giraudot 9fe8708fc2 Fix bug that created empty octrees 2021-03-15 10:18:55 +01:00
Simon Giraudot a5f139f9df Remove unused variables 2021-03-11 09:34:33 +01:00
Simon Giraudot b22bd4e498 Update dependencies 2021-03-08 11:11:36 +01:00
Simon Giraudot 46b9452ef4 Rebase on master 2021-03-04 13:48:11 +01:00
Laurent Rineau 3621aaaf3e Merge pull request #5426 from sgiraudot/PSP-RANSAC-Fix_warnings-GF
[PSP/RANSAC] Fix warnings
2021-03-03 17:33:05 +01:00
Laurent Rineau 05d0f01fc4 Merge pull request #5487 from sgiraudot/Shape_detection-Disable_long_tests-GF
Shape Detection: Disable expensive tests by default
2021-03-03 17:21:27 +01:00
Laurent Rineau 45373bef84 Merge pull request #5426 from sgiraudot/PSP-RANSAC-Fix_warnings-GF
[PSP/RANSAC] Fix warnings
2021-03-03 17:10:18 +01:00
Simon Giraudot 6e811d6a8f Rebase on master 2021-03-03 12:56:57 +01:00
Simon Giraudot bbcab8e56f Merge remote-tracking branch 'mine/Shape_detection-Region_growing_on_spheres-GF' into Shape_detection-Region_growing_on_spheres-GF 2021-03-03 11:52:14 +01:00
Simon Giraudot dc858ba722 Clean up namings according to review 2021-02-23 08:34:15 +01:00
Simon Giraudot 244ca61261 Text corrections from review 2021-02-23 08:26:41 +01:00
Simon Giraudot 5955028010 Disable expensive tests by default 2021-02-23 08:18:47 +01:00
Maxime Gimeno b80daff6fb Fixes 2021-02-19 11:31:52 +01:00
Maxime Gimeno 7f189620d8 Remove CMAKE_CXX_STANDARD commands in cmake scripts 2021-02-08 10:06:23 +01:00
Simon Giraudot 0cf9990bf0 Fix conversion warning in RANSAC 2021-02-04 08:33:54 +01:00
Laurent Rineau f176529041 Merge pull request #5357 from sloriot/CGAL-boost_function_output-master
Include non-deprecated header (master)
2021-01-21 16:22:39 +01:00
Laurent Rineau 52bb68c012 Merge pull request #5356 from sloriot/CGAL-boost_function_output-5.2
Include non-deprecated header (5.2)
2021-01-21 16:18:55 +01:00
Simon Giraudot a19836bfb6 Fix RANSAC's use of outdated Octree API 2021-01-20 11:20:01 +01:00
Simon Giraudot 1dcf876679 Remove TODOs 2021-01-19 14:07:13 +01:00
Simon Giraudot ae8ec55eac Merge remote-tracking branch 'jackson/gsoc2020-Octree-campolattaro' into gsoc2020-Octree-campolattaro 2021-01-19 09:54:58 +01:00
Sébastien Loriot bc161f2ae9 Merge 'CGAL-Eigen3_support-5.2' 2021-01-15 10:59:20 +01:00
Sébastien Loriot f4935dc199 Merge branch 'CGAL-Eigen3_support-5.1' 2021-01-15 10:54:02 +01:00
Sébastien Loriot eecb00534e fix macro name to be consistent with find_package 2021-01-15 10:43:34 +01:00
Sébastien Loriot ad911271a9 Merge commit '6594e7549bd70923990d86c31e2aa267a79bb629' into HEAD 2021-01-15 10:12:17 +01:00
Sébastien Loriot 6594e7549b do no include a deprecated header 2021-01-15 10:07:59 +01:00
Sébastien Loriot bdd4efe3b3 Merge commit 'efc0c525e8b' into HEAD 2021-01-15 10:06:56 +01:00
Sébastien Loriot efc0c525e8 include non-deprecated header 2021-01-15 10:02:00 +01:00
Maxime Gimeno 5948bc846e Try to remove Filtered_kernel from the dependencies of BGL 2021-01-11 14:11:30 +01:00
Maxime Gimeno 5d2ad68148 Add new Dependences. ATTENTION BGL is propagated through the NPs in Stream_support 2021-01-08 15:58:46 +01:00
Maxime Gimeno 3d1c41fd14 Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2021-01-07 15:05:28 +01:00
Simon Giraudot 773642e9dc Fix Boost include 2021-01-06 07:59:14 +01:00
Simon Giraudot 661fe3505e User + ref manual for new region growing classes 2021-01-05 10:35:05 +01:00
Simon Giraudot 74d01916e3 Document missing parts 2021-01-04 15:23:41 +01:00
Simon Giraudot 8a2029e233 Add possibility to restrict radius of sphere/circle/cylinder 2021-01-04 15:20:10 +01:00
Simon Giraudot 5e0487e455 Add region growing on cylinders for point_set_3 2020-12-31 13:26:57 +01:00
Simon Giraudot 31c577fc47 Add region growing on circles for point_set_2 2020-12-30 14:51:15 +01:00
Simon Giraudot da90b6ee4f Add region growing on spheres for point_set_3 2020-12-30 08:48:28 +01:00
Laurent Rineau 47c4fc8aa2 Merge pull request #5279 from sgiraudot/RANSAC-Fix_ptrdiff_overflow-GF
[RANSAC] Fix ptrdiff overflow
2020-12-16 17:49:07 +01:00
Laurent Rineau fe34a5aa04 Merge pull request #5279 from sgiraudot/RANSAC-Fix_ptrdiff_overflow-GF
[RANSAC] Fix ptrdiff overflow
2020-12-16 17:47:45 +01:00
Laurent Rineau cf5aaeba5c Merge pull request #5279 from sgiraudot/RANSAC-Fix_ptrdiff_overflow-GF
[RANSAC] Fix ptrdiff overflow
2020-12-16 17:46:45 +01:00
Simon Giraudot a7b2ed13f4 Fix conversion warning 2020-12-15 15:44:11 +01:00
Laurent Rineau 863cc4b816 Merge pull request #5238 from albert-github/feature/bug_space_link
Superfluous space in link
2020-12-15 09:07:46 +01:00
Laurent Rineau 3301a47c44 Merge pull request #5255 from sgiraudot/Shape_detection-Fix_auto_param_detection-GF
[RANSAC] Fix detection of automatic parameter selection
2020-12-15 09:07:44 +01:00
Laurent Rineau a0e1b15da3 Merge branch '5.1.x-branch' into 5.2.x-branch 2020-12-15 09:07:21 +01:00
Laurent Rineau 1ecc57b367 Merge pull request #5238 from albert-github/feature/bug_space_link
Superfluous space in link
2020-12-15 09:04:58 +01:00
Laurent Rineau 91b1ab221f Merge pull request #5255 from sgiraudot/Shape_detection-Fix_auto_param_detection-GF
[RANSAC] Fix detection of automatic parameter selection
2020-12-15 09:04:55 +01:00
Simon Giraudot 360040dfd6 Fix ptrdiff_t overflow 2020-12-14 15:18:56 +01:00
Maxime Gimeno 00edae2400 More fixes 2020-12-10 12:55:04 +01:00
Maxime Gimeno 1d98f0f71d Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-12-09 14:40:02 +01:00
Simon Giraudot 8c7d012297 Fix detection of automatic parameter selection + early exit if no shape can be detected 2020-12-08 15:35:22 +01:00
albert-github 1fd47a68fa Superfluous space in link
The texts in the ALIASES are taken literally and therefore should be (in this case) no space after the comma as this results in a space ion the resulting link and thus a file not found.
2020-12-08 15:19:50 +01:00
Laurent Rineau 5e53e0e70a Merge branch '5.2.x-branch' 2020-12-07 16:33:01 +01:00
Laurent Rineau 89eea037da
Merge pull request #5234 from sgiraudot/Shape_detection-Add_validity_tests-GF 2020-12-07 16:32:07 +01:00
Laurent Rineau b03399cc6c Merge pull request #5208 from maxGimeno/Shape_detection-Fix_warnings-maxGimeno
Shape_detection: Fix warnings.
2020-12-04 17:16:07 +01:00
Laurent Rineau 81dc3bf892 Merge pull request #5208 from maxGimeno/Shape_detection-Fix_warnings-maxGimeno
Shape_detection: Fix warnings.
2020-12-04 17:08:28 +01:00
Simon Giraudot b2573a7b38 Fix Windows min/max garbage 2020-12-03 09:34:31 +01:00
Simon Giraudot 873aa26a8f Avoid testsuite timeouts 2020-12-03 09:27:01 +01:00
Simon Giraudot 09b61c13d9 Fix assertion 2020-12-02 09:23:03 +01:00
Simon Giraudot 9294461c64
Call ctest on new validity test
Co-authored-by: Laurent Rineau <Laurent.Rineau@cgal.org>
2020-12-01 14:56:17 +01:00
Simon Giraudot e21d019c05 Finalize validity test 2020-12-01 14:28:00 +01:00
Simon Giraudot 4a3ad83f21 Small optimization: pick several candidates at each loop 2020-12-01 14:28:00 +01:00
Simon Giraudot d2d766a38e Fix stop probability to take into account different shapes 2020-12-01 14:28:00 +01:00
Simon Giraudot 37d38da190 Add validity tests with sampled data 2020-12-01 14:28:00 +01:00
Simon Giraudot 60f85259cd Add validity test to shape detection 2020-12-01 14:28:00 +01:00
albert-github 6b0cba883b Typo in list of documentation typedefs
I get a double defined ID (when running xmllint on the output) regarding the Vector_3 typedef.
In my opinion the second definition should be Vector_2 and not Vector_3.
2020-11-29 12:57:31 +01:00
Maxime Gimeno 393f547abf Fix size_t always >=0 warnings. 2020-11-27 09:10:24 +01:00
Maxime Gimeno 3b70343590 Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-11-16 16:19:43 +01:00
Simon Giraudot f30b1e5c06 Update RANSAC with octree changes 2020-10-27 14:06:12 +01:00
Maxime Gimeno bebd60c12b Merge remote-tracking branch 'cgal/master' into Cmake_improvements-maxGimeno 2020-10-20 09:53:54 +02:00
Jackson Campolattaro 943183490d Replace hardcoded bounding box with a method for determining the actual bounds of the tree 2020-10-19 16:20:45 -04:00
Mael Rouxel-Labbé f55ef7dd50 Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-10-09 18:36:17 +02:00
Laurent Rineau 0b2528c8b0 Merge branch 'releases/CGAL-5.0-branch' into 5.1.x-branch 2020-09-24 16:41:45 +02:00
Simon Giraudot c717fdaab6 Fix index access in RANSAC octrees 2020-09-17 14:51:04 +02:00
Simon Giraudot fb86a45d47 Adapt max level to old version 2020-09-17 14:19:04 +02:00
Simon Giraudot 64693edffa Fix RANSAC Octree wrapper: now Octrees are exactly the same as with old version 2020-09-17 11:45:34 +02:00
Simon Giraudot 604c793ba7 Fix nonnull warning 2020-09-01 09:14:10 +02:00
Jackson Campolattaro f1144724dd Rename Direct_octree to RANSAC_octree 2020-08-17 15:01:55 -04:00
Jackson Campolattaro 9e1505ad8a Eliminate Indexed_octree 2020-08-17 14:59:56 -04:00
Jackson Campolattaro 3252f82498 Update function invocations 2020-08-14 14:06:02 -04:00
Jackson Campolattaro ee2a93e8e1 Update refine method of Direct octree to match indexed 2020-08-10 12:39:19 -04:00
Jackson Campolattaro 939ba23f39 Add brackets to do-while loop for clarity 2020-08-08 14:14:06 -04:00
Jackson Campolattaro 87af9e7951 Add brackets to keep_searching check for clarity 2020-08-08 13:20:42 -04:00
Jackson Campolattaro 4c3c6c5140 Force bbox value to make sure it's not causing issues 2020-08-08 13:01:27 -04:00
Jackson Campolattaro 9d10429df5 Disable randomness in scene test 2020-08-08 12:18:27 -04:00
Jackson Campolattaro 5537e27696 Remove fixed seed for random generator 2020-08-07 19:04:18 -04:00
Jackson Campolattaro 2a6ce57648 Re-enable all cone parameter tests 2020-08-07 19:02:48 -04:00
Jackson Campolattaro 7b74d5bcbe Remove printouts 2020-08-07 18:57:05 -04:00
Jackson Campolattaro e8b4d56aad Remove printouts from Efficient_RANSAC.h 2020-08-07 18:56:21 -04:00
Jackson Campolattaro fa61c44d73 Return to independently defined Direct octree 2020-08-07 18:52:48 -04:00
Jackson Campolattaro dd9878a20d Add reminder to replace fixed side length map size 2020-08-07 18:41:41 -04:00
Jackson Campolattaro c53790776c Give indexed octree consistent api with direct 2020-08-07 18:26:15 -04:00
Jackson Campolattaro 49baf4ce36 Mark location of issue 2020-08-07 17:17:22 -04:00