Simon Giraudot
4b313a50d7
Add missing include
2021-05-04 10:20:09 +02:00
Simon Giraudot
ad17c0b562
Cylinder/circle sorting + documentation update
2021-05-04 08:47:08 +02:00
Simon Giraudot
a85583387d
Doc of sorting
2021-04-28 15:52:56 +02:00
Simon Giraudot
ab18b6bb39
Region growing sphere sorting + test
2021-04-28 14:38:08 +02:00
Simon Giraudot
dc4b2c94c5
Move sphere fit out of fitting class
2021-04-28 12:15:18 +02:00
Simon Giraudot
4080a8c32f
Rebase
2021-04-28 08:20:24 +02:00
Sebastien Loriot
77e5d1d26f
Merge pull request #4852 from JacksonCampolattaro/gsoc2020-Octree-campolattaro
...
Add Octree Package
2021-04-17 14:26:01 +02:00
Sebastien Loriot
b7323389c7
Merge pull request #5622 from maxGimeno/CMake-Update_versions_in_scripts-maxGimeno
...
Update maximum cmake versions
2021-04-17 10:58:14 +02:00
Dmitry Anisimov
04f385687d
fixed several tests and memory management
2021-04-16 15:37:00 +02:00
Maxime Gimeno
c49152359c
update max version of cmake and announce the new minimal in CHANGE.md
2021-04-15 15:08:54 +02:00
Dmitry Anisimov
f7deb31166
added multiple strict tests
2021-04-14 18:12:34 +02:00
Dmitry Anisimov
5a0587a315
updated tests + new tests
2021-04-14 16:22:23 +02:00
Dmitry Anisimov
17bcbfc38d
fixed another missing include
2021-04-14 14:12:43 +02:00
Dmitry Anisimov
55cc13bc5a
fixed bug with missing includes for undocumented free functions
2021-04-14 13:11:05 +02:00
Simon Giraudot
8e7ea14f58
Fix conversion warning
2021-04-14 10:57:53 +02:00
Dmitry Anisimov
d10c72f7d3
Merge remote-tracking branch 'upstream/master' into Region_growing-revision-danston
2021-04-14 10:57:01 +02:00
Simon Giraudot
3de09ad3da
Fix consistency assertions/comments
2021-04-14 09:20:40 +02:00
Simon Giraudot
e87747d082
Fix candidate counting
2021-04-14 09:20:17 +02:00
Dmitry Anisimov
1a542135d1
now works with default maps
2021-04-13 13:47:18 +02:00
Dmitry Anisimov
fe5e3415e8
changed API of Polyline_graph
2021-04-13 11:59:34 +02:00
Dmitry Anisimov
fa5d4b251a
remved some useless internal code
2021-04-13 09:24:45 +02:00
Dmitry Anisimov
f9bdb150a6
removed deprecated code
2021-04-13 09:20:19 +02:00
Dmitry Anisimov
b6e2ea61ea
named parameters now include point/normal/segment maps
2021-04-12 18:02:57 +02:00
Dmitry Anisimov
c1f27fb0c5
relaxed constraints on property maps
2021-04-12 15:27:55 +02:00
Dmitry Anisimov
3c48e35138
review Sebastien
2021-04-12 14:02:14 +02:00
Simon Giraudot
10f6992b2a
Rebase on master
2021-04-07 14:32:31 +02:00
Simon Giraudot
8f4dec8107
Avoid timeouts in testsuite
2021-04-07 14:27:44 +02:00
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
Dmitry Anisimov
f0a667d7be
docs cleanup
2021-03-29 17:14:06 +02:00
Dmitry Anisimov
0072ad7a77
updated ref docs + added sections in the user manual
2021-03-29 16:55:53 +02:00
Dmitry Anisimov
c7d9f007ce
updated docs, region growing now properly handles the first time call for all regions
2021-03-29 15:01:40 +02:00
Dmitry Anisimov
424405bcfd
added polyline ref docs
2021-03-26 17:18:21 +01:00
Dmitry Anisimov
a1af0e9bb3
added segment set region type + better polyline graph
2021-03-26 16:53:15 +01:00
Dmitry Anisimov
d881117b41
fitting now works both on points and segments, added segment set sorting
2021-03-26 15:51:23 +01:00
Dmitry Anisimov
8cc513e935
added internal region growing traits and polyline graph based on segments
2021-03-26 14:48:53 +01:00
Dmitry Anisimov
35648ab3d6
cleanup, move some stuff to internal, updated docs
2021-03-26 11:12:46 +01:00
Dmitry Anisimov
c502a39ea9
added empty segment set classes + updated several docs
2021-03-25 17:16:27 +01:00
Dmitry Anisimov
462817c48e
added polyline graph test
2021-03-25 14:55:01 +01:00
Dmitry Anisimov
8a0996b671
added polyline graph query
2021-03-25 11:33:35 +01:00
Dmitry Anisimov
3ca82f638c
added empty polyline graph
2021-03-24 17:36:52 +01:00
Dmitry Anisimov
793037c3d7
more precise tests, point set free function, better plane detection on points
2021-03-24 17:28:22 +01:00
Dmitry Anisimov
664bc73149
better old tests
2021-03-24 14:08:28 +01:00
Dmitry Anisimov
da8e1a66a3
cleanup (new assertions, removed useless code, etc.) + better examples
2021-03-24 12:25:22 +01:00
Dmitry Anisimov
ca8c7f0470
added polyline classes, both 2D and 3D, fixed a few small things in other classes
2021-03-23 18:51:40 +01:00
Dmitry Anisimov
b31c9016f9
internal code is unified, added utility functions, added normal orientation
2021-03-23 15:29:42 +01:00
Dmitry Anisimov
1ff8c00af4
several repeating functions are moved to internal
2021-03-23 12:29:22 +01: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
Dmitry Anisimov
25cd87cce3
better precision in all shapes, no approximations now, added iota to sorting
2021-03-22 17:37:25 +01:00
Dmitry Anisimov
b971f6a0e2
added free functions and new examples
2021-03-22 13:22:32 +01:00
Dmitry Anisimov
3ae46dd890
added new examples with free functions + new data
2021-03-19 17:15:54 +01:00
Dmitry Anisimov
b29db4ca7d
simplified region growing examples
2021-03-19 16:11:37 +01:00
Dmitry Anisimov
2d0b31b7f7
added named parameters
2021-03-19 14:32:14 +01:00
Dmitry Anisimov
4a9b7c7c9a
better incapsulation, naming, and added access to internal property maps
2021-03-19 12:20:03 +01:00
Dmitry Anisimov
05a8105ff8
added polyline headers and updated CGAL-style docs + fixed warnings in the Generic_facegraph_printer
2021-03-19 11:29:03 +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
Jackson Campolattaro
7b7a4e2b6a
Print out first input iterator value at multiple points in the code
2020-08-07 16:37:19 -04:00
Jackson Campolattaro
7f57f18a55
Force random seed for deterministic testing
2020-08-07 16:06:03 -04:00
Jackson Campolattaro
275feb0d3f
Refactor check for enough samples
2020-08-07 11:03:23 -04:00
Jackson Campolattaro
6084084f3a
Add more printouts to sample drawing
2020-08-07 10:47:25 -04:00
Jackson Campolattaro
1d19bca766
Remove printouts from refine()
2020-08-06 17:00:54 -04:00
Jackson Campolattaro
6905a65127
Add logic changing max level based on cluster epsilon
2020-08-06 16:05:10 -04:00
Jackson Campolattaro
aa7b8114cf
Implement node_containing_point using older version's logic
2020-08-06 15:07:03 -04:00
Jackson Campolattaro
ba79b9ecc6
Refactor logic confirming the node was found
2020-08-06 14:56:17 -04:00
Jackson Campolattaro
8747114f72
Add printout whether the relevant node was found
2020-08-06 14:37:18 -04:00
Jackson Campolattaro
7337443b6f
Include IO.h for printing octree nodes
2020-08-06 14:31:29 -04:00
Jackson Campolattaro
528918cf4f
Reduce printouts to most relevant information
2020-08-06 14:22:54 -04:00
Jackson Campolattaro
6a36493744
Add printouts for loop information
2020-08-06 11:43:56 -04:00
Jackson Campolattaro
7a9d06d50e
Add printouts for relevant functions
2020-08-06 10:50:00 -04:00
Jackson Campolattaro
b0e703b9d1
Add printouts for detecting and preprocessing
2020-08-06 10:42:08 -04:00
Jackson Campolattaro
976af7e816
Add printouts when building and deleting Efficient_RANSAC
2020-08-06 10:38:03 -04:00
Jackson Campolattaro
718ce05be4
Rename boundingBox to bbox
2020-08-05 13:49:18 -04:00
Jackson Campolattaro
310481b456
Don't return bounding box by reference
2020-08-05 12:05:40 -04:00
Jackson Campolattaro
5e1c087b0f
Make Direct_octree more similar to Indexed_octree
2020-08-05 10:49:49 -04:00
Jackson Campolattaro
f01061858a
Rename createTree to refine
2020-08-05 09:48:51 -04:00
Simon Giraudot
93b3f18275
Use indexed property map for Indexed octree
2020-08-05 11:23:48 +02:00
Jackson Campolattaro
d02e2bef1f
Update width to avoid access to private octree members
2020-08-04 22:59:06 -04:00
Jackson Campolattaro
d7421812ba
Add root accessor
2020-08-04 22:50:22 -04:00
Jackson Campolattaro
15e09e7940
Typedef Input_range as vector of ints
2020-08-04 22:48:58 -04:00
Jackson Campolattaro
94538c8686
Switch from is-a to has-a relationship with CGAL::Octree
2020-08-04 17:23:15 -04:00
Jackson Campolattaro
bb23d27217
Replace Index() with dereference
2020-08-04 16:24:05 -04:00
Jackson Campolattaro
1e06093411
Add width accessor
2020-08-04 16:20:45 -04:00
Jackson Campolattaro
154a436537
Typedef Cell as Node
2020-08-04 16:17:16 -04:00
Jackson Campolattaro
3cb182548e
Replace call to Index with dereferencing iterator
2020-08-04 16:16:45 -04:00
Jackson Campolattaro
c3ca8f0bbf
Add index map to both octrees
2020-08-04 15:13:27 -04:00
Jackson Campolattaro
bc5832d861
Octrees use vectors of sizes rather than Input_range as Point_range
2020-08-04 15:09:57 -04:00
Jackson Campolattaro
83f416e50c
Use for each loop over point indices contained by a node
2020-08-04 15:01:13 -04:00
Jackson Campolattaro
739bf9874e
Replace code block with method for finding the leaf containing a point
2020-08-04 14:56:29 -04:00
Jackson Campolattaro
73ddea7fc1
Use octree to find barycenter positions
2020-08-04 14:52:08 -04:00
Jackson Campolattaro
d96a4fd9a2
Typedef Cell as Node
2020-08-04 14:47:55 -04:00
Jackson Campolattaro
e54f753312
Add Indexed_octree constructor
2020-08-04 14:47:11 -04:00
Jackson Campolattaro
cdb25b8712
Add createTree function
2020-08-04 14:41:03 -04:00
Jackson Campolattaro
392fb5f30c
Add Direct_octree constructor
2020-08-04 14:39:00 -04:00
Jackson Campolattaro
19b0c80b4c
Add offset accessor
2020-08-04 14:20:46 -04:00
Jackson Campolattaro
ef943b6d3b
Add boundingBox method
2020-08-04 14:15:34 -04:00
Jackson Campolattaro
5afb9cf6aa
Add size method
2020-08-04 14:13:34 -04:00
Jackson Campolattaro
e2d1fdb4b6
Make both octrees extend the new octree
2020-08-04 14:07:23 -04:00
Jackson Campolattaro
6b4785a87d
Remove Octree declaration and typedef from Shape_base
2020-08-04 14:05:31 -04:00
Jackson Campolattaro
5f641c4594
Add new octree class declarations
2020-08-04 14:02:06 -04:00
Jackson Campolattaro
b7a4f50ac3
Remove all RANSAC octree code
2020-08-04 14:01:45 -04:00
Jackson Campolattaro
1f53a46e0f
Mark code using Cell in ways incompatible with Node
2020-08-04 12:36:12 -04:00
Maxime Gimeno
9c15f2c9dc
Use FeatureSummary in the demo, and remove CGAL_FOUND
2020-08-04 12:46:17 +02:00
Jackson Campolattaro
9405fd18be
Make Cell center private, add barycenter accessor
2020-08-03 13:53:22 -04:00
Jackson Campolattaro
baf7327021
Make Cell level private, add depth accessor
2020-08-03 13:45:29 -04:00
Jackson Campolattaro
5561dcb24f
Rename isLeaf to is_leaf
2020-08-03 13:40:59 -04:00
Jackson Campolattaro
cef9fad58c
Move Cell class definition outside octrees
2020-08-03 13:36:40 -04:00
Jackson Campolattaro
0270ed6167
Remove beyond from Indexed_octree
2020-08-03 11:38:25 -04:00
Jackson Campolattaro
d9649db9ff
Remove first from Indexed_octree
2020-08-03 11:36:48 -04:00
Jackson Campolattaro
0c1fbe07af
Remove beyond from Direct_octree
2020-08-03 11:32:58 -04:00
Jackson Campolattaro
55dd09407c
Remove first from Direct_octree
2020-08-03 11:31:16 -04:00
Jackson Campolattaro
df38189e63
Remove setData from Indexed_octree
2020-08-03 11:18:23 -04:00
Jackson Campolattaro
86354fa637
Remove setData from DirectOctree
2020-08-03 11:16:07 -04:00
Jackson Campolattaro
9a1581e513
Remove namespace Node
2020-08-03 09:51:58 -04:00
Jackson Campolattaro
74d6aa3014
Incorporate IndexedPointAccessor into Indexed_octree
2020-07-31 16:45:19 -04:00
Jackson Campolattaro
7a733cf44d
Incorporate DirectPointAccessor into Direct_octree
2020-07-31 16:30:23 -04:00
Jackson Campolattaro
c5d52350c2
Make externalized octree functions take a const pointer
2020-07-30 22:06:30 -04:00
Jackson Campolattaro
13fa41a3d4
Make accessor index() methods const
2020-07-30 22:06:05 -04:00
Jackson Campolattaro
2dd0b0d2e8
Split templated octree into pair of separately implemented versions
2020-07-30 21:32:26 -04:00
Jackson Campolattaro
47d141cb65
Begin implementing DirectOctree constructor
2020-07-30 13:46:55 -04:00
Jackson Campolattaro
066dc037bd
Begin defining a DirectOctree class containing a CGAL::Octree
2020-07-30 11:38:14 -04:00
Jackson Campolattaro
ed06a8bcb6
Remove extern int scoreTime
2020-07-29 18:41:44 -04:00
Jackson Campolattaro
cbb8f6f338
Remove Efficient_RANSAC forward declaration
2020-07-29 18:24:37 -04:00
Jackson Campolattaro
bc40cfa763
Move maxLevel argument from constructor to createTree
2020-07-29 18:20:04 -04:00
Jackson Campolattaro
707ba2536b
Move bucketSize argument from constructor to createTree
2020-07-29 17:15:48 -04:00
Jackson Campolattaro
700f345b0e
Remove normal map from octree
2020-07-29 16:51:40 -04:00
Jackson Campolattaro
a81cef079a
Make member variables private, with only const access
2020-07-29 14:59:29 -04:00
Jackson Campolattaro
587766f3e3
Add const width accessor
2020-07-29 14:57:45 -04:00
Jackson Campolattaro
32541f0074
Use const accessor everywhere root is used
2020-07-29 14:56:30 -04:00
Jackson Campolattaro
eec45bc2b0
Add const root accessor
2020-07-29 14:51:17 -04:00
Jackson Campolattaro
db16d02975
Remove drawSamplesFromCellContainingPoint from octree
2020-07-29 14:42:08 -04:00
Jackson Campolattaro
21f28d5134
Add drawSamplesFromCellContainingPoint outside octree
2020-07-29 14:40:31 -04:00
Jackson Campolattaro
161df54f00
Remove transl()
2020-07-29 13:12:31 -04:00
Jackson Campolattaro
f515c4ee49
Eliminate use of transl()
2020-07-29 13:10:35 -04:00
Jackson Campolattaro
9a9e5d2e10
Replace translation function with a sum
2020-07-29 13:06:52 -04:00
Jackson Campolattaro
8ee9c468a9
Remove constr_vec()
2020-07-29 13:02:54 -04:00
Jackson Campolattaro
02ec67c2af
Remove constr_pt()
2020-07-29 12:37:37 -04:00
Jackson Campolattaro
fbc89d08e9
Eliminate use of constr_pt()
2020-07-29 12:36:28 -04:00
Jackson Campolattaro
7fa85e08ca
Remove get_coord
2020-07-29 12:13:11 -04:00
Jackson Campolattaro
00c06e3fe5
Remove get_x, get_y, get_z
2020-07-29 12:12:10 -04:00
Jackson Campolattaro
a5fe24c966
Eliminate use of get_coord
2020-07-29 12:10:10 -04:00
Jackson Campolattaro
824743df3f
Eliminate use of get_x, get_y, get_z
2020-07-29 12:01:05 -04:00
Jackson Campolattaro
67a82563b3
Make split() private
2020-07-29 11:22:36 -04:00
Jackson Campolattaro
7ea5b1bc23
Make buildBoundingCube private
2020-07-29 11:21:03 -04:00
Jackson Campolattaro
6793b50d23
Remove ability to change bucket size after construction
2020-07-29 11:16:38 -04:00
Jackson Campolattaro
76b9ac3d1f
Remove Shape typedef
2020-07-29 10:42:08 -04:00
Jackson Campolattaro
e0e8aef745
Remove Efficient_RANSAC as friend class of octree
2020-07-29 10:11:47 -04:00
Jackson Campolattaro
e410c514f3
Remove Efficient_RANSAC::fullScore()
2020-07-23 11:53:27 -04:00
Jackson Campolattaro
1add423e04
Remove Octree::fullScore(); it was never used!
2020-07-23 11:50:49 -04:00
Jackson Campolattaro
d2d45d6ea5
Remove Octree::score()
2020-07-23 11:48:55 -04:00
Jackson Campolattaro
308255be4f
Eliminate usage of Octree::score()
2020-07-23 11:46:48 -04:00
Jackson Campolattaro
1ef6ee1cd7
score and fullScore now take octree arg by pointer
2020-07-23 11:42:29 -04:00
Jackson Campolattaro
a8abee4456
Define score method outside octree
2020-07-23 11:30:33 -04:00
Jackson Campolattaro
369cb69e08
Make Cell struct public
2020-07-23 11:13:27 -04:00
Jackson Campolattaro
0baee2d8fb
Define fullScore method outside octree
2020-07-23 11:09:55 -04:00
Jackson Campolattaro
0e305fc8a9
Reinstate original RANSAC tree code
2020-07-23 10:42:08 -04:00
Jackson Campolattaro
41cc40ab13
Define extension of package Octree
2020-07-22 12:45:55 -04:00
Jackson Campolattaro
013cafd43b
Remove RANSAC octree entirely
2020-07-22 12:35:17 -04:00
Jackson Campolattaro
12e82ce60c
Add Internal_octree typedef
2020-07-22 12:12:14 -04:00
Jackson Campolattaro
a0c3dbe39f
Remove all RANSAC octree implementation details
2020-07-22 11:12:02 -04:00
Mael Rouxel-Labbé
26ae0d2b8c
Misc compilation fixes
2020-06-23 19:11:55 +02:00
Mael Rouxel-Labbé
24d2ee9c75
Use the new IO functions in Point_set_3 / PSP_3 examples
2020-06-21 15:06:20 +02:00
Mael Rouxel-Labbé
2d49f7d702
Countless IO fixes...
...
Don't have the patience to split it nicely
2020-06-21 12:03:28 +02:00
Maxime Gimeno
ea53a8d70d
Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno
2020-06-17 14:25:21 +02:00
Maxime Gimeno
25c8313859
Replace IO functions in examples and fix Surface_mesh read_OFF()
2020-06-16 14:36:24 +02:00
Laurent Rineau
9b8ecd720b
Merge pull request #4636 from sgiraudot/CMake-Third_party_imported_targets-GF
...
CMake: Use Imported Targets for 3rd Party Libs
2020-06-05 17:54:14 +02:00
Andreas Fabri
d259d56712
Update PackageDescription.txt
...
No need to say that this is CGAL. And if we really want to keep it we have to use the macro or put a % before to avoid the link being generated.
2020-05-31 17:59:18 +02:00
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
Maxime Gimeno
049439fa6b
Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno
2020-04-30 16:47:58 +02:00
Maxime Gimeno
5b2d46cfa0
Fixes for min/max
2020-04-21 12:04:45 +02:00
Maxime Gimeno
e9d41d7b7d
Fixes for min/max
2020-04-21 11:38:37 +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
421096fd7f
Use imported targets everywhere
2020-04-15 14:06:13 +02:00
Mael Rouxel-Labbé
d8789f07c3
Remove tautological preconditions that spawn warnings on some platforms
2020-04-15 09:06:36 +02:00
Mael Rouxel-Labbé
9a8b48c8ea
Remove trailing whitespace
2020-04-10 17:13:26 +02:00
Maxime Gimeno
553d3c2f2c
Fix new warnings about precondition size_t >=0
2020-04-10 13:03:50 +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
fdb17cb3f1
extra run of the script to remove tabs and trailing whitespaces
2020-03-26 19:26:10 +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
cc1bd20c7c
Merge pull request #4356 from sgiraudot/Documentation-Update_cmake_variables-GF
...
Third party libs: improve documentation + introduce new CMake functions
2020-03-17 18:19:40 +01:00
Sébastien Loriot
ef6949419f
Merge remote-tracking branch 'cgal/releases/CGAL-5.0-branch'
2020-03-17 18:16:39 +01:00
Dmitry Anisimov
68e3a7b049
updated email address
2020-03-13 12:02:44 +01:00
Dmitry Anisimov
4134b89fd5
doc fix from the PR #4564
2020-03-11 14:44:28 +01:00
Dmitry Anisimov
4ace3cdf96
fixed PRs: #3864 ; #4563 ; #4570 ; added test with the degenerated mesh; fixed docs; cleanup
2020-03-11 14:44:27 +01:00
Thomas Karl Pietrowski
afd2eefa78
Shape_detection: Correcting comment in efficient_RANSAC_with_parameters example
...
Just because 200 != 500.
2020-03-01 19:52:35 +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
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
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
Laurent Rineau
65cde3ce79
Merge branch 'master' into Faster_dd_spatial_searching-cjamin
2019-12-03 19:18:15 +01:00
Laurent Rineau
15d9e1f0ff
Restore the alphabetical order of `dependencies` files
2019-10-31 14:41:37 +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
Lingjie Zhu
5ce268f7d5
minor fix: add const specifier
2019-07-30 10:10:03 +08:00
Simon Giraudot
91dc961b18
Use cache optimisation for KD Tree on indices for classification + shape detection
2019-07-04 13:18:52 +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
Laurent Rineau
be0d07d150
Merge pull request #3979 from afabri/CGAL-null_ptr-GF
...
Replace NULL and Nullptr_t with nullptr and nullptr_t
2019-06-17 14:10:35 +02:00
Dmitry Anisimov
feb0bf88d8
cgal max fix
2019-06-12 10:57:20 +02:00
Andreas Fabri
f7b7b9957f
Merge remote-tracking branch 'cgal/master' into CGAL-null_ptr-GF
2019-06-05 14:47:11 +02:00
Dmitry Anisimov
5a4fa9e98b
disabled warnings
2019-05-29 17:08:54 +02:00
Dmitry Anisimov
bdc46b293d
class name clash fix
2019-05-26 11:44:33 +02:00
Dmitry Anisimov
57cbe098fc
added deprecated code for back compatability
2019-05-24 18:57:15 +02:00
Dmitry Anisimov
2fac5f2f13
face index to size_t warning fix
2019-05-21 17:52:00 +02:00
Dmitry Anisimov
b2d64c796c
time to unsigned int conversion warnings fix
2019-05-20 10:05:48 +02:00
Dmitry Anisimov
76feac2716
more warnings fixed
2019-05-19 14:42:24 +02:00
Dmitry Anisimov
28bdc838b1
surface mesh sd plugin + test fixes
2019-05-15 21:33:27 +02:00
Dmitry Anisimov
c82199c012
improved demo + warnings fix
2019-05-13 19:08:07 +02:00
Dmitry Anisimov
ec147f2cc8
demo fixes
2019-05-10 11:23:49 +02:00
Dmitry Anisimov
a8a9c3bda4
bgl + shape detection dependent tests
2019-04-26 10:19:46 +02:00
Dmitry Anisimov
92d3417012
dependencies + structuring example fixes
2019-04-25 18:30:43 +02:00
Dmitry Anisimov
0ebebab1b8
shape detection dependent packages are fixed
2019-04-25 13:27:41 +02:00
Dmitry Anisimov
019a6a7954
cpp11 and boost foreach fixes
2019-04-24 11:41:05 +02:00
Dmitry Anisimov
44380db707
shape detection with region growing, benchmarks, examples, and tests - version 1.0
2019-04-18 17:34:57 +02:00