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