Commit Graph

429 Commits

Author SHA1 Message Date
Simon Giraudot 763fd28a69 Warning fix: explicit conversion from double to FT 2016-04-25 10:05:47 +02:00
Simon Giraudot d04378bc7a Update doc with latest review 2016-04-21 09:57:16 +02:00
Simon Giraudot 629571b8cb Test symmetry regularization 2016-04-21 09:42:07 +02:00
Simon Giraudot 5d5778f58e Fix symmetry regularization 2016-04-21 09:41:03 +02:00
Simon Giraudot abf2070f77 Clean up code 2016-04-21 07:56:03 +02:00
Simon Giraudot b101e9bc4c New test for plane_regularization 2016-04-20 15:35:25 +02:00
Simon Giraudot 18a3db0014 Use plane.d() to update m_d in Plane_shape 2016-04-20 15:34:58 +02:00
Simon Giraudot f28b7adc7b Some additional fixes 2016-04-20 15:34:39 +02:00
Simon Giraudot fc7d47e8d7 Add condition for subgraphing mutually orthogonal clusters 2016-04-20 12:57:13 +02:00
Simon Giraudot 5252b4ef36 Bugfix: bad index copy-paste 2016-04-20 12:35:30 +02:00
Simon Giraudot 238510c27e Remove warning 2016-04-20 11:55:29 +02:00
Simon Giraudot 55b9d92fc9 Bugfix: convert angle to radians 2016-04-20 11:33:46 +02:00
Simon Giraudot dc1aae87bd Bugfix: propagate property maps to regularization function 2016-04-20 11:33:10 +02:00
Simon Giraudot 372b2d161a Merge branch 'Point_set_processing_3-Point_set_structuring-GF-old-old' into Point_set_processing_3-Point_set_structuring-GF-old 2016-04-12 14:01:45 +02:00
Laurent Rineau 836ce61d39 Merge branch 'releases/CGAL-4.8-branch' 2016-03-31 12:35:23 +02:00
Simon Giraudot aaa2a41e01 Explicit propagations of property maps to Octree structures 2016-03-30 14:08:28 +02:00
Simon Giraudot be5a66ef63 Add property maps as parameters of Octree constructor 2016-03-30 14:08:00 +02:00
Simon Giraudot b98dc48a61 Windows warning fix: explicit conversion to FT 2016-03-21 10:49:59 +01:00
Simon Giraudot 7276c06c36 Merge branch 'Point_set_shape_detection_3-Plane_regularization-GF-old' into Point_set_shape_detection_3-Plane_regularization-GF 2016-03-15 10:37:02 +01:00
Simon Giraudot 64c69ebf97 Update manual 2016-03-14 15:25:38 +01:00
Simon Giraudot 2777311113 Add example to documentation 2016-03-14 15:25:26 +01:00
Simon Giraudot e3f9bac2c7 New example for plane regularization 2016-03-14 14:42:21 +01:00
Simon Giraudot 1f7a15c501 Update manual 2016-03-14 14:23:57 +01:00
Simon Giraudot 24d1c662ce Update doc with new API 2016-03-14 11:53:41 +01:00
Simon Giraudot cab047817a Clarify API of plane regularization 2016-03-14 10:16:43 +01:00
Simon Giraudot e30e2e278f Propagate name change (Plane_regularization -> regularize_planes) 2016-03-14 09:06:45 +01:00
Simon Giraudot cae23c7fe9 Update API of plane regularization 2016-03-14 07:12:55 +01:00
Simon Giraudot 03decddb0b Plane_regularization class is now a simple function regularize_planes 2016-03-11 15:29:15 +01:00
Clement Jamin 9a61b23b55 Use get_default_random() instead of default_random 2016-03-09 10:35:21 +01:00
Sébastien Loriot 881e4d3199 request Core only in examples, tests and demos when really needed 2016-03-07 22:36:57 +01:00
Philipp Möller 0a04a3a48f Use CGAL_DOC_VERSION 2016-02-11 15:37:54 +01:00
Sébastien Loriot 8cee2ef1dd Merge pull request #686 from afabri/Kernel_fix-warnings-GF
Fix warnings concerning indentation and unused parameter
2016-02-03 09:49:54 +01:00
Sébastien Loriot bc717f51d8 fix indentation issue 2016-01-29 09:20:31 +01:00
Maxime Gimeno 5ffc01f1a1 indentation warnings fix 2016-01-28 14:17:11 +01:00
Simon Giraudot 40257fefb5 Merge branch 'Point_set_processing_3-Point_set_structuring-GF-old' into Point_set_processing_3-Point_set_structuring-GF 2016-01-12 11:53:09 +01:00
Simon Giraudot cf7d88c475 Explicit cast to FT for constructor point 2016-01-06 08:08:26 +01:00
Simon Giraudot 3ba780f49c Warning fix: explicit conversion of float to FT 2016-01-05 10:33:45 +01:00
Simon Giraudot a0853b21a8 Authors 2016-01-04 11:54:38 +01:00
Simon Giraudot 467e599257 Explicit conversion of double/floats to FT 2016-01-04 11:39:05 +01:00
Simon Giraudot 1e079ed272 More on documentation 2015-12-30 15:05:03 +01:00
Simon Giraudot c51a9f5860 Also test regularization of symmetry 2015-12-30 13:53:35 +01:00
Simon Giraudot 91aa735745 Bugfix: assigned -1 to unsigned and test if <0 never works 2015-12-30 13:52:46 +01:00
Simon Giraudot 4cd4d02b18 Declare floats explicitly to avoid warnings on Visual Studio 2015-12-30 13:44:02 +01:00
Simon Giraudot ad1feb89e1 Warning corrections: incorrect types 2015-12-30 09:16:31 +01:00
Simon Giraudot bb169a00d0 Remove extra semicolon after namespace (pedantic error) 2015-12-30 08:31:02 +01:00
Simon Giraudot d46674d0c1 Add regularization to test_scene 2015-12-29 15:27:54 +01:00
Philipp Möller 71b4e9c515 Use CGAL_FULL_VERSION in all Doxyfile.in 2015-12-17 16:33:28 +01:00
Philipp Möller 79b7fc5081 Handle the INPUT cases where the whole include dir is used 2015-12-10 17:03:46 +01:00
Simon Giraudot 7b034b534b RANSAC plane: check if normal orientation is consistent with data 2015-11-30 14:34:08 +01:00
Simon Giraudot c5a1621ff7 Add access to base kernel in Efficient RANSAC traits 2015-11-27 11:51:55 +01:00
Simon Giraudot dcf06b4a13 Creation of edge points and anchor points 2015-11-12 14:58:43 +01:00
Simon Giraudot 192d8c00b4 Additional functions in plane shape to avoid constructing Plane_3 object 2015-11-09 12:26:40 +01:00
Simon Giraudot 939e541ba5 More on manual and improve clarity of parameters 2015-11-06 18:02:19 +01:00
Simon Giraudot 82ee9c8ce0 Default behavior: no symmetry required 2015-11-06 14:36:22 +01:00
Simon Giraudot 06fb8a7916 Generalize symmetry from Z-axis to any user-given vector 2015-11-06 14:16:53 +01:00
Simon Giraudot 1d44ead4bc Documentation of plane regularization 2015-11-05 13:52:46 +01:00
Simon Giraudot 2f2910dd50 Bugfix (0/0 makes NaN) + adding parameters + start writing doc 2015-11-05 11:09:46 +01:00
Simon Giraudot 58f4a7b74f Correction of variable name and meaning 2015-11-04 15:08:59 +01:00
Simon Giraudot 7559892be3 Remove useless vectors and apply directly transformations to planes 2015-11-04 12:04:21 +01:00
Simon Giraudot 752d9f2d16 More reorganization 2015-11-04 11:23:39 +01:00
Simon Giraudot 536abe1f3f Reorganize and simplify code 2015-11-03 18:02:15 +01:00
Simon Giraudot 25e65415e5 Introduce Plane_cluster structure for clearer notations 2015-11-02 16:41:53 +01:00
Simon Giraudot 9d5c13c94c Simplify storage of parallel planes 2015-11-02 15:40:11 +01:00
Simon Giraudot e1ff4f68c7 Remove wrapper completely 2015-11-02 15:34:56 +01:00
Simon Giraudot a49b440ba0 Use RANSAC planes directly (reduce wrapper) 2015-11-02 15:15:40 +01:00
Simon Giraudot ebb3dc18b9 Add some useful methods for RANSAC Planes 2015-11-02 15:15:27 +01:00
Simon Giraudot 455e341731 Bugfix in wrapper for regularization 2015-11-02 11:36:10 +01:00
Simon Giraudot 20c95612d0 Improve code readability 2015-11-02 11:17:34 +01:00
Simon Giraudot 9c50ea1070 Wrapper for raw code done + some errors corrected 2015-10-30 15:38:56 +01:00
Simon Giraudot 971f445093 Dump raw research code (wrapper not complete yet) 2015-10-30 14:38:15 +01:00
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
Sébastien Loriot bdc7271990 Fix "remove dont_submit to publish the doc"
This fixes commit aeffc4587c.
2015-07-31 09:54:12 +02:00
Sébastien Loriot aeffc4587c remove dont_submit to publish the doc 2015-07-30 17:44:48 +02:00
Clement Jamin d52cf3c9d7 Merge branch 'Point_set_shape_detection_3-cjamin' of github.com:CGAL/cgal-dev into Point_set_shape_detection_3-cjamin 2015-07-20 09:53:17 +02:00
Clement Jamin 37567eea5b Display the coverage value, and loosen the criterion 2015-07-20 09:52:50 +02:00
Sven Oesau aeffbed975 bugfix 2015-07-17 16:11: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 b0add30089 Updated the concept accordingly 2015-07-10 09:08:20 +02:00
Clement Jamin bb5b745d98 The torus is working fine, now 2015-07-10 09:08:07 +02:00
Clement Jamin fbb6494658 Restore Point_set_shape_detection_3/test_torus_connected_component.cpp 2015-07-10 08:39:20 +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 b19f7107de We don't care about "i" 2015-07-09 09:37:27 +02:00
Clement Jamin e4c7d8a865 Fix most tests 2015-07-09 09:20:45 +02:00
Clement Jamin 40fd40cc0e Missing param 2015-07-09 09:20:25 +02:00
Clement Jamin b645b9b084 Compute_cross_product_3 => Construct_cross_product_vector_3 2015-07-09 08:59:06 +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 553b240631 Fix the traits concept 2015-07-09 08:55:55 +02:00
Clement Jamin 8be5f5d31a Restore the generators as they was before 2015-07-09 08:49:22 +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 986571c5e9 Added Efficient_RANSAC_fake_traits_for_testing.h to dont_submit 2015-07-08 19:49:57 +02:00
Clement Jamin 3d4832f0b8 Restore torus => doesn't compile for now 2015-07-08 19:48:57 +02:00
Clement Jamin f64caa9a93 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:02 +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 e2d60afdee unit tests for connected component now use the number of input points after filtering for parametrization 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 4e51eee527 adjusted parameters for sphere connected component unit test 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 272b29209e Fixed deadlock in test_cone_parameters by increasing point density 2015-06-29 15:49:42 +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 d8a830183a fixed warning and added a check to the average distance of assigned points 2015-06-27 10:44:34 +02:00
Clement Jamin a1b916c578 Fix warning: unused types 2015-06-26 19:20:58 +02:00
Sven Oesau 9c69a5f0d4 added data/cube.pwn 2015-06-26 15:44:09 +02:00
Sven Oesau 8ce8ebaff2 fixed memory leak 2015-06-26 14:50:57 +02:00
Sven Oesau 9513f2ecc3 downsampled example data set
moved data set to data folder
2015-06-26 14:49:48 +02:00
Clement Jamin 43a4a00964 Fix warnings 2015-06-23 17:58:30 +02:00
Clement Jamin a9be1b0a20 "template" not needed here 2015-06-23 08:49:23 +02:00