Commit Graph

219 Commits

Author SHA1 Message Date
Simon Giraudot 49017ae7b4 Commented structure of algorithm + two useful functions 2015-10-30 13:23:32 +01:00
Simon Giraudot 4c601e00db Plug RANSAC in plane regularization class 2015-10-30 13:00:21 +01:00
Simon Giraudot cea079532a Plane regularization file and basic structure 2015-10-30 11:35:10 +01:00
Sébastien Loriot 277c7b562a move test file out of the include dir 2015-07-31 09:56:52 +02:00
Clement Jamin 98e36704f7 Make connected_component virtual 2015-07-17 14:16:28 +02:00
Clement Jamin 3b29aeef2d We must never call the Point_3/Vector_3 constructor directly
+ avoid having uninitialized variables
2015-07-17 12:25:17 +02:00
Sébastien Loriot 3ccb377f14 fix the uncatchable bug with spheres 2015-07-17 11:55:26 +02:00
Sven Oesau 5767aad9b3 bugfixes
and some warnings removed
2015-07-16 18:16:50 +02:00
Sven Oesau f1a36e891b bugfix 2015-07-16 15:45:45 +02:00
Sven Oesau d2ad8565a3 check vector size before access 2015-07-16 11:16:39 +02:00
Clement Jamin 86a5b78992 Use CGAL::default_random everywhere 2015-07-15 15:20:13 +02:00
Clement Jamin 1fd6e64737 More protection when accessing "bitmap" 2015-07-15 10:58:48 +02:00
Sven Oesau 6babcf966f fixed warnings 2015-07-11 12:24:10 +02:00
Sven Oesau 3f96610bcb checking range for bitmap access in connected component
shortening some lines
2015-07-10 23:17:42 +02:00
Clement Jamin c419bd1246 Added some "using" for the exact same reason 2015-07-10 10:47:12 +02:00
Clement Jamin 580211cc6a Added some this-> to make GCC happy again
I know, he's right to be angry...
2015-07-10 10:41:10 +02:00
Clement Jamin 870a49b868 Removed temporary testing code 2015-07-10 10:37:10 +02:00
Clement Jamin 0f17afa049 Octree: bugfix + use of Construct_xxx 2015-07-10 10:00:45 +02:00
Clement Jamin f4f9a75c44 Let's get back to the real traits class 2015-07-10 09:08:54 +02:00
Clement Jamin bb5b745d98 The torus is working fine, now 2015-07-10 09:08:07 +02:00
Sven Oesau 3e218a2c07 adapted torus to traits concept
ToDo: Collinear_2 needs to be adapted
2015-07-10 00:14:09 +02:00
Sven Oesau bb2998e11f bugfix 2015-07-10 00:12:32 +02:00
Clement Jamin 00e48dd169 Added right header in comments 2015-07-09 10:27:14 +02:00
Clement Jamin 7ee1ac7c41 Fix warnings 2015-07-09 10:22:43 +02:00
Clement Jamin 33d1b9f971 Doc: updated requirements for the shapes 2015-07-09 10:01:45 +02:00
Clement Jamin 7c45024d90 Dispatched utilities 2015-07-09 09:38:08 +02:00
Clement Jamin 40fd40cc0e Missing param 2015-07-09 09:20:25 +02:00
Clement Jamin b1a8059dc3 Fix warning 2015-07-09 08:58:43 +02:00
Clement Jamin daaa0a87d1 Update the real traits class 2015-07-09 08:58:22 +02:00
Clement Jamin 36d7bfa2c8 Compute_cross_product_3 => Construct_cross_product_vector_3 2015-07-09 08:57:27 +02:00
Clement Jamin 6dc0ff6ada Reordering 2015-07-09 08:28:07 +02:00
Clement Jamin 545756f2fc Merge branch 'Point_set_shape_detection_3-cjamin' of github.com:CGAL/cgal-dev into Point_set_shape_detection_3-cjamin 2015-07-09 08:09:13 +02:00
Clement Jamin 0968103236 Removed warning 2015-07-09 08:08:58 +02:00
Sébastien Loriot a2c1f72164 fix compilation issue 2015-07-09 08:07:49 +02:00
Clement Jamin 5d5b60d130 Revert "Make the utilities public"
This reverts commit 230c4aea14.
2015-07-09 07:47:36 +02:00
Clement Jamin 230c4aea14 Make the utilities public 2015-07-09 07:45:53 +02:00
Clement Jamin c2b35a7834 WIP: use functors from the trait class and update the concept
Temporarily replaced the actual traits class by a fake one to test the concept
Only a few examples compile for now
2015-07-08 19:45:54 +02:00
Sven Oesau d73676eb8f renamed several variables to follow CGAL standard
changed main loop: after search probability for min_points is surpassed, no more candidates are generated and the remaining ones are searched. Duplicate candidates are filtered.

added Shape_base::is_same(): compares to shapes by testing distance and normal deviation from random points from other shape
2015-07-08 18:55:52 +02:00
Sven Oesau f550b731ce changed Shape_base::squared_distance to const 2015-07-08 18:38:09 +02:00
Clement Jamin 385b5ee6ac Fix warnings + CGAL_M_PI => CGAL_PI 2015-07-07 16:54:27 +02:00
Clement Jamin 61eb5e7640 Fix PI macros 2015-07-07 12:06:45 +02:00
Sven Oesau 8db1f99353 bugfix 2015-07-07 12:06:45 +02:00
Sven Oesau 44a01d3b4c removed cross filtering kernel 2015-07-07 12:06:45 +02:00
Sven Oesau 81033fd37d added connected component for cones
2 case handling:
flat cones (opening angle > PI/4) are mapped onto circles
acute cones are mapped onto rectangular parameter space
2015-07-07 12:06:45 +02:00
Sven Oesau b58bc98206 added cross kernel for connected component labeling 2015-07-07 12:06:45 +02:00
Sven Oesau fbdfc61922 corrected the default value of the min_points parameter as specified in documentation (1% of input points), but not less than 10 points 2015-07-07 12:06:44 +02:00
Sven Oesau 8949009469 moved pi defines to Shape_base 2015-07-07 12:06:44 +02:00
Sven Oesau a2dc47ca3e fixed warning 2015-07-07 12:06:44 +02:00
Sven Oesau 73e28e6798 some bugfixes 2015-07-07 12:06:44 +02:00
Sven Oesau c1669667d3 added connected component for Sphere
removed few warnings
2015-07-07 12:06:44 +02:00
Sven Oesau 3300eb746b changed connected component (more flexible for other shape types) 2015-07-07 12:06:43 +02:00
Sven Oesau dc3eb93332 avoiding crash if Efficient_RANSAC instance is released after releasing the input data range 2015-06-29 15:46:51 +02:00
Sven Oesau ab7a764f53 Revert "changed connected component"
This reverts commit f525f447b2bd1aa2f004d2be0705c7749eef235b.
2015-06-29 15:40:54 +02:00
Sven Oesau 365d114ac0 changed connected component
removed wraps_u_wraps_v
adapted plane and cylinder
2015-06-29 11:13:22 +02:00
Sven Oesau d9ab3eec09 prevent spheres to be detected as tori (decision based on chosen epsilon) 2015-06-29 10:47:07 +02:00
Sven Oesau 0365e18bc9 small simplification of subset random number generation 2015-06-29 10:01:30 +02:00
Sven Oesau 8ce8ebaff2 fixed memory leak 2015-06-26 14:50:57 +02:00
Clement Jamin 136c6c6886 Use std::distance + reduce some line lengths 2015-06-22 11:30:13 +02:00
Clement Jamin b6e3c417aa Fix warnings 2015-06-22 11:15:11 +02:00
Clement Jamin 1335a1eaf7 Use CGAL::abs everywhere 2015-06-22 11:09:23 +02:00
Clement Jamin 40df02cc75 Removed "template" keyword + quick note in the doc
"template" should only be added before "add_shape_factory"
when the call is within a template
2015-06-22 10:43:21 +02:00
Sven Oesau f139720b8d added unit test for scenes
accesses all points assigned to a shape
retrieves the unassigned point range
validates coverage
requires cube.pwn
2015-06-22 00:04:31 +02:00
Sven Oesau 17caccffea added calls to all specific shape functions
added remaining connected component unit tests
small bugfixes (small datasets, cylinder parameter space mapping)
2015-06-21 22:58:18 +02:00
Andreas Fabri 27aa60c2dc more fixes 2015-06-19 10:04:36 +02:00
Andreas Fabri 8615f1b874 protect max() 2015-06-19 09:06:06 +02:00
Sven Oesau 3c50ebbb95 64 bit compatibility
changed random index selection in Octree to Random::uniform_int
switched hypergeometrical_dist from int to std::ptrdiff_t
2015-06-17 17:36:07 +02:00
Sven Oesau dfba7e2ce0 changed variable naming in several classes to match CGAL standard
octree now uses size_t instead of singed integers
added missing Plane::d() function to retrieve d parameter from plane equation (= - distance from origin)
changed many variables from int to size_t to remove 64 bit warnings
2015-06-17 10:27:14 +02:00
Clement Jamin dd855e0a43 Missing "template" 2015-06-15 14:26:32 +02:00
Clement Jamin 83cbb3b2f4 Use CGAL::Random instead of C++11 2015-06-15 14:01:07 +02:00
Sven Oesau d42aa18936 bugfix for clang (removed empty Filter_unassigned_points constructor)
removed several warnings
switch to CGAL::sqrt
2015-06-15 11:21:08 +02:00
Clement Jamin be9a7921eb Revert "Missing parenthesis"
This reverts commit 5a620cb873d2665eeac0f2d948fd03b578e9b127.
2015-06-12 17:39:17 +02:00
Clement Jamin 1e39860061 Missing parenthesis 2015-06-12 17:06:45 +02:00
Clement Jamin a5e017a7c3 Remove "SIZE_MAX" 2015-06-12 16:51:32 +02:00
Sven Oesau 4fbb438a8a fixed memory leak 2015-06-02 13:15:15 +02:00
Sébastien Loriot 0b77c9bf7e use CGAL::default_random instead of std::mt19937 2015-05-15 09:13:49 +02:00
Sébastien Loriot f7804127e9 give the shapes access to the traits 2015-04-29 15:28:15 +02:00
Sébastien Loriot dbf54bc4f4 the constructor of the default traits takes the geometric traits as parameter 2015-04-29 15:27:43 +02:00
Sébastien Loriot 37922582ff remove a More in the doc 2015-04-29 15:19:09 +02:00
Sébastien Loriot 4bc3ed055b fix compilation issues and warnings 2015-04-29 14:54:02 +02:00
Sébastien Loriot 7c757b8d8c fix the return type of point() and normal() 2015-04-29 14:36:44 +02:00
Sébastien Loriot 782a21822c clean do not call clear_shape_factories 2015-04-29 14:33:42 +02:00
Sven Oesau 41de18ca64 added traits class to Shape_base (set via compute)
removed clear_shape_factories()
removed unused member
2015-04-29 12:22:29 +02:00
Sébastien Loriot 13ef35d8e6 remove extra comma 2015-04-28 21:11:20 +02:00
Sébastien Loriot 3f6eba7993 improve wording 2015-04-28 21:10:40 +02:00
Sven Oesau e3761ae9d2 added example call to Efficient_RANSAC::add_shape_factory() documentation 2015-04-28 17:49:38 +02:00
Sven Oesau 83b7a30f8f changed 0.05 to 5% (documentation) 2015-04-24 16:26:24 +02:00
Andreas Fabri 6a7500a881 polish 2015-04-24 16:10:07 +02:00
Andreas Fabri 6a81833648 polish 2015-04-24 16:04:46 +02:00
Sébastien Loriot b0f50afafe fix citation 2015-04-24 15:26:38 +02:00
Sébastien Loriot 50cba4f5cb uniformize 2015-04-23 09:13:59 +02:00
Sébastien Loriot 08f17c33eb update doc 2015-04-23 08:43:57 +02:00
Sébastien Loriot 87ec11c370 Search_traits_3 requires a Kernel as template parameter 2015-04-23 08:42:56 +02:00
Andreas Fabri 676fd7d1c4 renamed assigned_points_indices to indices_of_assignd_points 2015-04-22 20:08:37 +02:00
Andreas Fabri b282414acf renamed unassigned_points_indices to indices_of_unassigned_points 2015-04-22 19:43:41 +02:00
Andreas Fabri 0676c53db4 fixes so that the examples compile again 2015-04-22 19:24:19 +02:00
Andreas Fabri fbf6926585 polish 2015-04-22 18:40:35 +02:00
Andreas Fabri 3aabefb150 refer to the property maps 2015-04-22 17:39:29 +02:00
Andreas Fabri 75622f39e4 Point ->Point_3 2015-04-22 17:39:29 +02:00
Andreas Fabri 62da6b4082 WIP concerning feedback of reviewers 2015-04-22 16:32:27 +02:00
Andreas Fabri cd693f27cb typos 2015-04-22 12:35:39 +02:00